Wordpress 2.3.3

[autoinstalls/wordpress.git] / wp-admin / options-permalink.php

diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index ff65875b0df44e5d622c2aa56df845db51882a33..01919feb8aedf82e123212ce50c873c127dea5cd 100644 (file)
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -41,7 +41,7 @@ structure.onfocus = function () { document.getElementById('custom_selection').ch
 
 var aInputs = document.getElementsByTagName('input');
 
 
 var aInputs = document.getElementsByTagName('input');
 

-for (var i = 0; i < aInputs.length; i++) {             
+for (var i = 0; i < aInputs.length; i++) {

 aInputs[i].onclick = aInputs[i].onkeyup = upit;
 }
 }
 aInputs[i].onclick = aInputs[i].onkeyup = upit;
 }
 }


@@ -57,24 +57,34 @@ include('admin-header.php');
 
 $home_path = get_home_path();
 
 
 $home_path = get_home_path();
 

-if ( isset($_POST) ) {
+if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
+       check_admin_referer('update-permalink');
+

        if ( isset($_POST['permalink_structure']) ) {
                $permalink_structure = $_POST['permalink_structure'];
                if (! empty($permalink_structure) )
                        $permalink_structure = preg_replace('#/+#', '/', '/' . $_POST['permalink_structure']);
                $wp_rewrite->set_permalink_structure($permalink_structure);
        }
        if ( isset($_POST['permalink_structure']) ) {
                $permalink_structure = $_POST['permalink_structure'];
                if (! empty($permalink_structure) )
                        $permalink_structure = preg_replace('#/+#', '/', '/' . $_POST['permalink_structure']);
                $wp_rewrite->set_permalink_structure($permalink_structure);
        }

-       
+

        if ( isset($_POST['category_base']) ) {
                $category_base = $_POST['category_base'];
                if (! empty($category_base) )
                        $category_base = preg_replace('#/+#', '/', '/' . $_POST['category_base']);
                $wp_rewrite->set_category_base($category_base);
        }
        if ( isset($_POST['category_base']) ) {
                $category_base = $_POST['category_base'];
                if (! empty($category_base) )
                        $category_base = preg_replace('#/+#', '/', '/' . $_POST['category_base']);
                $wp_rewrite->set_category_base($category_base);
        }

+
+       if ( isset($_POST['tag_base']) ) {
+               $tag_base = $_POST['tag_base'];
+               if (! empty($tag_base) )
+                       $tag_base = preg_replace('#/+#', '/', '/' . $_POST['tag_base']);
+               $wp_rewrite->set_tag_base($tag_base);
+       }

 }
 }

