nystudio107 / craft-retour

src/helpers/MultiSite.php

Spacing +20 added lines, -20 removed lines

@@ -42,53 +42,53 @@ 
         $sites = Craft::$app->getSites();
         if (Craft::$app->getIsMultiSite()) {
             // Set defaults based on the section settings
-            $variables['enabledSiteIds'] = [];
-            $variables['siteIds'] = [];
+            $variables[ 'enabledSiteIds' ] = [ ];
+            $variables[ 'siteIds' ] = [ ];
 
             /** @var Site $site */
             foreach ($sites->getEditableSiteIds() as $editableSiteId) {
-                $variables['enabledSiteIds'][] = $editableSiteId;
-                $variables['siteIds'][] = $editableSiteId;
+                $variables[ 'enabledSiteIds' ][ ] = $editableSiteId;
+                $variables[ 'siteIds' ][ ] = $editableSiteId;
             }
 
             // Make sure the $siteId they are trying to edit is in our array of editable sites
-            if (!\in_array($siteId, $variables['enabledSiteIds'], false)) {
-                if (!empty($variables['enabledSiteIds'])) {
+            if (!\in_array($siteId, $variables[ 'enabledSiteIds' ], false)) {
+                if (!empty($variables[ 'enabledSiteIds' ])) {
                     if ($siteId !== 0) {
-                        $siteId = reset($variables['enabledSiteIds']);
+                        $siteId = reset($variables[ 'enabledSiteIds' ]);
                     }
                 } else {
-                    self::requirePermission('editSite:'.$siteId);
+                    self::requirePermission('editSite:' . $siteId);
                 }
             }
         }
         // Set the currentSiteId and currentSiteHandle
-        $variables['currentSiteId'] = empty($siteId) ? 0 : $siteId;
-        $variables['currentSiteHandle'] = empty($siteHandle)
+        $variables[ 'currentSiteId' ] = empty($siteId) ? 0 : $siteId;
+        $variables[ 'currentSiteHandle' ] = empty($siteHandle)
             ? Craft::$app->getSites()->currentSite->handle
             : $siteHandle;
 
         // Page title
-        $variables['showSites'] = (
+        $variables[ 'showSites' ] = (
             Craft::$app->getIsMultiSite() &&
-            \count($variables['enabledSiteIds'])
+            \count($variables[ 'enabledSiteIds' ])
         );
 
-        if ($variables['showSites']) {
-            if ($variables['currentSiteId'] === 0) {
-                $variables['sitesMenuLabel'] = Craft::t(
+        if ($variables[ 'showSites' ]) {
+            if ($variables[ 'currentSiteId' ] === 0) {
+                $variables[ 'sitesMenuLabel' ] = Craft::t(
                     'retour',
                     'All Sites'
                 );
             } else {
-                $variables['sitesMenuLabel'] = Craft::t(
+                $variables[ 'sitesMenuLabel' ] = Craft::t(
                     'site',
-                    $sites->getSiteById((int)$variables['currentSiteId'])->name
+                    $sites->getSiteById((int) $variables[ 'currentSiteId' ])->name
                 );
             }
         } else {
-            $variables['currentSiteId'] = 0;
-            $variables['sitesMenuLabel'] = '';
+            $variables[ 'currentSiteId' ] = 0;
+            $variables[ 'sitesMenuLabel' ] = '';
         }
     }
 
@@ -106,7 +106,7 @@ 
         if ($siteHandle !== null) {
             $site = Craft::$app->getSites()->getSiteByHandle($siteHandle);
             if (!$site) {
-                throw new NotFoundHttpException('Invalid site handle: '.$siteHandle);
+                throw new NotFoundHttpException('Invalid site handle: ' . $siteHandle);
             }
             $siteId = $site->id;
         } else {

src/controllers/TablesController.php

Spacing +28 added lines, -28 removed lines

@@ -62,7 +62,7 @@ 
         $siteId = 0
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -76,39 +76,39 @@ 
         // Query the db table
         $offset = ($page - 1) * $per_page;
         $query = (new Query())
-            ->from(['{{%retour_stats}}'])
+            ->from([ '{{%retour_stats}}' ])
             ->offset($offset)
             ->limit($per_page)
             ->orderBy("{$sortField} {$sortType}");
-        if ((int)$siteId !== 0) {
-            $query->where(['siteId' => $siteId]);
+        if ((int) $siteId !== 0) {
+            $query->where([ 'siteId' => $siteId ]);
         }
         if ($filter !== '') {
-            $query->where(['like', 'redirectSrcUrl', $filter]);
-            $query->orWhere(['like', 'referrerUrl', $filter]);
+            $query->where([ 'like', 'redirectSrcUrl', $filter ]);
+            $query->orWhere([ 'like', 'referrerUrl', $filter ]);
         }
         $stats = $query->all();
         if ($stats) {
             // Add in the `addLink` field
             foreach ($stats as &$stat) {
-                $stat['addLink'] = '';
-                if (!$stat['handledByRetour']) {
-                    $encodedUrl = urlencode('/'.ltrim($stat['redirectSrcUrl'], '/'));
-                    $stat['addLink'] = UrlHelper::cpUrl('retour/add-redirect', [
+                $stat[ 'addLink' ] = '';
+                if (!$stat[ 'handledByRetour' ]) {
+                    $encodedUrl = urlencode('/' . ltrim($stat[ 'redirectSrcUrl' ], '/'));
+                    $stat[ 'addLink' ] = UrlHelper::cpUrl('retour/add-redirect', [
                         'defaultUrl' => $encodedUrl
                     ]);
                 }
             }
             // Format the data for the API
-            $data['data'] = $stats;
+            $data[ 'data' ] = $stats;
             $query = (new Query())
-                ->from(['{{%retour_stats}}']);
+                ->from([ '{{%retour_stats}}' ]);
             if ($filter !== '') {
-                $query->where(['like', 'redirectSrcUrl', $filter]);
-                $query->orWhere(['like', 'referrerUrl', $filter]);
+                $query->where([ 'like', 'redirectSrcUrl', $filter ]);
+                $query->orWhere([ 'like', 'referrerUrl', $filter ]);
             }
             $count = $query->count();
-            $data['links']['pagination'] = [
+            $data[ 'links' ][ 'pagination' ] = [
                 'total' => $count,
                 'per_page' => $per_page,
                 'current_page' => $page,
@@ -143,7 +143,7 @@ 
         $siteId = 0
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:redirects');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -157,34 +157,34 @@ 
         // Query the db table
         $offset = ($page - 1) * $per_page;
         $query = (new Query())
-            ->from(['{{%retour_static_redirects}}'])
+            ->from([ '{{%retour_static_redirects}}' ])
             ->offset($offset)
             ->limit($per_page)
             ->orderBy("{$sortField} {$sortType}");
-        if ((int)$siteId !== 0) {
-            $query->where(['siteId' => $siteId]);
+        if ((int) $siteId !== 0) {
+            $query->where([ 'siteId' => $siteId ]);
         }
         if ($filter !== '') {
-            $query->where(['like', 'redirectSrcUrl', $filter]);
-            $query->orWhere(['like', 'redirectDestUrl', $filter]);
+            $query->where([ 'like', 'redirectSrcUrl', $filter ]);
+            $query->orWhere([ 'like', 'redirectDestUrl', $filter ]);
         }
         $redirects = $query->all();
         // Add in the `deleteLink` field
         foreach ($redirects as &$redirect) {
-            $redirect['deleteLink'] = UrlHelper::cpUrl('retour/delete-redirect/'.$redirect['id']);
-            $redirect['editLink'] = UrlHelper::cpUrl('retour/edit-redirect/'.$redirect['id']);
+            $redirect[ 'deleteLink' ] = UrlHelper::cpUrl('retour/delete-redirect/' . $redirect[ 'id' ]);
+            $redirect[ 'editLink' ] = UrlHelper::cpUrl('retour/edit-redirect/' . $redirect[ 'id' ]);
         }
         // Format the data for the API
         if ($redirects) {
-            $data['data'] = $redirects;
+            $data[ 'data' ] = $redirects;
             $query = (new Query())
-                ->from(['{{%retour_static_redirects}}']);
+                ->from([ '{{%retour_static_redirects}}' ]);
             if ($filter !== '') {
-                $query->where(['like', 'redirectSrcUrl', $filter]);
-                $query->orWhere(['like', 'redirectDestUrl', $filter]);
+                $query->where([ 'like', 'redirectSrcUrl', $filter ]);
+                $query->orWhere([ 'like', 'redirectDestUrl', $filter ]);
             }
             $count = $query->count();
-            $data['links']['pagination'] = [
+            $data[ 'links' ][ 'pagination' ] = [
                 'total' => $count,
                 'per_page' => $per_page,
                 'current_page' => $page,