phpffcms / ffcms

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

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
 <hr />
 <div class="row">
     <div class="col-md-12">
-        <?= Url::link(['content/categoryupdate', 0], '<i class="fa fa-plus"></i> ' . __('Add category'), ['class' => 'btn btn-primary pull-right']) ?>
+        <?= Url::link(['content/categoryupdate', 0], '<i class="fa fa-plus"></i> '.__('Add category'), ['class' => 'btn btn-primary pull-right']) ?>
     </div>
 </div>
 <div class="table-responsive">
@@ -55,8 +55,8 @@ 
             <tr>
                 <td>
                     <div class="row">
-                        <div class="col-md-<?= $offset ?> col-xs-<?= $offset+2 ?>" style="padding-top: 8px;border-bottom: 2px solid #8a8a8a"></div>
-                        <div class="col-md-<?= $set ?> col-xs-<?= $set-2 ?>">
+                        <div class="col-md-<?= $offset ?> col-xs-<?= $offset + 2 ?>" style="padding-top: 8px;border-bottom: 2px solid #8a8a8a"></div>
+                        <div class="col-md-<?= $set ?> col-xs-<?= $set - 2 ?>">
                             <?= Serialize::getDecodeLocale($row->title) ?>
                             <sup>id: <?= $row->id ?></sup>
                             <span class="label label-info">/<?= $row->path ?></span>

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

Spacing +4 added lines, -4 removed lines

@@ -32,9 +32,9 @@ 
 foreach (\App::$Properties->get('languages') as $lang) {
     $items[] = [
         'type' => 'tab',
-        'text' => __('Lang') . ': ' . Str::upperCase($lang),
-        'content' => $form->field('title.' . $lang, 'text', ['class' => 'form-control'], __('Enter category title, visible for users')) .
-            $form->field('description.' . $lang, 'text', ['class' => 'form-control'], __('Enter category description')),
+        'text' => __('Lang').': '.Str::upperCase($lang),
+        'content' => $form->field('title.'.$lang, 'text', ['class' => 'form-control'], __('Enter category title, visible for users')).
+            $form->field('description.'.$lang, 'text', ['class' => 'form-control'], __('Enter category description')),
         'html' => true,
         'active' => $lang === \App::$Request->getLanguage(),
         '!secure' => true
@@ -53,7 +53,7 @@ 
 $pathProperty = [
     'class' => 'form-control'
 ];
-if ((int)$model->id == '1') {
+if ((int) $model->id == '1') {
     $pathProperty['disabled'] = '';
 } else {
     echo $form->field('dependId', 'select', ['class' => 'form-control', 'options' => $model->categoryList(), 'optionsKey' => true], __('Select owner category for this category'));

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

Spacing +17 added lines, -17 removed lines

@@ -42,9 +42,9 @@ 
 foreach (\App::$Properties->get('languages') as $lang) {
     $generalItems[] = [
         'type' => 'tab',
-        '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'), 'content/form/tab_content_update') .
-            $form->field('text.' . $lang, 'textarea', ['class' => 'form-control wysiwyg', 'rows' => 7, 'html' => true], null, 'content/form/tab_content_update'),
+        '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'), 'content/form/tab_content_update').
+            $form->field('text.'.$lang, 'textarea', ['class' => 'form-control wysiwyg', 'rows' => 7, 'html' => true], null, 'content/form/tab_content_update'),
         'html' => true,
         'active' => $lang === \App::$Request->getLanguage(),
         '!secure' => true
@@ -52,10 +52,10 @@ 
 
     $propertiesItems[] = [
         'type' => 'tab',
-        'text' => __('Lang') . ': ' . Str::upperCase($lang),
-        'content' => $form->field('metaTitle.' . $lang, 'text', ['class' => 'form-control'], __('Enter meta param title for page title. Recoomended: 50-70 characters')) .
-            $form->field('metaKeywords.' . $lang, 'text', ['class' => 'form-control'], __('Enter meta param keywords for this content, separated by comma. Example: home, door, dog')) .
-            $form->field('metaDescription.' . $lang, 'text', ['class' => 'form-control'], __('Enter meta param description for this content. Recommended is 100-150 characters')),
+        'text' => __('Lang').': '.Str::upperCase($lang),
+        'content' => $form->field('metaTitle.'.$lang, 'text', ['class' => 'form-control'], __('Enter meta param title for page title. Recoomended: 50-70 characters')).
+            $form->field('metaKeywords.'.$lang, 'text', ['class' => 'form-control'], __('Enter meta param keywords for this content, separated by comma. Example: home, door, dog')).
+            $form->field('metaDescription.'.$lang, 'text', ['class' => 'form-control'], __('Enter meta param description for this content. Recommended is 100-150 characters')),
         'html' => true,
         '!secure' => true,
         'active' => $lang === \App::$Request->getLanguage()
@@ -89,13 +89,13 @@ 
 <div class="col-md-4">
             <span class="btn btn-success fileinput-button btn-block">
                 <i class="glyphicon glyphicon-plus"></i>
-                <span>' . __('Upload image') . '</span>
+                <span>' . __('Upload image').'</span>
                 <!-- The file input field used as target for the file upload widget -->
                 <input id="fileupload" type="file" name="gallery-files" multiple>
             </span>
 </div>
 <div class="col-md-8">
-    ' . $form->field('poster', 'select', ['options' => [__('Not selected...')], 'class' => 'form-control'], __('Select image from gallery as a poster for this content')) . '
+    ' . $form->field('poster', 'select', ['options' => [__('Not selected...')], 'class' => 'form-control'], __('Select image from gallery as a poster for this content')).'
 </div>
 </div><br/><br/>';
 ?>
@@ -108,7 +108,7 @@ 
         ['type' => 'tab', 'text' => __('Gallery'), 'content' => $galleryTab, 'html' => true, '!secure' => true],
         ['type' => 'tab', 'text' => __('Other'), 'content' => $otherTab, 'html' => true, '!secure' => true]
     ]
-]);?>
+]); ?>
 
 <?= $form->field('galleryFreeId', 'hidden') ?>
 <?= $form->submitButton(__('Save'), ['class' => 'btn btn-primary']) ?>
