Changeset 609

Timestamp:

Aug 18, 2017 11:20:12 AM (7 years ago)

Author:

anonymous

Message:

 

Location:

trunk/lib

Files:

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

trunk/lib/ACL.inc.php

@@ -381 +381 @@
         $num_deleted_nodes = mysql_affected_rows($db->getDBH());
 
-        // Update transversal numbers for all nodes to the rgt of $parent, taking in to account the absence of it's children.
+        // Update transversal numbers for all nodes to the rgt of $parent, taking into account the absence of its children.
         $db->query("UPDATE $tbl SET lft = lft - ($rgt - $lft + 1) WHERE lft > $lft");
         $db->query("UPDATE $tbl SET rgt = rgt - ($rgt - $lft + 1) WHERE rgt > $rgt");

trunk/lib/Utilities.inc.php

@@ -1209 +1209 @@
 
     $add_members = '/usr/lib/mailman/bin/add_members';
-    // FIXME: checking of executable is disabled.
-    if (true || is_executable($add_members) && is_readable($add_members)) {
+    if (@is_executable($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);
@@ -1221 +1220 @@
         }
     } else {
-        $app->logMsg(sprintf('Mailman add member program not executable: %s', $add_members), LOG_ALERT, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Mailman add member program not executable: %s', $add_members), LOG_WARNING, __FILE__, __LINE__);
         return false;
     }
@@ -1241 +1240 @@
 
     $remove_members = '/usr/lib/mailman/bin/remove_members';
-    // FIXME: checking of executable is disabled.
-    if (true || is_executable($remove_members) && is_readable($remove_members)) {
+    if (@is_executable($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);
@@ -1249 +1247 @@
             return true;
         } else {
-            $app->logMsg(sprintf('Mailman remove member failed for list: %s, user: %s, with message: %s', $list, $email, $stdout), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Mailman remove member failed for list: %s, user: %s, with message: %s', $list, $email, getDump($stdout)), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
     } else {
-        $app->logMsg(sprintf('Mailman remove member program not executable: %s', $remove_members), LOG_ALERT, __FILE__, __LINE__);
+        // $app->logMsg(sprintf('Mailman remove member program not executable: %s', $remove_members), LOG_WARNING, __FILE__, __LINE__);
         return false;
     }