Changeset 1599

Timestamp:

09/05/04 00:24:28 (4 years ago)

Author:

saxmatt

Message:

Massive options cleanup and another step of cleaning up the upgrade/install.

Files:

• trunk/wp-admin/admin-header.php (modified) (1 diff)
• trunk/wp-admin/edit-form-advanced.php (modified) (3 diffs)
• trunk/wp-admin/edit-form-comment.php (modified) (1 diff)
• trunk/wp-admin/edit-form.php (modified) (1 diff)
• trunk/wp-admin/edit-page-form.php (modified) (1 diff)
• trunk/wp-admin/link-categories.php (modified) (4 diffs)
• trunk/wp-admin/link-import.php (modified) (2 diffs)
• trunk/wp-admin/link-manager.php (modified) (10 diffs)
• trunk/wp-admin/menu.php (modified) (1 diff)
• trunk/wp-admin/optionhandler.php (deleted)
• trunk/wp-admin/options-discussion.php (modified) (2 diffs)
• trunk/wp-admin/options-general.php (modified) (4 diffs)
• trunk/wp-admin/options-misc.php (modified) (2 diffs)
• trunk/wp-admin/options-permalink.php (modified) (1 diff)
• trunk/wp-admin/options-reading.php (modified) (1 diff)
• trunk/wp-admin/options-writing.php (modified) (3 diffs)
• trunk/wp-admin/options.php (modified) (9 diffs)
• trunk/wp-admin/post.php (modified) (3 diffs)
• trunk/wp-admin/profile.php (modified) (2 diffs)
• trunk/wp-admin/upgrade-functions.php (modified) (10 diffs)
• trunk/wp-atom.php (modified) (1 diff)
• trunk/wp-blog-header.php (modified) (1 diff)
• trunk/wp-commentsrss2.php (modified) (1 diff)
• trunk/wp-includes/functions-post.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (3 diffs)
• trunk/wp-includes/links-update-xml.php (modified) (1 diff)
• trunk/wp-includes/template-functions-general.php (modified) (1 diff)
• trunk/wp-locations.php (modified) (1 diff)
• trunk/wp-mail.php (modified) (1 diff)
• trunk/wp-rdf.php (modified) (1 diff)
• trunk/wp-rss.php (modified) (1 diff)
• trunk/wp-trackback.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -14 +14 @@
-$posts_per_page = get_settings('posts_per_page');
-$what_to_show = get_settings('what_to_show');
-$archive_mode = get_settings('archive_mode');
-$date_format = get_settings('date_format');
-$time_format = get_settings('time_format');

trunk/wp-admin/edit-form-advanced.php

@@ -10 +10 @@
-<?php
-
-$allowed_users = explode(" ", trim(get_settings('fileupload_allowedusers')));
-
-if (0 == $post_ID) {
-    $form_action = 'post';
@@ -19 +17 @@
-}
-
-
-
-
-
-
+
-
-$form_prevstatus = '<input type="hidden" name="prev_status" value="'.$post_status.'" />';
-
-if (get_settings('use_trackback')) {
-    $form_trackback = '<p><label for="trackback"><a href="http://wordpress.org/docs/reference/post/#trackback" title="' . __('Help on trackbacks') . '">' . __('<strong>TrackBack</strong> a <abbr title="Universal Resource Identifier">URI</abbr></a>') . '</label> ' . __('(Separate multiple <abbr title="Universal Resource Identifier">URI</abbr>s with spaces.)') . '<br />
-    <input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. str_replace("\n", ' ', $to_ping) .'" /></p>';
@@ -38 +31 @@
-        $pings .= '</ul>';
-    }
-
-
-
+
-$saveasdraft = '<input name="save" type="submit" id="save" tabindex="6" value="' . __('Save and Continue Editing') . '" />';
-

trunk/wp-admin/edit-form-comment.php

@@ -1 +1 @@
-<?php
-
-$allowed_users = explode(" ", trim(get_settings('fileupload_allowedusers')));
-
-$submitbutton_text = __('Edit Comment &raquo;');

trunk/wp-admin/edit-form.php

@@ -2 +2 @@
-<div class="wrap">
-<?php
-
-$allowed_users = explode(" ", trim(get_settings('fileupload_allowedusers')));
-
-$form_action = 'post';
-$form_extra = '';
-
-
-
-
-
-
+
-
-
-
+
-    '<input type="text" name="trackback_url" style="width: 360px" id="trackback" tabindex="7" /></p>';
-
-
-
+
-
-$saveasdraft = '';

