Changeset 957

Timestamp:

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

Author:

saxmatt

Message:

Migration to get_settings and away from globals.

Location:

trunk

Files:

• wp-admin/categories.php (modified) (1 diff)
• wp-admin/import-greymatter.php (modified) (4 diffs)
• wp-admin/install.php (modified) (1 diff)
• wp-admin/link-categories.php (modified) (1 diff)
• wp-admin/link-manager.php (modified) (2 diffs)
• wp-admin/moderation.php (modified) (2 diffs)
• wp-admin/options-discussion.php (modified) (1 diff)
• wp-admin/options-general.php (modified) (1 diff)
• wp-admin/options-permalink.php (modified) (1 diff)
• wp-admin/options-writing.php (modified) (1 diff)
• wp-admin/options.php (modified) (1 diff)
• wp-admin/post.php (modified) (3 diffs)
• wp-admin/profile.php (modified) (1 diff)
• wp-admin/templates.php (modified) (2 diffs)
• wp-admin/upgrade-functions.php (modified) (1 diff)
• wp-admin/users.php (modified) (2 diffs)
• wp-includes/functions-formatting.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/template-functions-general.php (modified) (2 diffs)
• wp-includes/vars.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)
• wp-mail.php (modified) (8 diffs)
• wp-rdf.php (modified) (1 diff)
• wp-register.php (modified) (2 diffs)
• wp-rss.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)
• wp-trackback.php (modified) (1 diff)

trunk/wp-admin/categories.php

@@ -135 +135 @@
     require_once ('admin-header.php');
     if ($user_level < 3) {
-        die("You have no right to edit the categories for this blog.<br />Ask for a promotion to your <a href='mailto:$admin_email'>blog admin</a>. :)");
+        die("You have no right to edit the categories for this blog.<br />Ask for a promotion to your <a href='mailto:" . get_settings('admin_email'). "'>blog admin</a>. :)");
     }
     ?>

trunk/wp-admin/import-greymatter.php

@@ -102 +102 @@
         $result = mysql_query($query);
         if ($result==false) {
-            die ("<b>ERROR</b>: couldn't register an user... please contact the <a href=\"mailto:$admin_email\">webmaster</a> !");
+            die ("<strong>ERROR</strong>: couldn't register an user!");
         }
         echo "<li>user <i>$user_login</i>... <b>Done</b></li>";
@@ -161 +161 @@
                 $result = mysql_query($query);
                 if ($result==false) {
-                    die ("<b>ERROR</b>: couldn't register an user... please contact the <a href=\"mailto:$admin_email\">webmaster</a> !");
+                    die ("<strong>ERROR</strong>: couldn't register an user!");
                 }
                 echo ": registered deleted user <i>$user_login</i> at level 0 ";
@@ -197 +197 @@
 
             if (!$result)
-                die ("Error in posting... contact the <a href=\"mailto:$admin_email\">webmaster</a>");
+                die ("Error in posting...");
             
             $sql2 = "SELECT * FROM $tableposts WHERE 1=1 ORDER BY ID DESC LIMIT 1";
@@ -245 +245 @@
                     $result3 = mysql_query($sql3);
                     if (!$result3)
-                        die ("There is an error with the database, it can't store your comment...<br>Contact the <a href=\"mailto:$admin_email\">webmaster</a>");
+                        die ("There is an error with the database, it can't store your comment..");
                 }
                 $comments=$c-4;

trunk/wp-admin/install.php

@@ -438 +438 @@
 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(43,'subjectprefix', 3, 'blog:', 'subject prefix', 8, 20)",
 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(44,'bodyterminator', 3, '___', 'body terminator string (starting from this string, everything will be ignored, including this string)', 8, 20)",
-"INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(45,'emailtestonly', 2, '0', 'set this to true to run in test mode', 8, 20)",
 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(46,'use_phoneemail', 2, '0', 'some mobile phone email services will send identical subject & content on the same line if you use such a service, set use_phoneemail to true, and indicate a separator string', 8, 20)",
 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(47,'phoneemail_separator', 3, ':::', 'when you compose your message, you\'ll type your subject then the separator string then you type your login:password, then the separator, then content', 8, 20)",

trunk/wp-admin/link-categories.php

@@ -281 +281 @@
     include_once ("./admin-header.php");
     if ($user_level < get_settings('links_minadminlevel')) {
-      die("You have no right to edit the link categories for this blog.<br>Ask for a promotion to your <a href=\"mailto:$admin_email\">blog admin</a> :)");
+      die("You have do not have sufficient permissions to edit the link categories for this blog. :)");
     }
 ?>

