[wp-cvs] wordpress/wp-admin admin-header.php, 1.31, 1.32 bookmarklet.php, 1.13, 1.14 categories.php, 1.39, 1.40 edit-comments.php, 1.34, 1.35 edit.php, 1.34, 1.35

[Matthew Mullenweg]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1798/wp-admin

Modified Files:
	admin-header.php bookmarklet.php categories.php 
	edit-comments.php edit.php 
Log Message:
Input cleanup

Index: edit-comments.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-comments.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** edit-comments.php	18 Sep 2004 05:56:28 -0000	1.34
--- edit-comments.php	5 Oct 2004 06:59:12 -0000	1.35
***************
*** 29,33 ****
    <fieldset> 
    <legend><?php _e('Show Comments That Contain...') ?></legend> 
!   <input type="text" name="s" value="<?php if (isset($s)) echo $s; ?>" size="17" /> 
    <input type="submit" name="submit" value="<?php _e('Search') ?>"  />  
    <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
--- 29,33 ----
    <fieldset> 
    <legend><?php _e('Show Comments That Contain...') ?></legend> 
!   <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo htmlspecialchars($_GET['s']); ?>" size="17" /> 
    <input type="submit" name="submit" value="<?php _e('Search') ?>"  />  
    <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
***************
*** 149,153 ****
  </div>
  
! <?php 
! include('admin-footer.php');
! ?>
--- 149,151 ----
  </div>
  
! <?php include('admin-footer.php'); ?>
\ No newline at end of file

Index: categories.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/categories.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** categories.php	22 Aug 2004 23:24:50 -0000	1.39
--- categories.php	5 Oct 2004 06:59:12 -0000	1.40
***************
*** 98,102 ****
      <form name="editcat" action="categories.php" method="post">
          <input type="hidden" name="action" value="editedcat" />
!         <input type="hidden" name="cat_ID" value="<?php echo $_GET['cat_ID'] ?>" />
          <p><?php _e('Category name:') ?><br />
          <input type="text" name="cat_name" value="<?php echo htmlspecialchars($cat_name); ?>" /></p>
--- 98,102 ----
      <form name="editcat" action="categories.php" method="post">
          <input type="hidden" name="action" value="editedcat" />
!         <input type="hidden" name="cat_ID" value="<?php echo $cat_ID ?>" />
          <p><?php _e('Category name:') ?><br />
          <input type="text" name="cat_name" value="<?php echo htmlspecialchars($cat_name); ?>" /></p>

Index: admin-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-header.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** admin-header.php	14 Sep 2004 10:17:12 -0000	1.31
--- admin-header.php	5 Oct 2004 06:59:12 -0000	1.32
***************
*** 42,59 ****
  <link rel="shortcut icon" href="../wp-images/wp-favicon.png" />
  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" />
- <?php
- if ($redirect==1) {
- ?>
- <script type="text/javascript">
- <!--
- function redirect() {
-   window.location = "<?php echo $redirect_url; ?>";
- }
- setTimeout("redirect();", 600);
- //-->
- </script>
- <?php
- } // redirect
- ?>
  
  <?php if (isset($xfn)) : ?>
--- 42,45 ----

Index: bookmarklet.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/bookmarklet.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** bookmarklet.php	20 Sep 2004 09:37:30 -0000	1.13
--- bookmarklet.php	5 Oct 2004 06:59:12 -0000	1.14
***************
*** 1,7 ****
  <?php
- /* <Bookmarklet> */
- 
- // accepts 'post_title' and 'content' as vars passed in. Add-on from Alex King
- 
  $mode = 'bookmarklet';
  
--- 1,3 ----
***************
*** 24,33 ****
  </head>
  <body></body>
! </html><?php
! 
  } else {
! 
!     $popuptitle = stripslashes($popuptitle);
!     $text = stripslashes(urldecode($text));
      
      /* big funky fixes for browsers' javascript bugs */
--- 20,28 ----
  </head>
  <body></body>
! </html>
! <?php
  } else {
!     $popuptitle = htmlspecialchars(stripslashes($popuptitle));
!     $text = htmlspecialchars(stripslashes(urldecode($text)));
      
      /* big funky fixes for browsers' javascript bugs */
***************
*** 58,62 ****
  // the var instead of changing the assignment on the lines above. 
  // -- Alex King 2004-01-07
!     $edited_post_title = $post_title;
  
  // $post_pingback needs to be set in any file that includes edit-form.php
--- 53,57 ----
  // the var instead of changing the assignment on the lines above. 
  // -- Alex King 2004-01-07
!     $edited_post_title = htmlspecialchars($post_title);
  
  // $post_pingback needs to be set in any file that includes edit-form.php

Index: edit.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** edit.php	28 Sep 2004 01:22:35 -0000	1.34
--- edit.php	5 Oct 2004 06:59:13 -0000	1.35
***************
*** 66,70 ****
  	echo $month[substr( $_GET['m'], 4, 2 )] . ' ' . substr( $_GET['m'], 0, 4 );
  } elseif ( isset( $_GET['s'] ) ) {
! 	printf(__('Search for &#8220;%s&#8221;'), $_GET['s']);
  } else {
  	_e('Last 15 Posts');
--- 66,70 ----
  	echo $month[substr( $_GET['m'], 4, 2 )] . ' ' . substr( $_GET['m'], 0, 4 );
  } elseif ( isset( $_GET['s'] ) ) {
! 	printf(__('Search for &#8220;%s&#8221;'), htmlspecialchars($_GET['s']) );
  } else {
  	_e('Last 15 Posts');