Changeset 71

Timestamp:

Mar 18, 2006 3:26:42 AM (18 years ago)

Author:

scdev

Message:

minor misc bug fixes

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• Auth_SQL.inc.php (modified) (2 diffs)
• Captcha.inc.php (modified) (1 diff)
• DB.inc.php (modified) (1 diff)
• RecordLock.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -523 +523 @@
             $previous_events[$msg_id]++;
             if ($previous_events[$msg_id] == 2) {
-                $this->logMsg(sprintf('%s (Event repeated more than %s times)', $message, $previous_events[$msg_id]), $priority, $file, $line);
+                $this->logMsg(sprintf('%s (Event repeated %s or more times)', $message, $previous_events[$msg_id]), $priority, $file, $line);
             }
             return false;

trunk/lib/Auth_SQL.inc.php

@@ -479 +479 @@
                 ($this->getVal('user_id') ? ' ' . $this->getVal('user_id') . ' (' .  $this->getVal('username') . ')' : ''),
                 $trusted_net
-            ), LOG_INFO, __FILE__, __LINE__);
+            ), LOG_DEBUG, __FILE__, __LINE__);
         } else if (preg_match('/proxy.aol.com$/i', getRemoteAddr(true))) {
             $user_in_trusted_network = true;
@@ -485 +485 @@
                 ucfirst($this->_auth),
                 ($this->getVal('user_id') ? ' ' . $this->getVal('user_id') . ' (' .  $this->getVal('username') . ')' : '')
-            ), LOG_INFO, __FILE__, __LINE__);
+            ), LOG_DEBUG, __FILE__, __LINE__);
         } else {
             $user_in_trusted_network = false;

trunk/lib/Captcha.inc.php

@@ -118 +118 @@
     function Captcha()
     {
+        $this->secret_key = App::getParam('signing_key');
         $this->random_number = $this->_getRandomNumber();
     }

trunk/lib/DB.inc.php

@@ -225 +225 @@
     {
         return $this->_connected;
+    }
+    
+    /**
+     * Returns a properly escaped string using mysql_real_escape_string() with the current connection's charset.
+     *
+     * @access  public
+     * @param   string  $string     Input string to be sent as SQL query.
+     * @return  string              Escaped string from mysql_real_escape_string()
+     * @author  Quinn Comendant <quinn@strangecode.com>
+     * @since   06 Mar 2006 16:41:32
+     */
+    function escapeString($string)
+    {
+        if (!isset($this) || !is_a($this, 'DB') && !is_subclass_of($this, 'DB')) {
+            $this =& DB::getInstance();
+        }
+        return mysql_real_escape_string($string, $this->dbh);
     }
 

trunk/lib/RecordLock.inc.php

@@ -293 +293 @@
             // Delete specific user's locks.
             DB::query("DELETE FROM " . $this->getParam('db_table') . " WHERE set_by_admin_id = '" . addslashes($user_id) . "'");
-            App::logMsg(sprintf('Record locks owned by %s %s have been deleted', $this->_auth->getVal('auth_name'), $this->_auth->getUsername($user_id)), LOG_INFO, __FILE__, __LINE__);
+            App::logMsg(sprintf('Record locks owned by %s %s have been deleted', $this->_auth->getVal('auth_name'), $this->_auth->getUsername($user_id)), LOG_DEBUG, __FILE__, __LINE__);
         } else {
             // Delete ALL locks.