Avoid php 8.2 warnings (#930)

* Avoid php warnings when run from command line

* Avoid php warning when template does not exist

* Avoid php 8 deprecation regarding string interpolation

* Improve handling of unknown admin to avoid php warnings and deprecations

* Avoid php 8.2 warning about dynamic properties

Author: bramley

public_html/lists/admin/actions/processqueue.php

@@ -623,7 +623,7 @@ function sendEmailTest($messageid, $email)
 } else {
     //# check for a future embargo, to be able to report when it expires.
     $future = Sql_Fetch_Assoc_Query('select unix_timestamp(embargo) - unix_timestamp(now()) as waittime '
-        ." from ${tables['message']}"
+        ." from {$tables['message']}"
         ." where status not in ('draft', 'sent', 'prepared', 'suspended')"
         .' and embargo > now()'
         .' order by embargo asc limit 1');
@@ -1327,7 +1327,7 @@ function sendEmailTest($messageid, $email)
             $msgperhour = (3600 / $totaltime) * $counters['sent'];
             $secpermsg = $totaltime / $counters['sent'];
             $timeleft = ($counters['total_users_for_message '.$messageid] - $counters['sent']) * $secpermsg;
-            $eta = date('D j M H:i', time() + $timeleft);
+            $eta = date('D j M H:i', time() + (int) $timeleft);
         } else {
             $msgperhour = 0;
             $secpermsg = 0;

public_html/lists/admin/defaultplugin.php

@@ -20,6 +20,7 @@ class phplistPlugin
     public $documentationUrl = ''; //# link to documentation for this plugin (eg https://resources.phplist.com/plugin/pluginname
     public $enabled = 1; // use directly, can be privitsed later and calculated with __get and __set
     public $system_root = ''; //# root dir of the phpList admin directory
+    public $dependencyFailure;
 
     //@@Some ideas to implement this:
     // * Start each method with if (!$this->enabled) return parent :: parentMethod($args);

public_html/lists/admin/lib.php

@@ -2453,7 +2453,11 @@ function getClientIP()
         }
     }
 
-    $the_ip = filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP);
+    if (isset($_SERVER['REMOTE_ADDR'])) {
+        $the_ip = filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP);
+    } else {
+        $the_ip = '';
+    }
     //logEvent("REMOTE_ADDR ip=".$the_ip);
 
     return $the_ip;

public_html/lists/admin/phpListAdminAuthentication.php

@@ -23,10 +23,16 @@ class phpListAdminAuthentication
      */
     public function validateLogin($login, $password)
     {
+        if (empty($login) || ($password == '')) {
+            return array(0, s('Please enter your credentials.'));
+        }
         $query = sprintf('select password, disabled, id from %s where loginname = "%s"', $GLOBALS['tables']['admin'],
             sql_escape($login));
         $req = Sql_Query($query);
         $admindata = Sql_Fetch_Assoc($req);
+        if (!$admindata) {
+            return array(0, s('incorrect password'));
+        }
         $encryptedPass = hash(HASH_ALGO, $password);
         $passwordDB = $admindata['password'];
         //Password encryption verification.
@@ -39,9 +45,6 @@ public function validateLogin($login, $password)
             $req = Sql_Query($query);
         }
 
-        if(empty($login)||($password=="")){
-            return array(0, s('Please enter your credentials.'));
-        }
         if ($admindata['disabled']) {
             return array(0, s('your account has been disabled'));
         }

public_html/lists/admin/sendemaillib.php

@@ -1443,16 +1443,18 @@ function precacheMessage($messageid, $forwardContent = 0)
 
     $cached[$messageid]['htmlformatted'] = strip_tags($cached[$messageid]['content']) != $cached[$messageid]['content'];
     $cached[$messageid]['sendformat'] = $message['sendformat'];
+
+    $cached[$messageid]['template'] = '';
+    $cached[$messageid]['template_text'] = '';
+    $cached[$messageid]['templateid'] = 0;
     if ($message['template']) {
         $req = Sql_Fetch_Row_Query("select template, template_text from {$GLOBALS['tables']['template']} where id = {$message['template']}");
-        $cached[$messageid]['template'] = stripslashes($req[0]);
-        $cached[$messageid]['template_text'] = stripslashes($req[1]);
-        $cached[$messageid]['templateid'] = $message['template'];
-        //   dbg("TEMPLATE: ".$req[0]);
-    } else {
-        $cached[$messageid]['template'] = '';
-        $cached[$messageid]['template_text'] = '';
-        $cached[$messageid]['templateid'] = 0;
+        if ($req) {
+            $cached[$messageid]['template'] = stripslashes($req[0]);
+            $cached[$messageid]['template_text'] = stripslashes($req[1]);
+            $cached[$messageid]['templateid'] = $message['template'];
+            //   dbg("TEMPLATE: ".$req[0]);
+        }
     }
 
     //# @@ put this here, so it can become editable per email sent out at a later stage