Changeset 241

Timestamp:

Apr 4, 2007 4:54:25 AM (17 years ago)

Author:

quinn

Message:

Q - Fixed a few non-fatal but still annoying bugs.

Location:

trunk/lib

Files:

• FormValidator.inc.php (modified) (1 diff)
• Prefs.inc.php (modified) (4 diffs)
• Utilities.inc.php (modified) (4 diffs)

trunk/lib/FormValidator.inc.php

@@ -209 +209 @@
     function isEmpty($form_name, $msg='')
     {
-        $this->notEmpty($form_name, $msg='');
+        $this->notEmpty($form_name, $msg);
     }
 

trunk/lib/Prefs.inc.php

@@ -204 +204 @@
         $app =& App::getInstance();
         if (array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['persistent'])) {
+            $app->logMsg(sprintf('Found %s in persistent', $key), LOG_DEBUG, __FILE__, __LINE__);
             return $_SESSION['_prefs'][$this->_ns]['persistent'][$key];
         } else if (array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['defaults'])) {
+            $app->logMsg(sprintf('Found %s in defaults', $key), LOG_DEBUG, __FILE__, __LINE__);
             return $_SESSION['_prefs'][$this->_ns]['defaults'][$key];
         } else {
@@ -238 +240 @@
      * as $auth->clear(), such as when logging out.
      */
-    function clear()
-    {
-        $_SESSION['_prefs'][$this->_ns] = array(
-            'loaded' => false,
-            'load_datetime' => '1970-01-01',
-            'defaults' => array(),
-            'persistent' => array(),
-        );
+    function clear($focus='all')
+    {
+        switch ($focus) {
+        case 'all' :
+            $_SESSION['_prefs'][$this->_ns] = array(
+                'loaded' => false,
+                'load_datetime' => '1970-01-01',
+                'defaults' => array(),
+                'persistent' => array(),
+            );
+            break;
+
+        case 'defaults' :
+            $_SESSION['_prefs'][$this->_ns]['defaults'] = array();
+            break;
+
+        case 'persistent' :
+            $_SESSION['_prefs'][$this->_ns]['persistent'] = array();
+            break;
+        }
     }
     
@@ -282 +296 @@
         
         // Clear existing cache.
-        $this->clear();
+        $this->clear('persistent');
         
         // Retrieve all prefs for this user and namespace.
@@ -296 +310 @@
         }
         
-        $app->logMsg(sprintf('Loaded %s prefs from database.', sizeof($_SESSION['_prefs'][$this->_ns]['persistent'])), LOG_DEBUG, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Loaded %s prefs from database.', mysql_num_rows($qid)), LOG_DEBUG, __FILE__, __LINE__);
         
         // Data loaded only once per session.

trunk/lib/Utilities.inc.php

@@ -329 +329 @@
  *
  * @param   string  $file   File in include path.
+ * @param   mixded  $stat   Which statistic to return (or null to return all).
  * @return  mixed   Value of requested key from fstat(), or false on error.
  * @author  Quinn Comendant <quinn@strangecode.com>
  * @since   03 Dec 2005 14:23:26
  */
-function statIncludePath($file, $stat)
+function statIncludePath($file, $stat=null)
 {
     // Open file pointer read-only using include path.
@@ -341 +342 @@
         fclose($fp);
         // Return specified stats.
-        return $stats[$stat];
+        return is_null($stat) ? $stats : $stats[$stat];
     } else {
         return false;
@@ -733 +734 @@
     $app =& App::getInstance();
     
-    $add_members = '/var/mailman/bin/add_members';
+    $add_members = '/usr/lib/mailman/bin/add_members';
     if (is_executable($add_members) && is_readable($add_members)) {
         $welcome_msg = $send_welcome_message ? 'y' : 'n';
-        exec(sprintf('/bin/echo %s | /usr/bin/sudo %s -r - --welcome-msg=%s --admin-notify=n %s', escapeshellarg($email), escapeshellarg($add_members), $welcome_msg, escapeshellarg($list)), $stdout, $return_code);
+        exec(sprintf("/bin/echo '%s' | /usr/bin/sudo %s -r - --welcome-msg=%s --admin-notify=n '%s'", escapeshellarg($email), escapeshellarg($add_members), $welcome_msg, escapeshellarg($list)), $stdout, $return_code);
         if (0 == $return_code) {
             $app->logMsg(sprintf('Mailman add member success for list: %s, user: %s', $list, $email, $stdout), LOG_INFO, __FILE__, __LINE__);
@@ -764 +765 @@
     $app =& App::getInstance();
     
-    $remove_members = '/var/mailman/bin/remove_members';
+    $remove_members = '/usr/lib/mailman/bin/remove_members';
     if (is_executable($remove_members) && is_readable($remove_members)) {
         $userack = $send_user_ack ? '' : '--nouserack';
-        exec(sprintf('/usr/bin/sudo %s %s --noadminack %s %s', escapeshellarg($remove_members), $userack, escapeshellarg($list), escapeshellarg($email)), $stdout, $return_code);
+        exec(sprintf("/usr/bin/sudo %s %s --noadminack '%s' '%s'", escapeshellarg($remove_members), $userack, escapeshellarg($list), escapeshellarg($email)), $stdout, $return_code);
         if (0 == $return_code) {
             $app->logMsg(sprintf('Mailman remove member success for list: %s, user: %s', $list, $email, $stdout), LOG_INFO, __FILE__, __LINE__);