Changeset 770

Timestamp:

Jun 11, 2022 11:15:06 PM (23 months ago)

Author:

anonymous

Message:

Minor fixes

Location:

trunk

Files:

• bin/user.cli.php (modified) (2 diffs)
• lib/Email.inc.php (modified) (2 diffs)
• lib/Utilities.inc.php (modified) (1 diff)
• lib/Validator.inc.php (modified) (1 diff)

trunk/bin/user.cli.php

@@ -39 +39 @@
 $rii->setMaxDepth(1);
 foreach ($rii as $filename => $file) {
-    if (mb_strpos($filename, '/_config.inc.php') !== false) {
+    if (mb_strpos($filename, '/_config.inc.php') !== false
+    && preg_match('/^\$auth = new Auth/m', file_get_contents($filename))
+    && preg_match('/^\$(db|pdo) =/m', file_get_contents($filename))) {
         $_config_file = $filename;
         echo "Loading $_config_file\n";
@@ -46 +48 @@
 }
 if (!$_config_file) {
-    echo "Error: could not find _config.inc.php in current directory or subdirectories.\n";
+    echo "Error: could not find a satisfactory _config.inc.php in current directory or subdirectories.\n";
     exit(1);
 }
 define('_CLI', true);
 require_once $_config_file;
+die;///
 
 /********************************************************************

trunk/lib/Email.inc.php

@@ -372 +372 @@
         foreach ($headers as $key => $val) {
             // Validate key and values.
-            if (!strlen($val)) {
+            if (!isset($val) || !strlen($val)) {
                 $app->logMsg(sprintf('Empty email header provided: %s', $key), LOG_NOTICE, __FILE__, __LINE__);
                 continue;
@@ -447 +447 @@
         // Ensure message was successfully accepted for delivery.
         if ($ret) {
-            $app->logMsg(sprintf('Email successfully sent to %s', $final_to), LOG_INFO, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Email successfully sent to %s: %s', $final_to, $this->_params['subject']), LOG_INFO, __FILE__, __LINE__);
             return true;
         } else {

trunk/lib/Utilities.inc.php

@@ -1373 +1373 @@
     } else {
         $app =& App::getInstance();
-        $app->logMsg(sprintf('Failed signature (%s should be %s)', $signed_val, addSignature($val, $salt, $length)), LOG_DEBUG, __FILE__, __LINE__);
+        // A signature mismatch might occur if the signing_key is not the same across all environments, apache, cli, etc.
+        $app->logMsg(sprintf('Failed signature (%s should be %s).', $signed_val, addSignature($val, $salt, $length)), LOG_DEBUG, __FILE__, __LINE__);
         return false;
     }

trunk/lib/Validator.inc.php

@@ -348 +348 @@
         }
 
-        if ($strict && getmxrr('checkdnsrr', $hosts_notused) && !getmxrr($domain)) {
+        if ($strict && function_exists('getmxrr') && !getmxrr($domain, $hosts_notused)) {
             // Strict tests: check if MX record exists.
             $app->logMsg(sprintf('%s (line %s) failed: %s', __METHOD__, __LINE__, getDump($val)), $type, $file, $line);