Changeset 123

Timestamp:

May 23, 2006 8:56:19 PM (18 years ago)

Author:

scdev

Message:

J - Updated Utilities.inc.php

Location:

branches/2.0singleton/lib

Files:

• App.inc.php (modified) (1 diff)
• Utilities.inc.php (modified) (6 diffs)

branches/2.0singleton/lib/App.inc.php

@@ -45 +45 @@
         'site_url' => '', // URL automatically determined by _SERVER['HTTP_HOST'] if not set here.
 
-        // The location the user will go if the system doesn't knew where else to send them.
+        // The location the user will go if the system doesn't know where else to send them.
         'redirect_home_url' => '/',
 

branches/2.0singleton/lib/Utilities.inc.php

@@ -74 +74 @@
 function oTxt($txt, $preserve_html=false)
 {
+    $app =& App::getInstance();
+
     $search = array();
     $replace = array();
@@ -100 +102 @@
     $replace['ampersand']       = '&';
 
-    return preg_replace($search, $replace, htmlentities($txt, ENT_QUOTES, App::getParam('character_set')));
+    return preg_replace($search, $replace, htmlentities($txt, ENT_QUOTES, $app->getParam('character_set')));
 }
 
@@ -596 +598 @@
 function addSignature($val, $seed_key=null)
 {
+    $app =& App::getInstance();
+    
     if ('' == $val) {
-        App::logMsg(sprintf('Adding signature to empty string.', null), LOG_NOTICE, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Adding signature to empty string.', null), LOG_NOTICE, __FILE__, __LINE__);
     }
 
     if (!isset($seed_key)) {
-        $seed_key = App::getParam('signing_key');
+        $seed_key = $app->getParam('signing_key');
     }
 
@@ -662 +666 @@
 function mailmanAddMember($email, $list, $send_welcome_message=false)
 {
-   $add_members = '/var/mailman/bin/add_members';
+    $app =& App::getInstance();
+    
+    $add_members = '/var/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);
         if (0 == $return_code) {
-            App::logMsg(sprintf('Mailman add member success for list: %s, user: %s', $list, $email, $stdout), LOG_INFO, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Mailman add member success for list: %s, user: %s', $list, $email, $stdout), LOG_INFO, __FILE__, __LINE__);
             return true;
         } else {
-            App::logMsg(sprintf('Mailman add member failed for list: %s, user: %s, with message: %s', $list, $email, $stdout), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Mailman add member failed for list: %s, user: %s, with message: %s', $list, $email, $stdout), LOG_WARNING, __FILE__, __LINE__);
             return false;
         }
     } 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_ALERT, __FILE__, __LINE__);
         return false;
     }
@@ -691 +697 @@
 function mailmanRemoveMember($email, $list, $send_user_ack=false)
 {
+    $app =& App::getInstance();
+    
     $remove_members = '/var/mailman/bin/remove_members';
     if (is_executable($remove_members) && is_readable($remove_members)) {
@@ -696 +704 @@
         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__);
+            $app->logMsg(sprintf('Mailman remove member success for list: %s, user: %s', $list, $email, $stdout), LOG_INFO, __FILE__, __LINE__);
             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, $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_ALERT, __FILE__, __LINE__);
         return false;
     }