@@ -30,11 +30,11 @@ |
||
30 | 30 | 3 => ['text' => $user->login], |
31 | 31 | 4 => ['text' => $user->role->name], |
32 | 32 | 5 => ['text' => Date::convertToDatetime($user->created_at, Date::FORMAT_TO_DAY)], |
33 | - 6 => ['text' => Url::link(['user/update', $user->id], '<i class="fa fa-pencil fa-lg"></i>') . |
|
33 | + 6 => ['text' => Url::link(['user/update', $user->id], '<i class="fa fa-pencil fa-lg"></i>'). |
|
34 | 34 | Url::link(['user/delete', $user->id], ' <i class="fa fa-trash-o fa-lg"></i>'), |
35 | 35 | 'html' => true, 'property' => ['class' => 'text-center']], |
36 | 36 | 'property' => [ |
37 | - 'class' => 'checkbox-row' . ($user->approve_token != '0' ? ' alert-warning' : null) |
|
37 | + 'class' => 'checkbox-row'.($user->approve_token != '0' ? ' alert-warning' : null) |
|
38 | 38 | ] |
39 | 39 | ]; |
40 | 40 | } |
@@ -11,10 +11,10 @@ |
||
11 | 11 | // add library |
12 | 12 | \App::$Alias->setCustomLibrary('css', \App::$Alias->getVendor('css', 'jquery-ui')); |
13 | 13 | \App::$Alias->setCustomLibrary('js', \App::$Alias->getVendor('js', 'jquery-ui')); |
14 | -\App::$Alias->setCustomLibrary('css', \App::$Alias->scriptUrl . '/vendor/studio-42/elfinder/css/elfinder.min.css'); |
|
15 | -\App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl . '/vendor/studio-42/elfinder/js/elfinder.min.js'); |
|
14 | +\App::$Alias->setCustomLibrary('css', \App::$Alias->scriptUrl.'/vendor/studio-42/elfinder/css/elfinder.min.css'); |
|
15 | +\App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl.'/vendor/studio-42/elfinder/js/elfinder.min.js'); |
|
16 | 16 | if (\App::$Request->getLanguage() !== 'en') { |
17 | - \App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl . '/vendor/studio-42/elfinder/js/i18n/elfinder.' . \App::$Request->getLanguage() . '.js'); |
|
17 | + \App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl.'/vendor/studio-42/elfinder/js/i18n/elfinder.'.\App::$Request->getLanguage().'.js'); |
|
18 | 18 | } |
19 | 19 | ?> |
20 | 20 |
@@ -55,6 +55,9 @@ |
||
55 | 55 | echo $form->submitButton(__('Download update'), ['class' => 'btn btn-primary']); |
56 | 56 | echo $form->finish(); |
57 | 57 | ?> |
58 | -<?php else: ?> |
|
58 | +<?php else { |
|
59 | + : ?> |
|
59 | 60 | <p><?= __('Your system is up to date. No updates is available') ?></p> |
60 | -<?php endif; ?> |
|
61 | +<?php endif; |
|
62 | +} |
|
63 | +?> |
@@ -31,8 +31,8 @@ discard block |
||
31 | 31 | $themeTab = $form->field->select('theme.Front', ['class' => 'form-control', 'options' => $model->getAvailableThemes('Front')], __('Set theme for user part of website')); |
32 | 32 | $themeTab .= $form->field->select('theme.Admin', ['class' => 'form-control', 'options' => $model->getAvailableThemes('Admin')], __('Set theme for admin panel')); |
33 | 33 | |
34 | -$debugTab = '<p>' . __('The key-value of cookie to enable debugging on website') . '. ' . __('If user got this cookie he can see debug bar') . '. ' . |
|
35 | - Url::link(['main/debugcookie'], __('Set cookie for me')) . '</p>'; |
|
34 | +$debugTab = '<p>'.__('The key-value of cookie to enable debugging on website').'. '.__('If user got this cookie he can see debug bar').'. '. |
|
35 | + Url::link(['main/debugcookie'], __('Set cookie for me')).'</p>'; |
|
36 | 36 | $debugTab .= $form->field->text('debug.cookie.key', ['class' => 'form-control'], __('Set cookie name(key) for enable debug bar panel')); |
37 | 37 | $debugTab .= $form->field->text('debug.cookie.value', ['class' => 'form-control'], __('Set cookie value for enable debug bar panel')); |
38 | 38 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $langTab .= $form->field('baseLanguage', 'text', ['class' => 'form-control', 'disabled' => null], __('Website base script language. Do not change it')); |
42 | 42 | $langTab .= $form->field('languages', 'checkboxes', ['options' => App::$Translate->getAvailableLangs()], __('Website available languages')); |
43 | 43 | |
44 | -$databaseTab = '<p>' . __('Do not change any information in this tab if you not sure what you do!') . '</p>'; |
|
44 | +$databaseTab = '<p>'.__('Do not change any information in this tab if you not sure what you do!').'</p>'; |
|
45 | 45 | $databaseTab .= $form->field('database.driver', 'select', ['class' => 'form-control', 'options' => ['mysql', 'sqlite', 'pgsql']], __('Database connection driver')); |
46 | 46 | $databaseTab .= $form->field('database.host', 'text', ['class' => 'form-control'], __('Database connection host name')); |
47 | 47 | $databaseTab .= $form->field('database.database', 'text', ['class' => 'form-control'], __('Database name or path to sqlite created file database')); |
@@ -51,14 +51,14 @@ discard block |
||
51 | 51 | $databaseTab .= $form->field('database.collation', 'text', ['class' => 'form-control']); |
52 | 52 | $databaseTab .= $form->field('database.prefix', 'text', ['class' => 'form-control'], __('Database tables prefix')); |
53 | 53 | |
54 | -$mailTab = '<p>' . __('Configure sendmail over smtp server. You should set host:port and auth data for your smtp server') . '</p>'; |
|
54 | +$mailTab = '<p>'.__('Configure sendmail over smtp server. You should set host:port and auth data for your smtp server').'</p>'; |
|
55 | 55 | $mailTab .= $form->field->text('mail.host', ['class' => 'form-control'], __('Set SMTP hostname or ip')); |
56 | 56 | $mailTab .= $form->field->text('mail.port', ['class' => 'form-control'], __('Set SMTP connection port')); |
57 | 57 | $mailTab .= $form->field->select('mail.encrypt', ['class' => 'form-control', 'options' => ['tls', 'ssl', 'none']], __('Set encryption method for your smtp server. For remote service we are strongly recommend use tls/ssl encryption')); |
58 | 58 | $mailTab .= $form->field->text('mail.user', ['class' => 'form-control'], __('Set auth user name if required')); |
59 | 59 | $mailTab .= $form->field->text('mail.password', ['class' => 'form-control'], __('Set auth user password if exist')); |
60 | 60 | |
61 | -$otherTab = '<p>' . __('There you can change specified configs depends of other platforms. GA = google analytics.') . '</p>'; |
|
61 | +$otherTab = '<p>'.__('There you can change specified configs depends of other platforms. GA = google analytics.').'</p>'; |
|
62 | 62 | $otherTab .= $form->field('gaClientId', 'text', ['class' => 'form-control'], __('Google oAuth2 client id. This id will be used to display google.analytics info. Client ID looks like: xxxxxx.apps.googleusercontent.com')); |
63 | 63 | $otherTab .= $form->field('gaTrackId', 'text', ['class' => 'form-control'], __('Set google analytics tracking id for your website. Track id looks like: UA-XXXXXX-Y')); |
64 | 64 | $otherTab .= $form->field('trustedProxy', 'text', ['class' => 'form-control'], __('Set trusted proxy list to accept X-FORWARDED data. Example: 103.21.244.15,103.22.200.0/22')); |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | <div class="row"> |
19 | 19 | <div class="col-md-12"> |
20 | 20 | <div class="pull-right"> |
21 | - <?= Url::link(['application/install'], '<i class="glyphicon glyphicon-tasks"></i> ' . __('Install'), ['class' => 'btn btn-primary']) ?> |
|
21 | + <?= Url::link(['application/install'], '<i class="glyphicon glyphicon-tasks"></i> '.__('Install'), ['class' => 'btn btn-primary']) ?> |
|
22 | 22 | </div> |
23 | 23 | </div> |
24 | 24 | </div> |
@@ -30,11 +30,11 @@ discard block |
||
30 | 30 | continue; |
31 | 31 | } |
32 | 32 | |
33 | - $route = $app->sys_name . '/index'; |
|
33 | + $route = $app->sys_name.'/index'; |
|
34 | 34 | $icoStatus = null; |
35 | 35 | $actions = \App::$View->render('native/macro/app_actions', ['controller' => $app->sys_name]); |
36 | 36 | // set action icons based on app status |
37 | - if ((int)$app->disabled !== 0) { |
|
37 | + if ((int) $app->disabled !== 0) { |
|
38 | 38 | $icoStatus = ' <i class="glyphicon glyphicon-pause" style="color: #ff0000;"></i>'; |
39 | 39 | } elseif ($app->checkVersion() !== true) { |
40 | 40 | $icoStatus = ' <i class="glyphicon glyphicon-exclamation-sign" style="color: #ffbd26;"></i>'; |
@@ -44,9 +44,9 @@ discard block |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | $appTableItems[] = [ |
47 | - ['text' => $app->id . $icoStatus, 'html' => true, '!secure' => true], |
|
47 | + ['text' => $app->id.$icoStatus, 'html' => true, '!secure' => true], |
|
48 | 48 | ['text' => Url::link([$route], $app->getLocaleName()), 'html' => true], |
49 | - ['text' => '<a target="_blank" href="' . \App::$Alias->scriptUrl . '/' . Str::lowerCase($route) . '">' . $route . '</a>', 'html' => true], |
|
49 | + ['text' => '<a target="_blank" href="'.\App::$Alias->scriptUrl.'/'.Str::lowerCase($route).'">'.$route.'</a>', 'html' => true], |
|
50 | 50 | ['text' => $app->version], |
51 | 51 | ['text' => Date::convertToDatetime($app->updated_at, Date::FORMAT_TO_HOUR)], |
52 | 52 | ['text' => $actions, 'property' => ['class' => 'text-center'], 'html' => true] |
@@ -34,7 +34,7 @@ |
||
34 | 34 | [['text' => __('Name')], ['text' => $app->getLocaleName()]], |
35 | 35 | [['text' => __('System name')], ['text' => $app->sys_name]], |
36 | 36 | [['text' => __('Last update')], ['text' => Date::convertToDatetime($app->updated_at, Date::FORMAT_TO_SECONDS)]], |
37 | - [['text' => __('Status')], ['text' => ((int)$app->disabled === 0) ? 'On' : 'Off'], 'property' => ['class' => ((int)$app->disabled === 0) ? 'alert-success' : 'alert-danger']] |
|
37 | + [['text' => __('Status')], ['text' => ((int) $app->disabled === 0) ? 'On' : 'Off'], 'property' => ['class' => ((int) $app->disabled === 0) ? 'alert-success' : 'alert-danger']] |
|
38 | 38 | ] |
39 | 39 | ] |
40 | 40 | ]); ?> |
@@ -28,38 +28,38 @@ discard block |
||
28 | 28 | <div class="panel panel-info"> |
29 | 29 | <div class="panel-heading"> |
30 | 30 | <?php |
31 | - if ((int)$record->readed !== 1) { |
|
31 | + if ((int) $record->readed !== 1) { |
|
32 | 32 | echo '<i class="fa fa-bell"></i> '; |
33 | 33 | } |
34 | 34 | ?> |
35 | 35 | <?= __('Message sent') ?>: <?= Date::convertToDatetime($record->created_at, Date::FORMAT_TO_HOUR) ?>. |
36 | 36 | <?php |
37 | - if ((int)$record->closed !== 1) { |
|
38 | - echo '<span class="label label-success">' . __('Opened') . '</span>'; |
|
37 | + if ((int) $record->closed !== 1) { |
|
38 | + echo '<span class="label label-success">'.__('Opened').'</span>'; |
|
39 | 39 | } else { |
40 | - echo '<span class="label label-danger">' . __('Closed') . '</span>'; |
|
40 | + echo '<span class="label label-danger">'.__('Closed').'</span>'; |
|
41 | 41 | } |
42 | 42 | ?> |
43 | 43 | </div> |
44 | 44 | <div class="panel-body"> |
45 | 45 | <?php |
46 | - if ((int)$record->closed !== 0) { |
|
47 | - echo '<p class="alert alert-warning">' . __('The feedback request is closed! Thread in only-read mode') . '.</p>'; |
|
46 | + if ((int) $record->closed !== 0) { |
|
47 | + echo '<p class="alert alert-warning">'.__('The feedback request is closed! Thread in only-read mode').'.</p>'; |
|
48 | 48 | } |
49 | 49 | ?> |
50 | 50 | <p><?= Str::replace("\n", "<br />", $record->message) ?></p> |
51 | 51 | <hr /> |
52 | 52 | <?php |
53 | 53 | // show "mark as read" button if message is not readed |
54 | - if ((int)$record->readed !== 1) { |
|
55 | - echo Url::link(['feedback/turn', 'read', $record->id], __('Mark as read'), ['class' => 'label label-success']) . ' '; |
|
54 | + if ((int) $record->readed !== 1) { |
|
55 | + echo Url::link(['feedback/turn', 'read', $record->id], __('Mark as read'), ['class' => 'label label-success']).' '; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | // show close/open button depend of current status |
59 | - if ((int)$record->closed === 0) { |
|
60 | - echo Url::link(['feedback/turn', 'close', $record->id], __('Close'), ['class' => 'label label-warning']) . ' '; |
|
59 | + if ((int) $record->closed === 0) { |
|
60 | + echo Url::link(['feedback/turn', 'close', $record->id], __('Close'), ['class' => 'label label-warning']).' '; |
|
61 | 61 | } else { |
62 | - echo Url::link(['feedback/turn', 'open', $record->id], __('Open'), ['class' => 'label label-info']) . ' '; |
|
62 | + echo Url::link(['feedback/turn', 'open', $record->id], __('Open'), ['class' => 'label label-info']).' '; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | ?> |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | <div class="panel-body"> |
77 | 77 | <?php |
78 | 78 | $uInfo = 'no'; |
79 | - if ((int)$record->user_id > 0) { |
|
79 | + if ((int) $record->user_id > 0) { |
|
80 | 80 | $user = \App::$User->identity($record->user_id); |
81 | 81 | if ($user !== null && $user->getId() > 0) { |
82 | 82 | $uInfo = Url::link(['user/update', $user->getId()], $user->profile->getNickname()); |
@@ -101,9 +101,9 @@ discard block |
||
101 | 101 | |
102 | 102 | <?php if ($record->answers->count() > 0): ?> |
103 | 103 | <?php foreach ($record->answers as $answer): ?> |
104 | - <div class="panel <?= (int)$answer->is_admin === 1 ? 'panel-success' : 'panel-default' ?>"> |
|
104 | + <div class="panel <?= (int) $answer->is_admin === 1 ? 'panel-success' : 'panel-default' ?>"> |
|
105 | 105 | <div class="panel-heading"> |
106 | - <?= __('From') ?>: <?= $answer->name . '(' . $answer->email . ')' . ((int)$answer->user_id > 0 ? Url::link(['user/update', $answer->user_id], '[id' . $answer->user_id . ']') : null) ?>, |
|
106 | + <?= __('From') ?>: <?= $answer->name.'('.$answer->email.')'.((int) $answer->user_id > 0 ? Url::link(['user/update', $answer->user_id], '[id'.$answer->user_id.']') : null) ?>, |
|
107 | 107 | <?= Date::convertToDatetime($answer->created_at, Date::FORMAT_TO_HOUR) ?> |
108 | 108 | <span class="pull-right"> |
109 | 109 | <?= Url::link(['feedback/update', 'answer', $answer->id], __('Edit'), ['class' => 'label label-primary']) ?> |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | <h1><?= __('Feedback list') ?></h1> |
24 | 24 | <hr /> |
25 | 25 | <?php if ($records === null || $records->count() < 1) { |
26 | - echo '<p class="alert alert-warning">' . __('Feedback requests is empty now!') . '</p>'; |
|
26 | + echo '<p class="alert alert-warning">'.__('Feedback requests is empty now!').'</p>'; |
|
27 | 27 | return; |
28 | 28 | } |
29 | 29 | |
@@ -31,17 +31,16 @@ discard block |
||
31 | 31 | foreach ($records as $item) { |
32 | 32 | /** @var \Apps\ActiveRecord\FeedbackPost $item*/ |
33 | 33 | $items[] = [ |
34 | - ['text' => $item->id . ((int)$item->readed !== 1 ? ' <i class="fa fa-bell alert-info"></i>' : null), 'html' => true], |
|
34 | + ['text' => $item->id.((int) $item->readed !== 1 ? ' <i class="fa fa-bell alert-info"></i>' : null), 'html' => true], |
|
35 | 35 | ['text' => Url::link(['feedback/read', $item->id], Text::snippet($item->message, 40, false)), 'html' => true], |
36 | 36 | ['text' => $item->answers->count()], |
37 | 37 | ['text' => $item->email], |
38 | 38 | ['text' => |
39 | - (int)$item->closed === 1 ? |
|
40 | - '<span class="label label-danger">' . __('Closed') . '</span>' : |
|
41 | - '<span class="label label-success">' . __('Opened') . '</span>', |
|
39 | + (int) $item->closed === 1 ? |
|
40 | + '<span class="label label-danger">'.__('Closed').'</span>' : '<span class="label label-success">'.__('Opened').'</span>', |
|
42 | 41 | 'html' => true, '!secure' => true], |
43 | 42 | ['text' => Date::convertToDatetime($item->updated_at, Date::FORMAT_TO_HOUR)], |
44 | - ['text' => Url::link(['feedback/read', $item->id], '<i class="fa fa-list fa-lg"></i> ') . |
|
43 | + ['text' => Url::link(['feedback/read', $item->id], '<i class="fa fa-list fa-lg"></i> '). |
|
45 | 44 | Url::link(['feedback/delete', 'post', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'), |
46 | 45 | 'html' => true, 'property' => ['class' => 'text-center']] |
47 | 46 | ]; |
@@ -10,4 +10,4 @@ |
||
10 | 10 | ['type' => 'link', 'text' => __('Settings'), 'link' => ['feedback/settings']] |
11 | 11 | ], |
12 | 12 | 'activeOrder' => 'action' |
13 | -]);?> |
|
14 | 13 | \ No newline at end of file |
14 | +]); ?> |
|
15 | 15 | \ No newline at end of file |