Changeset 1036
- Timestamp:
- 08/05/07 13:02:49 (1 year ago)
- Files:
-
- trunk/src/lyceum/wp-admin/admin-functions.php (modified) (6 diffs)
- trunk/src/lyceum/wp-admin/edit-form-advanced.php (modified) (10 diffs)
- trunk/src/lyceum/wp-admin/edit-form-comment.php (modified) (4 diffs)
- trunk/src/lyceum/wp-admin/edit-form.php (modified) (4 diffs)
- trunk/src/lyceum/wp-admin/edit-page-form.php (modified) (5 diffs)
- trunk/src/lyceum/wp-admin/import/livejournal.php (modified) (1 diff)
- trunk/src/lyceum/wp-admin/import/mt.php (modified) (2 diffs)
- trunk/src/lyceum/wp-admin/import/rss.php (modified) (1 diff)
- trunk/src/lyceum/wp-admin/link-import.php (modified) (1 diff)
- trunk/src/lyceum/wp-admin/options.php (modified) (4 diffs)
- trunk/src/lyceum/wp-admin/post.php (modified) (1 diff)
- trunk/src/lyceum/wp-content/themes/default/attachment.php (modified) (1 prop)
- trunk/src/lyceum/wp-content/themes/default/functions.php (modified) (12 diffs, 1 prop)
- trunk/src/lyceum/wp-includes/functions-formatting.php (modified) (1 diff)
- trunk/src/lyceum/wp-includes/functions.php (modified) (5 diffs)
- trunk/src/lyceum/wp-includes/pluggable-functions.php (modified) (1 diff)
- trunk/src/lyceum/wp-includes/version.php (modified) (1 diff)
- trunk/src/lyceum/wp-links-opml.php (modified) (1 diff)
- trunk/src/lyceum/wp-mail.php (modified) (1 diff)
- trunk/src/lyceum/xmlrpc.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/lyceum/wp-admin/admin-functions.php
r1034 r1036 320 320 $comment = get_comment($id); 321 321 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); 323 326 $comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content); 324 327 325 328 $comment->comment_author = format_to_edit($comment->comment_author); 326 329 $comment->comment_author_email = format_to_edit($comment->comment_author_email); 330 $comment->comment_author_url = clean_url($comment->comment_author_url); 327 331 $comment->comment_author_url = format_to_edit($comment->comment_author_url); 328 332 … … 877 881 $entry['meta_key'] = attribute_escape( $entry['meta_key']); 878 882 $entry['meta_value'] = attribute_escape( $entry['meta_value']); 883 $entry['meta_id'] = (int) $entry['meta_id']; 879 884 echo " 880 885 <tr class='$style'> … … 957 962 $post_ID = (int) $post_ID; 958 963 964 $protected = array( '_wp_attached_file', '_wp_attachment_metadata', '_wp_old_slug', '_wp_page_template' ); 965 959 966 $metakeyselect = $wpdb->escape(stripslashes(trim($_POST['metakeyselect']))); 960 967 $metakeyinput = $wpdb->escape(stripslashes(trim($_POST['metakeyinput']))); … … 971 978 if ($metakeyinput) 972 979 $metakey = $metakeyinput; // default 980 981 if ( in_array($metakey, $protected) ) 982 return false; 973 983 974 984 $result = $wpdb->query(" … … 989 999 function update_meta($mid, $mkey, $mvalue) { 990 1000 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 991 1007 $mvalue = maybe_serialize(stripslashes($mvalue)); 992 1008 $mvalue = $wpdb->escape($mvalue); … … 1846 1862 </script> 1847 1863 <form enctype="multipart/form-data" id="uploadForm" method="post" action="<?php echo attribute_escape($action) ?>"> 1864 <?php wp_nonce_field('import-upload'); ?> 1848 1865 <label for="upload"><?php _e('File:'); ?></label><input type="file" id="upload" name="import" /> 1849 1866 <input type="hidden" name="action" value="save" /> trunk/src/lyceum/wp-admin/edit-form-advanced.php
r1008 r1036 2 2 assert('isset($blog)'); 3 3 4 if ( isset($_GET['message']) ) 5 $_GET['message'] = (int) $_GET['message']; 4 6 $messages[1] = __('Post updated'); 5 7 $messages[2] = __('Custom field updated'); … … 7 9 ?> 8 10 <?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> 10 12 <?php endif; ?> 11 13 … … 27 29 wp_nonce_field('add-post'); 28 30 } else { 31 $post_ID = (int) $post_ID; 29 32 $form_action = 'editpost'; 30 33 $form_extra = "<input type='hidden' name='post_ID' value='$post_ID' />"; … … 32 35 } 33 36 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) ) .'" />'; 39 42 40 43 if ('' != $post->pinged) { … … 47 50 } 48 51 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')) . '" />'; 50 53 51 54 if (empty($post->post_status)) $post->post_status = 'draft'; … … 53 56 ?> 54 57 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 ?>" /> 56 59 <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) ?>" /> 58 61 59 62 <?php echo tokeninput('post.php', $form_action, isset($post_ID) ? $post_ID : 0)?> … … 90 93 <fieldset id="passworddiv" class="dbx-box"> 91 94 <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> 93 96 </fieldset> 94 97 95 98 <fieldset id="slugdiv" class="dbx-box"> 96 99 <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> 98 101 </fieldset> 99 102 … … 133 136 if ( $post->post_author == $o->ID || ( empty($post_ID) && $user_ID == $o->ID ) ) $selected = 'selected="selected"'; 134 137 else $selected = ''; 135 echo "<option value=' $o->ID' $selected>$o->display_name</option>";138 echo "<option value='" . (int) $o->ID . "' $selected>" . wp_specialchars($o->display_name) . "</option>"; 136 139 endforeach; 137 140 ?> … … 148 151 <fieldset id="titlediv"> 149 152 <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> 151 154 </fieldset> 152 155 … … 232 235 <?php 233 236 if (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); 235 238 $uploading_iframe_src = wp_nonce_url("inline-uploading.php?action=view&post=$uploading_iframe_ID", 'inlineuploading'); 236 239 $uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src); trunk/src/lyceum/wp-admin/edit-form-comment.php
r1004 r1036 9 9 <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?> 10 10 <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 ?>" /> 12 12 <input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' /> 13 13 … … 22 22 <legend><?php _e('Name:') ?></legend> 23 23 <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" /> 25 25 </div> 26 26 </fieldset> … … 28 28 <legend><?php _e('E-mail:') ?></legend> 29 29 <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" /> 31 31 </div> 32 32 </fieldset> … … 34 34 <legend><?php _e('URI:') ?></legend> 35 35 <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" /> 37 37 </div> 38 38 </fieldset> trunk/src/lyceum/wp-admin/edit-form.php
r1004 r1036 8 8 <input type="hidden" name="mode" value="bookmarklet" /> 9 9 <?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 ?>" /> 11 11 <input type="hidden" name="action" value='post' /> 12 12 … … 23 23 <fieldset id="titlediv"> 24 24 <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> 26 26 </fieldset> 27 27 … … 51 51 </script> 52 52 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" /> 54 54 55 55 <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') ?> … … 66 66 echo '<input name="advanced" type="submit" id="advancededit" tabindex="7" value="' . __('Advanced Editing »') . '" />'; 67 67 } ?> 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); ?>" /> 69 69 </p> 70 70 trunk/src/lyceum/wp-admin/edit-page-form.php
r1006 r1036 10 10 $form_extra = "<input type='hidden' name='temp_ID' value='$temp_ID' />"; 11 11 } else { 12 $post_ID = (int) $post_ID; 12 13 $form_action = 'editpost'; 13 14 $nonce_action = 'update-post_' . $post_ID; 14 15 $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />"; 15 16 } 17 18 $temp_ID = (int) $temp_ID; 19 $user_ID = (int) $user_ID; 16 20 17 21 $sendto = attribute_escape(wp_get_referer()); … … 61 65 <fieldset id="passworddiv" class="dbx-box"> 62 66 <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> 64 68 </fieldset> 65 69 … … 86 90 <fieldset id="slugdiv" class="dbx-box"> 87 91 <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> 89 93 </fieldset> 90 94 … … 99 103 if ( $post->post_author == $o->ID || ( empty($post_ID) && $user_ID == $o->ID ) ) $selected = 'selected="selected"'; 100 104 else $selected = ''; 105 $o->ID = (int) $o->ID; 106 $o->display_name = wp_specialchars( $o->display_name ); 101 107 echo "<option value='$o->ID' $selected>$o->display_name</option>"; 102 108 endforeach; … … 119 125 <fieldset id="titlediv"> 120 126 <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> 122 128 </fieldset> 123 129 trunk/src/lyceum/wp-admin/import/livejournal.php
r1034 r1036 198 198 break; 199 199 case 1 : 200 check_admin_referer('import-upload'); 200 201 $this->import(); 201 202 break; trunk/src/lyceum/wp-admin/import/mt.php
r1034 r1036 153 153 echo '<ol id="authors">'; 154 154 echo '<form action="?import=mt&step=2&id=' . $this->id . '" method="post">'; 155 wp_nonce_field('import-mt'); 155 156 $j = -1; 156 157 foreach ($authors as $author) { … … 423 424 break; 424 425 case 1 : 426 check_admin_referer('import-upload'); 425 427 $this->select_authors(); 426 428 break; 427 429 case 2: 430 check_admin_referer('import-mt'); 428 431 $this->import(); 429 432 break; trunk/src/lyceum/wp-admin/import/rss.php
r1005 r1036 155 155 break; 156 156 case 1 : 157 check_admin_referer('import-upload'); 157 158 $this->import(); 158 159 break; trunk/src/lyceum/wp-admin/link-import.php
r1008 r1036 78 78 <h2><?php _e('Importing...') ?></h2> 79 79 <?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; 84 83 85 84 $opml_url = $_POST['opml_url']; trunk/src/lyceum/wp-admin/options.php
r1006 r1036 218 218 continue; 219 219 $disabled = ''; 220 $option->option_name = attribute_escape($option->option_name); 220 221 if ( is_serialized($option->option_value) ) { 221 222 if ( is_serialized_string($option->option_value) ) { 222 223 // 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); 224 225 $options_to_update[] = $option->option_name; 225 226 $class = 'all-options'; … … 230 231 } 231 232 } else { 232 $value = wp_specialchars($option->option_value, 'single');233 $value = $option->option_value; 233 234 $options_to_update[] = $option->option_name; 234 235 $class = 'all-options'; … … 240 241 <td>"; 241 242 242 if (str istr($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 245 246 echo "</td> 246 247 <td>$option->option_description</td> … … 256 257 ======= 257 258 <?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 »') ?>" /></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 »') ?>" /></p> 259 260 >>>>>>> .merge-right.r4890 260 261 </form> trunk/src/lyceum/wp-admin/post.php
r1034 r1036 212 212 213 213 validateToken($_REQUEST['token'], 'post.php', 'confirmdeletecomment', $comment); 214 if ( ! $comment = get_comment ($comment) )214 if ( ! $comment = get_comment_to_edit($comment) ) 215 215 die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php')); 216 216 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 22 22 23 23 function 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')); 25 25 } 26 26 27 27 function 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) { 29 29 parse_str(substr($url, strpos($url, '?') + 1), $q); 30 30 return $q['upper']; … … 34 34 35 35 function 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) { 37 37 parse_str(substr($url, strpos($url, '?') + 1), $q); 38 38 return $q['lower']; … … 51 51 52 52 function 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')); 54 54 } 55 55 … … 63 63 64 64 function 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')); 66 66 } 67 67 … … 76 76 if ( $_GET['page'] == basename(__FILE__) ) { 77 77 if ( 'save' == $_REQUEST['action'] ) { 78 check_admin_referer('kubrick-header'); 78 79 if ( isset($_REQUEST['njform']) ) { 79 80 if ( isset($_REQUEST['defaults']) ) { … … 84 85 if ( '' == $_REQUEST['njfontcolor'] ) 85 86 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 } 89 91 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) ) { 90 92 $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]; … … 94 96 95 97 if ( isset($_REQUEST['toggledisplay']) ) { 96 if ( false === get_ settings('kubrick_header_display') )98 if ( false === get_option('kubrick_header_display') ) 97 99 update_option('kubrick_header_display', 'none'); 98 100 else … … 103 105 104 106 if ( isset($_REQUEST['headerimage']) ) { 107 check_admin_referer('kubrick-header'); 105 108 if ( '' == $_REQUEST['headerimage'] ) 106 109 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 } 109 114 } 110 115 111 116 if ( isset($_REQUEST['fontcolor']) ) { 117 check_admin_referer('kubrick-header'); 112 118 if ( '' == $_REQUEST['fontcolor'] ) 113 119 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 } 116 124 } 117 125 118 126 if ( isset($_REQUEST['fontdisplay']) ) { 127 check_admin_referer('kubrick-header'); 119 128 if ( '' == $_REQUEST['fontdisplay'] || 'inline' == $_REQUEST['fontdisplay'] ) 120 129 delete_option('kubrick_header_display'); … … 227 236 } 228 237 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'; 233 242 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()); ?>'; 236 245 document.getElementById('headerimg').style.display = document.getElementById('fontdisplay').value; 237 246 } … … 355 364 <div id="nonJsForm"> 356 365 <form method="post" action=""> 366 <?php wp_nonce_field('kubrick-header'); ?> 357 367 <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()); ?>" /> 362 372 <input type="submit" name="toggledisplay" id="toggledisplay" value="Toggle Text" /> 363 373 <input type="submit" name="defaults" value="Use Defaults" /> … … 368 378 </div> 369 379 <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'); ?> 371 382 <input type="button" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="Font Color"></input> 372 383 <input type="button" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="Upper Color"></input> … … 374 385 <input type="button" name="revert" value="Revert" onclick="kRevert()" /> 375 386 <input type="button" value="Advanced" onclick="toggleAdvanced()" /> 376 <input type="submit" name="submitform" class="defbutton" value="Save" onclick="cp.hidePopup('prettyplease')" />377 387 <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 »'); ?>" onclick="cp.hidePopup('prettyplease')" /></p> 383 394 </form> 384 395 <div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div> 385 396 <div id="advanced"> 386 397 <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 /> 390 402 <input type="button" name="default" value="Select Default Colors" onclick="kDefaults()" /><br /> 391 403 <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 1069 1069 function js_escape($text) { 1070 1070 $safe_text = wp_specialchars($text, 'double'); 1071 $safe_text = str_replace(''', "'", $safe_text);1071 $safe_text = preg_replace('/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes($safe_text)); 1072 1072 $safe_text = preg_replace("/\r?\n/", "\\n", addslashes($safe_text)); 1073 1073 return apply_filters('js_escape', $safe_text, $text); trunk/src/lyceum/wp-includes/functions.php
r1034 r1036 300 300 /* Options functions */ 301 301 302 // expects $setting to already be SQL-escaped 302 303 function get_settings($setting) { 303 304 global $wpdb; … … 385 386 } 386 387 388 // expects $option_name to NOT be SQL-escaped 387 389 function update_option($option_name, $newvalue) { 388 390 global $wpdb; … … 390 392 assert('isset($blog)'); 391 393 394 $safe_option_name = $wpdb->escape($option_name); 395 392 396 if ( is_string($newvalue) ) 393 397 $newvalue = trim($newvalue); 394 398 395 399 // 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); 397 401 if ( $newvalue == $oldvalue ) { 398 402 return false; … … 434 438 435 439 // thx Alex Stapleton, http://alex.vort-x.net/blog/ 440 // expects $name to NOT be SQL-escaped 436 441 function add_option($name, $value = '', $description = '', $autoload = 'yes') { 437 442 global $wpdb; … … 444 449 $blogvalue = 0; 445 450 451 $safe_name = $wpdb->escape($name); 452 446 453 // Make sure the option doesn't already exist 447 if ( false !== get_option($ name) )454 if ( false !== get_option($safe_name) ) 448 455 return; 449 456 trunk/src/lyceum/wp-includes/pluggable-functions.php
r1034 r1036 126 126 if ( $userdata ) 127 127 return $userdata; 128 129 $user_login = $wpdb->escape($user_login); 128 130 129 131 if ( !$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'") ) trunk/src/lyceum/wp-includes/version.php
r1034 r1036 3 3 // This just holds the version number, in a separate file so we can bump it without cluttering the SVN 4 4 5 $wp_version = '1.0.1 0.0-beta';5 $wp_version = '1.0.11.0-beta'; 6 6 $wp_db_version = 2; 7 7 trunk/src/lyceum/wp-links-opml.php
r1006 r1036 29 29 <?php $sql = "SELECT $wpdb->links.link_url, link_rss, $wpdb->links.link_name, $wpdb->links.link_category, $wpdb->linkcategories.cat_name, link_updated 30 30 FROM $wpdb->links 31 JOIN $wpdb->linkcategories on $wpdb->links.link_category = $wpdb->linkcategories.cat_id31 INNER JOIN $wpdb->linkcategories on $wpdb->links.link_category = $wpdb->linkcategories.cat_id 32 32 AND $wpdb->links.link_visible = 'Y' 33 33 AND $wpdb->linkcategories.blog = '$blog' trunk/src/lyceum/wp-mail.php
r543 r1036 60 60 // Set the author using the email address (To or Reply-To, the last used) 61 61 // 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)) { 63 63 $author=trim($line); 64 64 if ( ereg("([a-zA-Z0-9\_\-\.]+@[\a-zA-z0-9\_\-\.]+)", $author , $regs) ) { trunk/src/lyceum/xmlrpc.php
r1034 r1036 433 433 return new IXR_Error(401, 'Sorry, you do not have the right to edit this post.'); 434 434 435 extract($actual_post );435 extract($actual_post, EXTR_SKIP); 436 436 437 437 if ( ('publish' == $post_status) && !current_user_can('publish_posts') ) … … 599 599 600 600 $postdata = wp_get_single_post($post_ID, ARRAY_A); 601 extract($postdata);602 601 $this->escape($postdata); 602 extract($postdata, EXTR_SKIP); 603 603 604 604 $post_title = $content_struct['title'];
