@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | // Protected Properties |
| 62 | 62 | // ========================================================================= |
| 63 | 63 | |
| 64 | - protected $allowAnonymous = []; |
|
| 64 | + protected $allowAnonymous = [ ]; |
|
| 65 | 65 | |
| 66 | 66 | // Public Methods |
| 67 | 67 | // ========================================================================= |
@@ -86,23 +86,23 @@ discard block |
||
| 86 | 86 | $headers = array_flip($csv->fetchOne(0)); |
| 87 | 87 | $csv->setOffset(1); |
| 88 | 88 | $columns = ArrayHelper::filterEmptyStringsFromArray($columns); |
| 89 | - $csv->each(function ($row) use ($headers, $columns) { |
|
| 89 | + $csv->each(function($row) use ($headers, $columns) { |
|
| 90 | 90 | $redirectConfig = [ |
| 91 | 91 | 'id' => 0, |
| 92 | 92 | ]; |
| 93 | - if (isset($columns[0], $headers[$columns[0]])) { |
|
| 94 | - $redirectConfig['redirectSrcUrl'] = $row[$headers[$columns[0]]] ?? null; |
|
| 93 | + if (isset($columns[ 0 ], $headers[ $columns[ 0 ] ])) { |
|
| 94 | + $redirectConfig[ 'redirectSrcUrl' ] = $row[ $headers[ $columns[ 0 ] ] ] ?? null; |
|
| 95 | 95 | } |
| 96 | - if (isset($columns[1], $headers[$columns[1]])) { |
|
| 97 | - $redirectConfig['redirectDestUrl'] = $row[$headers[$columns[1]]] ?? null; |
|
| 96 | + if (isset($columns[ 1 ], $headers[ $columns[ 1 ] ])) { |
|
| 97 | + $redirectConfig[ 'redirectDestUrl' ] = $row[ $headers[ $columns[ 1 ] ] ] ?? null; |
|
| 98 | 98 | } |
| 99 | - if (isset($columns[2], $headers[$columns[2]])) { |
|
| 100 | - $redirectConfig['redirectMatchType'] = $row[$headers[$columns[2]]] ?? null; |
|
| 99 | + if (isset($columns[ 2 ], $headers[ $columns[ 2 ] ])) { |
|
| 100 | + $redirectConfig[ 'redirectMatchType' ] = $row[ $headers[ $columns[ 2 ] ] ] ?? null; |
|
| 101 | 101 | } |
| 102 | - if (isset($columns[3], $headers[$columns[3]])) { |
|
| 103 | - $redirectConfig['redirectHttpCode'] = $row[$headers[$columns[3]]] ?? null; |
|
| 102 | + if (isset($columns[ 3 ], $headers[ $columns[ 3 ] ])) { |
|
| 103 | + $redirectConfig[ 'redirectHttpCode' ] = $row[ $headers[ $columns[ 3 ] ] ] ?? null; |
|
| 104 | 104 | } |
| 105 | - Craft::debug('Importing row: '.print_r($redirectConfig, true), __METHOD__); |
|
| 105 | + Craft::debug('Importing row: ' . print_r($redirectConfig, true), __METHOD__); |
|
| 106 | 106 | Retour::$plugin->redirects->saveRedirect($redirectConfig); |
| 107 | 107 | |
| 108 | 108 | return true; |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | */ |
| 125 | 125 | public function actionImportCsv(string $siteHandle = null): Response |
| 126 | 126 | { |
| 127 | - $variables = []; |
|
| 127 | + $variables = [ ]; |
|
| 128 | 128 | PermissionHelper::controllerPermissionCheck('retour:redirects'); |
| 129 | 129 | // If your CSV document was created or is read on a Macintosh computer, |
| 130 | 130 | // add the following lines before using the library to help PHP detect line ending in Mac OS X |
@@ -142,20 +142,20 @@ discard block |
||
| 142 | 142 | } catch (InvalidConfigException $e) { |
| 143 | 143 | Craft::error($e->getMessage(), __METHOD__); |
| 144 | 144 | } |
| 145 | - $variables['baseAssetsUrl'] = Craft::$app->assetManager->getPublishedUrl( |
|
| 145 | + $variables[ 'baseAssetsUrl' ] = Craft::$app->assetManager->getPublishedUrl( |
|
| 146 | 146 | '@nystudio107/retour/assetbundles/retour/dist', |
| 147 | 147 | true |
| 148 | 148 | ); |
| 149 | 149 | // Enabled sites |
| 150 | 150 | MultiSiteHelper::setMultiSiteVariables($siteHandle, $siteId, $variables); |
| 151 | - $variables['controllerHandle'] = 'file'; |
|
| 151 | + $variables[ 'controllerHandle' ] = 'file'; |
|
| 152 | 152 | |
| 153 | 153 | // Basic variables |
| 154 | - $variables['fullPageForm'] = true; |
|
| 155 | - $variables['docsUrl'] = self::DOCUMENTATION_URL; |
|
| 156 | - $variables['pluginName'] = $pluginName; |
|
| 157 | - $variables['title'] = $templateTitle; |
|
| 158 | - $variables['crumbs'] = [ |
|
| 154 | + $variables[ 'fullPageForm' ] = true; |
|
| 155 | + $variables[ 'docsUrl' ] = self::DOCUMENTATION_URL; |
|
| 156 | + $variables[ 'pluginName' ] = $pluginName; |
|
| 157 | + $variables[ 'title' ] = $templateTitle; |
|
| 158 | + $variables[ 'crumbs' ] = [ |
|
| 159 | 159 | [ |
| 160 | 160 | 'label' => $pluginName, |
| 161 | 161 | 'url' => UrlHelper::cpUrl('retour'), |
@@ -165,19 +165,19 @@ discard block |
||
| 165 | 165 | 'url' => UrlHelper::cpUrl('retour/redirects'), |
| 166 | 166 | ], |
| 167 | 167 | ]; |
| 168 | - $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}"; |
|
| 169 | - $variables['selectedSubnavItem'] = 'redirects'; |
|
| 168 | + $variables[ 'docTitle' ] = "{$pluginName} - Redirects - {$templateTitle}"; |
|
| 169 | + $variables[ 'selectedSubnavItem' ] = 'redirects'; |
|
| 170 | 170 | |
| 171 | 171 | // The CSV file |
| 172 | 172 | $file = UploadedFile::getInstanceByName('file'); |
| 173 | 173 | if ($file !== null) { |
| 174 | - $filename = Craft::$app->getPath()->getTempPath().DIRECTORY_SEPARATOR.uniqid($file->name, true); |
|
| 174 | + $filename = Craft::$app->getPath()->getTempPath() . DIRECTORY_SEPARATOR . uniqid($file->name, true); |
|
| 175 | 175 | $file->saveAs($filename, false); |
| 176 | 176 | $csv = Reader::createFromPath($file->tempName); |
| 177 | 177 | $headers = $csv->fetchOne(0); |
| 178 | 178 | Craft::info(print_r($headers, true), __METHOD__); |
| 179 | - $variables['headers'] = $headers; |
|
| 180 | - $variables['filename'] = $filename; |
|
| 179 | + $variables[ 'headers' ] = $headers; |
|
| 180 | + $variables[ 'filename' ] = $filename; |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | // Render the template |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | } |
| 224 | 224 | // Query the db table |
| 225 | 225 | $data = (new Query()) |
| 226 | - ->from([$table]) |
|
| 226 | + ->from([ $table ]) |
|
| 227 | 227 | ->select(array_keys($columns)) |
| 228 | 228 | ->orderBy('hitCount DESC') |
| 229 | 229 | ->all(); |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | $csv = Writer::createFromFileObject(new \SplTempFileObject()); |
| 232 | 232 | $csv->insertOne(array_values($columns)); |
| 233 | 233 | $csv->insertAll($data); |
| 234 | - $csv->output($filename.'.csv'); |
|
| 234 | + $csv->output($filename . '.csv'); |
|
| 235 | 235 | exit(0); |
| 236 | 236 | } |
| 237 | 237 | } |