@@ -117,15 +117,15 @@ 
 
 <?php
 // load max length display plugin
-\App::$Alias->setCustomLibrary('js', \App::$Alias->currentViewUrl . '/assets/js/plugins/maxlength.js');
+\App::$Alias->setCustomLibrary('js', \App::$Alias->currentViewUrl.'/assets/js/plugins/maxlength.js');
 // load datapicker plugin
-\App::$Alias->setCustomLibrary('css', \App::$Alias->currentViewUrl . '/assets/css/plugins/datapick/datapick.css');
-\App::$Alias->setCustomLibrary('js', \App::$Alias->currentViewUrl . '/assets/js/plugins/datapick.js');
+\App::$Alias->setCustomLibrary('css', \App::$Alias->currentViewUrl.'/assets/css/plugins/datapick/datapick.css');
+\App::$Alias->setCustomLibrary('js', \App::$Alias->currentViewUrl.'/assets/js/plugins/datapick.js');
 // load jquery-upload plugin
-\App::$Alias->setCustomLibrary('css', \App::$Alias->scriptUrl . '/vendor/bower/blueimp-file-upload/css/jquery.fileupload.css');
-\App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl . '/vendor/bower/blueimp-file-upload/js/vendor/jquery.ui.widget.js');
-\App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl . '/vendor/bower/blueimp-file-upload/js/jquery.iframe-transport.js');
-\App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl . '/vendor/bower/blueimp-file-upload/js/jquery.fileupload.js');
+\App::$Alias->setCustomLibrary('css', \App::$Alias->scriptUrl.'/vendor/bower/blueimp-file-upload/css/jquery.fileupload.css');
+\App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl.'/vendor/bower/blueimp-file-upload/js/vendor/jquery.ui.widget.js');
+\App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl.'/vendor/bower/blueimp-file-upload/js/jquery.iframe-transport.js');
+\App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl.'/vendor/bower/blueimp-file-upload/js/jquery.fileupload.js');
 ?>
 
 <!-- dom model for gallery items -->

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

Spacing +5 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
     <div class="row">
         <div class="col-md-12">
             <div class="pull-right">
-                <?= Url::link(['widget/install'], '<i class="fa fa-tasks"></i> ' . __('Install'), ['class' => 'btn btn-primary']) ?>
+                <?= Url::link(['widget/install'], '<i class="fa fa-tasks"></i> '.__('Install'), ['class' => 'btn btn-primary']) ?>
             </div>
         </div>
     </div>