trunk/wp-admin/link-manager.php

@@ -291 +291 @@
     include_once ('admin-header.php');
     if ($user_level < get_settings('links_minadminlevel')) {
-      die("You have no right to edit the links for this blog.<br />Ask for a promotion to your <a href='mailto:$admin_email'>blog admin</a>. :)");
+      die('You have do not have sufficent permissions to edit the links for this blog.');
     }
 
@@ -538 +538 @@
     include_once ("./admin-header.php");
     if ($user_level < get_settings('links_minadminlevel')) {
-      die("You have no right to edit the links for this blog.<br>Ask for a promotion to your <a href=\"mailto:$admin_email\">blog admin</a> :)");
+      die("You have do not have sufficient permissions to edit the links for this blog.");
     }
 

trunk/wp-admin/moderation.php

@@ -52 +52 @@
 
     if ($user_level < 3) {
-        die('<p>Your level is not high enough to moderate comments. Ask for a promotion from your <a href="mailto:$admin_email">blog admin</a>. :)</p>');
+        die('<p>Your level is not high enough to moderate comments.</p>');
     }
 
@@ -93 +93 @@
 
     if ($user_level <= 3) {
-        die('<p>Your level is not high enough to moderate comments. Ask for a promotion from your <a href="mailto:$admin_email">blog admin</a>. :)</p>');
+        die('<p>Your level is not high enough to moderate comments.</p>');
     }
 ?>

trunk/wp-admin/options-discussion.php

@@ -41 +41 @@
 include_once('admin-header.php');
 if ($user_level <= 3) {
-    die("You have no right to edit the options for this blog.<br />Ask for a promotion to your <a href=\"mailto:$admin_email\">blog admin</a> :)");
+    die("You have do not have sufficient permissions to edit the options for this blog.");
 }
 ?>

trunk/wp-admin/options-general.php

@@ -41 +41 @@
 include_once('admin-header.php');
 if ($user_level <= 3) {
-    die("You have no right to edit the options for this blog.<br />Ask for a promotion to your <a href=\"mailto:$admin_email\">blog admin</a> :)");
+    die("You have do not have sufficient permissions to edit the options for this blog.");
 }
 ?>

trunk/wp-admin/options-permalink.php

@@ -52 +52 @@
     include_once('admin-header.php');
     if ($user_level <= 3) {
-        die("You have no right to edit the options for this blog.<br>Ask for a promotion to your <a href=\"mailto:$admin_email\">blog admin</a> :)");
+        die("You have do not have sufficient permissions to edit the options for this blog.");
     }
 ?>

trunk/wp-admin/options-writing.php

@@ -41 +41 @@
 include_once('admin-header.php');
 if ($user_level <= 3) {
-    die("You have no right to edit the options for this blog.<br />Ask for a promotion to your <a href=\"mailto:$admin_email\">blog admin</a> :)");
+    die("You have do not have sufficient permissions to edit the options for this blog.");
 }
 ?>

trunk/wp-admin/options.php

@@ -111 +111 @@
     include_once("./admin-header.php");
     if ($user_level <= 3) {
-        die("You have no right to edit the options for this blog.<br>Ask for a promotion from your <a href=\"mailto:$admin_email\">blog admin</a> :)");
+        die("You have do not have sufficient permissions to edit the options for this blog.");
     }
 ?>

trunk/wp-admin/post.php

@@ -243 +243 @@
             <p>Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to raise your level to 1,
             in order to be authorized to post.<br />
-            You can also <a href="mailto:<?php echo $admin_email ?>?subject=Promotion?">e-mail the admin</a>
+            You can also <a href="mailto:<?php echo get_settings('admin_email'); ?>?subject=Promotion?">e-mail the admin</a>
             to ask for a promotion.<br />
             When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)
@@ -414 +414 @@
         $result = $wpdb->query("DELETE FROM $tableposts WHERE ID=$post_id");
         if (!$result)
-            die('Error in deleting... contact the <a href="mailto:$admin_email">webmaster</a>.');
+            die('Error in deleting...');
 
         $result = $wpdb->query("DELETE FROM $tablecomments WHERE comment_post_ID=$post_id");
@@ -752 +752 @@
 <div class="wrap">
             <p>Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to raise your level to 1, in order to be authorized to post blog items.<br />
-                You can also <a href="mailto:<?php echo $admin_email ?>?subject=Blog posting permission">e-mail the admin</a> to ask for a promotion.<br />
+                You can also <a href="mailto:<?php echo get_settings('admin_email'); ?>?subject=Blog posting permission">e-mail the admin</a> to ask for a promotion.<br />
                 When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)</p>
 </div>

