Log in with username/password: lyceum/lyceum

Changeset 1036

Show
Ignore:
Timestamp:
08/05/07 13:02:49 (1 year ago)
Author:
jjb
Message:

Synching With WordPress? 2.0.11

svn merge --ignore-ancestry ~/ibiblio/wordpress/tags/2.0.10@HEAD ~/ibiblio/wordpress/tags/2.0.11@HEAD lyceum

And then, because of EOL changes in wp-content/themes/default/functions.php (resulting in the entire file being seen as "changed" and also in conflict), I reverted it and ran this:

svn merge --ignore-ancestry -x  --ignore-eol-style ~/ibiblio/wordpress/tags/2.0.10/wp-content/themes/default/functions.php@HEAD ~/ibiblio/wordpress/tags/2.0.11/wp-content/themes/default/functions.php@HEAD wp-content/themes/default/functions.php
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/lyceum/wp-admin/admin-functions.php

    r1034 r1036  
    320320   $comment = get_comment($id); 
    321321 
    322    $comment->comment_content = format_to_edit($comment->comment_content, $richedit); 
     322   $comment->comment_ID = (int) $comment->comment_ID; 
     323   $comment->comment_post_ID = (int) $comment->comment_post_ID; 
     324 
     325   $comment->comment_content = format_to_edit($comment->comment_content); 
    323326   $comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content); 
    324327 
    325328   $comment->comment_author = format_to_edit($comment->comment_author); 
    326329   $comment->comment_author_email = format_to_edit($comment->comment_author_email); 
     330   $comment->comment_author_url = clean_url($comment->comment_author_url); 
    327331   $comment->comment_author_url = format_to_edit($comment->comment_author_url); 
    328332 
     
    877881      $entry['meta_key'] = attribute_escape( $entry['meta_key']); 
    878882      $entry['meta_value'] = attribute_escape( $entry['meta_value']); 
     883      $entry['meta_id'] = (int) $entry['meta_id']; 
    879884      echo " 
    880885         <tr class='$style'> 
     
    957962   $post_ID = (int) $post_ID; 
    958963 
     964   $protected = array( '_wp_attached_file', '_wp_attachment_metadata', '_wp_old_slug', '_wp_page_template' ); 
     965 
    959966   $metakeyselect = $wpdb->escape(stripslashes(trim($_POST['metakeyselect']))); 
    960967   $metakeyinput = $wpdb->escape(stripslashes(trim($_POST['metakeyinput']))); 
     
    971978      if ($metakeyinput) 
    972979         $metakey = $metakeyinput; // default 
     980 
     981      if ( in_array($metakey, $protected) ) 
     982         return false; 
    973983 
    974984      $result = $wpdb->query(" 
     
    989999function update_meta($mid, $mkey, $mvalue) { 
    9901000   global $wpdb; 
     1001 
     1002   $protected = array( '_wp_attached_file', '_wp_attachment_metadata', '_wp_old_slug', '_wp_page_template' ); 
     1003 
     1004   if ( in_array($mkey, $protected) ) 
     1005      return false; 
     1006 
    9911007   $mvalue = maybe_serialize(stripslashes($mvalue)); 
    9921008   $mvalue = $wpdb->escape($mvalue); 
     
    18461862</script> 
    18471863<form enctype="multipart/form-data" id="uploadForm" method="post" action="<?php echo attribute_escape($action) ?>"> 
     1864<?php wp_nonce_field('import-upload'); ?> 
    18481865<label for="upload"><?php _e('File:'); ?></label><input type="file" id="upload" name="import" /> 
    18491866<input type="hidden" name="action" value="save" /> 
  • trunk/src/lyceum/wp-admin/edit-form-advanced.php

    r1008 r1036  
    22assert('isset($blog)'); 
    33 
     4if ( isset($_GET['message']) ) 
     5   $_GET['message'] = (int) $_GET['message']; 
    46$messages[1] = __('Post updated'); 
    57$messages[2] = __('Custom field updated'); 
     
    79?> 
    810<?php if (isset($_GET['message'])) : ?> 
    9 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> 
     11<div id="message" class="updated fade"><p><?php echo wp_specialchars($messages[$_GET['message']]); ?></p></div> 
    1012<?php endif; ?> 
    1113 
     
    2729   wp_nonce_field('add-post'); 
    2830} else { 
     31   $post_ID = (int) $post_ID; 
    2932   $form_action = 'editpost'; 
    3033   $form_extra = "<input type='hidden' name='post_ID' value='$post_ID' />"; 
     
    3235} 
    3336 
    34 $form_pingback = '<input type="hidden" name="post_pingback" value="' . get_option('default_pingback_flag') . '" id="post_pingback" />'; 
    35  
    36 $form_prevstatus = '<input type="hidden" name="prev_status" value="' . $post->post_status . '" />'; 
    37  
    38 $form_trackback = '<input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. str_replace("\n", ' ', $post->to_ping) .'" />'; 
     37$form_pingback = '<input type="hidden" name="post_pingback" value="' . (int) get_option('default_pingback_flag') . '" id="post_pingback" />';  
     38 
     39$form_prevstatus = '<input type="hidden" name="prev_status" value="' . attribute_escape( $post->post_status ) . '" />';  
     40 
     41$form_trackback = '<input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. attribute_escape( str_replace("\n", ' ', $post->to_ping) ) .'" />'; 
    3942 
    4043if ('' != $post->pinged) { 
     
    4750} 
    4851 
    49 $saveasdraft = '<input name="save" type="submit" id="save" tabindex="3" value="' . __('Save and Continue Editing') . '" />'; 
     52$saveasdraft = '<input name="save" type="submit" id="save" tabindex="3" value="' . attribute_escape(__('Save and Continue Editing')) . '" />'; 
    5053 
    5154if (empty($post->post_status)) $post->post_status = 'draft'; 
     
    5356?> 
    5457 
    55 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" /> 
     58<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" /> 
    5659<input type="hidden" name="action" value="<?php echo $form_action ?>" /> 
    57 <input type="hidden" name="post_author" value="<?php echo $post->post_author ?>" /> 
     60<input type="hidden" name="post_author" value="<?php echo attribute_escape($post->post_author) ?>" /> 
    5861 
    5962<?php echo tokeninput('post.php', $form_action, isset($post_ID) ? $post_ID : 0)?> 
     
    9093<fieldset id="passworddiv" class="dbx-box"> 
    9194<h3 class="dbx-handle"><?php _e('Password-Protect Post') ?></h3>  
    92 <div class="dbx-content"><input name="post_password" type="text" size="13" id="post_password" value="<?php echo $post->post_password ?>" /></div> 
     95<div class="dbx-content"><input name="post_password" type="text" size="13" id="post_password" value="<?php echo attribute_escape($post->post_password) ?>" /></div> 
    9396</fieldset> 
    9497 
    9598<fieldset id="slugdiv" class="dbx-box"> 
    9699<h3 class="dbx-handle"><?php _e('Post slug') ?></h3>  
    97 <div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo $post->post_name ?>" /></div> 
     100<div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape($post->post_name) ?>" /></div> 
    98101</fieldset> 
    99102 
     
    133136if ( $post->post_author == $o->ID || ( empty($post_ID) && $user_ID == $o->ID ) ) $selected = 'selected="selected"'; 
    134137else $selected = ''; 
    135 echo "<option value='$o->ID' $selected>$o->display_name</option>"; 
     138echo "<option value='" . (int) $o->ID . "' $selected>" . wp_specialchars($o->display_name) . "</option>"; 
    136139endforeach; 
    137140?> 
     
    148151<fieldset id="titlediv"> 
    149152  <legend><?php _e('Title') ?></legend>  
    150   <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div> 
     153  <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" /></div> 
    151154</fieldset> 
    152155 
     
    232235<?php 
    233236if (current_user_can('upload_files')) { 
    234    $uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID); 
     237   $uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID); 
    235238   $uploading_iframe_src = wp_nonce_url("inline-uploading.php?action=view&amp;post=$uploading_iframe_ID", 'inlineuploading'); 
    236239   $uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src); 
  • trunk/src/lyceum/wp-admin/edit-form-comment.php

    r1004 r1036  
    99<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?> 
    1010<div class="wrap"> 
    11 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" /> 
     11<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" /> 
    1212<input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' /> 
    1313 
     
    2222    <legend><?php _e('Name:') ?></legend> 
    2323   <div> 
    24      <input type="text" name="newcomment_author" size="22" value="<?php echo $comment->comment_author ?>" tabindex="1" id="name" /> 
     24     <input type="text" name="newcomment_author" size="22" value="<?php echo attribute_escape($comment->comment_author); ?>" tabindex="1" id="name" /> 
    2525    </div> 
    2626</fieldset> 
     
    2828        <legend><?php _e('E-mail:') ?></legend> 
    2929      <div> 
    30         <input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email ?>" tabindex="2" id="email" /> 
     30        <input type="text" name="newcomment_author_email" size="30" value="<?php echo attribute_escape($comment->comment_author_email); ?>" tabindex="2" id="email" /> 
    3131    </div> 
    3232</fieldset> 
     
    3434        <legend><?php _e('URI:') ?></legend> 
    3535      <div> 
    36         <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo $comment->comment_author_url ?>" tabindex="3" id="URL" /> 
     36        <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo attribute_escape($comment->comment_author_url); ?>" tabindex="3" id="URL" /> 
    3737    </div> 
    3838</fieldset> 
  • trunk/src/lyceum/wp-admin/edit-form.php

    r1004 r1036  
    88<input type="hidden" name="mode" value="bookmarklet" /> 
    99<?php endif; ?> 
    10 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" /> 
     10<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" /> 
    1111<input type="hidden" name="action" value='post' /> 
    1212 
     
    2323    <fieldset id="titlediv"> 
    2424      <legend><a href="http://wordpress.org/docs/reference/post/#title" title="<?php _e('Help on titles') ?>"><?php _e('Title') ?></a></legend>  
    25      <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div> 
     25     <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" /></div> 
    2626    </fieldset> 
    2727 
     
    5151</script> 
    5252 
    53 <input type="hidden" name="post_pingback" value="<?php echo get_option('default_pingback_flag') ?>" id="post_pingback" /> 
     53<input type="hidden" name="post_pingback" value="<?php echo (int) get_option('default_pingback_flag') ?>" id="post_pingback" /> 
    5454 
    5555<p><label for="trackback"> <?php printf(__('<a href="%s" 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 />'), 'http://wordpress.org/docs/reference/post/#trackback') ?> 
     
    6666      echo '<input name="advanced" type="submit" id="advancededit" tabindex="7" value="' .  __('Advanced Editing &raquo;') . '" />'; 
    6767  } ?> 
    68   <input name="referredby" type="hidden" id="referredby" value="<?php if ( wp_get_referer() ) echo urlencode(wp_get_referer()); ?>" /> 
     68  <input name="referredby" type="hidden" id="referredby" value="<?php if ( $refby = wp_get_referer() ) echo urlencode($refby); ?>" /> 
    6969</p> 
    7070 
  • trunk/src/lyceum/wp-admin/edit-page-form.php

    r1006 r1036  
    1010   $form_extra = "<input type='hidden' name='temp_ID' value='$temp_ID' />"; 
    1111} else { 
     12   $post_ID = (int) $post_ID; 
    1213   $form_action = 'editpost'; 
    1314   $nonce_action = 'update-post_' . $post_ID; 
    1415   $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />"; 
    1516} 
     17 
     18$temp_ID = (int) $temp_ID; 
     19$user_ID = (int) $user_ID; 
    1620 
    1721$sendto = attribute_escape(wp_get_referer()); 
     
    6165<fieldset id="passworddiv" class="dbx-box"> 
    6266<h3 class="dbx-handle"><?php _e('Password-Protect Post') ?></h3>  
    63 <div class="dbx-content"><input name="post_password" type="text" size="13" id="post_password" value="<?php echo $post->post_password ?>" /></div> 
     67<div class="dbx-content"><input name="post_password" type="text" size="13" id="post_password" value="<?php echo attribute_escape($post->post_password); ?>" /></div> 
    6468</fieldset> 
    6569 
     
    8690<fieldset id="slugdiv" class="dbx-box"> 
    8791<h3 class="dbx-handle"><?php _e('Post slug') ?></h3>  
    88 <div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo $post->post_name ?>" /></div> 
     92<div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape($post->post_name); ?>" /></div> 
    8993</fieldset> 
    9094 
     
    99103if ( $post->post_author == $o->ID || ( empty($post_ID) && $user_ID == $o->ID ) ) $selected = 'selected="selected"'; 
    100104else $selected = ''; 
     105$o->ID = (int) $o->ID; 
     106$o->display_name = wp_specialchars( $o->display_name ); 
    101107echo "<option value='$o->ID' $selected>$o->display_name</option>"; 
    102108endforeach; 
     
    119125<fieldset id="titlediv"> 
    120126  <legend><?php _e('Page Title') ?></legend>  
    121   <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div> 
     127  <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" /></div> 
    122128</fieldset> 
    123129 
  • trunk/src/lyceum/wp-admin/import/livejournal.php

    r1034 r1036  
    198198            break; 
    199199         case 1 : 
     200            check_admin_referer('import-upload'); 
    200201            $this->import(); 
    201202            break; 
  • trunk/src/lyceum/wp-admin/import/mt.php

    r1034 r1036  
    153153      echo '<ol id="authors">'; 
    154154      echo '<form action="?import=mt&amp;step=2&amp;id=' . $this->id . '" method="post">'; 
     155      wp_nonce_field('import-mt'); 
    155156      $j = -1; 
    156157      foreach ($authors as $author) { 
     
    423424            break; 
    424425         case 1 : 
     426            check_admin_referer('import-upload'); 
    425427            $this->select_authors(); 
    426428            break; 
    427429         case 2: 
     430            check_admin_referer('import-mt'); 
    428431            $this->import(); 
    429432            break; 
  • trunk/src/lyceum/wp-admin/import/rss.php

    r1005 r1036  
    155155            break; 
    156156         case 1 : 
     157            check_admin_referer('import-upload'); 
    157158            $this->import(); 
    158159            break; 
  • trunk/src/lyceum/wp-admin/link-import.php

    r1008 r1036  
    7878     <h2><?php _e('Importing...') ?></h2> 
    7979<?php 
    80                 $cat_id = $_POST['cat_id']; 
    81                 if (($cat_id == '') || ($cat_id == 0)) { 
    82                     $cat_id  = 1; 
    83                 } 
     80            $cat_id = abs( (int) $_POST['cat_id'] ); 
     81            if ( $cat_id < 1 ) 
     82               $cat_id  = 1; 
    8483 
    8584                $opml_url = $_POST['opml_url']; 
  • trunk/src/lyceum/wp-admin/options.php

    r1006 r1036  
    218218      continue; 
    219219   $disabled = ''; 
     220   $option->option_name = attribute_escape($option->option_name); 
    220221   if ( is_serialized($option->option_value) ) { 
    221222      if ( is_serialized_string($option->option_value) ) { 
    222223         // this is a serialized string, so we should display it 
    223          $value = wp_specialchars(maybe_unserialize($option->option_value), 'single'); 
     224         $value = maybe_unserialize($option->option_value); 
    224225         $options_to_update[] = $option->option_name; 
    225226         $class = 'all-options'; 
     
    230231      } 
    231232   } else { 
    232       $value = wp_specialchars($option->option_value, 'single')
     233      $value = $option->option_value
    233234      $options_to_update[] = $option->option_name; 
    234235      $class = 'all-options'; 
     
    240241<td>"; 
    241242 
    242    if (stristr($value, "\n")) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>$value</textarea>"; 
    243    else echo "<input class='$class' type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . $value . "'$disabled />"; 
    244     
     243   if (strpos($value, "\n") !== false) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>" . wp_specialchars($value) . "</textarea>"; 
     244   else echo "<input class='$class' type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . attribute_escape($value) . "'$disabled />"; 
     245 
    245246   echo "</td> 
    246247   <td>$option->option_description</td> 
     
    256257======= 
    257258<?php $options_to_update = implode(',', $options_to_update); ?> 
    258 <p class="submit"><input type="hidden" name="page_options" value="<?php echo attribute_escape($options_to_update); ?>" /><input type="submit" name="Update" value="<?php _e('Update Options &raquo;') ?>" /></p> 
     259<p class="submit"><input type="hidden" name="page_options" value="<?php echo $options_to_update; ?>" /><input type="submit" name="Update" value="<?php _e('Update Options &raquo;') ?>" /></p> 
    259260>>>>>>> .merge-right.r4890 
    260261  </form> 
  • trunk/src/lyceum/wp-admin/post.php

    r1034 r1036  
    212212 
    213213   validateToken($_REQUEST['token'], 'post.php', 'confirmdeletecomment', $comment); 
    214    if ( ! $comment = get_comment($comment) ) 
     214   if ( ! $comment = get_comment_to_edit($comment) ) 
    215215      die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php')); 
    216216 
  • trunk/src/lyceum/wp-content/themes/default/attachment.php

    • Property svn:eol-style set to native
  • trunk/src/lyceum/wp-content/themes/default/functions.php

    • Property svn:eol-style set to native
    r1004 r1036  
    2222 
    2323function kubrick_header_image() { 
    24    return apply_filters('kubrick_header_image', get_settings('kubrick_header_image')); 
     24   return apply_filters('kubrick_header_image', get_option('kubrick_header_image')); 
    2525} 
    2626 
    2727function kubrick_upper_color() { 
    28    if ( strstr( $url = kubrick_header_image_url(), 'header-img.php?' ) ) { 
     28   if (strpos($url = kubrick_header_image_url(), 'header-img.php?') !== false) { 
    2929      parse_str(substr($url, strpos($url, '?') + 1), $q); 
    3030      return $q['upper']; 
     
    3434 
    3535function kubrick_lower_color() { 
    36    if ( strstr( $url = kubrick_header_image_url(), 'header-img.php?' ) ) { 
     36   if (strpos($url = kubrick_header_image_url(), 'header-img.php?') !== false) { 
    3737      parse_str(substr($url, strpos($url, '?') + 1), $q); 
    3838      return $q['lower']; 
     
    5151 
    5252function kubrick_header_color() { 
    53    return apply_filters('kubrick_header_color', get_settings('kubrick_header_color')); 
     53   return apply_filters('kubrick_header_color', get_option('kubrick_header_color')); 
    5454} 
    5555 
     
    6363 
    6464function kubrick_header_display() { 
    65    return apply_filters('kubrick_header_display', get_settings('kubrick_header_display')); 
     65   return apply_filters('kubrick_header_display', get_option('kubrick_header_display')); 
    6666} 
    6767 
     
    7676   if ( $_GET['page'] == basename(__FILE__) ) { 
    7777      if ( 'save' == $_REQUEST['action'] ) { 
     78         check_admin_referer('kubrick-header'); 
    7879         if ( isset($_REQUEST['njform']) ) { 
    7980            if ( isset($_REQUEST['defaults']) ) { 
     
    8485               if ( '' == $_REQUEST['njfontcolor'] ) 
    8586                  delete_option('kubrick_header_color'); 
    86                else 
    87                   update_option('kubrick_header_color', $_REQUEST['njfontcolor']); 
    88  
     87               else { 
     88                  $fontcolor = preg_replace('/^.*(#[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['njfontcolor']); 
     89                  update_option('kubrick_header_color', $fontcolor); 
     90               } 
    8991               if ( preg_match('/[0-9A-F]{6}|[0-9A-F]{3}/i', $_REQUEST['njuppercolor'], $uc) && preg_match('/[0-9A-F]{6}|[0-9A-F]{3}/i', $_REQUEST['njlowercolor'], $lc) ) { 
    9092                  $uc = ( strlen($uc[0]) == 3 ) ? $uc[0]{0}.$uc[0]{0}.$uc[0]{1}.$uc[0]{1}.$uc[0]{2}.$uc[0]{2} : $uc[0]; 
     
    9496 
    9597               if ( isset($_REQUEST['toggledisplay']) ) { 
    96                   if ( false === get_settings('kubrick_header_display') ) 
     98                  if ( false === get_option('kubrick_header_display') ) 
    9799                     update_option('kubrick_header_display', 'none'); 
    98100                  else 
     
    103105 
    104106            if ( isset($_REQUEST['headerimage']) ) { 
     107               check_admin_referer('kubrick-header'); 
    105108               if ( '' == $_REQUEST['headerimage'] ) 
    106109                  delete_option('kubrick_header_image'); 
    107                else 
    108                   update_option('kubrick_header_image', $_REQUEST['headerimage']); 
     110               else { 
     111                  $headerimage = preg_replace('/^.*?(header-img.php\?upper=[0-9a-fA-F]{6}&lower=[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['headerimage']); 
     112                  update_option('kubrick_header_image', $headerimage); 
     113               } 
    109114            } 
    110115 
    111116            if ( isset($_REQUEST['fontcolor']) ) { 
     117               check_admin_referer('kubrick-header'); 
    112118               if ( '' == $_REQUEST['fontcolor'] ) 
    113119                  delete_option('kubrick_header_color'); 
    114                else 
    115                   update_option('kubrick_header_color', $_REQUEST['fontcolor']); 
     120               else { 
     121                  $fontcolor = preg_replace('/^.*?(#[0-9a-fA-F]{6})?.*$/', '$1', $_REQUEST['fontcolor']); 
     122                  update_option('kubrick_header_color', $fontcolor); 
     123               } 
    116124            } 
    117125 
    118126            if ( isset($_REQUEST['fontdisplay']) ) { 
     127               check_admin_referer('kubrick-header'); 
    119128               if ( '' == $_REQUEST['fontdisplay'] || 'inline' == $_REQUEST['fontdisplay'] ) 
    120129                  delete_option('kubrick_header_display'); 
     
    227236   } 
    228237   function kRevert() { 
    229       document.getElementById('headerimage').value = '<?php echo kubrick_header_image(); ?>'; 
    230       document.getElementById('advuppercolor').value = document.getElementById('uppercolor').value = '#<?php echo kubrick_upper_color(); ?>'; 
    231       document.getElementById('advlowercolor').value = document.getElementById('lowercolor').value = '#<?php echo kubrick_lower_color(); ?>'; 
    232       document.getElementById('header').style.background = 'url("<?php echo kubrick_header_image_url(); ?>") center no-repeat'; 
     238      document.getElementById('headerimage').value = '<?php echo js_escape(kubrick_header_image()); ?>'; 
     239      document.getElementById('advuppercolor').value = document.getElementById('uppercolor').value = '#<?php echo js_escape(kubrick_upper_color()); ?>'; 
     240      document.getElementById('advlowercolor').value = document.getElementById('lowercolor').value = '#<?php echo js_escape(kubrick_lower_color()); ?>'; 
     241      document.getElementById('header').style.background = 'url("<?php echo js_escape(kubrick_header_image_url()); ?>") center no-repeat'; 
    233242      document.getElementById('header').style.color = ''; 
    234       document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '<?php echo kubrick_header_color_string(); ?>'; 
    235       document.getElementById('fontdisplay').value = '<?php echo kubrick_header_display_string(); ?>'; 
     243      document.getElementById('advfontcolor').value = document.getElementById('fontcolor').value = '<?php echo js_escape(kubrick_header_color_string()); ?>'; 
     244      document.getElementById('fontdisplay').value = '<?php echo js_escape(kubrick_header_display_string()); ?>'; 
    236245      document.getElementById('headerimg').style.display = document.getElementById('fontdisplay').value; 
    237246   } 
     
    355364      <div id="nonJsForm"> 
    356365         <form method="post" action=""> 
     366            <?php wp_nonce_field('kubrick-header'); ?> 
    357367            <div class="zerosize"><input type="submit" name="defaultsubmit" value="Save" /></div> 
    358             <label for="njfontcolor">Font Color:</label><input type="text" name="njfontcolor" id="njfontcolor" value="<?php echo kubrick_header_color(); ?>" /> Any CSS color (<code>red</code> or <code>#FF0000</code> or <code>rgb(255, 0, 0)</code>)<br /> 
    359             <label for="njuppercolor">Upper Color:</label><input type="text" name="njuppercolor" id="njuppercolor" value="#<?php echo kubrick_upper_color(); ?>" /> HEX only (<code>#FF0000</code> or <code>#F00</code>)<br /> 
    360             <label for="njlowercolor">Lower Color:</label><input type="text" name="njlowercolor" id="njlowercolor" value="#<?php echo kubrick_lower_color(); ?>" /> HEX only (<code>#FF0000</code> or <code>#F00</code>)<br /> 
    361             <input type="hidden" name="hi" id="hi" value="<?php echo kubrick_header_image(); ?>" /> 
     368            <label for="njfontcolor">Font Color:</label><input type="text" name="njfontcolor" id="njfontcolor" value="<?php echo attribute_escape(kubrick_header_color()); ?>" /> Any CSS color (<code>red</code> or <code>#FF0000</code> or <code>rgb(255, 0, 0)</code>)<br /> 
     369            <label for="njuppercolor">Upper Color:</label><input type="text" name="njuppercolor" id="njuppercolor" value="#<?php echo attribute_escape(kubrick_upper_color()); ?>" /> HEX only (<code>#FF0000</code> or <code>#F00</code>)<br /> 
     370            <label for="njlowercolor">Lower Color:</label><input type="text" name="njlowercolor" id="njlowercolor" value="#<?php echo attribute_escape(kubrick_lower_color()); ?>" /> HEX only (<code>#FF0000</code> or <code>#F00</code>)<br /> 
     371            <input type="hidden" name="hi" id="hi" value="<?php echo attribute_escape(kubrick_header_image()); ?>" /> 
    362372            <input type="submit" name="toggledisplay" id="toggledisplay" value="Toggle Text" /> 
    363373            <input type="submit" name="defaults" value="Use Defaults" /> 
     
    368378      </div> 
    369379      <div id="jsForm"> 
    370          <form style="display:inline;" method="post" name="hicolor" id="hicolor" action="<?php echo $_SERVER['REQUEST_URI']; ?>"> 
     380         <form style="display:inline;" method="post" name="hicolor" id="hicolor" action="<?php echo attribute_escape($_SERVER['REQUEST_URI']); ?>"> 
     381            <?php wp_nonce_field('kubrick-header'); ?> 
    371382            <input type="button" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="Font Color"></input> 
    372383            <input type="button" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="Upper Color"></input> 
     
    374385            <input type="button" name="revert" value="Revert" onclick="kRevert()" /> 
    375386            <input type="button" value="Advanced" onclick="toggleAdvanced()" /> 
    376             <input type="submit" name="submitform" class="defbutton" value="Save" onclick="cp.hidePopup('prettyplease')" /> 
    377387            <input type="hidden" name="action" value="save" /> 
    378             <input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo kubrick_header_display(); ?>" /> 
    379             <input type="hidden" name="fontcolor" id="fontcolor" value="<?php echo kubrick_header_color(); ?>" /> 
    380             <input type="hidden" name="uppercolor" id="uppercolor" value="<?php echo kubrick_upper_color(); ?>" /> 
    381             <input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo kubrick_lower_color(); ?>" /> 
    382             <input type="hidden" name="headerimage" id="headerimage" value="<?php echo kubrick_header_image(); ?>" /> 
     388            <input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo attribute_escape(kubrick_header_display()); ?>" /> 
     389            <input type="hidden" name="fontcolor" id="fontcolor" value="<?php echo attribute_escape(kubrick_header_color()); ?>" /> 
     390            <input type="hidden" name="uppercolor" id="uppercolor" value="<?php echo attribute_escape(kubrick_upper_color()); ?>" /> 
     391            <input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo attribute_escape(kubrick_lower_color()); ?>" /> 
     392            <input type="hidden" name="headerimage" id="headerimage" value="<?php echo attribute_escape(kubrick_header_image()); ?>" /> 
     393            <p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php _e('Update Header &raquo;'); ?>" onclick="cp.hidePopup('prettyplease')" /></p> 
    383394         </form> 
    384395         <div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div> 
    385396         <div id="advanced"> 
    386397            <form id="jsAdvanced" style="display:none;" action=""> 
    387                <label for="advfontcolor">Font Color (CSS): </label><input type="text" id="advfontcolor" onchange="advUpdate(this.value, 'fontcolor')" value="<?php echo kubrick_header_color(); ?>" /><br /> 
    388                <label for="advuppercolor">Upper Color (HEX): </label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo kubrick_upper_color(); ?>" /><br /> 
    389                <label for="advlowercolor">Lower Color (HEX): </label><input type="text" id="advlowercolor" onchange="advUpdate(this.value, 'lowercolor')" value="#<?php echo kubrick_lower_color(); ?>" /><br /> 
     398               <?php wp_nonce_field('kubrick-header'); ?> 
     399               <label for="advfontcolor">Font Color (CSS): </label><input type="text" id="advfontcolor" onchange="advUpdate(this.value, 'fontcolor')" value="<?php echo attribute_escape(kubrick_header_color()); ?>" /><br /> 
     400               <label for="advuppercolor">Upper Color (HEX): </label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo attribute_escape(kubrick_upper_color()); ?>" /><br /> 
     401               <label for="advlowercolor">Lower Color (HEX): </label><input type="text" id="advlowercolor" onchange="advUpdate(this.value, 'lowercolor')" value="#<?php echo attribute_escape(kubrick_lower_color()); ?>" /><br /> 
    390402               <input type="button" name="default" value="Select Default Colors" onclick="kDefaults()" /><br /> 
    391403               <input type="button" onclick="toggleDisplay();return false;" name="pick" id="pick" value="Toggle Text Display"></input><br /> 
  • trunk/src/lyceum/wp-includes/functions-formatting.php

    r1034 r1036  
    10691069function js_escape($text) { 
    10701070   $safe_text = wp_specialchars($text, 'double'); 
    1071    $safe_text = str_replace('&#039;', "'", $safe_text); 
     1071   $safe_text = preg_replace('/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes($safe_text)); 
    10721072   $safe_text = preg_replace("/\r?\n/", "\\n", addslashes($safe_text)); 
    10731073   return apply_filters('js_escape', $safe_text, $text); 
  • trunk/src/lyceum/wp-includes/functions.php

    r1034 r1036  
    300300/* Options functions */ 
    301301 
     302// expects $setting to already be SQL-escaped 
    302303function get_settings($setting) { 
    303304   global $wpdb; 
     
    385386} 
    386387 
     388// expects $option_name to NOT be SQL-escaped 
    387389function update_option($option_name, $newvalue) { 
    388390   global $wpdb; 
     
    390392   assert('isset($blog)'); 
    391393 
     394   $safe_option_name = $wpdb->escape($option_name); 
     395 
    392396   if ( is_string($newvalue) ) 
    393397      $newvalue = trim($newvalue); 
    394398 
    395399   // If the new and old values are the same, no need to update. 
    396    $oldvalue = get_option($option_name); 
     400   $oldvalue = get_option($safe_option_name); 
    397401   if ( $newvalue == $oldvalue ) { 
    398402      return false; 
     
    434438 
    435439// thx Alex Stapleton, http://alex.vort-x.net/blog/ 
     440// expects $name to NOT be SQL-escaped 
    436441function add_option($name, $value = '', $description = '', $autoload = 'yes') { 
    437442   global $wpdb; 
     
    444449      $blogvalue = 0; 
    445450    
     451   $safe_name = $wpdb->escape($name); 
     452 
    446453   // Make sure the option doesn't already exist 
    447    if ( false !== get_option($name) ) 
     454   if ( false !== get_option($safe_name) ) 
    448455      return; 
    449456 
  • trunk/src/lyceum/wp-includes/pluggable-functions.php

    r1034 r1036  
    126126   if ( $userdata ) 
    127127      return $userdata; 
     128 
     129   $user_login = $wpdb->escape($user_login); 
    128130 
    129131   if ( !$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'") ) 
  • trunk/src/lyceum/wp-includes/version.php

    r1034 r1036  
    33// This just holds the version number, in a separate file so we can bump it without cluttering the SVN 
    44 
    5 $wp_version = '1.0.10.0-beta'; 
     5$wp_version = '1.0.11.0-beta'; 
    66$wp_db_version = 2; 
    77 
  • trunk/src/lyceum/wp-links-opml.php

    r1006 r1036  
    2929<?php $sql = "SELECT $wpdb->links.link_url, link_rss, $wpdb->links.link_name, $wpdb->links.link_category, $wpdb->linkcategories.cat_name, link_updated  
    3030FROM $wpdb->links  
    31  JOIN $wpdb->linkcategories on $wpdb->links.link_category = $wpdb->linkcategories.cat_id 
     31 INNER JOIN $wpdb->linkcategories on $wpdb->links.link_category = $wpdb->linkcategories.cat_id 
    3232 AND $wpdb->links.link_visible = 'Y' 
    3333 AND $wpdb->linkcategories.blog = '$blog' 
  • trunk/src/lyceum/wp-mail.php

    r543 r1036  
    6060         // Set the author using the email address (To or Reply-To, the last used) 
    6161         // otherwise use the site admin 
    62          if (preg_match('/From: /', $line) | preg_match('Reply-To: /', $line))  { 
     62         if (preg_match('/From: /', $line) | preg_match('/Reply-To: /', $line))  { 
    6363            $author=trim($line); 
    6464         if ( ereg("([a-zA-Z0-9\_\-\.]+@[\a-zA-z0-9\_\-\.]+)", $author , $regs) ) { 
  • trunk/src/lyceum/xmlrpc.php

    r1034 r1036  
    433433       return new IXR_Error(401, 'Sorry, you do not have the right to edit this post.'); 
    434434 
    435      extract($actual_post); 
     435     extract($actual_post, EXTR_SKIP); 
    436436 
    437437     if ( ('publish' == $post_status) && !current_user_can('publish_posts') ) 
     
    599599 
    600600     $postdata = wp_get_single_post($post_ID, ARRAY_A); 
    601      extract($postdata); 
    602601      $this->escape($postdata); 
     602      extract($postdata, EXTR_SKIP); 
    603603 
    604604     $post_title = $content_struct['title']; 
Log in with username/password: lyceum/lyceum