phpffcms / ffcms

Apps/ActiveRecord/ContentCategory.php

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
      */
     public static function all($columns = ['*'])
     {
-        $cacheName = 'activerecord.contentcategory.all.' . implode('.', $columns);
+        $cacheName = 'activerecord.contentcategory.all.'.implode('.', $columns);
         $records = MemoryObject::instance()->get($cacheName);
         if ($records === null) {
             $records = parent::all($columns);
@@ -50,12 +50,12 @@ 
      */
     public static function getByPath($path = '')
     {
-        if (MainApp::$Memory->get('cache.content.category.path.' . $path) !== null) {
-            return MainApp::$Memory->get('cache.content.category.path.' . $path);
+        if (MainApp::$Memory->get('cache.content.category.path.'.$path) !== null) {
+            return MainApp::$Memory->get('cache.content.category.path.'.$path);
         }
 
         $record = self::where('path', '=', $path)->first();
-        MainApp::$Memory->set('cache.content.category.path.' . $path, $record);
+        MainApp::$Memory->set('cache.content.category.path.'.$path, $record);
         return $record;
     }
 
@@ -66,12 +66,12 @@ 
      */
     public static function getById($id)
     {
-        if (MainApp::$Memory->get('cache.content.category.id.' . $id) !== null) {
-            return MainApp::$Memory->get('cache.content.category.id.' . $id);
+        if (MainApp::$Memory->get('cache.content.category.id.'.$id) !== null) {
+            return MainApp::$Memory->get('cache.content.category.id.'.$id);
         }
 
         $record = self::find($id);
-        MainApp::$Memory->set('cache.content.category.id.' . $id, $record);
+        MainApp::$Memory->set('cache.content.category.id.'.$id, $record);
         return $record;
     }
 
@@ -99,12 +99,12 @@ 
             } else {
                 // set level marker based on slashes count in pathway
                 $slashCount = Str::entryCount($path, '/');
-                for ($i=-1; $i <= $slashCount; $i++) {
+                for ($i = -1; $i <= $slashCount; $i++) {
                     $title .= '--';
                 }
             }
             // add canonical title from db
-            $title .= ' ' . $data->getLocaled('title');
+            $title .= ' '.$data->getLocaled('title');
             // set response as array [id => title, ... ]
             $response[$data->id] = $title;
         }

Apps/View/Admin/default/content/index.php

Spacing +16 added lines, -16 removed lines

@@ -34,9 +34,9 @@ 
                     <span class="sr-only">Toggle Dropdown</span>
                 </button>
                 <ul class="dropdown-menu" role="menu">
-                    <li><?= Url::link(['content/index', null, null, ['type' => 'all']], '<i class="fa fa-list"></i> ' . __('All')) ?></li>
-                    <li><?= Url::link(['content/index', null, null, ['type' => 'moderate']], '<i class="fa fa-exclamation"></i> ' . __('Moderate')) ?></li>
-                    <li><?= Url::link(['content/index', null, null, ['type' => 'trash']], '<i class="fa fa-trash"></i> ' . __('Trash')) ?></li>
+                    <li><?= Url::link(['content/index', null, null, ['type' => 'all']], '<i class="fa fa-list"></i> '.__('All')) ?></li>
+                    <li><?= Url::link(['content/index', null, null, ['type' => 'moderate']], '<i class="fa fa-exclamation"></i> '.__('Moderate')) ?></li>
+                    <li><?= Url::link(['content/index', null, null, ['type' => 'trash']], '<i class="fa fa-trash"></i> '.__('Trash')) ?></li>
                     <li>
                         <a class="trigger right-caret"><i class="fa fa-table"></i> <?= __('Categories') ?></a>
                         <ul class="dropdown-menu sub-menu">
@@ -50,9 +50,9 @@ 
         </div>
         <?php
         if ($type === 'trash') {
-            echo Url::link(['content/clear'], '<i class="fa fa-minus"></i> ' . __('Remove all'), ['class' => 'btn btn-danger pull-right']);
+            echo Url::link(['content/clear'], '<i class="fa fa-minus"></i> '.__('Remove all'), ['class' => 'btn btn-danger pull-right']);
         } else {
-            echo Url::link(['content/update', 0], '<i class="fa fa-plus"></i> ' . __('Add content'), ['class' => 'btn btn-primary pull-right']);
+            echo Url::link(['content/update', 0], '<i class="fa fa-plus"></i> '.__('Add content'), ['class' => 'btn btn-primary pull-right']);
         }
         ?>
     </div>
@@ -61,23 +61,23 @@ 
 <?php
 
 if ($records->count() < 1) {
-    echo '<p class="alert alert-warning">' . __('Content is not found') . '</p>';
+    echo '<p class="alert alert-warning">'.__('Content is not found').'</p>';
     return;
 }
 
 $items = [];
 $moderate = false;
 foreach ($records as $content) {
-    $frontLink = \App::$Alias->scriptUrl . '/content/read';
+    $frontLink = \App::$Alias->scriptUrl.'/content/read';
     $frontPath = null;
     if (!Str::likeEmpty($content->getCategory()->path)) {
-        $frontLink .= '/' . $content->getCategory()->path;
-        $frontPath .= '/' . $content->getCategory()->path;
+        $frontLink .= '/'.$content->getCategory()->path;
+        $frontPath .= '/'.$content->getCategory()->path;
     }
-    $frontLink .= '/' . $content->path;
-    $frontPath .= '/' . $content->path;
+    $frontLink .= '/'.$content->path;
+    $frontPath .= '/'.$content->path;
     $frontPath = Str::sub($frontPath, 0, 30);
-    $actionIcons = '<a href="' . $frontLink . '" target="_blank"><i class="fa fa-eye fa-lg"></i></a> ';
+    $actionIcons = '<a href="'.$frontLink.'" target="_blank"><i class="fa fa-eye fa-lg"></i></a> ';
     $actionIcons .= Url::link(['content/update', $content->id], '<i class="fa fa-pencil fa-lg"></i> ');
     if ($type === 'trash') {
         $actionIcons .= Url::link(['content/restore', $content->id], '<i class="fa fa-refresh fa-lg"></i>');
@@ -85,16 +85,16 @@ 
         $actionIcons .= Url::link(['content/delete', $content->id], '<i class="fa fa-trash-o fa-lg"></i>');
     }
 
-    if (!(bool)$content->display) {
+    if (!(bool) $content->display) {
         $moderate = true;
     }
 
     $items[] = [
-        'property' => ['class' => 'checkbox-row' . (!(bool)$content->display ? ' alert-warning' : null)],
+        'property' => ['class' => 'checkbox-row'.(!(bool) $content->display ? ' alert-warning' : null)],
         1 => ['text' => $content->id, 'html' => true, '!secure' => true],
-        2 => ['text' => (!(bool)$content->display ? '<i class="fa fa-exclamation text-warning"></i> ' : null) . Url::link(['content/update', $content->id], $content->getLocaled('title')), 'html' => true],
+        2 => ['text' => (!(bool) $content->display ? '<i class="fa fa-exclamation text-warning"></i> ' : null).Url::link(['content/update', $content->id], $content->getLocaled('title')), 'html' => true],
         3 => ['text' => $content->getCategory()->getLocaled('title')],
-        4 =>['text' => '<a href="' . $frontLink . '" target="_blank">' . $frontPath . '</a>', 'html' => true],
+        4 =>['text' => '<a href="'.$frontLink.'" target="_blank">'.$frontPath.'</a>', 'html' => true],
         5 => ['text' => Date::convertToDatetime($content->updated_at, Date::FORMAT_TO_SECONDS)],
         6 => ['text' => $actionIcons, 'html' => true, 'property' => ['class' => 'text-center']]
     ];

Apps/View/Front/default/widgets/newcontent/default.php

Spacing +7 added lines, -7 removed lines

@@ -12,15 +12,15 @@
     }
     $title = Text::snippet($title, 50);
     $date = Date::humanize($record->created_at);
-    $categoryUrl = \App::$Alias->baseUrl . '/content/list/' . $record->cpath;
-    $categoryLink = '<a href="' . $categoryUrl . '">' . \App::$Translate->getLocaleText($record->ctitle) . '</a>';
-    $newsLink = \App::$Alias->baseUrl . '/content/read/' . $record->cpath;
-    $newsLink = rtrim($newsLink, '/') . '/' . $record->path;
+    $categoryUrl = \App::$Alias->baseUrl.'/content/list/'.$record->cpath;
+    $categoryLink = '<a href="'.$categoryUrl.'">'.\App::$Translate->getLocaleText($record->ctitle).'</a>';
+    $newsLink = \App::$Alias->baseUrl.'/content/read/'.$record->cpath;
+    $newsLink = rtrim($newsLink, '/').'/'.$record->path;
     
     echo '<div class="row"><div class="col-md-12">';
-    echo '<a href="' . $newsLink . '">&rarr; ' . $title . '</a><br />';
-    echo '<small class="pull-left">' . $categoryLink . '</small>';
-    echo '<small class="pull-right">' . $date . '</small>';
+    echo '<a href="'.$newsLink.'">&rarr; '.$title.'</a><br />';
+    echo '<small class="pull-left">'.$categoryLink.'</small>';
+    echo '<small class="pull-right">'.$date.'</small>';
     echo '</div></div>';
     echo '<hr class="pretty" />';
 }

Private/Database/Tables/App.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 ]);
 
 $configs->newcontent = serialize([
-    'categories' => ['2','3'],
+    'categories' => ['2', '3'],
     'count' => '5',
     'cache' => '60'
 ]);

Apps/Model/Admin/Application/FormInstall.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
     public function before()
     {
         foreach ($this->_apps as $app) {
-            $this->_definedControllers[] = (string)$app->sys_name;
+            $this->_definedControllers[] = (string) $app->sys_name;
         }
 
         parent::before();
@@ -79,14 +79,14 @@ 
     public function make()
     {
         $cName = ucfirst(Str::lowerCase($this->sysname));
-        $cPath = 'Apps\Controller\Admin\\' . $cName;
+        $cPath = 'Apps\Controller\Admin\\'.$cName;
         // if object class is not loaded - prevent install
-        if (!class_exists($cPath) || !defined($cPath . '::VERSION')) {
+        if (!class_exists($cPath) || !defined($cPath.'::VERSION')) {
             return false;
         }
 
         // get ext version
-        $cVersion = constant($cPath . '::VERSION');
+        $cVersion = constant($cPath.'::VERSION');
         if ($cVersion === null || Str::likeEmpty($cVersion)) {
             $cVersion = '1.0.0';
         }
@@ -102,7 +102,7 @@ 
 
         // callback to install method in extension
         if (method_exists($cPath, 'install')) {
-            call_user_func($cPath . '::install');
+            call_user_func($cPath.'::install');
         }
 
         return true;

Apps/Controller/Api/Content.php

Spacing +24 added lines, -24 removed lines

@@ -33,12 +33,12 @@ 
         parent::before();
         $configs = AppRecord::getConfigs('app', 'Content');
         // prevent null-type config data
-        if ((int)$configs['gallerySize'] > 0) {
-            $this->maxSize = (int)$configs['gallerySize'] * 1024;
+        if ((int) $configs['gallerySize'] > 0) {
+            $this->maxSize = (int) $configs['gallerySize'] * 1024;
         }
 
-        if ((int)$configs['galleryResize'] > 0) {
-            $this->maxResize = (int)$configs['galleryResize'];
+        if ((int) $configs['galleryResize'] > 0) {
+            $this->maxResize = (int) $configs['galleryResize'];
         }
     }
     
@@ -117,8 +117,8 @@ 
         }
 
         // check if directory exist
-        if (!Directory::exist('/upload/gallery/' . $id)) {
-            Directory::create('/upload/gallery/' . $id);
+        if (!Directory::exist('/upload/gallery/'.$id)) {
+            Directory::create('/upload/gallery/'.$id);
         }
 
         // get file object
@@ -130,7 +130,7 @@ 
 
         // check file size
         if ($file->getSize() < 1 || $file->getSize() > $this->maxSize) {
-            throw new ForbiddenException(__('File size is too big. Max size: %size%kb', ['size' => (int)($this->maxSize/1024)]));
+            throw new ForbiddenException(__('File size is too big. Max size: %size%kb', ['size' => (int) ($this->maxSize / 1024)]));
         }
 
         // check file extension
@@ -139,41 +139,41 @@ 
         }
 
         // create origin directory
-        $originPath = '/upload/gallery/' . $id . '/orig/';
+        $originPath = '/upload/gallery/'.$id.'/orig/';
         if (!Directory::exist($originPath)) {
             Directory::create($originPath);
         }
 
         // lets make a new file name
-        $fileName = App::$Security->simpleHash($file->getClientOriginalName() . $file->getSize());
-        $fileNewName = $fileName . '.' . $file->guessExtension();
+        $fileName = App::$Security->simpleHash($file->getClientOriginalName().$file->getSize());
+        $fileNewName = $fileName.'.'.$file->guessExtension();
         // check if image is already loaded
-        if (File::exist($originPath . $fileNewName)) {
+        if (File::exist($originPath.$fileNewName)) {
             throw new ForbiddenException(__('File is always exists!'));
         }
         // save file from tmp to gallery origin directory
         $file->move(Normalize::diskFullPath($originPath), $fileNewName);
 
         // lets resize preview image for it
-        $thumbPath = '/upload/gallery/' . $id . '/thumb/';
+        $thumbPath = '/upload/gallery/'.$id.'/thumb/';
         if (!Directory::exist($thumbPath)) {
             Directory::create($thumbPath);
         }
 
         $thumb = new Image();
-        $thumb->setCacheDir(root . '/Private/Cache/images');
+        $thumb->setCacheDir(root.'/Private/Cache/images');
 
         // open original file, resize it and save
-        $thumbSaveName = Normalize::diskFullPath($thumbPath) . '/' . $fileName . '.jpg';
-        $thumb->open(Normalize::diskFullPath($originPath) . DIRECTORY_SEPARATOR . $fileNewName)
+        $thumbSaveName = Normalize::diskFullPath($thumbPath).'/'.$fileName.'.jpg';
+        $thumb->open(Normalize::diskFullPath($originPath).DIRECTORY_SEPARATOR.$fileNewName)
             ->cropResize($this->maxResize)
             ->save($thumbSaveName, 'jpg', 90);
         $thumb = null;
 
         $this->setJsonHeader();
         return json_encode(['status' => 1, 'file' => [
-            'thumbnailUrl' => '/upload/gallery/' . $id . '/thumb/' . $fileName . '.jpg',
-            'url' => '/upload/gallery/' . $id . '/orig/' . $fileNewName,
+            'thumbnailUrl' => '/upload/gallery/'.$id.'/thumb/'.$fileName.'.jpg',
+            'url' => '/upload/gallery/'.$id.'/orig/'.$fileNewName,
             'name' => $fileNewName
         ]]);
     }
@@ -197,7 +197,7 @@ 
             throw new NativeException('Permission denied');
         }
 
-        $thumbDir = Normalize::diskFullPath('/upload/gallery/' . $id . '/orig/');
+        $thumbDir = Normalize::diskFullPath('/upload/gallery/'.$id.'/orig/');
         if (!Directory::exist($thumbDir)) {
             throw new NotFoundException('Nothing found');
         }
@@ -212,10 +212,10 @@ 
             $fileExt = Str::lastIn($file, '.');
             $fileName = Str::sub($file, 0, -Str::length($fileExt));
             $output[] = [
-                'thumbnailUrl' => '/upload/gallery/' . $id . '/thumb/' . $fileName . '.jpg',
-                'url' => '/upload/gallery/' . $id . '/orig/' . $file,
+                'thumbnailUrl' => '/upload/gallery/'.$id.'/thumb/'.$fileName.'.jpg',
+                'url' => '/upload/gallery/'.$id.'/orig/'.$file,
                 'name' => $file,
-                'size' => File::size('/upload/gallery/' . $id . '/orig/' . $file)
+                'size' => File::size('/upload/gallery/'.$id.'/orig/'.$file)
             ];
         }
 
@@ -234,7 +234,7 @@ 
     public function actionGallerydelete($id, $file = null)
     {
         if ($file === null || Str::likeEmpty($file)) {
-            $file = (string)$this->request->query->get('file', null);
+            $file = (string) $this->request->query->get('file', null);
         }
         // check passed data
         if (Str::likeEmpty($file) || !Obj::isLikeInt($id)) {
@@ -249,8 +249,8 @@ 
         }
 
         // generate path
-        $thumb = '/upload/gallery/' . $id . '/thumb/' . $fileName . '.jpg';
-        $full = '/upload/gallery/' . $id . '/orig/' . $file;
+        $thumb = '/upload/gallery/'.$id.'/thumb/'.$fileName.'.jpg';
+        $full = '/upload/gallery/'.$id.'/orig/'.$file;
 
         // check if file exists and remove
         if (File::exist($thumb) || File::exist($full)) {

Apps/Model/Admin/Content/FormContentPublish.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
     /**
      * FormContentPublish constructor. Pass records inside
-     * @param Content[]|Collection $records
+     * @param \Ffcms\Core\Arch\ActiveModel $records
      */
     public function __construct($records)
     {

Extend/Core/Arch/ApiController.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Apps\Model\Front\Profile;
 
 use Apps\ActiveRecord\Blacklist;
-use Ffcms\Core\App;
 use Ffcms\Core\Arch\Model;
 use Ffcms\Core\Interfaces\iUser;
 

Apps/Controller/Api/Main.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
         $connector = new \elFinderConnector(new \elFinder([
             'locale' => '',
             'roots' => [
-                ['driver' => 'LocalFileSystem', 'path' => root . '/upload/', 'URL' => App::$Alias->scriptUrl . '/upload/']
+                ['driver' => 'LocalFileSystem', 'path' => root.'/upload/', 'URL' => App::$Alias->scriptUrl.'/upload/']
             ]
         ]));
 
@@ -105,7 +105,7 @@ 
         if (App::$Cache->get('download.ffcms.api.news.'.$this->lang) !== null) {
             $news = App::$Cache->get('download.ffcms.api.news.'.$this->lang);
         } else {
-            $news = Url::download('https://ffcms.org/api/api/news?lang=' . $this->lang);
+            $news = Url::download('https://ffcms.org/api/api/news?lang='.$this->lang);
             if ($news !== null && !Str::likeEmpty($news)) {
                 App::$Cache->set('download.ffcms.api.news.'.$this->lang, $news, 3600 * 12);
             }