@@ -25,10 +25,10 @@ 
 $widgetTableItems = null;
 foreach ($widgets as $widget) {
     /** @var $widget Apps\ActiveRecord\App */
-    $route = $widget->sys_name . '/index';
+    $route = $widget->sys_name.'/index';
     $icoStatus = null;
     $actions = $this->render('native/macro/widget_actions', ['controller' => $widget->sys_name]);
-    if ((int)$widget->disabled !== 0) {
+    if ((int) $widget->disabled !== 0) {
         $icoStatus = ' <i class="fa fa-pause" style="color: #ff0000;"></i>';
     } elseif ($widget->checkVersion() !== true) {
         $icoStatus = ' <i class="fa fa-exclamation" style="color: #ffbd26;"></i>';
@@ -38,7 +38,7 @@ 
     }
 
     $widgetTableItems[] = [
-        ['text' => $widget->id . $icoStatus, 'html' => true, '!secure' => true],
+        ['text' => $widget->id.$icoStatus, 'html' => true, '!secure' => true],
         ['text' => Url::link([$route], $widget->getLocaleName()), 'html' => true],
         ['text' => $widget->version],
         ['text' => Date::convertToDatetime($widget->updated_at, Date::FORMAT_TO_HOUR)],
@@ -49,7 +49,7 @@ 
 ?>
 
 <?php if ($widgetTableItems === null || count($widgetTableItems) < 1) {
-    echo '<p class="alert alert-info">' . __('Installed widgets is not founded') . '</p>';
+    echo '<p class="alert alert-info">'.__('Installed widgets is not founded').'</p>';
 } ?>
 
 

Apps/View/Front/default/user/recovery.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 <?= $form->field('email', 'email', ['class' => 'form-control'], __('Input your account email')); ?>
 <?php
 if (\App::$Captcha->isFull()) {
-    echo '<div class="col-md-offset-3 col-md-9">' . \App::$Captcha->get() . '</div>';
+    echo '<div class="col-md-offset-3 col-md-9">'.\App::$Captcha->get().'</div>';
 } else {
     echo $form->field('captcha', 'captcha', ['class' => 'form-control'], __('Enter data from security image to prove that you are human. If you can\'t read symbols - click on image to reload'));
 }

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

Spacing +10 added lines, -11 removed lines

@@ -26,7 +26,7 @@ 
     $name = __('No name');
 }
 
-$this->title = __('Profile') . ': ' . $name;
+$this->title = __('Profile').': '.$name;
 
 $this->breadcrumbs = [
     Url::to('/') => __('Home'),
@@ -46,7 +46,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) {
@@ -84,19 +84,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']
                 ]
             ];
         }
@@ -172,7 +172,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']).' ';
                             }
                         }
                         ?>
@@ -218,7 +218,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):
@@ -229,8 +229,7 @@ 
                     continue;
                 }
                 $referNickname = ($referObject->getProfile()->nick == null ?
-                    __('No name') . ' <sup>id' . $referObject->getId() . '</sup>' :
-                    \App::$Security->strip_tags($referObject->getProfile()->nick));
+                    __('No name').' <sup>id'.$referObject->getId().'</sup>' : \App::$Security->strip_tags($referObject->getProfile()->nick));
                 ?>
                 <div class="row object-lightborder" id="wall-post-<?= $post->id ?>">
                     <div class="col-md-2">

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

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 /** @var $pagination object */
 /** @var $ratingOn int */
 
-$this->title = __('User list') . ': ' . __('Search');
+$this->title = __('User list').': '.__('Search');
 
 $this->breadcrumbs = [
     Url::to('main/index') => __('Home'),
@@ -35,7 +35,7 @@ 
 <?php
 if ($records === null || $records->count() < 1) {
     if ($model->send()) {
-        echo '<div class="row"><div class="col-md-12"><div class="alert alert-danger">' . __('Users are not founded!') . '</div></div></div>';
+        echo '<div class="row"><div class="col-md-12"><div class="alert alert-danger">'.__('Users are not founded!').'</div></div></div>';
     }
 
     return;

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

Spacing +5 added lines, -5 removed lines

@@ -13,13 +13,13 @@ 
 $this->title = __('User list');
 
 if ($id === 'all') {
-    $this->title .= ': ' . __('All');
+    $this->title .= ': '.__('All');
 } elseif ($id === 'rating') {
-    $this->title .= ': ' . __('Rating');
+    $this->title .= ': '.__('Rating');
 } elseif ($id === 'city') {
-    $this->title .= ': ' . __('City') . ' ' . \App::$Security->strip_tags($add);
+    $this->title .= ': '.__('City').' '.\App::$Security->strip_tags($add);
 } elseif ($id === 'hobby') {
-    $this->title .= ': ' . __('Hobby') . ' ' . \App::$Security->strip_tags($add);
+    $this->title .= ': '.__('Hobby').' '.\App::$Security->strip_tags($add);
 }
 
 $this->breadcrumbs = [
@@ -34,7 +34,7 @@ 
 
 <?php
     if ($records === null || $records->count() < 1) {
-        echo '<div class="alert alert-danger">' . __('Users are not founded!') . '</div>';
+        echo '<div class="alert alert-danger">'.__('Users are not founded!').'</div>';
         return;
     }
 ?>

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

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 <?= $form->field('url', 'text', ['class' => 'form-control'], __('If you have your own homepage - enter url there')) ?>
 <?php
 foreach (ProfileField::getAll() as $custom) {
-    echo $form->field('custom_data.' . $custom->id, 'text', ['class' => 'form-control']);
+    echo $form->field('custom_data.'.$custom->id, 'text', ['class' => 'form-control']);
 }
 ?>