nystudio107 / craft-retour

src/controllers/TablesController.php

Spacing +5 added lines, -5 removed lines

@@ -123,7 +123,7 @@ 
             ->orderBy([$sortField => $sortType])
             ->filterWhere(['like', 'redirectSrcUrl', $filter])
             ->orFilterWhere(['like', 'referrerUrl', $filter]);
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         if ($handled !== 'all') {
@@ -144,7 +144,7 @@ 
                 }
                 $stat['addLink'] = '';
                 if (!$stat['handledByRetour']) {
-                    $encodedUrl = urlencode('/' . ltrim($stat['redirectSrcUrl'], '/'));
+                    $encodedUrl = urlencode('/'.ltrim($stat['redirectSrcUrl'], '/'));
                     // Add the siteId to the URL, but keep the current behavior of passing in siteId=0 for "all"
                     $statSiteId = $stat['siteId'] ?? 0;
                     try {
@@ -152,7 +152,7 @@ 
                     } catch (SiteNotFoundException $e) {
                         $primarySite = null;
                     }
-                    if ($primarySite !== null && $statSiteId == (int)$primarySite->id) {
+                    if ($primarySite !== null && $statSiteId == (int) $primarySite->id) {
                         $statSiteId = 0;
                     }
                     $stat['addLink'] = UrlHelper::cpUrl('retour/add-redirect', [
@@ -227,7 +227,7 @@ 
             ->orderBy([$sortField => $sortType])
             ->filterWhere(['like', 'redirectSrcUrl', $filter])
             ->orFilterWhere(['like', 'redirectDestUrl', $filter]);
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         if ($shortLinks) {
@@ -274,7 +274,7 @@ 
             }
             $redirect['siteBaseUrl'] = $site->getBaseUrl();
 
-            $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) {

src/controllers/RedirectsController.php

Spacing +10 added lines, -10 removed lines

@@ -85,7 +85,7 @@ 
         $variables['docsUrl'] = self::DOCUMENTATION_URL;
         $variables['pluginName'] = $pluginName;
         $variables['title'] = $templateTitle;
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -93,7 +93,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
@@ -153,13 +153,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;
@@ -195,7 +195,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/edit-redirect/' . $redirectId),
+                'url' => UrlHelper::cpUrl('retour/edit-redirect/'.$redirectId),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}";
@@ -252,7 +252,7 @@ 
         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') {
@@ -340,7 +340,7 @@ 
         $variables['docsUrl'] = self::DOCUMENTATION_URL;
         $variables['pluginName'] = $pluginName;
         $variables['title'] = $templateTitle;
-        $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : '';
+        $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : '';
         $variables['crumbs'] = [
             [
                 'label' => $pluginName,
@@ -348,7 +348,7 @@ 
             ],
             [
                 'label' => $templateTitle,
-                'url' => UrlHelper::cpUrl('retour/shortlinks' . $siteHandleUri),
+                'url' => UrlHelper::cpUrl('retour/shortlinks'.$siteHandleUri),
             ],
         ];
         $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
@@ -403,13 +403,13 @@ 
         if (!preg_match('/\.[^\/]+$/', $url) && strpos($url, '?') === false && strpos($url, '#') === false) {
             // If it's a root relative URL, assume it's a site URL
             if (UrlHelper::isRootRelativeUrl($url)) {
-                return rtrim($url, '/') . '/';
+                return rtrim($url, '/').'/';
             }
             // If the URL matches any of the site's base URLs, assume it's a site URL
             $sites = Craft::$app->getSites()->getAllSites();
             foreach ($sites as $site) {
                 if (strpos($url, $site->getBaseUrl()) === 0) {
-                    return rtrim($url, '/') . '/';
+                    return rtrim($url, '/').'/';
                 }
             }
         }