Merge pull request #1829 from nuxsmin/fix/wrong_syntax

Fix/wrong syntax Signed-off-by: Rubén D <nuxsmin@syspass.org>
nuxsmin · May 26, 2022 · 7a813d4 · 7a813d4
2 parents 3c026f7 + e1f7374
commit 7a813d4
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/app/modules/web/themes/material-blue/views/account/search-rows.inc b/app/modules/web/themes/material-blue/views/account/search-rows.inc
@@ -76,7 +76,7 @@ $favoriteRouteOff = $_getvar('favoriteRouteOff');
                                class="btn-action"
                                data-action-route="<?php echo $_getvar('viewAccountRoute'); ?>"
                                data-item-id="<?php echo $accountSearchData->getId(); ?>"
-                               data-onclick="account/view"><?php echo htmlspecialchars(accountSearchData->getName(), ENT_QUOTES); ?></a>
+                               data-onclick="account/view"><?php echo htmlspecialchars($accountSearchData->getName(), ENT_QUOTES); ?></a>
                         <?php else: ?>
                             <div class="field-text">
                                 <?php echo htmlspecialchars($accountSearchData->getName(), ENT_QUOTES); ?>

diff --git a/app/modules/web/themes/material-blue/views/config/info.inc b/app/modules/web/themes/material-blue/views/config/info.inc
@@ -58,7 +58,7 @@
         <td class="valField">
             <div class="lowres-title"><?php echo __('PHP'); ?></div>
 
-            <?php printf('%s: %s', Html::strongText(__('Version')), phpversion()); ?>
+            <?php printf('%s: %s', Html::strongText(__('Version')), PHP_VERSION); ?>
             <br>
             <?php printf('%s: %s', Html::strongText(__('Extensions')), implode(', ', get_loaded_extensions())); ?>
             <br>
@@ -73,7 +73,7 @@
             <?php printf('%s: %s', Html::strongText(__('User')), (!$_getvar('isDemo')) ? get_current_user() : '***'); ?>
             <br>
             <?php printf('%s: %d MB/s', Html::strongText(__('Download rate')), $_getvar('downloadRate')); ?>
-            <?php if (function_exists('opcache_get_status') && version_compare(PHP_VERSION, '5.6.0', '>=')): ?>
+            <?php if (function_exists('opcache_get_status') && PHP_VERSION_ID >= 50600): ?>
                 <br>
                 <?php echo Html::strongText(__('OP Cache')); ?>
                 <?php foreach (opcache_get_status(false)['opcache_statistics'] as $key => $value): ?>

diff --git a/app/modules/web/themes/material-blue/views/config/wiki.inc b/app/modules/web/themes/material-blue/views/config/wiki.inc
@@ -61,7 +61,7 @@ use SP\Mvc\View\Template;
                     </p>
 
                     <p>
-                        <?php __('Example:'); ?>
+                        <?php echo __('Example:'); ?>
                     </p>
 
                     <p>

diff --git a/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc b/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc
@@ -22,7 +22,7 @@ $data = $_getvar('data');
         <tr data-item-id="<?php echo $dataItem->{$data->getData()->getDataRowSourceId()}; ?>">
             <?php foreach ($data->getData()->getDataRowSources() as $rowSrc): ?>
                 <?php $value = $rowSrc['isMethod'] === true && method_exists($dataItem, $rowSrc['name']) ? $dataItem->{$rowSrc['name']}() : $dataItem->{$rowSrc['name']}; ?>
-                <?php $value = $rowSrc['filter'] !== null && $rowSrc['filter'] ? $rowSrc['filter']($value) : $value; ?>
+                <?php $value = isset($rowSrc['filter']) ? $rowSrc['filter']($value) : $value; ?>
                 <td class="cell-data"><?php echo $value !== '' ? $value : '&nbsp;'; // Fix height ?></td>
             <?php endforeach; ?>
         </tr>

diff --git a/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc b/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc
@@ -19,7 +19,7 @@ if (!isset($data)) {
     $data = $_getvar('data');
 }
 
-$index = isset($index) ? $index : 0;
+$index = $index ?? 0;
 ?>
 
 <div class="tab-actions">

diff --git a/lib/SP/Services/Install/Installer.php b/lib/SP/Services/Install/Installer.php
@@ -60,9 +60,9 @@ final class Installer extends Service
     /**
      * sysPass' version and build number
      */
-    const VERSION = [3, 2, 3];
+    const VERSION = [3, 2, 4];
     const VERSION_TEXT = '3.2';
-    const BUILD = 22052501;
+    const BUILD = 22052601;
 
     /**
      * @var DatabaseSetupInterface