phpffcms / ffcms

Apps/View/Admin/default/profile/_tabs.php

Spacing +1 added lines, -1 removed lines

@@ -9,4 +9,4 @@
         ['type' => 'link', 'text' => __('Group management'), 'link' => ['user/grouplist']],
         ['type' => 'link', 'text' => __('Settings'), 'link' => ['user/settings']]
     ]
-]);?>
\ No newline at end of file
+]); ?>
\ No newline at end of file

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

Braces +5 added lines, -2 removed lines

@@ -59,7 +59,8 @@ 
                 </a>
             </div>
         </div>
-        <?php else: ?>
+        <?php else {
+    : ?>
         <div class="row">
             <div class="col-md-8" style="padding-right: 0;">
                 <a href="javascript:void(0);" class="btn btn-block <?= $rateClass ?>">
@@ -76,7 +77,9 @@ 
                 <a href="javascript:void(0);" class="btn btn-block btn-danger" id="reduceRating">-</a>
             </div>
         </div>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
         <?php endif; ?>
         <?php
         $userMenu = null;

Indentation +6 added lines, -6 removed lines

@@ -100,12 +100,12 @@
         </div>
         <div class="meta">
         	<?php if ((int)$catConfigs['showRating'] === 1) {
-        	    echo \App::$View->render('content/_rate', [
-        	        'id' => $item['id'],
-        	        'canRate' => $item['canRate'],
-        	        'rating' => $item['rating']
-        	    ]);
-        	} ?>
+                echo \App::$View->render('content/_rate', [
+                    'id' => $item['id'],
+                    'canRate' => $item['canRate'],
+                    'rating' => $item['rating']
+                ]);
+            } ?>
         	
         	<span class="spaced hidden-xs"><i class="fa fa-comments"></i>
                 <a href="#"><?= __('Comments') ?>: <span itemprop="commentCount">0</span></a>

