Changeset 749

Timestamp:

Sep 2, 2021 10:35:20 PM (3 years ago)

Author:

anonymous

Message:

Replace mailman utility functions with stubs. Remove gettext sub functions.

File:

• branches/1.1dev/lib/Utilities.inc.php (modified) (3 diffs)

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

@@ -768 +768 @@
 }
 
-
 /**
  * Verifies a signature appened to a value by addSignature().
@@ -793 +792 @@
 
 /**
- * Stub functions used when installation does not have
- * GNU gettext extension installed
- */
-if (!extension_loaded('gettext')) {
-    /**
-    * Translates text
-    *
-    * @access public
-    * @param string $text the text to be translated
-    * @return string translated text
-    */
-    function gettext($text) {
-        return $text;
-    }
-
-    /**
-    * Translates text
-    *
-    * @access public
-    * @param string $text the text to be translated
-    * @return string translated text
-    */
-    function _($text) {
-        return $text;
-    }
-
-    /**
-    * Translates text by domain
-    *
-    * @access public
-    * @param string $domain the language to translate the text into
-    * @param string $text the text to be translated
-    * @return string translated text
-    */
-    function dgettext($domain, $text) {
-        return $text;
-    }
-
-    /**
-    * Translates text by domain and category
-    *
-    * @access public
-    * @param string $domain the language to translate the text into
-    * @param string $text the text to be translated
-    * @param string $category the language dialect to use
-    * @return string translated text
-    */
-    function dcgettext($domain, $text, $category) {
-        return $text;
-    }
-
-    /**
-    * Binds the text domain
-    *
-    * @access public
-    * @param string $domain the language to translate the text into
-    * @param string
-    * @return string translated text
-    */
-    function bindtextdomain($domain, $directory) {
-        return $domain;
-    }
-
-    /**
-    * Sets the text domain
-    *
-    * @access public
-    * @param string $domain the language to translate the text into
-    * @return string translated text
-    */
-    function textdomain($domain) {
-        return $domain;
-    }
-}
-
-/**
  * Sends empty output to the browser and flushes the php buffer so the client
  * will see data before the page is finished processing.
@@ -878 +801 @@
 
 /**
- * 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)
 {
-   $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__);
-            return true;
-        } else {
-            logMsg(sprintf('Mailman add member failed for list: %s, user: %s, with message: %s', $list, $email, $stdout), LOG_WARNING, __FILE__, __LINE__);
-            return false;
-        }
-    } else {
-        logMsg(sprintf('Mailman add member program not executable: %s', $add_members), LOG_ALERT, __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".
+    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)
 {
-    $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__);
-            return true;
-        } else {
-            logMsg(sprintf('Mailman remove member failed for list: %s, user: %s, with message: %s', $list, $email, $stdout), LOG_WARNING, __FILE__, __LINE__);
-            return false;
-        }
-    } else {
-        logMsg(sprintf('Mailman remove member program not executable: %s', $remove_members), LOG_ALERT, __FILE__, __LINE__);
-        return false;
-    }
-}
-
-
-
-?>
+    logMsg(sprintf('mailmanRemoveMember called and ignored: %s, %s, %s', $email, $list, $send_user_ack), LOG_WARNING, __FILE__, __LINE__);
+}
+