phpffcms / ffcms

Apps/Model/Front/Content/FormNarrowContentUpdate.php

Spacing +18 added lines, -18 removed lines

@@ -57,13 +57,13 @@ 
         // set current user id
         $this->authorId = App::$User->identity()->getId();
         // set true if it is a new content item
-        if ($this->_record->id === null || (int)$this->_record->id < 1) {
+        if ($this->_record->id === null || (int) $this->_record->id < 1) {
             $this->_new = true;
         }
 
         // set random path slug if not defined
         if ($this->path === null || Str::likeEmpty($this->path)) {
-            $randPath = date('d-m-Y') . '-' . Str::randomLatin(mt_rand(8,12));
+            $randPath = date('d-m-Y').'-'.Str::randomLatin(mt_rand(8, 12));
             $this->path = Str::lowerCase($randPath);
         }
     }
@@ -107,21 +107,21 @@ 
     {
         $r = [
             [['path', 'categoryId'], 'required'],
-            ['title.' . App::$Request->getLanguage(), 'required'],
-            ['text.' . App::$Request->getLanguage(), 'required', null, true, true],
+            ['title.'.App::$Request->getLanguage(), 'required'],
+            ['text.'.App::$Request->getLanguage(), 'required', null, true, true],
             ['text', 'used', null, true, true],
             ['path', 'direct_match', '/^[a-zA-Z0-9\-]+$/'],
             ['categoryId', 'in', $this->categoryIds()],
             ['path', 'Apps\Model\Front\Content\FormNarrowContentUpdate::validatePath'],
             ['poster', 'used'],
             ['poster', 'isFile', ['jpg', 'png', 'gif', 'jpeg']],
-            ['poster', 'sizeFile', (int)$this->_configs['gallerySize'] * 1024] // in bytes
+            ['poster', 'sizeFile', (int) $this->_configs['gallerySize'] * 1024] // in bytes
         ];
 
         foreach (App::$Properties->get('languages') as $lang) {
-            $r[] = ['title.' . $lang, 'length_max', 120, null, true, true];
-            $r[] = ['keywords.' . $lang, 'length_max', 150];
-            $r[] = ['description.' . $lang, 'length_max', 250];
+            $r[] = ['title.'.$lang, 'length_max', 120, null, true, true];
+            $r[] = ['keywords.'.$lang, 'length_max', 150];
+            $r[] = ['description.'.$lang, 'length_max', 250];
         }
 
         return $r;
@@ -136,9 +136,9 @@ 
         $this->_record->title = Serialize::encode(App::$Security->strip_tags($this->title));
         $this->_record->text = Serialize::encode(App::$Security->secureHtml($this->text));
         $this->_record->path = $this->path;
-        $this->_record->category_id = (int)$this->categoryId;
+        $this->_record->category_id = (int) $this->categoryId;
         $this->_record->display = 0; // set to premoderation
-        $this->_record->author_id = (int)$this->authorId;
+        $this->_record->author_id = (int) $this->authorId;
         if ($this->_new === true) {
             $this->_record->comment_hash = $this->generateCommentHash();
         }
@@ -148,8 +148,8 @@ 
         // work with poster data
         if ($this->poster !== null) {
             // lets move poster from tmp to gallery
-            $originDir = '/upload/gallery/' . $this->_record->id . '/orig/';
-            $thumbDir = '/upload/gallery/' . $this->_record->id . '/thumb/';
+            $originDir = '/upload/gallery/'.$this->_record->id.'/orig/';
+            $thumbDir = '/upload/gallery/'.$this->_record->id.'/thumb/';
             if (!Directory::exist($originDir)) {
                 Directory::create($originDir);
             }
@@ -157,17 +157,17 @@ 
                 Directory::create($thumbDir);
             }
 
-            $fileName = App::$Security->simpleHash($this->poster->getClientOriginalName() . $this->poster->getSize());
-            $newFullName = $fileName . '.' . $this->poster->guessExtension();
+            $fileName = App::$Security->simpleHash($this->poster->getClientOriginalName().$this->poster->getSize());
+            $newFullName = $fileName.'.'.$this->poster->guessExtension();
             // move poster to upload gallery directory
             $this->poster->move(Normalize::diskFullPath($originDir), $newFullName);
             // initialize image resizer
             $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($thumbDir) . '/' . $fileName . '.jpg';
-            $thumb->open(Normalize::diskFullPath($originDir) . DIRECTORY_SEPARATOR . $newFullName)
+            $thumbSaveName = Normalize::diskFullPath($thumbDir).'/'.$fileName.'.jpg';
+            $thumb->open(Normalize::diskFullPath($originDir).DIRECTORY_SEPARATOR.$newFullName)
                 ->cropResize($this->_configs['galleryResize'])
                 ->save($thumbSaveName, 'jpg', 90);
             $thumb = null;
@@ -187,7 +187,7 @@ 
         $data = ContentCategory::getSortedCategories();
         $response = [];
         foreach ($data as $key=>$val) {
-            $response[] = (string)$key;
+            $response[] = (string) $key;
         }
         return $response;
     }

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

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 		<ul class="list-inline list-info">
 			<li><i class="fa fa-calendar"></i> <?= $data['date'] ?></li>
 			<li><i class="fa fa-user"></i>
