Changeset 768

Timestamp:

Jun 9, 2022 7:24:04 PM (23 months ago)

Author:

anonymous

Message:

Minor improvements

Location:

trunk

Files:

• bin/module_maker/list_template.cli.php (modified) (2 diffs)
• lib/App.inc.php (modified) (2 diffs)
• lib/Auth_Simple.inc.php (modified) (1 diff)
• lib/PageNumbers.inc.php (modified) (1 diff)
• lib/Utilities.inc.php (modified) (1 diff)
• lib/Validator.inc.php (modified) (1 diff)
• services/templates/admin_list.ihtml (modified) (1 diff)

trunk/bin/module_maker/list_template.cli.php

@@ -117 +117 @@
             'longblob' == $type
         ) {
-            $listrows[] = "<\x3fphp echo mb_strlen(\$list[\$i]['$field'])<50 \x3f oTxt(\$list[\$i]['$field'], true) : oTxt(trim(mb_substr(\$list[\$i]['$field'], 0, 50)) . '...'); \x3f>";
+            $listrows[] = "<\x3fphp echo mb_strlen(\$list[\$i]['$field'])<50 \x3f oTxt(\$list[\$i]['$field']) : oTxt(trim(mb_substr(\$list[\$i]['$field'], 0, 50)) . '...'); \x3f>";
         } else if (preg_match('/.*(begin|start).*date.*/i', $field)) {
             $listrows[] = "<\x3fphp echo \$db->getParam('zero_date') == \$list[\$i]['$field'] ? '' : date(\$app->getParam('date_format'), strtotime(\$list[\$i]['$field'])); \x3f>";
@@ -135 +135 @@
             $listrows[] = "<input type=\"text\" name=\"rank[<\x3fphp echo \$list[\$i]['$primary_key']; \x3f>]\" value=\"<\x3fphp echo \$list[\$i]['rank']; \x3f>\" size=\"5\" />";
         } else {
-            $listrows[] = "<\x3fphp echo oTxt(\$list[\$i]['$field'], true); \x3f>";
+            $listrows[] = "<\x3fphp echo oTxt(\$list[\$i]['$field']); \x3f>";
         }
     }

trunk/lib/App.inc.php

@@ -430 +430 @@
             // DB credentials for CLI scripts stored in a JSON file with read rights given only to the user who will be executing the scripts: -r--------
             // But not if all DB credentials have been defined already by other means.
-            if ($this->cli && '' != $this->getParam('db_auth_file') && (!$this->getParam('db_server') || !$this->getParam('db_name') || !$this->getParam('db_user') || !$this->getParam('db_pass'))) {
+            if ('' != $this->getParam('db_auth_file') && (!$this->getParam('db_server') || !$this->getParam('db_name') || !$this->getParam('db_user') || !$this->getParam('db_pass'))) {
                 if (false !== ($db_auth_file = stream_resolve_include_path($this->getParam('db_auth_file')))) {
                     if (is_readable($db_auth_file)) {
@@ -664 +664 @@
             if ($num_queries > 0 && true === $this->getParam('enable_db_pdo')) {
                 // If the app wants to use PDO, warn if any legacy db queries are made.
-                $this->logMsg(sprintf('%s queries using legacy DB functions', $num_queries), LOG_WARNING, __FILE__, __LINE__);
+                $this->logMsg(sprintf('%s queries using legacy DB functions', $num_queries), LOG_DEBUG, __FILE__, __LINE__);
             }
             $this->db->close();

trunk/lib/Auth_Simple.inc.php

@@ -11 +11 @@
 
     // Namespace of this auth object.
-    var $_ns;
+    protected $_ns;
 
     // Parameters to be configured by setParam.
-    var $_params = array();
-    var $_default_params = array(
+    protected $_params = array();
+    protected $_default_params = array(
 
         // The URL to the login script.

trunk/lib/PageNumbers.inc.php

@@ -71 +71 @@
     {
         // Default options for the quantity per page links.
-        $this->per_page_options = array(25, 50, 100, 200);
+        $this->per_page_options = array(50, 100, 250, 1000);
 
         // Default options for the page number links.

trunk/lib/Utilities.inc.php

@@ -998 +998 @@
     }
     return $url_args;
+}
+
+/*
+* Encode/decode a string that is safe for URLs.
+*
+* @access   public
+* @param    string   $string    Input string
+* @return   string              Encoded/decoded string.
+* @author   Rasmus Schultz <https://www.php.net/manual/en/function.base64-encode.php#123098>
+* @since    09 Jun 2022 07:50:49
+*/
+function base64_encode_url($string) {
+    return str_replace(['+','/','='], ['-','_',''], base64_encode($string));
+}
+function base64_decode_url($string) {
+    return base64_decode(str_replace(['-','_'], ['+','/'], $string));
 }
 

trunk/lib/Validator.inc.php

@@ -348 +348 @@
         }
 
-        if ($strict) {
-            // Strict tests.
-            if (ip2long($domain) === false && function_exists('checkdnsrr') && !checkdnsrr($domain . '.', 'MX') && gethostbyname($domain) == $domain) {
-                // Check domain exists: It's a domain if ip2long fails; checkdnsrr ensures a MX record exists; gethostbyname() ensures the domain exists.
-                $app->logMsg(sprintf('%s (line %s) failed: %s', __METHOD__, __LINE__, getDump($val)), $type, $file, $line);
-                return self::EMAIL_MX_FAIL;
-            }
+        if ($strict && getmxrr('checkdnsrr') && !getmxrr($domain)) {
+            // Strict tests: check if MX record exists.
+            $app->logMsg(sprintf('%s (line %s) failed: %s', __METHOD__, __LINE__, getDump($val)), $type, $file, $line);
+            return self::EMAIL_MX_FAIL;
         }
 

trunk/services/templates/admin_list.ihtml

@@ -68 +68 @@
                 }
             ?></td>
-            <td class="sc-nowrap"><?php echo gethostbyaddr($list[$i]['last_login_ip']); ?></td>
+            <td class="sc-nowrap"><?php echo ipInRange($list[$i]['last_login_ip'], ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16']) ? "(Private IP)" : sprintf('<a href="https://ip.me/ip/%1$s">%1$s</a>', $list[$i]['last_login_ip']); ?></td>
             <td class="sc-nowrap"><?php echo Validator::validateStrDate($list[$i]['added_datetime']) ? date($app->getParam('date_format'), strtotime($list[$i]['added_datetime'])) : ''; ?></td>
             <td class="sc-nowrap"><?php echo oTxt($list[$i]['added_admin_username'], true); ?></td>