Merge pull request #587 from lansuite/rector-UP_TO_PHP_73

Rector: Raise Level set to UP_TO_PHP_73
lansuite · May 28, 2023 · 7e16dd2 · 7e16dd2
2 parents 667a83f + 9228eec
commit 7e16dd2
Show file tree

Hide file tree

Showing 24 changed files with 48 additions and 51 deletions.
diff --git a/inc/Classes/Auth.php b/inc/Classes/Auth.php
@@ -692,9 +692,7 @@ private function cookie_set()
         setcookie(
             $this->cookie_name,
             $this->cookiedata_pack(),
-            time()+3600*24*$this->cookie_time,
-            $this->cookie_path,
-            $this->cookie_domain
+            ['expires' => time()+3600*24*$this->cookie_time, 'path' => $this->cookie_path, 'domain' => $this->cookie_domain]
         );
     }
 
@@ -708,9 +706,7 @@ private function cookie_unset()
         setcookie(
             $this->cookie_name,
             '',
-            time()+1,
-            $this->cookie_path,
-            $this->cookie_domain
+            ['expires' => time()+1, 'path' => $this->cookie_path, 'domain' => $this->cookie_domain]
         );
     }
 

diff --git a/inc/Classes/Framework.php b/inc/Classes/Framework.php
@@ -355,7 +355,7 @@ public function html_out()
 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
 })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-ga('create', " . json_encode($cfg['google_analytics_id']) . ", 'auto');
+ga('create', " . json_encode($cfg['google_analytics_id'], JSON_THROW_ON_ERROR) . ", 'auto');
 ga('set', 'anonymizeIp', true);
 ga('send', 'pageview');
 </script>";

diff --git a/inc/Classes/Func.php b/inc/Classes/Func.php
@@ -99,13 +99,13 @@ public function str2time($strStr, $strPattern = 'Y-m-d H:i:s')
         $arrPattern = preg_split('~['.$strDelimiters.']~', $strPattern);
 
         // If the numbers of the two array are not the same, return false, because the cannot belong together