Spacing +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
 
 $catConfigs = [];
 foreach ($model->category['configs'] as $key=>$value) {
-    $catConfigs[$key] = (int)$value === 1;
+    $catConfigs[$key] = (int) $value === 1;
 }
 
 $catMeta = [
@@ -56,7 +56,7 @@ 
 <?php foreach ($model->items as $item): ?>
     <article class="article-item" itemscope="itemscope" itemtype="https://schema.org/NewsArticle">
         <h2 itemprop="name">
-            <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>">
+            <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>">
                 <?= $item['title'] ?>
             </a>
         </h2>
@@ -83,7 +83,7 @@ 
                 <?php
                 $ownerNick = $item['author']->getProfile()->getNickname();
                 if ($item['author']->getId() < 1) {
-                    echo '<s>' . $ownerNick . '</s>';
+                    echo '<s>'.$ownerNick.'</s>';
                 } else {
                     echo Url::link(['profile/show', $item['author']->getId()], $ownerNick, ['itemprop' => 'author']);
                 }
@@ -100,7 +100,7 @@ 
         <div class="row">
             <div class="col-md-12">
                 <?php if ($catConfigs['showPoster'] === true && $item['thumb'] !== null): ?>
-                <img src="<?= \App::$Alias->scriptUrl . $item['thumb'] ?>" class="image_poster img-thumbnail hidden-xs" alt="<?= __('Poster for') ?>: <?= Str::lowerCase($item['title']) ?>" />
+                <img src="<?= \App::$Alias->scriptUrl.$item['thumb'] ?>" class="image_poster img-thumbnail hidden-xs" alt="<?= __('Poster for') ?>: <?= Str::lowerCase($item['title']) ?>" />
                 <?php endif; ?>
                 <div itemprop="text articleBody">
                     <?= $item['text'] ?>
@@ -108,7 +108,7 @@ 
             </div>
         </div>
         <div class="meta">
-        	<?php if ((int)$catConfigs['showRating'] === 1) {
+        	<?php if ((int) $catConfigs['showRating'] === 1) {
         	    echo \App::$View->render('content/_rate', [
         	        'id' => $item['id'],
         	        'canRate' => $item['canRate'],
@@ -120,12 +120,12 @@ 
                 <a href="#"><?= __('Comments') ?>: <span itemprop="commentCount" id="comment-count-<?= $item['id'] ?>">0</span></a>
             </span>
             <span class="pull-right">
-            <?php if ((int)$configs['keywordsAsTags'] === 1 && $item['tags'] !== null && Obj::isArray($item['tags'])): ?>
+            <?php if ((int) $configs['keywordsAsTags'] === 1 && $item['tags'] !== null && Obj::isArray($item['tags'])): ?>
                 <span class="spaced"><i class="fa fa-tags hidden-xs"></i>
                 <?php
                     foreach ($item['tags'] as $tag) {
                         $tag = \App::$Security->strip_tags(trim($tag));
-                        echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default']) . "&nbsp;";
+                        echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default'])."&nbsp;";
                     }
                 ?>
                 </span>

Private/Config/Default.php

Indentation +32 added lines, -32 removed lines

@@ -1,34 +1,34 @@
 <?php return [
-	'basePath' => '/',
-	'passwordSalt' => '$2a$10$1o81mUjA4NhQp8nSeaFmN8',
-	'debug' => [
-		'all' => false,
-		'cookie' => [
-			'key' => 'fdebug',
-			'value' => 'jiSpq941Am'
-		]
-	],
-	'theme' => [
-		'Front' => 'default',
-		'Admin' => 'default'
-	],
-	'database' => [
-		'driver' => 'mysql',
-		'host' => '127.0.0.1',
-		'database' => 'ffcms3',
-		'username' => 'mysql',
-		'password' => 'mysql',
-		'charset' => 'utf8',
-		'collation' => 'utf8_unicode_ci',
-		'prefix' => 'ffcms_'
-	],
-	'adminEmail' => 'noreplay@site.com',
-	'baseLanguage' => 'en',
-	'multiLanguage' => true,
-	'singleLanguage' => 'en',
-	'languages' => [
-		'en',
-		'ru'
-	],
-	'languageDomainAlias' => false
+    'basePath' => '/',
+    'passwordSalt' => '$2a$10$1o81mUjA4NhQp8nSeaFmN8',
+    'debug' => [
+        'all' => false,
+        'cookie' => [
+            'key' => 'fdebug',
+            'value' => 'jiSpq941Am'
+        ]
+    ],
+    'theme' => [
+        'Front' => 'default',
+        'Admin' => 'default'
+    ],
+    'database' => [
+        'driver' => 'mysql',
+        'host' => '127.0.0.1',
+        'database' => 'ffcms3',
+        'username' => 'mysql',
+        'password' => 'mysql',
+        'charset' => 'utf8',
+        'collation' => 'utf8_unicode_ci',
+        'prefix' => 'ffcms_'
+    ],
+    'adminEmail' => 'noreplay@site.com',
+    'baseLanguage' => 'en',
+    'multiLanguage' => true,
+    'singleLanguage' => 'en',
+    'languages' => [
+        'en',
+        'ru'
+    ],
+    'languageDomainAlias' => false
 ];
\ No newline at end of file

Apps/Model/Install/Main/FormInstall.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Apps\ActiveRecord\Profile;
 use Apps\ActiveRecord\User;
-use Apps\Controller\Console\Db;
 use Ffcms\Core\App;
 use Ffcms\Core\Arch\Model;
 use Ffcms\Core\Helper\FileSystem\File;

Indentation +4 added lines, -4 removed lines

@@ -25,8 +25,8 @@ 
     }
 
     /**
-    * Labels for installation form
-    */
+     * Labels for installation form
+     */
     public function labels()
     {
         return [
@@ -46,8 +46,8 @@ 
     }
 
     /**
-    * Installation post data validation
-    */
+     * Installation post data validation
+     */
     public function rules()
     {
         return [

Spacing +4 added lines, -4 removed lines

@@ -71,14 +71,14 @@
         $cfg['database'] = $this->db;
         $cfg['adminEmail'] = $this->email;
         $cfg['singleLanguage'] = $this->singleLanguage;
-        $cfg['multiLanguage'] = (bool)$this->multiLanguage;
-        $cfg['passwordSalt'] = '$2a$07$' . Str::randomLatinNumeric(mt_rand(21, 30)) . '$';
-        $cfg['debug']['cookie']['key'] = 'fdebug_' . Str::randomLatinNumeric(mt_rand(4, 16));
+        $cfg['multiLanguage'] = (bool) $this->multiLanguage;
+        $cfg['passwordSalt'] = '$2a$07$'.Str::randomLatinNumeric(mt_rand(21, 30)).'$';
+        $cfg['debug']['cookie']['key'] = 'fdebug_'.Str::randomLatinNumeric(mt_rand(4, 16));
         $cfg['debug']['cookie']['value'] = Str::randomLatinNumeric(mt_rand(32, 128));
 
         // import database tables
         $connectName = 'install';
-        include(root . '/Private/Database/install.php');
+        include(root.'/Private/Database/install.php');
 
         // insert admin user
         $user = new User();

Apps/Model/Install/Main/EntityCheck.php

Indentation +2 added lines, -2 removed lines

@@ -20,8 +20,8 @@
     public $chmodCheck = [];
 
     /**
-    * Get default server information and prepare chmod info
-    */
+     * Get default server information and prepare chmod info
+     */
     public function before()
     {
         $this->phpVersion = phpversion();

Apps/View/Install/default/main/index.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 ]);
 ?>
 
-<?php if($model->checkAll()): ?>
+<?php if ($model->checkAll()): ?>
     <?= \Ffcms\Core\Helper\Url::link('main/install', __('Start install'), ['class' => 'btn btn-success btn-block']) ?>
 <?php else: ?>
     <?= \Ffcms\Core\Helper\Url::link('main/index', __('Check again'), ['class' => 'btn btn-warning btn-block']) ?>

Braces +5 added lines, -2 removed lines

@@ -56,7 +56,10 @@
 
 <?php if($model->checkAll()): ?>
     <?= \Ffcms\Core\Helper\Url::link('main/install', __('Start install'), ['class' => 'btn btn-success btn-block']) ?>
-<?php else: ?>
+<?php else {
+    : ?>
     <?= \Ffcms\Core\Helper\Url::link('main/index', __('Check again'), ['class' => 'btn btn-warning btn-block']) ?>
-<?php endif; ?>
+<?php endif;
+}
+?>
 

Private/Database/Tables/Session.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 Illuminate\Database\Capsule\Manager::schema($connectName)->create('sessions', function($table) {
-    $table->string('sess_id', 128)->index()->primary()  ;
+    $table->string('sess_id', 128)->index()->primary();
     $table->binary('sess_data');
     $table->string('sess_lifetime', 16); // shutout to laravel, if i make it like "integer" it automaticlly add "primary" key for it, hate this!!!
     $table->string('sess_time', 16);

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

Braces +10 added lines, -4 removed lines

@@ -67,17 +67,23 @@
         <?php if ($properties['author'] === true): ?>
             <?php if ($model->authorId !== null && $model->authorId > 0): ?>
                 <span><i class="fa fa-user"></i><?= Url::link(['profile/show', $model->authorId], $model->authorName, ['itemprop' => 'author']) ?></span>
-            <?php else: ?>
+            <?php else {
+    : ?>
                 <span><i class="fa fa-user"></i><s><?= $model->authorName ?></s></span>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         <?php endif; ?>
         <?php if ($properties['views'] === true): ?>
         <span><i class="fa fa-eye"></i><?= $model->views ?></span>
         <?php endif ?>
     </div>
-    <?php else: ?>
+    <?php else {
+    : ?>
     <hr />
-    <?php endif; ?>
+    <?php endif;
+}
+?>
     <?php if ($trash): ?>
     <p class="alert alert-danger"><i class="fa fa-trash-o"></i> <?= __('This content is placed in trash') ?></p>
     <?php endif; ?>

Indentation +6 added lines, -6 removed lines

@@ -159,12 +159,12 @@
     	<div class="col-md-12">
     		<div class="pull-left">
         	<?php if ($properties['rating']) {
-        	    echo \App::$View->render('content/_rate', [
-        	        'id' => $model->id,
-        	        'rating' => $model->rating,
-        	        'canRate' => $model->canRate
-        	    ]);
-        	} ?>
+                echo \App::$View->render('content/_rate', [
+                    'id' => $model->id,
+                    'rating' => $model->rating,
+                    'canRate' => $model->canRate
+                ]);
+            } ?>
         	<?= \App::$View->render('content/_rateJs') ?>
     		</div>
     		<div class="pull-right">

Spacing +18 added lines, -18 removed lines

@@ -23,7 +23,7 @@ 
 }
 
 // don't use breadcrumbs on injected pathway rule
-if (!\App::$Request->isPathInjected() && (bool)$model->getCategory()->getProperty('showCategory')) {
+if (!\App::$Request->isPathInjected() && (bool) $model->getCategory()->getProperty('showCategory')) {
     $breadcrumbs = [
             Url::to('/') => __('Home')
     ];
@@ -35,21 +35,21 @@ 
                 $breadcrumbs[Url::to('content/list', $cat['path'], null, [], false)] = $cat['name'];
             }
         }
-        $breadcrumbs[] = __('Content') . ': ' . Str::sub($this->title, 0, 40);
+        $breadcrumbs[] = __('Content').': '.Str::sub($this->title, 0, 40);
     }
 
     $this->breadcrumbs = $breadcrumbs;
 }
 
 $properties = [
-    'date' => (bool)$model->getCategory()->getProperty('showDate'),
-    'author' => (bool)$model->getCategory()->getProperty('showAuthor'),
-    'views' => (bool)$model->getCategory()->getProperty('showViews'),
-    'category' => (bool)$model->getCategory()->getProperty('showCategory'),
-    'rating' => (bool)$model->getCategory()->getProperty('showRating')
+    'date' => (bool) $model->getCategory()->getProperty('showDate'),
+    'author' => (bool) $model->getCategory()->getProperty('showAuthor'),
+    'views' => (bool) $model->getCategory()->getProperty('showViews'),
+    'category' => (bool) $model->getCategory()->getProperty('showCategory'),
+    'rating' => (bool) $model->getCategory()->getProperty('showRating')
 ];
-$showComments = (bool)$model->getCategory()->getProperty('showComments');
-$showPoster = (bool)$model->getCategory()->getProperty('showPoster');
+$showComments = (bool) $model->getCategory()->getProperty('showComments');
+$showPoster = (bool) $model->getCategory()->getProperty('showPoster');
 
 ?>
 
@@ -74,7 +74,7 @@ 
         <span class="spaced"><i class="fa fa-eye"></i> <?= $model->views ?></span>
         <?php endif ?>
         <?php if (\App::$User->isAuth() && \App::$User->identity()->getRole()->can('Admin/Content/Update')): ?>
-        <span class="pull-right"><a href="<?= \App::$Alias->scriptUrl . '/admin/content/update/' . $model->id ?>" target="_blank"><i class="fa fa-pencil" style="color: #ff0000;"></i></a></span>
+        <span class="pull-right"><a href="<?= \App::$Alias->scriptUrl.'/admin/content/update/'.$model->id ?>" target="_blank"><i class="fa fa-pencil" style="color: #ff0000;"></i></a></span>
         <?php endif; ?>
     </div>
     <?php else: ?>
@@ -86,7 +86,7 @@ 
     <div id="content-text">
         <?php if ($showPoster === true && $model->posterFull !== null && $model->posterThumb !== null): ?>
             <a href="#showPoster" data-toggle="modal" data-target="#showPoster">
-                <img alt="<?= __('Poster for') ?>: <?= Str::lowerCase(\App::$Security->strip_tags($model->title)) ?>" src="<?= \App::$Alias->scriptUrl . $model->posterThumb ?>" class="image_poster img-thumbnail" />
+                <img alt="<?= __('Poster for') ?>: <?= Str::lowerCase(\App::$Security->strip_tags($model->title)) ?>" src="<?= \App::$Alias->scriptUrl.$model->posterThumb ?>" class="image_poster img-thumbnail" />
             </a>
 
             <!-- Modal poster pop-up -->
@@ -98,19 +98,19 @@ 
                             <h4 class="modal-title" id="myModalLabel"><?= __('View poster') ?></h4>
                         </div>
                         <div class="modal-body">
-                            <img class="img-responsive" src="<?= \App::$Alias->scriptUrl . $model->posterFull ?>" alt="<?= __('Poster image') ?>" style="margin: 0 auto;" />
+                            <img class="img-responsive" src="<?= \App::$Alias->scriptUrl.$model->posterFull ?>" alt="<?= __('Poster image') ?>" style="margin: 0 auto;" />
                         </div>
                     </div>
                 </div>
             </div>
-        <?php endif ;?>
+        <?php endif; ?>
         <?= $model->text ?>
     </div>
     <?php if ($model->galleryItems !== null && Obj::isArray($model->galleryItems)): ?>
         <div class="row">
         <?php foreach ($model->galleryItems as $thumbPic => $fullPic): ?>
             <div class="col-md-2 well">
-                <a href="#showGallery" class="modalGallery" content="<?= \App::$Alias->scriptUrl . $fullPic ?>"><img src="<?= \App::$Alias->scriptUrl . $thumbPic ?>" class="img-responsive image-item" /></a>
+                <a href="#showGallery" class="modalGallery" content="<?= \App::$Alias->scriptUrl.$fullPic ?>"><img src="<?= \App::$Alias->scriptUrl.$thumbPic ?>" class="img-responsive image-item" /></a>
             </div>
         <?php endforeach; ?>
         </div>
@@ -122,7 +122,7 @@ 
                         <h4 class="modal-title" id="showModalLabel"><?= __('View picture') ?></h4>
                     </div>
                     <div class="modal-body" id="modal-gallery-body">
-                        <img class="img-responsive" src="<?= \App::$Alias->scriptUrl . $model->posterFull ?>" alt="<?= __('Gallery picture') ?>" style="margin: 0 auto;" />
+                        <img class="img-responsive" src="<?= \App::$Alias->scriptUrl.$model->posterFull ?>" alt="<?= __('Gallery picture') ?>" style="margin: 0 auto;" />
                     </div>
                 </div>
             </div>
@@ -143,7 +143,7 @@ 
                 </div>
                 <div id="similar<?= $idx ?>" class="panel-collapse collapse">
                     <div class="panel-body">
-                        <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>">
+                        <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>">
                             <?= $item['snippet'] ?>
                         </a>
                     </div>
@@ -167,14 +167,14 @@ 
         	<?= \App::$View->render('content/_rateJs') ?>
     		</div>
     		<div class="pull-right">
-    		    <?php if ((int)$configs['keywordsAsTags'] === 1): ?>
+    		    <?php if ((int) $configs['keywordsAsTags'] === 1): ?>
                 <div id="content-tags">
                     <?php
                     if (Obj::isArray($model->metaKeywords) && count($model->metaKeywords) > 0 && Str::length($model->metaKeywords[0]) > 0) {
                         echo '<i class="fa fa-tags hidden-xs"></i> ';
                         foreach ($model->metaKeywords as $tag) {
                             $tag = \App::$Security->strip_tags(trim($tag));
-                            echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default']) . "&nbsp;";
+                            echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default'])."&nbsp;";
                         }
                     }
                     ?>

Apps/Model/Admin/Application/FormInstall.php

Indentation +2 added lines, -2 removed lines

@@ -33,8 +33,8 @@
     }
 
     /**
-    * Validation rules
-    */
+     * Validation rules
+     */
     public function rules()
     {
         return [

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
     public function before()
     {
         foreach ($this->_apps as $app) {
-            $this->_definedControllers[] = (string)$app->sys_name;
+            $this->_definedControllers[] = (string) $app->sys_name;
         }
 
         parent::before();
@@ -70,14 +70,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 = (float)constant($cPath . '::VERSION');
+        $cVersion = (float) constant($cPath.'::VERSION');
         if ($cVersion < 0.1) {
             $cVersion = 0.1;
         }
@@ -93,7 +93,7 @@ 
 
         // callback to install method in extension
         if (method_exists($cPath, 'install')) {
-            call_user_func($cPath . '::install');
+            call_user_func($cPath.'::install');
         }
 
         return true;