Changeset 209 for trunk/lib

Timestamp:

Nov 29, 2006 1:25:59 AM (17 years ago)

Author:

scdev

Message:

Q - bug fixes

Location:

trunk/lib

Files:

• ACL.inc.php (modified) (1 diff)
• Auth_File.inc.php (modified) (1 diff)
• DB.inc.php (modified) (2 diffs)

trunk/lib/ACL.inc.php

@@ -604 +604 @@
     * Calculates the most specific cascading privilege found for a requested
     * ARO -> ACO -> AXO entry. Returns FALSE if the entry is denied. By default, 
-    * all entries are denied, unless some point in the hierarchy is set ao "allow."
+    * all entries are denied, unless some point in the hierarchy is set to "allow."
     *
     * @access   public

trunk/lib/Auth_File.inc.php

@@ -307 +307 @@
     }
     
+    /**
+     * Wrapper function for compatability with lib/Lock.inc.php.
+     *
+     * @param  string  $username    Username to return.
+     * @return string               Username, or false if none found.
+     */
+    function getUsername($username)
+    {
+        if ('' != $username) {
+            return $username;
+        } else {
+            return false;
+        }
+    }
+
     /*
     * Reads the configured htpasswd file into the _users array.

trunk/lib/DB.inc.php

@@ -143 +143 @@
             // Die or continue without connection?
             if ($this->getParam('db_die_on_failure')) {
-                echo "\n\n<!-- Script execution stopped out of embarrassment. -->";
+                echo "\n\n<!-- Script execution stopped out of embarrassment. There was a database error. -->";
                 die;
             } else {
@@ -154 +154 @@
 
         // Tell MySQL what character set we're useing. Available only on MySQL verions > 4.01.01.
-        $this->query("/*!40101 SET NAMES '" . $this->mysql_character_sets[strtolower($app->getParam('character_set'))] . "' */");
+        if ('' != $app->getParam('character_set') && isset($this->mysql_character_sets[strtolower($app->getParam('character_set'))])) {
+            $this->query("/*!40101 SET NAMES '" . $this->mysql_character_sets[strtolower($app->getParam('character_set'))] . "' */");
+        } else {
+            $app->logMsg(sprintf('%s is not a known character_set.', $app->getParam('character_set')), LOG_ERR, __FILE__, __LINE__);
+        }
 
         return true;