trunk/wp-admin/profile.php

@@ -95 +95 @@
     $result = $wpdb->query($query);
     if (!$result) {
-        die ("<strong>ERROR</strong>: couldn't update your profile... please contact the <a href=\"mailto:$admin_email\">webmaster</a> !<br /><br />$query<br /><br />");
+        die ("<strong>ERROR</strong>: couldn't update your profile...");
     }
     header('Location: profile.php?updated=true');

trunk/wp-admin/templates.php

@@ -43 +43 @@
 
     if ($user_level < 3) {
-        die('<p>You have no right to edit the template for this blog.<br />Ask for a promotion to your <a href="mailto:$admin_email">blog admin</a>. :)</p>');
+        die('<p>You have do not have sufficient permissions to edit templates for this blog.</p>');
     }
 
@@ -63 +63 @@
 
     if ($user_level <= 3) {
-        die('<p>You have no right to edit the template for this blog.<br>Ask for a promotion to your <a href="mailto:$admin_email">blog admin</a>. :)</p>');
+        die('<p>You have do not have sufficient permissions to edit templates for this blog.</p>');
     }
 

trunk/wp-admin/upgrade-functions.php

@@ -215 +215 @@
         "43" => "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (43,'subjectprefix', 3, 'blog:', 'subject prefix', 8, 20)",
         "44" => "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (44,'bodyterminator', 3, '___', 'body terminator string (starting from this string, everything will be ignored, including this string)', 8, 20)",
-        "45" => "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (45,'emailtestonly', 2, '0', 'set this to true to run in test mode', 8, 20)",
         "46" => "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (46,'use_phoneemail', 2, '0', 'some mobile phone email services will send identical subject & content on the same line if you use such a service, set use_phoneemail to true, and indicate a separator string', 8, 20)",
         "47" => "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (47,'phoneemail_separator', 3, ':::', 'when you compose your message, you\'ll type your subject then the separator string then you type your login:password, then the separator, then content', 8, 20)",

trunk/wp-admin/users.php

@@ -79 +79 @@
     
     if ($result == false) {
-        die ('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:'.$admin_email.'">webmaster</a> !');
+        die ('<strong>ERROR</strong>: Couldn&#8217;t register you!');
     }
 
@@ -90 +90 @@
     $message .= "Login: $user_login\r\n\r\nE-mail: $user_email";
 
-    @mail($admin_email, '[' . get_settings('blogname') . '] New User Registration', $message);
+    @mail(get_settings('admin_email'), '[' . get_settings('blogname') . '] New User Registration', $message);
     header('Location: users.php');
 break;

trunk/wp-includes/functions-formatting.php

