phpffcms / ffcms

Apps/Controller/Api/Content.php

Spacing +21 added lines, -21 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'];
         }
     }
     
@@ -116,8 +116,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
@@ -129,7 +129,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
@@ -138,37 +138,37 @@ 
         }
 
         // 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();
         // 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;
 
         // dont ask me why there is 2nd lvl array (can contains multiply items to frontend response)
         $output = [
-            '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,8 +212,8 @@ 
             $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
             ];
         }
@@ -245,8 +245,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/View/Admin/default/content/index.php

Spacing +16 added lines, -16 removed lines

@@ -35,9 +35,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">
@@ -51,9 +51,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>
@@ -62,23 +62,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>');
@@ -86,16 +86,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], Serialize::getDecodeLocale($content->title)), 'html' => true],
+        2 => ['text' => (!(bool) $content->display ? '<i class="fa fa-exclamation text-warning"></i> ' : null).Url::link(['content/update', $content->id], Serialize::getDecodeLocale($content->title)), 'html' => true],
         3 => ['text' => Serialize::getDecodeLocale($content->getCategory()->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']]
     ];