Changeset 206 for branches/1.1dev

Timestamp:

Aug 30, 2006 8:54:43 AM (18 years ago)

Author:

scdev

Message:

Q - Modified paths to new mailman binaries.

Location:

branches/1.1dev

Files:

• config/defaults.inc.php (modified) (1 diff)
• lib/Utilities.inc.php (modified) (2 diffs)

branches/1.1dev/config/defaults.inc.php

@@ -117 +117 @@
 setDefault($CFG->trusted_networks, array());
 
+// Array of usernames which are exempt from abuse detection.
+setDefault($CFG->login_abuse_exempt_usernames, array());
+
 // Array of usernames which are exempt from remote_ip matching. Users behind
 // proxy servers should be appended to this array so their shifting remote IP
 // will not log them out.
-setDefault($CFG->login_abuse_exempt_usernames, array());
-
+setDefault($CFG->match_remote_ip_exempt_usernames, array());
 
 /******************************************************************************

branches/1.1dev/lib/Utilities.inc.php

@@ -760 +760 @@
 function mailmanAddMember($email, $list, $send_welcome_message=false)
 {
-   $add_members = '/var/mailman/bin/add_members';
-    if (is_executable($add_members) && is_readable($add_members)) {
+   $add_members = '/usr/lib/mailman/bin/add_members';
+    if (true || 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);
+        $stdout = is_array($stdout) ? getDump($stdout) : $stdout;
         if (0 == $return_code) {
             logMsg(sprintf('Mailman add member success for list: %s, user: %s', $list, $email, $stdout), LOG_INFO, __FILE__, __LINE__);
@@ -791 +792 @@
 function mailmanRemoveMember($email, $list, $send_user_ack=false)
 {
-    $remove_members = '/var/mailman/bin/remove_members';
-    if (is_executable($remove_members) && is_readable($remove_members)) {
+    $remove_members = '/usr/lib/mailman/bin/remove_members';
+    if (true || 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);
+        $stdout = is_array($stdout) ? getDump($stdout) : $stdout;
         if (0 == $return_code) {
             logMsg(sprintf('Mailman remove member success for list: %s, user: %s', $list, $email, $stdout), LOG_INFO, __FILE__, __LINE__);