@@ -318 +318 @@
 
 function convert_smilies($text) {
-    global $smilies_directory, $use_smilies;
     global $wp_smiliessearch, $wp_smiliesreplace;
     $output = '';
-    if ($use_smilies) {
+    if (get_settings('use_smilies')) {
         // HTML loop taken from texturize function, could possible be consolidated
         $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between

trunk/wp-includes/functions.php

@@ -933 +933 @@
 
 function doGeoUrlHeader($posts) {
-    global $use_default_geourl,$default_geourl_lat,$default_geourl_lon;
     if (count($posts) == 1) {
         // there's only one result  see if it has a geo code
@@ -947 +946 @@
         }
     } else {
-        if($use_default_geourl) {
+        if(get_settings('use_default_geourl')) {
             // send the default here 
-            echo "<meta name=\"ICBM\" content=\"".$default_geourl_lat.", ".$default_geourl_lon."\" />\n";
+            echo "<meta name=\"ICBM\" content=\"". get_settings('default_geourl_lat') .", ". get_settings('default_geourl_lon') ."\" />\n";
             echo "<meta name=\"DC.title\" content=\"".convert_chars(strip_tags(get_bloginfo("name")),"unicode")."\" />\n";
-            echo "<meta name=\"geo.position\" content=\"".$default_geourl_lat.";".$default_geourl_lon."\" />\n";
+            echo "<meta name=\"geo.position\" content=\"". get_settings('default_geourl_lat') .";". get_settings('default_geourl_lon') ."\" />\n";
         }
     }

trunk/wp-includes/template-functions-general.php

@@ -23 +23 @@
 
 function get_bloginfo($show='') {
-    global $admin_email;
 
     $do_perma = 0;
@@ -76 +75 @@
             break;
         case 'admin_email':
-            $output = $admin_email;
+            $output = get_settings('admin_email');
             break;
         case 'name':

trunk/wp-includes/vars.php

@@ -263 +263 @@
     $wp_smiliessearch[] = $smiley;
     $smiley_masked = str_replace(' ', '', $smiley);
-    $wp_smiliesreplace[] = " <img src='$smilies_directory/$img' alt='$smiley_masked' />";
+    $wp_smiliesreplace[] = " <img src='" . get_settings('smilies_directory') . "/$img' alt='$smiley_masked' />";
 }
 

trunk/wp-login.php

@@ -224 +224 @@
         <a href='wp-login.php' title='Check your email first, of course'>Click here to login!</a></p>";
         // send a copy of password change notification to the admin
-        mail($admin_email, '[' . get_settings('blogname') . "] Password Lost/Change", "Password Lost and Changed for user: $user_login");
+        mail(get_settings('admin_email'), '[' . get_settings('blogname') . "] Password Lost/Change", "Password Lost and Changed for user: $user_login");
         die();
     }

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');
             }
 

trunk/wp-rdf.php

@@ -40 +40 @@
     <dc:language><?php echo get_settings('rss_language'); ?></dc:language>
     <dc:date><?php echo gmdate('Y-m-d\TH:i:s'); ?></dc:date>
-    <dc:creator><?php echo antispambot($admin_email) ?></dc:creator>
+    <dc:creator><?php echo antispambot(get_settings('admin_email')) ?></dc:creator>
     <admin:generatorAgent rdf:resource="http://wordpress.org/?v=<?php echo $wp_version ?>"/>
-    <admin:errorReportsTo rdf:resource="mailto:<?php echo antispambot($admin_email) ?>"/>
+    <admin:errorReportsTo rdf:resource="mailto:<?php echo antispambot(get_settings('admin_email')) ?>"/>
     <sy:updatePeriod>hourly</sy:updatePeriod>
     <sy:updateFrequency>1</sy:updateFrequency>

trunk/wp-register.php

@@ -97 +97 @@
     
     if ($result == false) {
-        die ('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:'.$admin_email.'">webmaster</a> !');
+        die ('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:'.get_settings('admin_email').'">webmaster</a> !');
     }
 
@@ -108 +108 @@
     $message .= "Login: $user_login\r\n\r\nE-mail: $user_email";
 
-    @mail($admin_email, '[' . get_settings('blogname') . '] New User Registration', $message);
+    @mail(get_settings('admin_email'), '[' . get_settings('blogname') . '] New User Registration', $message);
 
     ?>

trunk/wp-rss.php

@@ -33 +33 @@
         <lastBuildDate><?php echo gmdate("D, d M Y H:i:s"); ?> GMT</lastBuildDate>
         <docs>http://backend.userland.com/rss092</docs>
-        <managingEditor><?php echo antispambot($admin_email) ?></managingEditor>
+        <managingEditor><?php echo antispambot(get_settings('admin_email')) ?></managingEditor>
         <webMaster><?php echo antispambot($admin_email) ?></webMaster>
         <language><?php echo get_settings('rss_language'); ?></language>

trunk/wp-settings.php

@@ -50 +50 @@
 // accessing a single global $all_settings var
 if (!strstr($_SERVER['REQUEST_URI'], 'install.php') && !strstr($_SERVER['REQUEST_URI'], 'wp-admin/import')) {
-    $admin_email = get_settings('admin_email');
-    $use_smilies = get_settings('use_smilies');
-    $smilies_directory = get_settings('smilies_directory');
-    $mailserver_url = get_settings('mailserver_url');
-    $mailserver_login = get_settings('mailserver_login');
-    $mailserver_pass = get_settings('mailserver_pass');
-    $mailserver_port = get_settings('mailserver_port');
-    $default_category = get_settings('default_category');
-    $subjectprefix = get_settings('subjectprefix');
-    $bodyterminator = get_settings('bodyterminator');
-    $emailtestonly = get_settings('emailtestonly');
-    $use_phoneemail = get_settings('use_phoneemail');
-    $phoneemail_separator = get_settings('phoneemail_separator');
-    $use_default_geourl = get_settings('use_default_geourl');
-    $default_geourl_lat = get_settings('default_geourl_lat');
-    $default_geourl_lon = get_settings('default_geourl_lon');
 
     $querystring_start = '?';

trunk/wp-trackback.php

@@ -82 +82 @@
 
     if (!$result) {
-        die ("There is an error with the database, it can't store your comment...<br />Please contact the <a href='mailto:$admin_email'>webmaster</a>.");
+        die ("There is an error with the database, it can't store your comment...<br />Please contact the webmaster.");
     } else {
         $comment_ID = $wpdb->get_var('SELECT last_insert_id()');