@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | // add localizations |
| 34 | - App::$Translate->append(App::$Alias->currentViewPath . '/I18n/' . App::$Request->getLanguage() . '.php'); |
|
| 34 | + App::$Translate->append(App::$Alias->currentViewPath.'/I18n/'.App::$Request->getLanguage().'.php'); |
|
| 35 | 35 | |
| 36 | 36 | parent::__construct(); |
| 37 | 37 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // check if disabled (0 = enabled, anything else = on) |
| 57 | - return (int)$this->application->disabled === 0; |
|
| 57 | + return (int) $this->application->disabled === 0; |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -66,10 +66,10 @@ discard block |
||
| 66 | 66 | if ($this->configs !== null) { |
| 67 | 67 | return $this->configs; |
| 68 | 68 | } |
| 69 | - $configs = (array)unserialize($this->application->configs); // data always stored like a "string" objects |
|
| 69 | + $configs = (array) unserialize($this->application->configs); // data always stored like a "string" objects |
|
| 70 | 70 | foreach ($configs as $cfg => $value) { |
| 71 | 71 | if (Obj::isLikeInt($value)) { |
| 72 | - $configs[$cfg] = (int)$value; // convert string 1 "1" to int 1 1 |
|
| 72 | + $configs[$cfg] = (int) $value; // convert string 1 "1" to int 1 1 |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | $this->configs = $configs; |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | /** |
| 34 | 34 | * Check if widget is enabled |
| 35 | 35 | * @param string|null $name |
| 36 | - * @return bool |
|
| 36 | + * @return null|boolean |
|
| 37 | 37 | */ |
| 38 | 38 | public static function enabled($name = null) |
| 39 | 39 | { |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | // if widget is disabled - lets return nothing |
| 54 | - return !(bool)$wData->disabled; |
|
| 54 | + return !(bool) $wData->disabled; |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | } |
| 58 | 58 | \ No newline at end of file |
@@ -42,9 +42,9 @@ discard block |
||
| 42 | 42 | foreach (\App::$Properties->get('languages') as $lang) { |
| 43 | 43 | $generalItems[] = [ |
| 44 | 44 | 'type' => 'tab', |
| 45 | - 'text' => __('Lang') . ': ' . Str::upperCase($lang), |
|
| 46 | - 'content' => $form->field('title.' . $lang, 'text', ['class' => 'form-control'], __('Please, enter the title of your material for current language locale'), 'content/form/tab_content_update') . |
|
| 47 | - $form->field('text.' . $lang, 'textarea', ['class' => 'form-control wysiwyg', 'rows' => 7, 'html' => true], null, 'content/form/tab_content_update'), |
|
| 45 | + 'text' => __('Lang').': '.Str::upperCase($lang), |
|
| 46 | + 'content' => $form->field('title.'.$lang, 'text', ['class' => 'form-control'], __('Please, enter the title of your material for current language locale'), 'content/form/tab_content_update'). |
|
| 47 | + $form->field('text.'.$lang, 'textarea', ['class' => 'form-control wysiwyg', 'rows' => 7, 'html' => true], null, 'content/form/tab_content_update'), |
|
| 48 | 48 | 'html' => true, |
| 49 | 49 | 'active' => $lang === \App::$Request->getLanguage(), |
| 50 | 50 | '!secure' => true |
@@ -52,10 +52,10 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | $propertiesItems[] = [ |
| 54 | 54 | 'type' => 'tab', |
| 55 | - 'text' => __('Lang') . ': ' . Str::upperCase($lang), |
|
| 56 | - 'content' => $form->field('metaTitle.' . $lang, 'text', ['class' => 'form-control'], __('Enter meta param title for page title. Recoomended: 50-70 characters')) . |
|
| 57 | - $form->field('metaKeywords.' . $lang, 'text', ['class' => 'form-control'], __('Enter meta param keywords for this content, separated by comma. Example: home, door, dog')) . |
|
| 58 | - $form->field('metaDescription.' . $lang, 'text', ['class' => 'form-control'], __('Enter meta param description for this content. Recommended is 100-150 characters')), |
|
| 55 | + 'text' => __('Lang').': '.Str::upperCase($lang), |
|
| 56 | + 'content' => $form->field('metaTitle.'.$lang, 'text', ['class' => 'form-control'], __('Enter meta param title for page title. Recoomended: 50-70 characters')). |
|
| 57 | + $form->field('metaKeywords.'.$lang, 'text', ['class' => 'form-control'], __('Enter meta param keywords for this content, separated by comma. Example: home, door, dog')). |
|
| 58 | + $form->field('metaDescription.'.$lang, 'text', ['class' => 'form-control'], __('Enter meta param description for this content. Recommended is 100-150 characters')), |
|
| 59 | 59 | 'html' => true, |
| 60 | 60 | '!secure' => true, |
| 61 | 61 | 'active' => $lang === \App::$Request->getLanguage() |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | <div class="dropzone dropzone-previews" id="ffcms-dropzone"></div> |
| 91 | 91 | </div> |
| 92 | 92 | <div class="col-md-4"> |
| 93 | - ' . $form->field('poster', 'select', ['options' => [__('Not selected...')], 'class' => 'form-control'], __('Select image from gallery as a poster for this content')) . ' |
|
| 93 | + ' . $form->field('poster', 'select', ['options' => [__('Not selected...')], 'class' => 'form-control'], __('Select image from gallery as a poster for this content')).' |
|
| 94 | 94 | </div> |
| 95 | 95 | </div><br/><br/>'; |
| 96 | 96 | ?> |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | ['type' => 'tab', 'text' => __('Gallery'), 'content' => $galleryTab, 'html' => true, '!secure' => true], |
| 104 | 104 | ['type' => 'tab', 'text' => __('Other'), 'content' => $otherTab, 'html' => true, '!secure' => true] |
| 105 | 105 | ] |
| 106 | -]);?> |
|
| 106 | +]); ?> |
|
| 107 | 107 | |
| 108 | 108 | <?= $form->field('galleryFreeId', 'hidden') ?> |
| 109 | 109 | <?= $form->submitButton(__('Save'), ['class' => 'btn btn-primary']) ?> |
@@ -112,14 +112,14 @@ discard block |
||
| 112 | 112 | |
| 113 | 113 | <?php |
| 114 | 114 | // load max length display plugin |
| 115 | -\App::$Alias->setCustomLibrary('js', \App::$Alias->currentViewUrl . '/assets/js/plugins/maxlength.js'); |
|
| 115 | +\App::$Alias->setCustomLibrary('js', \App::$Alias->currentViewUrl.'/assets/js/plugins/maxlength.js'); |
|
| 116 | 116 | // load datapicker plugin |
| 117 | -\App::$Alias->setCustomLibrary('css', \App::$Alias->currentViewUrl . '/assets/css/plugins/datapick/datapick.css'); |
|
| 118 | -\App::$Alias->setCustomLibrary('js', \App::$Alias->currentViewUrl . '/assets/js/plugins/datapick.js'); |
|
| 117 | +\App::$Alias->setCustomLibrary('css', \App::$Alias->currentViewUrl.'/assets/css/plugins/datapick/datapick.css'); |
|
| 118 | +\App::$Alias->setCustomLibrary('js', \App::$Alias->currentViewUrl.'/assets/js/plugins/datapick.js'); |
|
| 119 | 119 | // load jquery-upload plugin |
| 120 | -\App::$Alias->setCustomLibrary('css', \App::$Alias->scriptUrl . '/vendor/bower/dropzone/dist/min/dropzone.min.css'); |
|
| 121 | -\App::$Alias->setCustomLibrary('css', \App::$Alias->scriptUrl . '/vendor/bower/dropzone/dist/min/basic.min.css'); |
|
| 122 | -\App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl . '/vendor/bower/dropzone/dist/min/dropzone.min.js'); |
|
| 120 | +\App::$Alias->setCustomLibrary('css', \App::$Alias->scriptUrl.'/vendor/bower/dropzone/dist/min/dropzone.min.css'); |
|
| 121 | +\App::$Alias->setCustomLibrary('css', \App::$Alias->scriptUrl.'/vendor/bower/dropzone/dist/min/basic.min.css'); |
|
| 122 | +\App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl.'/vendor/bower/dropzone/dist/min/dropzone.min.js'); |
|
| 123 | 123 | ?> |
| 124 | 124 | |
| 125 | 125 | <script> |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | var DropzoneFiles = []; |
| 217 | 217 | $('#ffcms-dropzone').dropzone({ |
| 218 | 218 | url: script_url+'/api/content/galleryupload/<?= $model->galleryFreeId ?>?lang='+script_lang, |
| 219 | - dictDefaultMessage: '<?= __('Drop files here to upload in gallery') . '<br />' . __('(or click here)') ?>', |
|
| 219 | + dictDefaultMessage: '<?= __('Drop files here to upload in gallery').'<br />'.__('(or click here)') ?>', |
|
| 220 | 220 | acceptedFiles: ".jpeg,.jpg,.png,.gif,.webp", |
| 221 | 221 | addRemoveLinks: true, |
| 222 | 222 | removedfile: function (file) { // file remove click, lets try to remove file from server & make visual changes |
@@ -33,12 +33,12 @@ discard block |
||
| 33 | 33 | parent::before(); |
| 34 | 34 | $configs = AppRecord::getConfigs('app', 'Content'); |
| 35 | 35 | // prevent null-type config data |
| 36 | - if ((int)$configs['gallerySize'] > 0) { |
|
| 37 | - $this->maxSize = (int)$configs['gallerySize'] * 1024; |
|
| 36 | + if ((int) $configs['gallerySize'] > 0) { |
|
| 37 | + $this->maxSize = (int) $configs['gallerySize'] * 1024; |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - if ((int)$configs['galleryResize'] > 0) { |
|
| 41 | - $this->maxResize = (int)$configs['galleryResize']; |
|
| 40 | + if ((int) $configs['galleryResize'] > 0) { |
|
| 41 | + $this->maxResize = (int) $configs['galleryResize']; |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
@@ -117,8 +117,8 @@ discard block |
||
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | // check if directory exist |
| 120 | - if (!Directory::exist('/upload/gallery/' . $id)) { |
|
| 121 | - Directory::create('/upload/gallery/' . $id); |
|
| 120 | + if (!Directory::exist('/upload/gallery/'.$id)) { |
|
| 121 | + Directory::create('/upload/gallery/'.$id); |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | // get file object |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | |
| 131 | 131 | // check file size |
| 132 | 132 | if ($file->getSize() < 1 || $file->getSize() > $this->maxSize) { |
| 133 | - throw new ForbiddenException(__('File size is too big. Max size: %size%kb', ['size' => (int)($this->maxSize/1024)])); |
|
| 133 | + throw new ForbiddenException(__('File size is too big. Max size: %size%kb', ['size' => (int) ($this->maxSize / 1024)])); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | // check file extension |
@@ -139,41 +139,41 @@ discard block |
||
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | // create origin directory |
| 142 | - $originPath = '/upload/gallery/' . $id . '/orig/'; |
|
| 142 | + $originPath = '/upload/gallery/'.$id.'/orig/'; |
|
| 143 | 143 | if (!Directory::exist($originPath)) { |
| 144 | 144 | Directory::create($originPath); |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | // lets make a new file name |
| 148 | - $fileName = App::$Security->simpleHash($file->getClientOriginalName() . $file->getSize()); |
|
| 149 | - $fileNewName = $fileName . '.' . $file->guessExtension(); |
|
| 148 | + $fileName = App::$Security->simpleHash($file->getClientOriginalName().$file->getSize()); |
|
| 149 | + $fileNewName = $fileName.'.'.$file->guessExtension(); |
|
| 150 | 150 | // check if image is already loaded |
| 151 | - if (File::exist($originPath . $fileNewName)) { |
|
| 151 | + if (File::exist($originPath.$fileNewName)) { |
|
| 152 | 152 | throw new ForbiddenException(__('File is always exists!')); |
| 153 | 153 | } |
| 154 | 154 | // save file from tmp to gallery origin directory |
| 155 | 155 | $file->move(Normalize::diskFullPath($originPath), $fileNewName); |
| 156 | 156 | |
| 157 | 157 | // lets resize preview image for it |
| 158 | - $thumbPath = '/upload/gallery/' . $id . '/thumb/'; |
|
| 158 | + $thumbPath = '/upload/gallery/'.$id.'/thumb/'; |
|
| 159 | 159 | if (!Directory::exist($thumbPath)) { |
| 160 | 160 | Directory::create($thumbPath); |
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | $thumb = new Image(); |
| 164 | - $thumb->setCacheDir(root . '/Private/Cache/images'); |
|
| 164 | + $thumb->setCacheDir(root.'/Private/Cache/images'); |
|
| 165 | 165 | |
| 166 | 166 | // open original file, resize it and save |
| 167 | - $thumbSaveName = Normalize::diskFullPath($thumbPath) . '/' . $fileName . '.jpg'; |
|
| 168 | - $thumb->open(Normalize::diskFullPath($originPath) . DIRECTORY_SEPARATOR . $fileNewName) |
|
| 167 | + $thumbSaveName = Normalize::diskFullPath($thumbPath).'/'.$fileName.'.jpg'; |
|
| 168 | + $thumb->open(Normalize::diskFullPath($originPath).DIRECTORY_SEPARATOR.$fileNewName) |
|
| 169 | 169 | ->cropResize($this->maxResize) |
| 170 | 170 | ->save($thumbSaveName, 'jpg', 90); |
| 171 | 171 | $thumb = null; |
| 172 | 172 | |
| 173 | 173 | $this->setJsonHeader(); |
| 174 | 174 | return json_encode(['status' => 1, 'file' => [ |
| 175 | - 'thumbnailUrl' => '/upload/gallery/' . $id . '/thumb/' . $fileName . '.jpg', |
|
| 176 | - 'url' => '/upload/gallery/' . $id . '/orig/' . $fileNewName, |
|
| 175 | + 'thumbnailUrl' => '/upload/gallery/'.$id.'/thumb/'.$fileName.'.jpg', |
|
| 176 | + 'url' => '/upload/gallery/'.$id.'/orig/'.$fileNewName, |
|
| 177 | 177 | 'name' => $fileNewName |
| 178 | 178 | ]]); |
| 179 | 179 | } |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | throw new NativeException('Permission denied'); |
| 198 | 198 | } |
| 199 | 199 | |
| 200 | - $thumbDir = Normalize::diskFullPath('/upload/gallery/' . $id . '/orig/'); |
|
| 200 | + $thumbDir = Normalize::diskFullPath('/upload/gallery/'.$id.'/orig/'); |
|
| 201 | 201 | if (!Directory::exist($thumbDir)) { |
| 202 | 202 | throw new NotFoundException('Nothing found'); |
| 203 | 203 | } |
@@ -212,10 +212,10 @@ discard block |
||
| 212 | 212 | $fileExt = Str::lastIn($file, '.'); |
| 213 | 213 | $fileName = Str::sub($file, 0, -Str::length($fileExt)); |
| 214 | 214 | $output[] = [ |
| 215 | - 'thumbnailUrl' => '/upload/gallery/' . $id . '/thumb/' . $fileName . '.jpg', |
|
| 216 | - 'url' => '/upload/gallery/' . $id . '/orig/' . $file, |
|
| 215 | + 'thumbnailUrl' => '/upload/gallery/'.$id.'/thumb/'.$fileName.'.jpg', |
|
| 216 | + 'url' => '/upload/gallery/'.$id.'/orig/'.$file, |
|
| 217 | 217 | 'name' => $file, |
| 218 | - 'size' => File::size('/upload/gallery/' . $id . '/orig/' . $file) |
|
| 218 | + 'size' => File::size('/upload/gallery/'.$id.'/orig/'.$file) |
|
| 219 | 219 | ]; |
| 220 | 220 | } |
| 221 | 221 | |
@@ -246,8 +246,8 @@ discard block |
||
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | // generate path |
| 249 | - $thumb = '/upload/gallery/' . $id . '/thumb/' . $fileName . '.jpg'; |
|
| 250 | - $full = '/upload/gallery/' . $id . '/orig/' . $file; |
|
| 249 | + $thumb = '/upload/gallery/'.$id.'/thumb/'.$fileName.'.jpg'; |
|
| 250 | + $full = '/upload/gallery/'.$id.'/orig/'.$file; |
|
| 251 | 251 | |
| 252 | 252 | // check if file exists and remove |
| 253 | 253 | if (File::exist($thumb) || File::exist($full)) { |
@@ -2,7 +2,6 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace Apps\Controller\Console; |
| 4 | 4 | |
| 5 | -use Apps\ActiveRecord\App; |
|
| 6 | 5 | use Ffcms\Console\Console; |
| 7 | 6 | use Ffcms\Core\Exception\NativeException; |
| 8 | 7 | use Ffcms\Core\Helper\FileSystem\Directory; |
@@ -11,7 +10,6 @@ discard block |
||
| 11 | 10 | use Ffcms\Core\Helper\Type\Obj; |
| 12 | 11 | use Ffcms\Core\Helper\Type\Str; |
| 13 | 12 | use Apps\Controller\Console\Db as DbController; |
| 14 | -use Symfony\Component\VarDumper\Caster\ConstStub; |
|
| 15 | 13 | |
| 16 | 14 | class Main |
| 17 | 15 | { |
@@ -28,20 +28,20 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function actionHelp() |
| 30 | 30 | { |
| 31 | - $text = "You are using FFCMS console application." . PHP_EOL; |
|
| 32 | - $text .= "This application support next basic commands:" . PHP_EOL; |
|
| 33 | - $text .= "\t main/info - show info about CMS" . PHP_EOL; |
|
| 34 | - $text .= "\t main/install - install FFCMS from console line." . PHP_EOL; |
|
| 35 | - $text .= "\t main/update - update package to current minor version if available." . PHP_EOL; |
|
| 36 | - $text .= "\t main/chmod - update chmod for ffcms special folders. Can be used after project deployment." . PHP_EOL; |
|
| 37 | - $text .= "\t main/buildperms - build and update permissions map for applications." . PHP_EOL; |
|
| 38 | - $text .= "\t create/model workground/modelName - create model carcase default." . PHP_EOL; |
|
| 39 | - $text .= "\t create/ar activeRecordName - create active record table and model." . PHP_EOL; |
|
| 40 | - $text .= "\t create/controller workground/controllerName - create default controller carcase." . PHP_EOL; |
|
| 41 | - $text .= "\t create/widget workground/widgetName/widgetName - create default widget carcase." . PHP_EOL; |
|
| 42 | - $text .= "\t db/import activeRecordName - import to database single schema from ar model." . PHP_EOL; |
|
| 43 | - $text .= "\t db/importAll - import all active record tables to database." . PHP_EOL; |
|
| 44 | - $text .= "\t db/adduser - add new user into database." . PHP_EOL; |
|
| 31 | + $text = "You are using FFCMS console application.".PHP_EOL; |
|
| 32 | + $text .= "This application support next basic commands:".PHP_EOL; |
|
| 33 | + $text .= "\t main/info - show info about CMS".PHP_EOL; |
|
| 34 | + $text .= "\t main/install - install FFCMS from console line.".PHP_EOL; |
|
| 35 | + $text .= "\t main/update - update package to current minor version if available.".PHP_EOL; |
|
| 36 | + $text .= "\t main/chmod - update chmod for ffcms special folders. Can be used after project deployment.".PHP_EOL; |
|
| 37 | + $text .= "\t main/buildperms - build and update permissions map for applications.".PHP_EOL; |
|
| 38 | + $text .= "\t create/model workground/modelName - create model carcase default.".PHP_EOL; |
|
| 39 | + $text .= "\t create/ar activeRecordName - create active record table and model.".PHP_EOL; |
|
| 40 | + $text .= "\t create/controller workground/controllerName - create default controller carcase.".PHP_EOL; |
|
| 41 | + $text .= "\t create/widget workground/widgetName/widgetName - create default widget carcase.".PHP_EOL; |
|
| 42 | + $text .= "\t db/import activeRecordName - import to database single schema from ar model.".PHP_EOL; |
|
| 43 | + $text .= "\t db/importAll - import all active record tables to database.".PHP_EOL; |
|
| 44 | + $text .= "\t db/adduser - add new user into database.".PHP_EOL; |
|
| 45 | 45 | return $text; |
| 46 | 46 | } |
| 47 | 47 | |
@@ -51,17 +51,17 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | public function actionInfo() |
| 53 | 53 | { |
| 54 | - $text = "Information about FFCMS package and environment:" . PHP_EOL; |
|
| 55 | - $text .= "\t PHP version: " . phpversion() . PHP_EOL; |
|
| 56 | - $text .= "\t Dist path: " . root . PHP_EOL; |
|
| 57 | - $text .= "\t Used version: " . Console::$Properties->version['num'] . ' [build: ' . Console::$Properties->version['date'] . ']' . PHP_EOL; |
|
| 58 | - $text .= "Information about FFCMS cmf packages:" . PHP_EOL; |
|
| 54 | + $text = "Information about FFCMS package and environment:".PHP_EOL; |
|
| 55 | + $text .= "\t PHP version: ".phpversion().PHP_EOL; |
|
| 56 | + $text .= "\t Dist path: ".root.PHP_EOL; |
|
| 57 | + $text .= "\t Used version: ".Console::$Properties->version['num'].' [build: '.Console::$Properties->version['date'].']'.PHP_EOL; |
|
| 58 | + $text .= "Information about FFCMS cmf packages:".PHP_EOL; |
|
| 59 | 59 | |
| 60 | 60 | $composerInfo = File::read('/composer.lock'); |
| 61 | 61 | if (false !== $composerInfo) { |
| 62 | 62 | $jsonInfo = json_decode($composerInfo); |
| 63 | 63 | foreach ($jsonInfo->packages as $item) { |
| 64 | - $text .= "\t Package: " . $item->name . ' => ' . $item->version . PHP_EOL; |
|
| 64 | + $text .= "\t Package: ".$item->name.' => '.$item->version.PHP_EOL; |
|
| 65 | 65 | } |
| 66 | 66 | } else { |
| 67 | 67 | $text .= "\t Composer is never be used - no information available."; |
@@ -97,16 +97,16 @@ discard block |
||
| 97 | 97 | preg_match_all('/public function action(\w*?)\(/', $byte, $matches); // matches[0] contains all methods ;) |
| 98 | 98 | if (Obj::isArray($matches[1]) && count($matches[1]) > 0) { |
| 99 | 99 | foreach ($matches[1] as $perm) { |
| 100 | - $permissions[] = 'Admin/' . $className . '/' . $perm; |
|
| 100 | + $permissions[] = 'Admin/'.$className.'/'.$perm; |
|
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | // prepare save string |
| 106 | - $stringSave = "<?php \n\nreturn " . var_export($permissions, true) . ';'; |
|
| 106 | + $stringSave = "<?php \n\nreturn ".var_export($permissions, true).';'; |
|
| 107 | 107 | File::write('/Private/Config/Permissions.php', $stringSave); |
| 108 | 108 | |
| 109 | - return 'Permissions configuration is successful updated! Founded permissions: ' . count($permissions); |
|
| 109 | + return 'Permissions configuration is successful updated! Founded permissions: '.count($permissions); |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /** |
@@ -120,9 +120,9 @@ discard block |
||
| 120 | 120 | if (Directory::exist($obj)) { |
| 121 | 121 | Directory::recursiveChmod($obj, 0777); |
| 122 | 122 | } elseif (File::exist($obj)) { |
| 123 | - chmod(root . $obj, 0777); |
|
| 123 | + chmod(root.$obj, 0777); |
|
| 124 | 124 | } else { |
| 125 | - $errors .= Console::$Output->write('Filesystem object is not founded: ' . $obj); |
|
| 125 | + $errors .= Console::$Output->write('Filesystem object is not founded: '.$obj); |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | echo Console::$Output->writeHeader('License start'); |
| 144 | - echo File::read('/LICENSE') . PHP_EOL; |
|
| 144 | + echo File::read('/LICENSE').PHP_EOL; |
|
| 145 | 145 | echo Console::$Output->writeHeader('License end'); |
| 146 | 146 | |
| 147 | 147 | $config = Console::$Properties->get('database'); |
@@ -160,38 +160,38 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | // database config from input |
| 162 | 162 | echo Console::$Output->writeHeader('Database connection configuration'); |
| 163 | - echo 'Driver(default:' . $config['driver'] . '):'; |
|
| 163 | + echo 'Driver(default:'.$config['driver'].'):'; |
|
| 164 | 164 | $dbDriver = Console::$Input->read(); |
| 165 | 165 | if (Arr::in($dbDriver, ['mysql', 'pgsql', 'sqlite'])) { |
| 166 | 166 | $newConfig['driver'] = $dbDriver; |
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | // for sqlite its would be a path |
| 170 | - echo 'Host(default:' . $config['host'] . '):'; |
|
| 170 | + echo 'Host(default:'.$config['host'].'):'; |
|
| 171 | 171 | $dbHost = Console::$Input->read(); |
| 172 | 172 | if (!Str::likeEmpty($dbHost)) { |
| 173 | 173 | $newConfig['host'] = $dbHost; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - echo 'Database name(default:' . $config['database'] . '):'; |
|
| 176 | + echo 'Database name(default:'.$config['database'].'):'; |
|
| 177 | 177 | $dbName = Console::$Input->read(); |
| 178 | 178 | if (!Str::likeEmpty($dbName)) { |
| 179 | 179 | $newConfig['database'] = $dbName; |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - echo 'User(default:' . $config['username'] . '):'; |
|
| 182 | + echo 'User(default:'.$config['username'].'):'; |
|
| 183 | 183 | $dbUser = Console::$Input->read(); |
| 184 | 184 | if (!Str::likeEmpty($dbUser)) { |
| 185 | 185 | $newConfig['username'] = $dbUser; |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | - echo 'Password(default:' . $config['password'] . '):'; |
|
| 188 | + echo 'Password(default:'.$config['password'].'):'; |
|
| 189 | 189 | $dbPwd = Console::$Input->read(); |
| 190 | 190 | if (!Str::likeEmpty($dbPwd)) { |
| 191 | 191 | $newConfig['password'] = $dbPwd; |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | - echo 'Table prefix(default:' . $config['prefix'] . '):'; |
|
| 194 | + echo 'Table prefix(default:'.$config['prefix'].'):'; |
|
| 195 | 195 | $dbPrefix = Console::$Input->read(); |
| 196 | 196 | if (!Str::likeEmpty($dbPrefix)) { |
| 197 | 197 | $newConfig['prefix'] = $dbPrefix; |
@@ -204,11 +204,11 @@ discard block |
||
| 204 | 204 | try { |
| 205 | 205 | Console::$Database->connection('install')->getDatabaseName(); |
| 206 | 206 | } catch (\Exception $e) { |
| 207 | - return 'Testing database connection is failed! Run installer again and pass tested connection data! Log: ' . $e->getMessage(); |
|
| 207 | + return 'Testing database connection is failed! Run installer again and pass tested connection data! Log: '.$e->getMessage(); |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | // autoload isn't work here |
| 211 | - include(root . '/Apps/Controller/Console/Db.php'); |
|
| 211 | + include(root.'/Apps/Controller/Console/Db.php'); |
|
| 212 | 212 | |
| 213 | 213 | // import db data |
| 214 | 214 | $dbController = new DbController(); |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | |
| 217 | 217 | // set website send from email from input |
| 218 | 218 | $emailConfig = Console::$Properties->get('adminEmail'); |
| 219 | - echo 'Website sendFrom email(default: ' . $emailConfig . '):'; |
|
| 219 | + echo 'Website sendFrom email(default: '.$emailConfig.'):'; |
|
| 220 | 220 | $email = Console::$Input->read(); |
| 221 | 221 | if (!Str::isEmail($email)) { |
| 222 | 222 | $email = $emailConfig; |
@@ -237,9 +237,9 @@ discard block |
||
| 237 | 237 | $allCfg['adminEmail'] = $email; |
| 238 | 238 | $allCfg['baseDomain'] = $baseDomain; |
| 239 | 239 | echo Console::$Output->write('Generate password salt for BLOWFISH crypt'); |
| 240 | - $allCfg['passwordSalt'] = '$2a$07$' . Str::randomLatinNumeric(mt_rand(21, 30)) . '$'; |
|
| 240 | + $allCfg['passwordSalt'] = '$2a$07$'.Str::randomLatinNumeric(mt_rand(21, 30)).'$'; |
|
| 241 | 241 | echo Console::$Output->write('Generate security cookies for debug panel'); |
| 242 | - $allCfg['debug']['cookie']['key'] = 'fdebug_' . Str::randomLatinNumeric(mt_rand(8, 32)); |
|
| 242 | + $allCfg['debug']['cookie']['key'] = 'fdebug_'.Str::randomLatinNumeric(mt_rand(8, 32)); |
|
| 243 | 243 | $allCfg['debug']['cookie']['value'] = Str::randomLatinNumeric(mt_rand(32, 128)); |
| 244 | 244 | |
| 245 | 245 | // write config data |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | 50 | * @deprecated |
| 51 | - * @return \Illuminate\Database\Eloquent\Collection|mixed |
|
| 51 | + * @return \Illuminate\Database\Eloquent\Collection |
|
| 52 | 52 | * @throws SyntaxException |
| 53 | 53 | */ |
| 54 | 54 | public static function getAll() |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | * Get single row by defined type and sys_name with query caching |
| 79 | 79 | * @param string $type |
| 80 | 80 | * @param string|array $sys_name |
| 81 | - * @return mixed|null |
|
| 81 | + * @return App |
|
| 82 | 82 | * @throws SyntaxException |
| 83 | 83 | */ |
| 84 | 84 | public static function getItem($type, $sys_name) |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | public static function all($columns = ['*']) |
| 35 | 35 | { |
| 36 | - $cacheName = 'activercord.app.all.' . implode('.', $columns); |
|
| 36 | + $cacheName = 'activercord.app.all.'.implode('.', $columns); |
|
| 37 | 37 | $records = MemoryObject::instance()->get($cacheName); |
| 38 | 38 | if ($records === null) { |
| 39 | 39 | $records = parent::all($columns); |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | |
| 165 | 165 | $scriptVersion = $this->getScriptVersion(); |
| 166 | 166 | |
| 167 | - return $scriptVersion === (float)$this->version; |
|
| 167 | + return $scriptVersion === (float) $this->version; |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | /** |
@@ -173,16 +173,16 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | public function getScriptVersion() |
| 175 | 175 | { |
| 176 | - $class = 'Apps\Controller\Admin\\' . $this->sys_name; |
|
| 176 | + $class = 'Apps\Controller\Admin\\'.$this->sys_name; |
|
| 177 | 177 | if (!class_exists($class)) { |
| 178 | 178 | return false; |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | - if (!defined($class . '::VERSION')) { |
|
| 181 | + if (!defined($class.'::VERSION')) { |
|
| 182 | 182 | return false; |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | - return (float)constant($class . '::VERSION'); |
|
| 185 | + return (float) constant($class.'::VERSION'); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | } |
| 189 | 189 | \ No newline at end of file |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public static function all($columns = ['*']) |
| 28 | 28 | { |
| 29 | - $cacheName = 'activerecords.role.all.' . implode('.', $columns); |
|
| 29 | + $cacheName = 'activerecords.role.all.'.implode('.', $columns); |
|
| 30 | 30 | $records = MemoryObject::instance()->get($cacheName); |
| 31 | 31 | if ($records === null) { |
| 32 | 32 | $records = parent::all($columns); |
@@ -43,12 +43,12 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public static function get($role_id) |
| 45 | 45 | { |
| 46 | - $role = MainApp::$Memory->get('user.role.cache.' . $role_id); |
|
| 46 | + $role = MainApp::$Memory->get('user.role.cache.'.$role_id); |
|
| 47 | 47 | |
| 48 | 48 | // not founded in cache |
| 49 | 49 | if ($role === null) { |
| 50 | 50 | $role = self::find($role_id); |
| 51 | - MainApp::$Memory->set('user.role.cache.' . $role_id, $role); |
|
| 51 | + MainApp::$Memory->set('user.role.cache.'.$role_id, $role); |
|
| 52 | 52 | } |
| 53 | 53 | return $role; |
| 54 | 54 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public static function all($columns = ['*']) |
| 31 | 31 | { |
| 32 | - $cacheName = 'activerecord.contentcategory.all.' . implode('.', $columns); |
|
| 32 | + $cacheName = 'activerecord.contentcategory.all.'.implode('.', $columns); |
|
| 33 | 33 | $records = MemoryObject::instance()->get($cacheName); |
| 34 | 34 | if ($records === null) { |
| 35 | 35 | $records = parent::all($columns); |
@@ -45,12 +45,12 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public static function getByPath($path = '') |
| 47 | 47 | { |
| 48 | - if (MainApp::$Memory->get('cache.content.category.path.' . $path) !== null) { |
|
| 49 | - return MainApp::$Memory->get('cache.content.category.path.' . $path); |
|
| 48 | + if (MainApp::$Memory->get('cache.content.category.path.'.$path) !== null) { |
|
| 49 | + return MainApp::$Memory->get('cache.content.category.path.'.$path); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | $record = self::where('path', '=', $path)->first(); |
| 53 | - MainApp::$Memory->set('cache.content.category.path.' . $path, $record); |
|
| 53 | + MainApp::$Memory->set('cache.content.category.path.'.$path, $record); |
|
| 54 | 54 | return $record; |
| 55 | 55 | } |
| 56 | 56 | |
@@ -61,12 +61,12 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | public static function getById($id) |
| 63 | 63 | { |
| 64 | - if (MainApp::$Memory->get('cache.content.category.id.' . $id) !== null) { |
|
| 65 | - return MainApp::$Memory->get('cache.content.category.id.' . $id); |
|
| 64 | + if (MainApp::$Memory->get('cache.content.category.id.'.$id) !== null) { |
|
| 65 | + return MainApp::$Memory->get('cache.content.category.id.'.$id); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | $record = self::find($id); |
| 69 | - MainApp::$Memory->set('cache.content.category.id.' . $id, $record); |
|
| 69 | + MainApp::$Memory->set('cache.content.category.id.'.$id, $record); |
|
| 70 | 70 | return $record; |
| 71 | 71 | } |
| 72 | 72 | |
@@ -94,12 +94,12 @@ discard block |
||
| 94 | 94 | } else { |
| 95 | 95 | // set level marker based on slashes count in pathway |
| 96 | 96 | $slashCount = Str::entryCount($path, '/'); |
| 97 | - for ($i=-1; $i <= $slashCount; $i++) { |
|
| 97 | + for ($i = -1; $i <= $slashCount; $i++) { |
|
| 98 | 98 | $title .= '--'; |
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | 101 | // add canonical title from db |
| 102 | - $title .= ' ' . Serialize::getDecodeLocale($data->title); |
|
| 102 | + $title .= ' '.Serialize::getDecodeLocale($data->title); |
|
| 103 | 103 | // set response as array [id => title, ... ] |
| 104 | 104 | $response[$data->id] = $title; |
| 105 | 105 | } |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public static function all($columns = ['*']) |
| 30 | 30 | { |
| 31 | - $cacheName = 'activerecord.profilefield.all.' . implode('.', $columns); |
|
| 31 | + $cacheName = 'activerecord.profilefield.all.'.implode('.', $columns); |
|
| 32 | 32 | $records = MemoryObject::instance()->get($cacheName); |
| 33 | 33 | if ($records === null) { |
| 34 | 34 | $records = parent::all($columns); |