-       
-$permalink_structure = get_settings('permalink_structure');
-$category_base = get_settings('category_base');
+
+$permalink_structure = get_option('permalink_structure');
+$category_base = get_option('category_base');
+$tag_base = get_option( 'tag_base' );

 
 if ( (!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess') )
        $writable = true;
 
 if ( (!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess') )
        $writable = true;


@@ -91,16 +101,19 @@ $wp_rewrite->flush_rules();
 
 <?php if (isset($_POST['submit'])) : ?>
 <div id="message" class="updated fade"><p><?php
 
 <?php if (isset($_POST['submit'])) : ?>
 <div id="message" class="updated fade"><p><?php

-if ($writable)
-       _e('Permalink structure updated.');
+if ( $permalink_structure && !$usingpi && !$writable )
+       _e('You should update your .htaccess now.');

 else
 else

-       _e('You should update your .htaccess now.'); 
+       _e('Permalink structure updated.');

 ?></p></div>
 <?php endif; ?>
 
 ?></p></div>
 <?php endif; ?>
 

-<div class="wrap"> 
-  <h2><?php _e('Customize Permalink Structure') ?></h2> 
-  <p><?php _e('By default WordPress uses web URIs which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URI structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
+<div class="wrap">
+  <h2><?php _e('Customize Permalink Structure') ?></h2>
+<form name="form" action="options-permalink.php" method="post">
+<?php wp_nonce_field('update-permalink') ?>
+<p class="submit"><input type="submit" name="submit" value="<?php _e('Update Permalink Structure &raquo;') ?>" /></p>
+  <p><?php _e('By default WordPress uses web <abbr title="Universal Resource Locator">URL</abbr>s which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>

 
 <?php
 $prefix = '';
 
 <?php
 $prefix = '';


@@ -114,24 +127,23 @@ $structures = array(
        $prefix . '/archives/%post_id%'
        );
 ?>
        $prefix . '/archives/%post_id%'
        );
 ?>

-<form name="form" action="options-permalink.php" method="post"> 

 <h3><?php _e('Common options:'); ?></h3>
 <p>
        <label>
 <h3><?php _e('Common options:'); ?></h3>
 <p>
        <label>

-<input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> /> 
-<?php _e('Default'); ?><br /> <span> &raquo; <code><?php echo get_settings('home'); ?>/?p=123</code></span>
+<input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> />
+<?php _e('Default'); ?><br /> <span> <?php echo _c('&raquo;|Used as a list bullet'); ?> <code><?php echo get_option('home'); ?>/?p=123</code></span>

    </label>
 </p>
 <p>
        <label>
    </label>
 </p>
 <p>
        <label>

-<input name="selection" type="radio" value="<?php echo $structures[1]; ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> 
-<?php _e('Date and name based'); ?><br /> <span> &raquo; <code><?php echo get_settings('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></span>
+<input name="selection" type="radio" value="<?php echo $structures[1]; ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> />
+<?php _e('Date and name based'); ?><br /> <span> <?php echo _c('&raquo;|Used as a list bullet'); ?> <code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></span>

    </label>
 </p>
 <p>
        <label>
    </label>
 </p>
 <p>
        <label>

-<input name="selection" type="radio" value="<?php echo $structures[2]; ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> 
-<?php _e('Numeric'); ?><br /> <span> &raquo; <code><?php echo get_settings('home') . $prefix  ; ?>/archives/123</code></span>
+<input name="selection" type="radio" value="<?php echo $structures[2]; ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> />
+<?php _e('Numeric'); ?><br /> <span> <?php echo _c('&raquo;|Used as a list bullet'); ?> <code><?php echo get_option('home') . $prefix  ; ?>/archives/123</code></span>

    </label>
 </p>
 <p>
    </label>
 </p>
 <p>


@@ -140,33 +152,34 @@ $structures = array(
 <?php if ( !in_array($permalink_structure, $structures) ) { ?>
 checked="checked"
 <?php } ?>
 <?php if ( !in_array($permalink_structure, $structures) ) { ?>
 checked="checked"
 <?php } ?>

- /> 
-<?php _e('Custom, specify below'); ?>  
+ />
+<?php _e('Custom, specify below'); ?>

 </label>
 <br />
 </p>
 </label>
 <br />
 </p>

-<p id="customstructure"><?php _e('Custom structure'); ?>: <input name="permalink_structure" id="permalink_structure" type="text" class="code" style="width: 60%;" value="<?php echo $permalink_structure; ?>" size="50" /></p>
+<p id="customstructure"><?php _e('Custom structure'); ?>: <input name="permalink_structure" id="permalink_structure" type="text" class="code" style="width: 60%;" value="<?php echo attribute_escape($permalink_structure); ?>" size="50" /></p>

 
 <h3><?php _e('Optional'); ?></h3>
 <?php if ($is_apache) : ?>
 
 <h3><?php _e('Optional'); ?></h3>
 <?php if ($is_apache) : ?>

-       <p><?php _e('If you like, you may enter a custom prefix for your category URIs here. For example, <code>/taxonomy/tags</code> would make your category links like <code>http://example.org/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
+       <p><?php _e('If you like, you may enter custom bases for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>/topics/</code> as your category base would make your category links like <code>http://example.org/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>

 <?php else : ?>
 <?php else : ?>

-       <p><?php _e('If you like, you may enter a custom prefix for your category URIs here. For example, <code>/index.php/taxonomy/tags</code> would make your category links like <code>http://example.org/index.php/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
+       <p><?php _e('If you like, you may enter custom bases for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>/topics/</code> as your category base would make your category links like <code>http://example.org/index.php/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>

 <?php endif; ?>
 <?php endif; ?>

-       <p> 
-  <?php _e('Category base'); ?>: <input name="category_base" type="text" class="code"  value="<?php echo $category_base; ?>" size="30" /> 
-     </p> 
-    <p class="submit"> 
-      <input type="submit" name="submit" value="<?php _e('Update Permalink Structure &raquo;') ?>" /> 
-    </p> 
-  </form> 
+       <p>
+  <?php _e('Category base'); ?>: <input name="category_base" id="category_base" type="text" class="code"  value="<?php echo attribute_escape($category_base); ?>" size="30" />
+     </p>
+         <p>
+         <?php _e('Tag base'); ?>: <input name="tag_base" id="tag_base" type="text" class="code"  value="<?php echo attribute_escape($tag_base); ?>" size="30" />
+     </p>
+    <p class="submit">
+      <input type="submit" name="submit" value="<?php _e('Update Permalink Structure &raquo;') ?>" />
+    </p>
+  </form>

 <?php if ( $permalink_structure && !$usingpi && !$writable ) : ?>
   <p><?php _e('If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Make_a_Directory_Writable">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php if ( $permalink_structure && !$usingpi && !$writable ) : ?>
   <p><?php _e('If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Make_a_Directory_Writable">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">

-   <p>
-<textarea rows="5" style="width: 98%;" name="rules"><?php echo $wp_rewrite->mod_rewrite_rules(); ?>
-</textarea>
-    </p>
+<?php wp_nonce_field('update-permalink') ?>
+       <p><textarea rows="5" style="width: 98%;" name="rules" id="rules"><?php echo wp_specialchars($wp_rewrite->mod_rewrite_rules()); ?></textarea></p>

 </form>
 <?php endif; ?>
 
 </form>
 <?php endif; ?>