trunk/wp-admin/edit-page-form.php

@@ -2 +2 @@
-<div class="wrap">
-<?php
-
-$allowed_users = explode(" ", trim(get_settings('fileupload_allowedusers')));
-
-$form_action = 'post';
-$form_extra = '';

trunk/wp-admin/link-categories.php

@@ -29 +29 @@
-      include_once('admin-header.php');
-
-get_settings('links_minadminlevel')
+5
-          die (__("Cheatin' uh ?"));
-
@@ -92 +92 @@
-        die(sprintf(__("Can't delete the <strong>%s</strong> link category: this is the default one"), $cat_name));
-
-get_settings('links_minadminlevel')
+5
-      die (__("Cheatin' uh ?"));
-
@@ -208 +208 @@
-    include_once("./admin-header.php");
-
-get_settings('links_minadminlevel')
+5
-      die (__("Cheatin' uh ?"));
-
@@ -281 +281 @@
-    $standalone=0;
-    include_once ("./admin-header.php");
-get_settings('links_minadminlevel')
+5
-      die(__("You have do not have sufficient permissions to edit the link categories for this blog. :)"));
-    }

trunk/wp-admin/link-import.php

@@ -18 +18 @@
-        $standalone = 0;
-        include_once('admin-header.php');
-get_settings('links_minadminlevel')
+5
-            die (__("Cheatin’ uh?"));
-
@@ -75 +75 @@
-                $standalone = 0;
-                include_once('admin-header.php');
-get_settings('links_minadminlevel')
+5
-                    die (__("Cheatin' uh ?"));
-?>

trunk/wp-admin/link-manager.php

@@ -90 +90 @@
-
-    // check the current user's level first.
-get_settings('links_minadminlevel')
+5
-      die (__("Cheatin' uh ?"));
-
@@ -103 +103 @@
-    $results = $wpdb->get_results("SELECT link_id, link_owner, user_level FROM $wpdb->links LEFT JOIN $wpdb->users ON link_owner = ID WHERE link_id in ($all_links)");
-    foreach ($results as $row) {
-!get_settings('links_use_adminlevels') || 
+
-        $ids_to_change[] = $row->link_id;
-      }
@@ -123 +123 @@
-
-    // check the current user's level first.
-get_settings('links_minadminlevel')
+5
-      die (__("Cheatin' uh ?"));
-
@@ -163 +163 @@
-
-    // check the current user's level first.
-get_settings('links_minadminlevel')
+5
-      die (__("Cheatin' uh ?"));
-
@@ -200 +200 @@
-    $auto_toggle = get_autotoggle($link_category);
-
-get_settings('links_minadminlevel')
+5
-      die (__("Cheatin' uh ?"));
-
@@ -251 +251 @@
-      $auto_toggle = get_autotoggle($link_category);
-
-get_settings('links_minadminlevel')
+5
-        die (__("Cheatin' uh ?"));
-
@@ -284 +284 @@
-    $link_id = (int) $_GET['link_id'];
-
-get_settings('links_minadminlevel')
+5
-      die (__("Cheatin' uh ?"));
-
@@ -307 +307 @@
-    $xfn = true;
-    include_once ('admin-header.php');
-get_settings('links_minadminlevel')
+5
-      die(__('You do not have sufficient permissions to edit the links for this blog.'));
-    }
@@ -572 +572 @@
-    $standalone=0;
-    include_once ("./admin-header.php");
-get_settings('links_minadminlevel')
+5
-      die(__("You do not have sufficient permissions to edit the links for this blog."));
-    }
@@ -722 +722 @@
-            $show_buttons = 1; // default
-
-get_settings('links_use_adminlevels') && ($link->user_level > $user_level)
+$link->user_level > $user_level
-              $show_buttons = 0;
-            }

trunk/wp-admin/menu.php

@@ -37 +37 @@
-$submenu['options-general.php'][15] = array(__('Reading'), 5, 'options-reading.php');
-$submenu['options-general.php'][20] = array(__('Discussion'), 5, 'options-discussion.php');
-
-
-
+
+
-
-$self = preg_replace('|.*/wp-admin/|i', '', $_SERVER['PHP_SELF']);

trunk/wp-admin/options-discussion.php

@@ -104 +104 @@
-    <p><?php _e('When a comment contains any of these words in its content, name, URI, e-mail, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://wiki.wordpress.org/index.php/SpamWords">Common spam words</a>.') ?></p>
-        <p> 
-echo get_settings
+form_option
-        </p> 
-</fieldset>
@@ -111 +111 @@
-        </p> 
-    </form> 
- 
-"admin-footer.php")
+
+'./admin-footer.php');