-        if ((is_array($arrStr) || $arrStr instanceof \Countable ? count($arrStr) : 0) !== (is_array($arrPattern) || $arrPattern instanceof \Countable ? count($arrPattern) : 0)) {
+        if ((is_countable($arrStr) ? count($arrStr) : 0) !== (is_countable($arrPattern) ? count($arrPattern) : 0)) {
             return false;
         }
 
         // Creates a new array which has the keys from the $arrPattern array and the values from the $arrStr array
         $arrTime = [];
-        for ($i = 0; $i < (is_array($arrStr) || $arrStr instanceof \Countable ? count($arrStr) : 0); $i++) {
+        for ($i = 0; $i < (is_countable($arrStr) ? count($arrStr) : 0); $i++) {
             $arrTime[$arrPattern[$i]] = $arrStr[$i];
         }
 

diff --git a/inc/Classes/Security.php b/inc/Classes/Security.php
@@ -12,7 +12,7 @@ public function check_blacklist()
         global $db, $cfg;
 
         // Global blacklist
-        if (strpos($cfg['ip_blacklist'], $_SERVER['REMOTE_ADDR']) !== false) {
+        if (strpos($cfg['ip_blacklist'], (string) $_SERVER['REMOTE_ADDR']) !== false) {
             return 'Deine IP wird von LanSuite geblockt. Melde dich bitte bei den Administratoren';
         }
 

diff --git a/modules/about/Functions/GetTheLinesAndChars.php b/modules/about/Functions/GetTheLinesAndChars.php
@@ -8,7 +8,7 @@ function GetTheLinesAndChars($file)
 {
     $data = [];
     $file_content = file($file);
-    $data[0] = is_array($file_content) || $file_content instanceof \Countable ? count($file_content) : 0;
+    $data[0] = is_countable($file_content) ? count($file_content) : 0;
     foreach ($file_content as $iValue) {
         $data[1] += strlen($iValue);
     }

diff --git a/modules/downloads/show.php b/modules/downloads/show.php
@@ -166,7 +166,7 @@
         if ($_GET['go_dir'] == "up") {
             array_pop($_SESSION['downloads_dir']);
         } elseif ($_GET['go_dir']) {
-            if ((is_array($_SESSION['downloads_dir']) || $_SESSION['downloads_dir'] instanceof \Countable ? count($_SESSION['downloads_dir']) : 0) > "0") {
+            if ((is_countable($_SESSION['downloads_dir']) ? count($_SESSION['downloads_dir']) : 0) > "0") {
                 foreach ($_SESSION['downloads_dir'] as $dir_entry) {
                     $set_dir .= "/" . $dir_entry;
                 }
@@ -181,7 +181,7 @@
             unset($join_dir);
         }
 
-        if ((is_array($_SESSION['downloads_dir']) || $_SESSION['downloads_dir'] instanceof \Countable ? count($_SESSION['downloads_dir']) : 0) > "0") {
+        if ((is_countable($_SESSION['downloads_dir']) ? count($_SESSION['downloads_dir']) : 0) > "0") {
             foreach ($_SESSION['downloads_dir'] as $dir_entry) {
                 $set_dir .= "/" . $dir_entry;
             }
@@ -267,7 +267,7 @@
         }
 
         $dsp->NewContent(t('Downloads'), t('Hier kannst du zum Download bereitgestellte Dateien downloaden. Ordner sind durch ein Ordner-Symbol gekennzeichnet und können per Klick auf dieses oder den Namen ge&ouml;ffnet werden. Bei &ouml;ffnen eines Unterverzeichnisses wird das aktuelle Verzeichnis am oberen Rand angezeigt. Ebenfalls angezeigt wird ein Symbol mit dem du zum nächst höhergelegenen Verzeichnis gelangst'));
-        if ((is_array($_SESSION['downloads_dir']) || $_SESSION['downloads_dir'] instanceof \Countable ? count($_SESSION['downloads_dir']) : 0) > "0") {
+        if ((is_countable($_SESSION['downloads_dir']) ? count($_SESSION['downloads_dir']) : 0) > "0") {
             $dsp->AddSingleRow('<a href="index.php?mod=downloads&action=show&go_dir=up"><img src="design/'. $auth['design'] .'/images/downloads_goup.gif" border="0"></a> '. $dir .'/');
         }
         $dsp->AddTableRow($table);

diff --git a/modules/faq/change_cat.php b/modules/faq/change_cat.php
@@ -43,7 +43,7 @@
             $catcaption = $get_data["name"];
 
             if ($catcaption != "") {
-                $change_it = $db->qry("UPDATE %prefix%faq_cat SET name = %string% WHERE catid = %int%", $_POST[cat_caption], $_GET["catid"]);
+                $change_it = $db->qry("UPDATE %prefix%faq_cat SET name = %string% WHERE catid = %int%", $_POST['cat_caption'], $_GET["catid"]);
 
                 if ($change_it == true) {
                     $_SESSION["change_blocker_faq_cat"] = 1;

diff --git a/modules/foodcenter/Classes/ProductList.php b/modules/foodcenter/Classes/ProductList.php
@@ -84,6 +84,7 @@ public function get_info($id, $worklink)
      */
     public function add_product($id, $opt)
     {
+        $key_array = [];
         // Product already in the list?
         if (in_array($id, $this->product_list)) {
             if (is_array($opt)) {

diff --git a/modules/hardware/edit.php b/modules/hardware/edit.php
@@ -17,7 +17,7 @@
     $mf->AddField('Monitor', 'monitor', '', '', \LanSuite\MasterForm::FIELD_OPTIONAL);
     $mf->AddField('Betriebssystem', 'os', '', '', \LanSuite\MasterForm::FIELD_OPTIONAL);
     $mf->AddField('Computername', 'name', '', '', \LanSuite\MasterForm::FIELD_OPTIONAL);
-    $mf->AddField('Sonstiges', 'sonstiges', text, '', \LanSuite\MasterForm::FIELD_OPTIONAL);
+    $mf->AddField('Sonstiges', 'sonstiges', 'text', '', \LanSuite\MasterForm::FIELD_OPTIONAL);
     $mf->AddFix('userid', $_GET['userid']);
     $mf->SendForm('index.php?mod=hardware&action=edit&userid='.$_GET['userid'], 'hardware', 'hardwareid', $_GET['hardwareid']);
 } else {

diff --git a/modules/install/Classes/Export.php b/modules/install/Classes/Export.php
@@ -507,7 +507,7 @@ public function ExportExtInc($filename)
         header("Content-Disposition: attachment; filename=\"$filename\"");
         $zip->download_file();
 
-        if ((is_array($zip->errors) || $zip->errors instanceof \Countable ? count($zip->errors) : 0) > 0) {
+        if ((is_countable($zip->errors) ? count($zip->errors) : 0) > 0) {
             return false;
         }
 

diff --git a/modules/msgsys/add.php b/modules/msgsys/add.php
@@ -89,7 +89,7 @@
 
             // Confirmations / Errors
             // Successful
-            if ((is_array($sux) || $sux instanceof \Countable ? count($sux) : 0) > "0" && (is_array($err) || $err instanceof \Countable ? count($err) : 0) == "0") {
+            if ((is_countable($sux) ? count($sux) : 0) > "0" && (is_countable($err) ? count($err) : 0) == "0") {
                 foreach ($sux as $item) {
                     if ($names1 != "") {
                         $names1 .= ", ";
@@ -100,7 +100,7 @@
                                            <b>%NAMES1%</b> ' . HTML_NEWLINE . ' Die &Auml;nderung wird beim n&auml;chsten Seitenaufruf sichtbar.')));
 
             // Partly Successful
-            } elseif ((is_array($sux) || $sux instanceof \Countable ? count($sux) : 0) > "0" && (is_array($err) || $err instanceof \Countable ? count($err) : 0) > "0") {
+            } elseif ((is_countable($sux) ? count($sux) : 0) > "0" && (is_countable($err) ? count($err) : 0) > "0") {
                 foreach ($sux as $item) {
                     if ($names1 != "") {
                         $names1 .= ", ";
@@ -124,7 +124,7 @@
                                            - Du versuchst dich selbst in die Buddy-Liste hinzuzuf&uuml;gen ' . HTML_NEWLINE . '
                                            Die &Auml;nderung wird beim n&auml;chsten Seitenaufruf sichtbar.'))), "");
                 // Not successful
-            } elseif ((is_array($sux) || $sux instanceof \Countable ? count($sux) : 0) == "0" && (is_array($err) || $err instanceof \Countable ? count($err) : 0) > "0") {
+            } elseif ((is_countable($sux) ? count($sux) : 0) == "0" && (is_countable($err) ? count($err) : 0) > "0") {
                 $func->error(t('Es konnten keine Benutzer in die Buddy-Liste hinzugef&uuml;gt werden. ' . HTML_NEWLINE . '
                       Dies kann folgende Ursachen haben: ' . HTML_NEWLINE . '
                       - Der Benutzer ist bereits in deiner Buddy-Liste ' . HTML_NEWLINE . '

diff --git a/modules/msgsys/query_messages.php b/modules/msgsys/query_messages.php
@@ -26,7 +26,7 @@
     )
   ORDER BY timestamp", $auth['userid'], $_GET['queryid'], $_GET['queryid'], $auth['userid']);
 
-$row2 = $db->qry_first("SELECT username FROM %prefix%user WHERE userid = %int%", $_GET[queryid]);
+$row2 = $db->qry_first("SELECT username FROM %prefix%user WHERE userid = %int%", $_GET['queryid']);
 
 while ($row = $db->fetch_array($query)) {
     $senderid   = $row["senderid"];

diff --git a/modules/msgsys/remove.php b/modules/msgsys/remove.php
@@ -1,25 +1,25 @@
 <?php
 
-if ($_GET[queryid]) {
-    switch ($_GET[step]) {
+if ($_GET['queryid']) {
+    switch ($_GET['step']) {
         default:
             $rowcheck = $db->qry("
               SELECT id
               FROM %prefix%buddys
               WHERE userid = %int%
-              AND buddyid = %int%", $auth['userid'], $_GET[queryid]);
+              AND buddyid = %int%", $auth['userid'], $_GET['queryid']);
 
             // User in buddylist ?
             if ($db->num_rows() != '0') {
                 $row = $db->qry_first("
                   SELECT username, name, firstname
                   FROM %prefix%user
-                  WHERE userid = %int%", $_GET[queryid]);
+                  WHERE userid = %int%", $_GET['queryid']);
 
                 if ($cfg['sys_internet'] == 0) {
-                    $func->question(t('Willst du den Benutzer <b>%1 (%2 %3)</b> wirklich aus deiner Buddy-Liste entfernen?', $row[name], $row[firstname], $row[username]), "index.php?mod=msgsys&action=removebuddy&queryid=$_GET[queryid]&step=2", "index.php");
+                    $func->question(t('Willst du den Benutzer <b>%1 (%2 %3)</b> wirklich aus deiner Buddy-Liste entfernen?', $row['name'], $row['firstname'], $row['username']), 'index.php?mod=msgsys&action=removebuddy&queryid=' . $_GET['queryid'] . '&step=2', "index.php");
                 } else {
-                    $func->question(t('Willst du den Benutzer <b>%1</b> wirklich aus deiner Buddy-Liste entfernen?', $row[username]), "index.php?mod=msgsys&action=removebuddy&queryid=$_GET[queryid]&step=2", "index.php");
+                    $func->question(t('Willst du den Benutzer <b>%1</b> wirklich aus deiner Buddy-Liste entfernen?', $row['username']), 'index.php?mod=msgsys&action=removebuddy&queryid=' . $_GET['queryid'] . '&step=2', "index.php");
                 }
             } else {
                 $func->error(t('Dieser Benutzer befindet sich nicht in deiner Buddy-Liste'));
@@ -31,19 +31,19 @@
             $row1 = $db->qry_first("
                SELECT username, name, firstname
                FROM %prefix%user
-               WHERE userid = %int%", $_GET[queryid]);
+               WHERE userid = %int%", $_GET['queryid']);
 
             $row2 = $db->qry("
                DELETE FROM %prefix%buddys
                WHERE buddyid = %int%
-               AND userid = %int%", $_GET[queryid], $auth['userid']);
+               AND userid = %int%", $_GET['queryid'], $auth['userid']);
 
             // Confirmation
             if ($row2 == true) {
                 if ($cfg['sys_internet'] == 1) {
-                    $func->confirmation(t('Der Benutzer <b>%1</b> wurde aus deiner Buddy-Liste entfernt. Die &Auml;nderung wird beim n&auml;chsten Seitenaufruf wirksam.', $row1[username]), "");
+                    $func->confirmation(t('Der Benutzer <b>%1</b> wurde aus deiner Buddy-Liste entfernt. Die &Auml;nderung wird beim n&auml;chsten Seitenaufruf wirksam.', $row1['username']), "");
                 } else {
-                    $func->confirmation(t('Der Benutzer <b>%1 (%2 %3)</b> wurde aus deiner Buddy-Liste entfernt. Die &Auml;nderung wird beim n&auml;chsten Seitenaufruf wirksam.', $row1[name], $row1[firstname], $row1[username]), "");
+                    $func->confirmation(t('Der Benutzer <b>%1 (%2 %3)</b> wurde aus deiner Buddy-Liste entfernt. Die &Auml;nderung wird beim n&auml;chsten Seitenaufruf wirksam.', $row1['name'], $row1['firstname'], $row1['username']), "");
                 }
             }
             break;

diff --git a/modules/noc/class_noc.php b/modules/noc/class_noc.php
@@ -147,7 +147,7 @@ public function getMacAddress($Device, $ReadComunity, $device_id, $modell)
             }
         }
         // Array mit Ports und Adressen zusammenfügen
-        for ($i = 0; $i < (is_array($ports) || $ports instanceof \Countable ? count($ports) : 0); $i++) {
+        for ($i = 0; $i < (is_countable($ports) ? count($ports) : 0); $i++) {
             if ($data[$ports[$i]] == "") {
                 $data[$ports[$i]] = $Addresses[$i];
             } else {

diff --git a/modules/noc/device_add.php b/modules/noc/device_add.php
@@ -91,7 +91,7 @@
         $sysLocation    = $noc->getSNMPValue($_POST["device_ip"], $_POST["device_read"], ".1.3.6.1.2.1.1.6.0");
         $sysName    = $noc->getSNMPValue($_POST["device_ip"], $_POST["device_read"], ".1.3.6.1.2.1.1.5.0");
         $ports    = $noc->getSNMPwalk($_POST["device_ip"], $_POST["device_read"], ".1.3.6.1.2.1.2.2.1.1");
-        $numport = is_array($ports) || $ports instanceof \Countable ? count($ports) : 0;
+        $numport = is_countable($ports) ? count($ports) : 0;
 
         // Store the device into a SQL table
         $add_query = $db->qry("INSERT INTO %prefix%noc_devices SET
@@ -112,7 +112,7 @@
 
         $row = $db->fetch_array();
 
-        for ($ActualPort=0; $ActualPort < (is_array($ports) || $ports instanceof \Countable ? count($ports) : 0); $ActualPort++) {
+        for ($ActualPort=0; $ActualPort < (is_countable($ports) ? count($ports) : 0); $ActualPort++) {
             $Port[$ActualPort]["deviceid"] = $row["id"];
 
             $Port[$ActualPort]["PortNr"] =

diff --git a/modules/noc/statistics.php b/modules/noc/statistics.php
@@ -64,7 +64,7 @@
 }
 
 // We need more than 10 Values to continue...
-if ((is_array($value) || $value instanceof \Countable ? count($value) : 0) < 10) {
+if ((is_countable($value) ? count($value) : 0) < 10) {
     if (!is_array($value)) {
         $msg = "Es sind keine Daten vorhanden.";
     } else {

diff --git a/modules/party/plugins/home.php b/modules/party/plugins/home.php
@@ -43,6 +43,6 @@
         $content .= t('Gäste bezahlt / eingecheckt / ausgecheckt') .': '. $user_paid['n'] .' / '. $user_checkin['n'] .' / '. $user_checkout['n'] . HTML_NEWLINE;
 
         $visits = $db->qry_first("SELECT SUM(visits) AS visits, SUM(hits) AS hits FROM %prefix%stats_usage");
-        $content .= t('Besucher gesamt / Gerade eingeloggt') .": ". $visits['visits'] .' / '. (is_array($authentication->online_users) || $authentication->online_users instanceof \Countable ? count($authentication->online_users) : 0) . HTML_NEWLINE;
+        $content .= t('Besucher gesamt / Gerade eingeloggt') .": ". $visits['visits'] .' / '. (is_countable($authentication->online_users) ? count($authentication->online_users) : 0) . HTML_NEWLINE;
     }
 }
diff --git a/modules/party/price_del.php b/modules/party/price_del.php
@@ -1,6 +1,6 @@
 <?php
 
-foreach ($_POST[action] as $key => $val) {
+foreach ($_POST['action'] as $key => $val) {
     $db->qry("DELETE FROM %prefix%party_prices WHERE price_id = %string%", $key);
 }
 $func->confirmation('Erfolgreich gelöscht', 'index.php?mod=party');
diff --git a/modules/shoutbox/shoutqueries.php b/modules/shoutbox/shoutqueries.php
@@ -67,4 +67,4 @@
 header("Cache-Control: post-check=0, pre-check=0", false);
 header("Pragma: no-cache");
 
-echo json_encode($data);
+echo json_encode($data, JSON_THROW_ON_ERROR);
diff --git a/modules/stats/boxes/stats.php b/modules/stats/boxes/stats.php
@@ -24,13 +24,13 @@
 $box->DotRow(t('Aufrufe').':');
 $box->EngangedRow('<span class="infolink">'.number_format($total['hits'], 0, '', '.').'<span class="infobox">'.$total['hits'].' '.t('Seitenzugriffe insgesamt').'</span></span>&nbsp;<span class="infolink">('.($avg['hits'] ?: '0').')<span class="infobox">'.($avg['hits'] ?: '0').' '.t('Seitenzugriffe in der letzten Stunde').'</span></span>');
 
-$box->DotRow(t('Online') .': '. (is_array($authentication->online_users) || $authentication->online_users instanceof \Countable ? count($authentication->online_users) : 0), 'index.php?mod=guestlist&action=onlineuser');
+$box->DotRow(t('Online') .': '. (is_countable($authentication->online_users) ? count($authentication->online_users) : 0), 'index.php?mod=guestlist&action=onlineuser');
 foreach ($authentication->online_users as $userid) {
     $row = $db->qry_first("SELECT username FROM %prefix%user WHERE userid = %int%", $userid);
     $box->EngangedRow($dsp->FetchUserIcon($userid, $row["username"]));
 }
 
-$box->DotRow(t('Untätig') .': '. (is_array($authentication->away_users) || $authentication->away_users instanceof \Countable ? count($authentication->away_users) : 0), 'index.php?mod=guestlist&action=onlineuser');
+$box->DotRow(t('Untätig') .': '. (is_countable($authentication->away_users) ? count($authentication->away_users) : 0), 'index.php?mod=guestlist&action=onlineuser');
 foreach ($authentication->away_users as $userid) {
     $row = $db->qry_first("SELECT username FROM %prefix%user WHERE userid = %int%", $userid);
     $box->EngangedRow($dsp->FetchUserIcon($userid, $row["username"]));

diff --git a/modules/tournament2/Classes/LanSuiteTree.php b/modules/tournament2/Classes/LanSuiteTree.php
@@ -73,7 +73,7 @@ public function prepareWB()
 
         // Determine winner of each match
         foreach ($this->wb_teams as $round => $teams) {
-            for ($i=0; $i<(is_array($teams) || $teams instanceof \Countable ? count($teams) : 0); $i++) {
+            for ($i=0; $i<(is_countable($teams) ? count($teams) : 0); $i++) {
                 $t1 = $this->wb_teams[$round][$i];
                 $i++;
                 $t2 = $this->wb_teams[$round][$i];
@@ -122,7 +122,7 @@ public function prepareLB()
         array_push($this->wb_teams, $fix, $fix);
 
         foreach ($this->lb_teams as $round => $teams) {
-            for ($i=0; $i<(is_array($teams) || $teams instanceof \Countable ? count($teams) : 0); $i++) {
+            for ($i=0; $i<(is_countable($teams) ? count($teams) : 0); $i++) {
                 $t1 = $this->lb_teams[$round][$i];
                 $i++;
                 $t2 = $this->lb_teams[$round][$i];