Merge pull request #44 from Dolphiq/development

small changes

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Redirect Changelog
+## 1.0.16 - 2018-04-18
+### Fixed
+- Fixed migration scripts to create all tables on first install
+- Small text changes
 
 ## 1.0.15 - 2018-02-21
 ### Fixed

INSTALL.md

@@ -2,7 +2,7 @@
 
 ## Requirements
 
-This plugin requires Craft CMS 3.0.0-RC1 or later.
+This plugin requires Craft CMS 3.0.3.1 or later.
 
 ## Installation
 

README.md

@@ -11,7 +11,7 @@ As a new (experimental) feature the redirect also give you the ability to enable
 **Note**: This plugin may become a paid add-on when the Craft Plugin store becomes available.
 
 ## Requirements
-This plugin requires Craft CMS 3.0.0-RC11 or later.
+This plugin requires Craft CMS 3.0.3.1 or later.
 
 ## Installation
 

composer.json

@@ -2,7 +2,7 @@
     "name": "dolphiq/redirect",
     "description": "Craft redirect plugin provides an easy way to enter and maintain 301 and 302 redirects and 404 error pages.",
     "type": "craft-plugin",
-    "version": "1.0.15",
+    "version": "1.0.16",
     "keywords": [
         "craft",
         "cms",
@@ -25,7 +25,7 @@
         }
     ],
     "require": {
-        "craftcms/cms": "^3.0.0-RC11"
+        "craftcms/cms": "^3.0.3.1"
     },
     "autoload": {
         "psr-4": {

src/RedirectPlugin.php

@@ -102,6 +102,9 @@ public function getSettingsResponse()
 
     public function registerCpUrlRules(RegisterUrlRulesEvent $event)
     {
+        // only register CP URLs if the user is logged in
+        if (!\Craft::$app->user->identity)
+            return;
         $rules = [
             // register routes for the sub nav
             'redirect' => 'redirect/settings/',

src/migrations/Install.php

@@ -31,6 +31,7 @@ public function safeUp()
     public function safeDown()
     {
         $this->dropTableIfExists('{{%dolphiq_redirects}}');
+        $this->dropTableIfExists('{{%dolphiq_redirects_catch_all_urls}}');
         return true;
     }
 
@@ -58,6 +59,24 @@ protected function createTables()
             'uid' => $this->uid()
         ]);
 
+        if (!$this->db->tableExists('{{%dolphiq_redirects_catch_all_urls}}')) {
+
+            $this->createTable(
+                '{{%dolphiq_redirects_catch_all_urls%}}',
+                [
+                    'id' => $this->primaryKey(),
+                    'uri' => $this->string(255)->notNull()->defaultValue(''),
+                    // 'firstHitAt' => $this->dateTime()->notNull(),
+                    // 'lastHitAt' => $this->dateTime()->notNull(),
+                    'uid' => $this->uid(),
+                    'siteId' => $this->integer()->unsigned()->notNull()->defaultValue(0),
+                    'dateCreated' => $this->dateTime()->notNull(),
+                    'dateUpdated' => $this->dateTime()->notNull(),
+                    'hitCount' => $this->integer()->unsigned()->notNull()->defaultValue(0),
+                ]
+            );
+        }
+
         $this->addForeignKey(null, '{{%dolphiq_redirects}}', ['id'], '{{%elements}}', ['id'], 'CASCADE', null);
     }
 }

src/templates/edit.twig

@@ -16,7 +16,7 @@
 
     {% if redirect.id %}<input type="hidden" name="redirectId" value="{{ redirect.id }}">{% endif %}
     <div class="readable">
-        <p>{{ "You can use the Redirect plugin to redirect simple routes but also use it for more advanced route matches with parameters"|t('redirect') }}.<br><a target="_blank" href="https://github.com/Dolphiq/craft3-plugin-redirect/blob/master/RULES.md">{{ "See some examples and instrutions here"|t('redirect') }}</a>.</p>
+        <p>{{ "You can use the Redirect plugin to redirect simple routes but also use it for more advanced route matches with parameters"|t('redirect') }}.<br><a target="_blank" href="https://github.com/Dolphiq/craft3-plugin-redirect/blob/master/RULES.md">{{ "See some examples and instructions here"|t('redirect') }}</a>.</p>
     <br>
     </div>
     <div id="categorygroup-settings">

src/translations/nl/redirect.php

@@ -24,6 +24,6 @@
     "Couldn’t save the redirect." => "Opslaan van de doorverwijzing mislukt!",
     "Redirect saved." => "Doorverwijzing opgeslagen.",
     "You can use the Redirect plugin to redirect simple routes but also use it for more advanced route matches with parameters" => "De Redirect plugin kan gebruikt worden voor eenvoudige routes maar ook voor geavanceerdere routes met parameters",
-    "See some examples and instrutions here" => "Voorbeelden en instructies over het gebruik zijn hier te vinden (engels)"
+    "See some examples and instructions here" => "Voorbeelden en instructies over het gebruik zijn hier te vinden (engels)"
 
 ];