trunk/wp-admin/options-general.php

@@ -52 +52 @@
-      <tr valign="top"> 
-        <th width="33%" scope="row"><?php _e('Weblog title:') ?></th> 
-echo htmlspecialchars(get_settings('blogname')
+form_option('blogname'
-      </tr> 
-      <tr valign="top"> 
-        <th scope="row"><?php _e('Tagline:') ?></th> 
-echo htmlspecialchars(get_settings('blogdescription')
+form_option('blogdescription'
-        <br />
-<?php _e('In a few words, explain what this weblog is about.') ?></td> 
@@ -62 +62 @@
-      <tr valign="top"> 
-        <th scope="row"><?php _e('WordPress address (URI):') ?></th> 
-echo get_settings
+form_option
-      </tr> 
-      <tr valign="top">
-        <th scope="row"><?php _e('Blog address (URI):') ?></th>
-echo get_settings
+form_option
-        </tr>
-      <tr valign="top"> 
-        <th scope="row"><?php _e('E-mail address:') ?> </th> 
-echo get_settings
+form_option
-        <br />
-<?php _e('This address is used only for admin purposes.') ?></td> 
@@ -94 +94 @@
-      <tr>
-        <th scope="row"><?php _e('Times in the weblog should differ by:') ?> </th>
-echo get_settings
+form_option
-        <?php _e('hours') ?> </td>
-      </tr>
@@ -103 +103 @@
-      <tr>
-        <th scope="row"><?php _e('Default date format:') ?></th>
-echo get_settings
+form_option
-<?php _e('Output:') ?> <strong><?php echo gmdate(get_settings('date_format'), current_time('timestamp')); ?></strong></td>
-        </tr>
-      <tr>
-        <th scope="row"><?php _e('Default time format:') ?></th>
-echo get_settings
+form_option
-<?php _e('Output:') ?> <strong><?php echo gmdate(get_settings('time_format'), current_time('timestamp')); ?></strong></td>
-        </tr> 

trunk/wp-admin/options-misc.php

@@ -22 +22 @@
-}
-
-, 'option_group_id'
+
-for ($i=0; $i<count($wpvarstoreset); $i += 1) {
-    $wpvar = $wpvarstoreset[$i];
@@ -45 +45 @@
- 
-<div class="wrap"> 
-  
-  <form name="form1
-
-action" value="update" />       <input type="hidden" name="page_options" value="'hack_file','use_fileupload','fileupload_realpath','fileupload_url','fileupload_allowedtypes','fileupload_maxk','fileupload_maxk','fileupload_minlevel','use_geo_positions
-
-
-
-
-    
-      
-        
-        
-           <input name="fileupload_realpath" type="text" id="fileupload_realpath" value="<?php echo get_settings
-
-
-        
-      
-      
-        
-        
-           <input name="fileupload_url" type="text" id="fileupload_url" value="<?php echo get_settings
-
-        
-      
-      
-        
-       <td><input name="fileupload_maxk" type="text" id="fileupload_maxk" value="<?php echo get_settings
-        
-      
-      
-        
-       <td><input name="fileupload_allowedtypes" type="text" id="fileupload_allowedtypes" value="<?php echo get_settings
-       
-         <?php _e('Recommended: <code>jpg jpeg png gif 
-      
-      
-        
-      
-
-
-
-
+
+<form name="miscoptions
+
+page_options" value="'hack_file','use_fileupload','fileupload_realpath','fileupload_url','fileupload_allowedtypes','fileupload_maxk','fileupload_maxk','fileupload_minlevel','use_geo_positions','use_linksupdate','weblogs_xml_url','links_updated_date_format','links_recently_updated_prepend','links_recently_updated_append
+   
+   
+   
+   
+   
+   
+   
+   
+   <input name="fileupload_realpath" type="text" id="fileupload_realpath" value="<?php form_option
+   
+
+
+   
+   
+   
+   
+   <input name="fileupload_url" type="text" id="fileupload_url" value="<?php form_option
+   
+   
+   
+   
+   
+   <td><input name="fileupload_maxk" type="text" id="fileupload_maxk" value="<?php form_option
+   
+
+   
+   
+   <td><input name="fileupload_allowedtypes" type="text" id="fileupload_allowedtypes" value="<?php form_option
+
+   <?php _e('Recommended: <code>jpg jpeg png gif
+
+   
+   
+
+   
+   
+   
+   
-    echo "\n\t<option value='$i' $selected>$i</option>";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

trunk/wp-admin/options-permalink.php

@@ -30 +30 @@
-  $home_path = ABSPATH;
-}
-
-require_once('./optionhandler.php');
-
-if (isset($_POST['submit'])) {

trunk/wp-admin/options-reading.php

@@ -44 +44 @@
-
-<div class="wrap"> 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div> 
-"admin-footer.php")
+'./admin-footer.php');

trunk/wp-admin/options-writing.php

@@ -64 +64 @@
-      <tr valign="top"> 
-        <th width="33%" scope="row"> <?php _e('Size of the writing box:') ?></th> 
-echo get_settings
+form_option
-         <?php _e('lines') ?></td> 
-      </tr> 
@@ -93 +93 @@
-          <p><?php printf(__('Enter the sites that you would like to notify when you publish a new post. For a list of some recommended sites to ping please see <a href="%s">Update Services</a> on the wiki. Separate multiple URIs by line breaks.'), 'http://wiki.wordpress.org/index.php/UpdateServices') ?></p>
-    
-echo get_settings
+form_option
-    </fieldset>
-    <fieldset class="options">
@@ -102 +102 @@
-            <tr valign="top">
-                <th scope="row"><?php _e('Mail server:') ?></th>
-echo get_settings
+form_option
-                <label for="port"><?php _e('Port:') ?></label> 
-echo get_settings
+form_option
-                </td>
-            </tr>
-            <tr valign="top">
-                <th width="33%" scope="row"><?php _e('Login name:') ?></th>
-echo get_settings
+form_option
-            </tr>
-            <tr valign="top">
-                <th scope="row"><?php _e('Password:') ?></th>
-                <td>
-echo get_settings
+form_option
-                </td>
-            </tr>

trunk/wp-admin/options.php

@@ -23 +23 @@
-}
-
-, 'option_group_id'
+
-for ($i=0; $i<count($wpvarstoreset); $i += 1) {
-    $wpvar = $wpvarstoreset[$i];
@@ -38 +38 @@
-    }
-}
-if (isset($_GET['option_group_id'])) $option_group_id = (int) $_GET['option_group_id'];
-require_once('./optionhandler.php');
-$non_was_selected = 0;
-if (!isset($_GET['option_group_id'])) {
-    $option_group_id = 1;
-    $non_was_selected = 1;
-}
-
-switch($action) {
@@ -53 +46 @@
-    $any_changed = 0;
-    
-    // iterate through the list of options in this group
-    // pull the vars from the post
-    // validate ranges etc.
-    // update the values
-    if (!$_POST['page_options']) {
-        foreach ($_POST as $key => $value) {
@@ -67 +56 @@
-
-    $options = $wpdb->get_results("SELECT $wpdb->options.option_id, option_name, option_type, option_value, option_admin_level FROM $wpdb->options WHERE option_name IN ($option_names)");
-//  die(var_dump($options));
-
-// HACK
@@ -85 +73 @@
-                }
-                if( in_array($option->option_name, $nonbools) && $new_val == 0 ) $new_val = 'closed';
-
-
-
-
-
-
-
-
-
+
+
-                }
-            }
-        } // end foreach
-        unset($cache_settings); // so they will be re-read
-        get_settings('siteurl'); // make it happen now
@@ -105 +85 @@
-    }
-    
-
-
-
-
-
-
-
-
-
-
+
+
-    header('Location: ' . $goback);
-    break;
@@ -120 +92 @@
-default:
-    $standalone = 0;
-"./admin-header.php"
+'./admin-header.php'
-    if ($user_level <= 6) {
-        die(__("You have do not have sufficient permissions to edit the options for this blog."));
@@ -129 +101 @@
-
-<div class="wrap">
-<?php echo $current_desc; ?>
-<?php echo $this_file; ?>
+All options
+options.php
-  <input type="hidden" name="action" value="update" />
-
-
+
-<?php
-//Now display all the options for the selected group.
-if ('all' == $_GET['option_group_id']) :
-$options = $wpdb->get_results("SELECT * FROM $wpdb->options ORDER BY option_name");
-endif;
-
-foreach ($options as $option) :
-
-
-
+
+
+
+
+
+
+
-endforeach;
-?>
@@ -151 +123 @@
-</div>
-
-
+
-<?php
-if ($current_long_desc != '') {