Changeset 667

Timestamp:

Feb 15, 2019 9:07:51 PM (5 years ago)

Author:

anonymous

Message:

Convert mailman functions to stubs

File:

• trunk/lib/Utilities.inc.php (modified) (1 diff)

trunk/lib/Utilities.inc.php

@@ -1226 +1226 @@
 
 /**
- * Adds email address to mailman mailing list. Requires /etc/sudoers entry for apache to sudo execute add_members.
- * Don't forget to allow php_admin_value open_basedir access to "/var/mailman/bin".
+ * A stub for apps that still use this function.
  *
  * @access  public
- * @param   string  $email     Email address to add.
- * @param   string  $list      Name of list to add to.
- * @param   bool    $send_welcome_message   True to send welcome message to subscriber.
- * @return  bool    True on success, false on failure.
+ * @return  void
  */
 function mailmanAddMember($email, $list, $send_welcome_message=false)
 {
     $app =& App::getInstance();
-
-    $add_members = '/usr/lib/mailman/bin/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);
-        if (0 == $return_code) {
-            $app->logMsg(sprintf('Mailman add member success for list: %s, user: %s', $list, $email), LOG_INFO, __FILE__, __LINE__);
-            return true;
-        } else {
-            $app->logMsg(sprintf('Mailman add 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 add member program not executable: %s', $add_members), LOG_WARNING, __FILE__, __LINE__);
-        return false;
-    }
-}
-
-/**
- * Removes email address from mailman mailing list. Requires /etc/sudoers entry for apache to sudo execute add_members.
- * Don't forget to allow php_admin_value open_basedir access to "/var/mailman/bin".
+    $app->logMsg(sprintf('mailmanAddMember called and ignored: %s, %s, %s', $email, $list, $send_welcome_message), LOG_WARNING, __FILE__, __LINE__);
+}
+
+/**
+ * A stub for apps that still use this function.
  *
  * @access  public
- * @param   string  $email     Email address to add.
- * @param   string  $list      Name of list to add to.
- * @param   bool    $send_user_ack   True to send goodbye message to subscriber.
- * @return  bool    True on success, false on failure.
+ * @return  void
  */
 function mailmanRemoveMember($email, $list, $send_user_ack=false)
 {
     $app =& App::getInstance();
-
-    $remove_members = '/usr/lib/mailman/bin/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);
-        if (0 == $return_code) {
-            $app->logMsg(sprintf('Mailman remove member success for list: %s, user: %s', $list, $email), LOG_INFO, __FILE__, __LINE__);
-            return true;
-        } else {
-            $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_WARNING, __FILE__, __LINE__);
-        return false;
-    }
+    $app->logMsg(sprintf('mailmanRemoveMember called and ignored: %s, %s, %s', $email, $list, $send_user_ack), LOG_WARNING, __FILE__, __LINE__);
 }