nystudio107 / craft-retour

src/controllers/TablesController.php

Spacing +44 added lines, -44 removed lines

@@ -96,7 +96,7 @@ 
         $handled = 'all'
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -108,7 +108,7 @@ 
             }
         }
         $sortType = strtoupper($sortType);
-        $sortType = self::SORT_MAP[$sortType] ?? self::SORT_MAP['DESC'];
+        $sortType = self::SORT_MAP[ $sortType ] ?? self::SORT_MAP[ 'DESC' ];
         // Validate untrusted data
         if (!in_array($sortField, self::ALLOWED_STATS_SORT_FIELDS, true)) {
             throw new BadRequestHttpException(Craft::t('retour', 'Invalid sort field specified.'));
@@ -116,48 +116,48 @@ 
         // 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]);
+            ->orderBy([ $sortField => $sortType ]);
+        if ((int) $siteId !== 0) {
+            $query->where([ 'siteId' => $siteId ]);
         }
         if ($handled !== 'all') {
-            $query->where(['handledByRetour' => self::HANDLED_MAP[$handled]]);
+            $query->where([ 'handledByRetour' => self::HANDLED_MAP[ $handled ] ]);
         }
         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}}']);
-            if ((int)$siteId !== 0) {
-                $query->where(['siteId' => $siteId]);
+                ->from([ '{{%retour_stats}}' ]);
+            if ((int) $siteId !== 0) {
+                $query->where([ 'siteId' => $siteId ]);
             }
             if ($handled !== 'all') {
-                $query->where(['handledByRetour' => self::HANDLED_MAP[$handled]]);
+                $query->where([ 'handledByRetour' => self::HANDLED_MAP[ $handled ] ]);
             }
             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,
@@ -193,7 +193,7 @@ 
         $siteId = 0
     ): Response {
         PermissionHelper::controllerPermissionCheck('retour:redirects');
-        $data = [];
+        $data = [ ];
         $sortField = 'hitCount';
         $sortType = 'DESC';
         // Figure out the sorting type
@@ -205,7 +205,7 @@ 
             }
         }
         $sortType = strtoupper($sortType);
-        $sortType = self::SORT_MAP[$sortType] ?? self::SORT_MAP['DESC'];
+        $sortType = self::SORT_MAP[ $sortType ] ?? self::SORT_MAP[ 'DESC' ];
         // Validate untrusted data
         if (!in_array($sortField, self::ALLOWED_REDIRECTS_SORT_FIELDS, true)) {
             throw new BadRequestHttpException(Craft::t('retour', 'Invalid sort field specified.'));
@@ -213,52 +213,52 @@ 
         // 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]);
+            ->orderBy([ $sortField => $sortType ]);
+        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 and clean up the redirects
         foreach ($redirects as &$redirect) {
             // Make sure the destination URL is not a regex
-            if ($redirect['redirectMatchType'] !== 'exactmatch') {
-                if (preg_match("/\$\d+/", $redirect['redirectDestUrl'])) {
-                    $redirect['redirectDestUrl'] = '';
+            if ($redirect[ 'redirectMatchType' ] !== 'exactmatch') {
+                if (preg_match("/\$\d+/", $redirect[ 'redirectDestUrl' ])) {
+                    $redirect[ 'redirectDestUrl' ] = '';
                 }
             }
             // Handle extracting the site name
-            $redirect['siteName'] = Craft::t('retour', 'All Sites');
-            if ($redirect['siteId']) {
+            $redirect[ 'siteName' ] = Craft::t('retour', 'All Sites');
+            if ($redirect[ 'siteId' ]) {
                 $sites = Craft::$app->getSites();
-                $site = $sites->getSiteById($redirect['siteId']);
+                $site = $sites->getSiteById($redirect[ 'siteId' ]);
                 if ($site) {
-                    $redirect['siteName'] = $site->name;
+                    $redirect[ 'siteName' ] = $site->name;
                 }
             }
 
-            $redirect['editLink'] = UrlHelper::cpUrl('retour/edit-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}}']);
-            if ((int)$siteId !== 0) {
-                $query->where(['siteId' => $siteId]);
+                ->from([ '{{%retour_static_redirects}}' ]);
+            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 ]);
             }
             $count = $query->count();
-            $data['links']['pagination'] = [
+            $data[ 'links' ][ 'pagination' ] = [
                 'total' => $count,
                 'per_page' => $per_page,
                 'current_page' => $page,