Changeset 241 for trunk/lib/Utilities.inc.php

Timestamp:

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

Author:

quinn

Message:

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

File:

• trunk/lib/Utilities.inc.php (modified) (4 diffs)

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__);