Changeset 957 for trunk/wp-mail.php

Timestamp:

03/01/2004 07:55:45 PM (23 years ago)

Author:

saxmatt

Message:

Migration to get_settings and away from globals.

File:

• trunk/wp-mail.php (modified) (8 diffs)

trunk/wp-mail.php

@@ -11 +11 @@
 $time_difference = get_settings('time_difference');
 
-if ($use_phoneemail) {
+if (get_settings('use_phoneemail')) {
         // if you're using phone email, the email will already be in your timezone
         $time_difference = 0;
@@ -22 +22 @@
 $pop3 = new POP3();
 
-if(!$pop3->connect($mailserver_url, $mailserver_port)) {
+if(!$pop3->connect(get_settings('mailserver_url'), get_settings('mailserver_port'))) {
         echo "Ooops $pop3->ERROR <br />\n";
         exit;
 }
 
-$Count = $pop3->login($mailserver_login, $mailserver_pass);
+$Count = $pop3->login(get_settings('mailserver_login'), get_settings('mailserver_pass'));
 if((!$Count) || ($Count == -1)) {
         echo "<h1>Login Failed: $pop3->ERROR</h1>\n";
@@ -77 +77 @@
                                   $subject = wp_iso_descrambler($subject);
                                 }
-                                if ($use_phoneemail) {
-                                        $subject = explode($phoneemail_separator, $subject);
+                                if (get_settings('use_phoneemail')) {
+                                        $subject = explode(get_settings('phoneemail_separator'), $subject);
                                         $subject = trim($subject[0]);
                                 }
-                                if (!ereg($subjectprefix, $subject)) {
+                                if (!ereg(get_settings('subjectprefix'), $subject)) {
                                         continue;
                                 }
@@ -125 +125 @@
         }
 
-        if (preg_match('/'.$subjectprefix.'/', $subject)) {
+        if (preg_match('/'.get_settings('subjectprefix').'/', $subject)) {
 
                 $userpassstring = '';
@@ -132 +132 @@
                 echo "<p><b>$iCount</b></p><p><b>Subject: </b>$subject</p>\n";
 
-                $subject = trim(str_replace($subjectprefix, '', $subject));
+                $subject = trim(str_replace(get_settings('subjectprefix'), '', $subject));
 
                 if ($content_type == 'multipart/alternative') {
@@ -145 +145 @@
                 echo "<p><b>Raw content:</b><br /><pre>".$content.'</pre></p>';
                 
-                $btpos = strpos($content, $bodyterminator);
+                $btpos = strpos($content, get_settings('bodyterminator'));
                 if ($btpos) {
                         $content = substr($content, 0, $btpos);
@@ -155 +155 @@
                 $secondline = $blah[1];
 
-                if ($use_phoneemail) {
-                        $btpos = strpos($firstline, $phoneemail_separator);
+                if (get_settings('use_phoneemail')) {
+                        $btpos = strpos($firstline, get_settings('phoneemail_separator'));
                         if ($btpos) {
                                 $userpassstring = trim(substr($firstline, 0, $btpos));
-                                $content = trim(substr($content, $btpos+strlen($phoneemail_separator), strlen($content)));
-                                $btpos = strpos($content, $phoneemail_separator);
+                                $content = trim(substr($content, $btpos+strlen(get_settings('phoneemail_separator')), strlen($content)));
+                                $btpos = strpos($content, get_settings('phoneemail_separator'));
                                 if ($btpos) {
                                         $userpassstring = trim(substr($content, 0, $btpos));
-                                        $content = trim(substr($content, $btpos+strlen($phoneemail_separator), strlen($content)));
+                                        $content = trim(substr($content, $btpos+strlen(get_settings('phoneemail_separator')), strlen($content)));
                                 }
                         }
@@ -219 +219 @@
                         }
                         if (empty($post_categories)) {
-                                $post_categories[] = $default_category;
+                                $post_categories[] = get_settings('default_category');
                         }