Fix minor issues reported by Phan

cmsimple-xh · Mar 21, 2022 · c36c7f1 · c36c7f1
1 parent 42a5fb4
commit c36c7f1
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/cmsimple/classes/Controller.php b/cmsimple/classes/Controller.php
@@ -443,7 +443,7 @@ public function outputAdminScripts()
     {
         global $tx, $o;
 
-        $interval = 1000 * (ini_get('session.gc_maxlifetime') - 1);
+        $interval = 1000 * ((int) ini_get('session.gc_maxlifetime') - 1);
         $o .= <<<EOT
 <script>
 if (document.cookie.indexOf('status=adm') == -1) {

diff --git a/cmsimple/classes/LinkChecker.php b/cmsimple/classes/LinkChecker.php
@@ -312,7 +312,7 @@ protected function makeHeadRequest($scheme, $host, $path)
                     )
                 )
             );
-            $headers = get_headers($url, 1, $context);
+            $headers = get_headers($url, true, $context);
             $status = array();
             for ($i = 0; $i <= $maxredir; $i++) {
                 if (!empty($headers[$i])) {
@@ -321,6 +321,7 @@ protected function makeHeadRequest($scheme, $host, $path)
                     break;
                 }
             }
+            assert(isset($headers_tmp));
             preg_match('#HTTP/[0-9\.]+\s+([0-9]+)#i', $headers_tmp, $status);
             if (!empty($status[1])) {
                 return (int) $status[1];

diff --git a/cmsimple/classes/PasswordForgotten.php b/cmsimple/classes/PasswordForgotten.php
@@ -134,7 +134,7 @@ private function submit()
      * Resets the password to a randomly generated one and sends an appropriate
      * info email.
      *
-     * @return void.
+     * @return void
      */
     private function reset()
     {

diff --git a/cmsimple/compat.php b/cmsimple/compat.php
@@ -117,7 +117,7 @@ function chkdl($fl)
     $m = false;
     if (is_dir($pth['folder']['downloads'])) {
         if ($fd = opendir($pth['folder']['downloads'])) {
-            while (($p = readdir($fd)) == true) {
+            while (($p = readdir($fd))) {
                 if (preg_match("/.+\..+$/", $p)) {
                     if ($fl == $sn . '?download=' . $p) {
                         $m = true;

diff --git a/cmsimple/functions.php b/cmsimple/functions.php
@@ -773,8 +773,8 @@ function XH_readContents($language = null)
             $temp = $tx['toc']['empty'] . ' ' . $empty;
         }
         $h[] = $temp;
-        $ancestors[$l[$i] - 1] = XH_uenc($temp, $search, $replace);
-        $ancestors = array_slice($ancestors, 0, $l[$i]);
+        $ancestors[(int) $l[$i] - 1] = XH_uenc($temp, $search, $replace);
+        $ancestors = array_slice($ancestors, 0, (int) $l[$i]);
         $url = implode($cf['uri']['seperator'], $ancestors);
         $u[] = utf8_substr($url, 0, (int) $cf['uri']['length']);
         $tooLong[] = utf8_strlen($url) > $cf['uri']['length'];
@@ -1060,7 +1060,7 @@ function tag($s)
  *
  * @param int $s The HTTP status response code (401, 403, 404).
  *
- * @return void.
+ * @return void
  */
 function shead($s)
 {
@@ -1115,7 +1115,7 @@ function XH_debugmode()
     $dbglevel = '';
     $filename = $pth['folder']['downloads'] . '_XHdebug.txt';
     if (file_exists($filename)) {
-        ini_set('display_errors', 0);
+        ini_set('display_errors', "0");
         $dbglevel = file_get_contents($filename);
         if (strlen($dbglevel) == 1) {
             set_error_handler('XH_debug');
@@ -1150,7 +1150,7 @@ function XH_debugmode()
             error_reporting(E_ERROR | E_USER_ERROR | E_USER_WARNING | E_PARSE);
         }
     } else {
-        ini_set('display_errors', 0);
+        ini_set('display_errors', "0");
         error_reporting(0);
     }
     return error_reporting() > 0;
@@ -1394,7 +1394,7 @@ function gc($s)
 /**
  * Returns wether the user is logged in.
  *
- * @return bool.
+ * @return bool
  */
 function logincheck()
 {
@@ -1961,7 +1961,7 @@ function XH_isInternalPath($path)
 /**
  * Returns whether a URL points to this CMSimple installation.
  *
- * @param string $urlParts Parts of an URL.
+ * @param array $urlParts Parts of an URL.
  *
  * @return bool
  *

diff --git a/cmsimple/seofuncs.php b/cmsimple/seofuncs.php
@@ -32,6 +32,7 @@ function XH_URI_Cleaning()
     global $su, $s, $xh_publisher, $pth;
 
     $parts = parse_url(CMSIMPLE_URL);
+    assert(isset($parts['scheme'], $parts['host'], $parts['path']));
     $scheme = $parts['scheme'];
     $host = $parts['host'];
     $port = '';

diff --git a/cmsimple/tplfuncs.php b/cmsimple/tplfuncs.php
@@ -412,7 +412,7 @@ function content()
 
     if (!($edit && XH_ADM) && $s > -1) {
         if (isset($_GET['search'])) {
-            $search = XH_hsc(trim(preg_replace('/\s+/u', ' ', (stsl($_GET['search'])))));
+            $search = XH_hsc(trim(preg_replace('/\s+/u', ' ', $_GET['search'])));
             $words = explode(' ', $search);
             $c[$s] = XH_highlightSearchWords($words, $c[$s]);
         }
@@ -526,6 +526,7 @@ function languagemenu()
     $i = array_search($sl, $r);
     unset($r[$i]);
 
+    $langName = [];
     $langNames = explode(';', $cf['language']['2nd_lang_names']);
     foreach ($langNames as $value) {
         $langName[substr($value, 0, 2)] = substr($value, 3);