Merge pull request #183 from pentium10/master

improvements for php8.1
ptrofimov · Feb 4, 2022 · 6523c20 · 6523c20
2 parents 9876bd0 + 4a00a87
commit 6523c20
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/include.php b/lib/include.php
@@ -416,7 +416,7 @@ protected function _postDelete() {
             $this->_globalVar['tube'] = null;
         }
         header(
-                sprintf('Location: ./?server=%s&tube=%s', $this->_globalVar['server'], urlencode($this->_globalVar['tube'])));
+                sprintf('Location: ./?server=%s&tube=%s', $this->_globalVar['server'], urlencode($this->_globalVar['tube'] ?? '')));
         exit();
     }
 
@@ -689,7 +689,7 @@ protected function _actionSearch() {
 
         foreach ($states as $state) {
             $jobList[$state] = $this->findJobsByState($GLOBALS['tube'], $state, $searchStr, $limit);
-            $jobList['total']+=count($jobList[$state]);
+            $jobList['total'] += count($jobList[$state]);
         }
 
         $this->searchResults = $jobList;
@@ -741,8 +741,8 @@ private function findJobsByState($tube, $state, $searchStr, $limit = 25) {
                 if ($job) {
                     $jobStats = $this->interface->_client->statsJob($job);
                     if ($jobStats->tube === $tube &&
-                        $jobStats->state === $state &&
-                        strpos($job->getData(), $searchStr) !== false
+                            $jobStats->state === $state &&
+                            strpos($job->getData(), $searchStr) !== false
                     ) {
                         $jobList[$id] = $job;
                         $added++;

diff --git a/lib/tpl/currentTubeJobsShowcase.php b/lib/tpl/currentTubeJobsShowcase.php
@@ -25,8 +25,8 @@
                                         <?php
                                         if (in_array($key, array('age', 'delay', 'time-left'), true)) {
                                             $days = floor($value / 86400);
-                                            $hours = floor($value / 3600 % 24);
-                                            $minutes = floor($value / 60 % 60);
+                                            $hours = floor($value / 3600) % 24;
+                                            $minutes = floor($value / 60) % 60;
                                             $seconds = floor($value % 60);
                                             echo $days > 0 ? 'days: ' . $days . '<br>' : '';
                                             echo $hours > 0 ? 'hours: ' . $hours . '<br>' : '';