-			<?php if ((int)$data['user']['id'] > 0): ?>
+			<?php if ((int) $data['user']['id'] > 0): ?>
 				<?= Url::link(['profile/show', $data['user']['id']], $data['user']['name']) ?>
 			<?php else: ?>
 				<?= $data['user']['name'] ?>
@@ -35,7 +35,7 @@ 
 			<img class="media-object img-responsive" src="<?= $data['user']['avatar']?>" style="width: 64px; height: 64px;" alt="Picture of user <?= $data['user']['name'] ?>">
 		</span>
 		<div class="media-body">
-			<a href="<?= \App::$Alias->baseUrl . $data['pathway'] . '#comment-list' ?>">
+			<a href="<?= \App::$Alias->baseUrl.$data['pathway'].'#comment-list' ?>">
 				<?= \App::$Security->strip_tags($data['text']) ?>
 			</a>
 		</div>

Apps/View/Front/default/content/update.php

Spacing +3 added lines, -3 removed lines

@@ -32,10 +32,10 @@
 foreach (\App::$Properties->get('languages') as $lang) {
     $items[] = [
         'type' => 'tab',
-        'text' => __('Lang') . ': ' . Str::upperCase($lang),
+        'text' => __('Lang').': '.Str::upperCase($lang),
         'content' =>
-            $form->field('title.' . $lang, 'text', ['class' => 'form-control'], __('Please, enter the title of your material for current language locale')) .
-            $form->field('text.' . $lang, 'textarea', ['class' => 'form-control wysiwyg', 'rows' => 7, 'html' => true]),
+            $form->field('title.'.$lang, 'text', ['class' => 'form-control'], __('Please, enter the title of your material for current language locale')).
+            $form->field('text.'.$lang, 'textarea', ['class' => 'form-control wysiwyg', 'rows' => 7, 'html' => true]),
         'html' => true,
         'active' => $lang === \App::$Request->getLanguage(),
         '!secure' => true

Apps/View/Front/default/content/my.php

Spacing +2 added lines, -2 removed lines

@@ -29,10 +29,10 @@
 }
 $items = [];
 foreach ($records as $record) {
-    $moderate = (int)$record->display === 0;
+    $moderate = (int) $record->display === 0;
     $title = Serialize::getDecodeLocale($record->title);
     if ($moderate) {
-        $title = Url::link(['content/update', $record->id], $title) . ' <i class="fa fa-pencil"></i>';
+        $title = Url::link(['content/update', $record->id], $title).' <i class="fa fa-pencil"></i>';
     }
 
     $items[] = [

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']]
     ];

Apps/View/Front/default/profile/show.php

Spacing +9 added lines, -9 removed lines

@@ -27,7 +27,7 @@ 
     $name = __('No name');
 }
 
-$this->title = __('Profile') . ': ' . $name;
+$this->title = __('Profile').': '.$name;
 
 $this->breadcrumbs = [
     Url::to('/') => __('Home'),
@@ -47,7 +47,7 @@ 
         <?php
         if ($ratingOn):
             $rateClass = 'btn-default';
-            $rateValue = (int)$user->getProfile()->rating;
+            $rateValue = (int) $user->getProfile()->rating;
             if ($user->getProfile()->rating > 0) {
                 $rateClass = 'btn-info';
             } elseif ($user->getProfile()->rating < 0) {
@@ -85,19 +85,19 @@ 
         $userMenu = null;
         if (true === $isSelf) {
             $userMenu = [
-                ['type' => 'link', 'link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> ' . __('Avatar'), 'html' => true],
-                ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true],
-                ['type' => 'link', 'link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true]
+                ['type' => 'link', 'link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> '.__('Avatar'), 'html' => true],
+                ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true],
+                ['type' => 'link', 'link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true]
             ];
         } elseif (\App::$User->isAuth()) {
             $userMenu = [
                 [
                     'type' => 'link', 'link' => Url::to('profile/messages', null, null, ['newdialog' => $user->id]),
-                    'text' => '<i class="fa fa-pencil-square-o"></i> ' . __('Write message'), 'html' => true
+                    'text' => '<i class="fa fa-pencil-square-o"></i> '.__('Write message'), 'html' => true
                 ],
                 [
                     'type' => 'link', 'link' => Url::to('profile/ignore', null, null, ['id' => $user->id]),
-                    'text' => '<i class="fa fa-user-times"></i> ' . __('Block'), 'html' => true, 'property' => ['class' => 'alert-danger']
+                    'text' => '<i class="fa fa-user-times"></i> '.__('Block'), 'html' => true, 'property' => ['class' => 'alert-danger']
                 ]
             ];
         }
@@ -173,7 +173,7 @@ 
                         foreach ($hobbyArray as $item) {
                             $item = \App::$Security->strip_tags($item);
                             if ($item !== null && Str::length($item) > 1) {
-                                echo Url::link(['profile/index', 'hobby', trim($item, ' ')], $item, ['class' => 'label label-success']) . ' ';
+                                echo Url::link(['profile/index', 'hobby', trim($item, ' ')], $item, ['class' => 'label label-success']).' ';
                             }
                         }
                         ?>
@@ -219,7 +219,7 @@ 
             <?= $form->field('message', 'textarea', ['class' => 'form-control']); ?>
             <div class="text-right"><?= $form->submitButton(__('Send'), ['class' => 'btn btn-default']); ?></div>
             <?= $form->finish(); ?>
-            <?php \App::$Alias->addPlainCode('js', "$('#" . $wall->getFormName() . "').on('change keyup keydown paste cut', 'textarea', function () { $(this).height(0).height(this.scrollHeight);}).find('textarea').change();") ?>
+            <?php \App::$Alias->addPlainCode('js', "$('#".$wall->getFormName()."').on('change keyup keydown paste cut', 'textarea', function () { $(this).height(0).height(this.scrollHeight);}).find('textarea').change();") ?>
         <?php endif; ?>
         <?php
         if ($wallRecords !== null):

Apps/Model/Admin/Main/FormSettings.php

Spacing +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
      */
     public function getAvailableThemes($env_name)
     {
-        $path = root . '/Apps/View/' . $env_name . '/';
+        $path = root.'/Apps/View/'.$env_name.'/';
         if (!Directory::exist($path)) {
             return [];
         }
@@ -124,7 +124,7 @@ 
     public function makeSave()
     {
         $toSave = App::$Security->strip_php_tags($this->getAllProperties());
-        $stringSave = '<?php return ' . Arr::exportVar($toSave, null, true) . ';';
+        $stringSave = '<?php return '.Arr::exportVar($toSave, null, true).';';
 
         $cfgPath = '/Private/Config/Default.php';
         if (File::exist($cfgPath) && File::writable($cfgPath)) {

cron.php

Spacing +1 added lines, -1 removed lines

@@ -2,4 +2,4 @@
 define('root', __DIR__);
 error_reporting(E_ALL ^ E_NOTICE);
 
-require_once(root . '/Loader/Cron/index.php');
\ No newline at end of file
+require_once(root.'/Loader/Cron/index.php');
\ No newline at end of file