nystudio107 / craft-retour

src/controllers/RedirectsController.php

Spacing +38 added lines, -38 removed lines

@@ -41,7 +41,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -57,7 +57,7 @@ 
      */
     public function actionRedirects(string $siteHandle = null): Response
     {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:redirects');
         // Get the site to edit
         $siteId = MultiSiteHelper::getSiteIdFromHandle($siteHandle);
@@ -70,32 +70,32 @@ 
         } catch (InvalidConfigException $e) {
             Craft::error($e->getMessage(), __METHOD__);
         }
-        $variables['baseAssetsUrl'] = Craft::$app->assetManager->getPublishedUrl(
+        $variables[ 'baseAssetsUrl' ] = Craft::$app->assetManager->getPublishedUrl(
             '@nystudio107/retour/web/assets/dist',
             true
         );
         // Enabled sites
         MultiSiteHelper::setMultiSiteVariables($siteHandle, $siteId, $variables);
-        $variables['controllerHandle'] = 'redirects';
+        $variables[ 'controllerHandle' ] = 'redirects';
 
         // Basic variables
-        $variables['fullPageForm'] = false;
-        $variables['docsUrl'] = self::DOCUMENTATION_URL;
-        $variables['pluginName'] = $pluginName;
-        $variables['title'] = $templateTitle;
-        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
-        $variables['crumbs'] = [
+        $variables[ 'fullPageForm' ] = false;
+        $variables[ 'docsUrl' ] = self::DOCUMENTATION_URL;
+        $variables[ 'pluginName' ] = $pluginName;
+        $variables[ 'title' ] = $templateTitle;
+        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $variables[ 'crumbs' ] = [
             [
                 'label' => $pluginName,
                 'url' => UrlHelper::cpUrl('retour'),
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'redirects';
+        $variables[ 'docTitle' ] = "{$pluginName} - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'redirects';
 
         // Render the template
         return $this->renderTemplate('retour/redirects/index', $variables);
@@ -119,7 +119,7 @@ 
         int $siteId = 0,
         StaticRedirectsModel $redirect = null
     ): Response {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:redirects');
 
         // Load in the redirect
@@ -133,12 +133,12 @@ 
         if ($redirect === null) {
             $redirectConfig = Retour::$plugin->redirects->getRedirectById($redirectId);
             if ($redirectConfig === null) {
-                $redirectConfig = [];
+                $redirectConfig = [ ];
                 Craft::error(
                     Craft::t(
                         'retour',
                         "Couldn't load redirect id {id}",
-                        ['id' => $redirectId]
+                        [ 'id' => $redirectId ]
                     ),
                     __METHOD__
                 );
@@ -151,13 +151,13 @@ 
         if ($redirect->siteId) {
             $site = $sites->getSiteById($redirect->siteId);
             if ($site) {
-                MultiSiteHelper::requirePermission('editSite:'.$site->uid);
+                MultiSiteHelper::requirePermission('editSite:' . $site->uid);
             }
         }
         if ($siteId) {
             $site = $sites->getSiteById($siteId);
             if ($site) {
-                MultiSiteHelper::requirePermission('editSite:'.$site->uid);
+                MultiSiteHelper::requirePermission('editSite:' . $site->uid);
             }
         }
         $pluginName = Retour::$settings->pluginName;
@@ -169,20 +169,20 @@ 
         } catch (InvalidConfigException $e) {
             Craft::error($e->getMessage(), __METHOD__);
         }
-        $variables['baseAssetsUrl'] = Craft::$app->assetManager->getPublishedUrl(
+        $variables[ 'baseAssetsUrl' ] = Craft::$app->assetManager->getPublishedUrl(
             '@nystudio107/retour/web/assets/dist',
             true
         );
         // Sites menu
         MultiSiteHelper::setSitesMenuVariables($variables);
-        $variables['controllerHandle'] = 'redirects';
+        $variables[ 'controllerHandle' ] = 'redirects';
 
         // Basic variables
-        $variables['fullPageForm'] = true;
-        $variables['docsUrl'] = self::DOCUMENTATION_URL;
-        $variables['pluginName'] = $pluginName;
-        $variables['title'] = $templateTitle;
-        $variables['crumbs'] = [
+        $variables[ 'fullPageForm' ] = true;
+        $variables[ 'docsUrl' ] = self::DOCUMENTATION_URL;
+        $variables[ 'pluginName' ] = $pluginName;
+        $variables[ 'title' ] = $templateTitle;
+        $variables[ 'crumbs' ] = [
             [
                 'label' => $pluginName,
                 'url' => UrlHelper::cpUrl('retour'),
@@ -193,12 +193,12 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/edit-redirect/'.$redirectId),
+                'url' => UrlHelper::cpUrl('retour/edit-redirect/' . $redirectId),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'redirects';
-        $variables['redirect'] = $redirect;
+        $variables[ 'docTitle' ] = "{$pluginName} - Redirects - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'redirects';
+        $variables[ 'redirect' ] = $redirect;
 
         // Render the template
         return $this->renderTemplate('retour/redirects/_edit', $variables);
@@ -251,17 +251,17 @@ 
         if ($redirectConfig === null) {
             throw new NotFoundHttpException('Redirect not found');
         }
-        $redirectConfig['id'] = (int)$redirectConfig['id'];
+        $redirectConfig[ 'id' ] = (int) $redirectConfig[ 'id' ];
         // Handle enforcing trailing slashes
         $generalConfig = Craft::$app->getConfig()->getGeneral();
-        if ($generalConfig->addTrailingSlashesToUrls && $redirectConfig['redirectMatchType'] === 'exactmatch') {
-            $destUrl = $redirectConfig['redirectDestUrl'] ?? '';
-            $redirectConfig['redirectDestUrl'] = $this->addSlashToSiteUrls($destUrl);
+        if ($generalConfig->addTrailingSlashesToUrls && $redirectConfig[ 'redirectMatchType' ] === 'exactmatch') {
+            $destUrl = $redirectConfig[ 'redirectDestUrl' ] ?? '';
+            $redirectConfig[ 'redirectDestUrl' ] = $this->addSlashToSiteUrls($destUrl);
         }
         // Handle URL encoded URLs by decoding them before saving them
-        if ($redirectConfig['redirectMatchType'] === 'exactmatch') {
-            $redirectConfig['redirectSrcUrl'] = urldecode($redirectConfig['redirectSrcUrl'] ?? '');
-            $redirectConfig['redirectSrcUrlParsed'] = urldecode($redirectConfig['redirectSrcUrlParsed'] ?? '');
+        if ($redirectConfig[ 'redirectMatchType' ] === 'exactmatch') {
+            $redirectConfig[ 'redirectSrcUrl' ] = urldecode($redirectConfig[ 'redirectSrcUrl' ] ?? '');
+            $redirectConfig[ 'redirectSrcUrlParsed' ] = urldecode($redirectConfig[ 'redirectSrcUrlParsed' ] ?? '');
         }
         $redirect = new StaticRedirectsModel($redirectConfig);
         // Make sure the redirect validates
@@ -279,8 +279,8 @@ 
         Retour::$plugin->redirects->saveRedirect($redirectConfig);
         // Handle the case where the redirect wasn't saved because it'd create a redirect loop
         $testRedirectConfig = Retour::$plugin->redirects->getRedirectByRedirectSrcUrl(
-            $redirectConfig['redirectSrcUrl'],
-            $redirectConfig['siteId']
+            $redirectConfig[ 'redirectSrcUrl' ],
+            $redirectConfig[ 'siteId' ]
         );
         if ($testRedirectConfig === null) {
             Craft::$app->getSession()->setError(Craft::t('app', "Couldn't save redirect settings because it'd create a redirect loop."));

src/controllers/FileController.php

Spacing +25 added lines, -25 removed lines

@@ -79,7 +79,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -156,7 +156,7 @@ 
      */
     public function actionImportCsv(string $siteHandle = null): Response
     {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:redirects');
         // If your CSV document was created or is read on a Macintosh computer,
         // add the following lines before using the library to help PHP detect line ending in Mac OS X
@@ -174,38 +174,38 @@ 
         } catch (InvalidConfigException $e) {
             Craft::error($e->getMessage(), __METHOD__);
         }
-        $variables['baseAssetsUrl'] = Craft::$app->assetManager->getPublishedUrl(
+        $variables[ 'baseAssetsUrl' ] = Craft::$app->assetManager->getPublishedUrl(
             '@nystudio107/retour/web/assets/dist',
             true
         );
         // Enabled sites
         MultiSiteHelper::setMultiSiteVariables($siteHandle, $siteId, $variables);
-        $variables['controllerHandle'] = 'file';
+        $variables[ 'controllerHandle' ] = 'file';
 
         // Basic variables
-        $variables['fullPageForm'] = true;
-        $variables['docsUrl'] = self::DOCUMENTATION_URL;
-        $variables['pluginName'] = $pluginName;
-        $variables['title'] = $templateTitle;
-        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
-        $variables['crumbs'] = [
+        $variables[ 'fullPageForm' ] = true;
+        $variables[ 'docsUrl' ] = self::DOCUMENTATION_URL;
+        $variables[ 'pluginName' ] = $pluginName;
+        $variables[ 'title' ] = $templateTitle;
+        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $variables[ 'crumbs' ] = [
             [
                 'label' => $pluginName,
                 'url' => UrlHelper::cpUrl('retour'),
             ],
             [
                 'label' => 'Redirects',
-                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'redirects';
+        $variables[ 'docTitle' ] = "{$pluginName} - Redirects - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'redirects';
 
         // The CSV file
         $file = UploadedFile::getInstanceByName('file');
         if ($file !== null) {
             $filename = uniqid($file->name, true);
-            $filePath = Craft::$app->getPath()->getTempPath().DIRECTORY_SEPARATOR.$filename;
+            $filePath = Craft::$app->getPath()->getTempPath() . DIRECTORY_SEPARATOR . $filename;
             $file->saveAs($filePath, false);
             // Also save the file to the cache as a backup way to access it
             $cache = Craft::$app->getCache();
@@ -226,8 +226,8 @@ 
             }
             $headers = $csv->fetchOne(0);
             Craft::info(print_r($headers, true), __METHOD__);
-            $variables['headers'] = $headers;
-            $variables['filename'] = $filePath;
+            $variables[ 'headers' ] = $headers;
+            $variables[ 'filename' ] = $filePath;
         }
 
         // Render the template
@@ -273,7 +273,7 @@ 
         }
         // Query the db table
         $data = (new Query())
-            ->from([$table])
+            ->from([ $table ])
             ->select(array_keys($columns))
             ->orderBy('hitCount DESC')
             ->all();
@@ -286,7 +286,7 @@ 
         }
         $csv->insertOne(array_values($columns));
         $csv->insertAll($data);
-        $csv->output($filename.'.csv');
+        $csv->output($filename . '.csv');
         exit(0);
     }
 
@@ -299,16 +299,16 @@ 
     {
         $csv->setOffset(1);
         $columns = ArrayHelper::filterEmptyStringsFromArray($columns);
-        $csv->each(function ($row) use ($headers, $columns) {
+        $csv->each(function($row) use ($headers, $columns) {
             $redirectConfig = [
                 'id' => 0,
             ];
             $index = 0;
             foreach (self::IMPORT_REDIRECTS_CSV_FIELDS as $importField) {
-                if (isset($columns[$index], $headers[$columns[$index]])) {
-                    $redirectConfig[$importField] = empty($row[$headers[$columns[$index]]])
+                if (isset($columns[ $index ], $headers[ $columns[ $index ] ])) {
+                    $redirectConfig[ $importField ] = empty($row[ $headers[ $columns[ $index ] ] ])
                         ? null
-                        : $row[$headers[$columns[$index]]];
+                        : $row[ $headers[ $columns[ $index ] ] ];
                 }
                 $index++;
             }
@@ -338,10 +338,10 @@ 
             ];
             $index = 0;
             foreach (self::IMPORT_REDIRECTS_CSV_FIELDS as $importField) {
-                if (isset($columns[$index], $headers[$columns[$index]])) {
-                    $redirectConfig[$importField] = empty($row[$headers[$columns[$index]]])
+                if (isset($columns[ $index ], $headers[ $columns[ $index ] ])) {
+                    $redirectConfig[ $importField ] = empty($row[ $headers[ $columns[ $index ] ] ])
                         ? null
-                        : $row[$headers[$columns[$index]]];
+                        : $row[ $headers[ $columns[ $index ] ] ];
                 }
                 $index++;
             }