diff options
| -rw-r--r-- | wp-inst/wp-admin/admin-db.php | 57 | ||||
| -rw-r--r-- | wp-inst/wp-admin/edit-form-advanced.php | 2 | ||||
| -rw-r--r-- | wp-inst/wp-admin/edit-page-form.php | 2 | ||||
| -rw-r--r-- | wp-inst/wp-admin/upgrade-schema.php | 180 | ||||
| -rw-r--r-- | wp-inst/wp-includes/kses.php | 671 | ||||
| -rw-r--r-- | wp-inst/wp-includes/registration-functions.php | 2 |
6 files changed, 419 insertions, 495 deletions
diff --git a/wp-inst/wp-admin/admin-db.php b/wp-inst/wp-admin/admin-db.php index e6c8584..7ef41b0 100644 --- a/wp-inst/wp-admin/admin-db.php +++ b/wp-inst/wp-admin/admin-db.php @@ -12,34 +12,27 @@ function get_others_drafts( $user_id ) { global $wpdb; $user = get_userdata( $user_id ); $level_key = $wpdb->prefix . 'user_level'; - if ( 1 < $user->user_level ) { - $editable = get_editable_user_ids( $user_id ); + + $editable = get_editable_user_ids( $user_id ); - if( !$editable ) { - $other_drafts = ''; - } else { - $editable = join(',', $editable); - $other_drafts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_status = 'draft' AND post_author IN ($editable) AND post_author != '$user_id' "); - } + if( !$editable ) { + $other_drafts = ''; } else { - $other_drafts = false; + $editable = join(',', $editable); + $other_drafts = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_status = 'draft' AND post_author IN ($editable) AND post_author != '$user_id' "); } + return apply_filters('get_others_drafts', $other_drafts); } function get_editable_authors( $user_id ) { global $wpdb; - $user = get_userdata( $user_id ); - $level_key = $wpdb->prefix . 'user_level'; - - if ( 7 > $user->user_level ) // TODO: ROLE SYSTEM - return false; $editable = get_editable_user_ids( $user_id ); - if( !$editable ) - return false; - else { + if( !$editable ) { + return false; + } else { $editable = join(',', $editable); $authors = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($editable)" ); } @@ -49,24 +42,24 @@ function get_editable_authors( $user_id ) { function get_editable_user_ids( $user_id, $exclude_zeros = true ) { global $wpdb; - $user = get_userdata( $user_id ); + + $user = new WP_User( $user_id ); + + if ( ! $user->has_cap('edit_others_posts') ) { + echo "no cap<br/>"; + if ( $user->has_cap('edit_posts') || $exclude_zeros == false ) + return array($user->id); + else + return false; + } + $level_key = $wpdb->prefix . 'user_level'; - $query = "SELECT * FROM $wpdb->usermeta WHERE meta_key = '$level_key'"; + $query = "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$level_key'"; if ( $exclude_zeros ) $query .= " AND meta_value != '0'"; - $possible = $wpdb->get_results( $query ); - - if ( !$possible ) - return false; - - $user_ids = array(); - foreach ( $possible as $mark ) - if ( intval($mark->meta_value) <= $user->user_level ) - $user_ids[] = $mark->user_id; - if ( empty( $user_ids ) ) - return false; - return $user_ids; + + return $wpdb->get_col( $query ); } function get_author_user_ids() { @@ -87,4 +80,4 @@ function get_nonauthor_user_ids() { return $wpdb->get_col( $query ); } -?>
\ No newline at end of file +?> diff --git a/wp-inst/wp-admin/edit-form-advanced.php b/wp-inst/wp-admin/edit-form-advanced.php index 3524c53..8818da0 100644 --- a/wp-inst/wp-admin/edit-form-advanced.php +++ b/wp-inst/wp-admin/edit-form-advanced.php @@ -105,7 +105,7 @@ addLoadEvent(focusit); </fieldset> <?php endif; ?> -<?php if ( $authors = get_editable_authors( $current_user->ID ) ) : // TODO: ROLE SYSTEM ?> +<?php if ( $authors = get_editable_authors( $current_user->id ) ) : // TODO: ROLE SYSTEM ?> <fieldset id="authordiv" class="dbx-box"> <h3 class="dbx-handle"><?php _e('Post author'); ?>:</h3> <div class="dbx-content"> diff --git a/wp-inst/wp-admin/edit-page-form.php b/wp-inst/wp-admin/edit-page-form.php index 96b8d69..23d19e2 100644 --- a/wp-inst/wp-admin/edit-page-form.php +++ b/wp-inst/wp-admin/edit-page-form.php @@ -83,7 +83,7 @@ addLoadEvent(focusit); <div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo $post->post_name ?>" /></div> </fieldset> -<?php if ( $authors = get_editable_authors( $current_user->ID ) ) : // TODO: ROLE SYSTEM ?> +<?php if ( $authors = get_editable_authors( $current_user->id ) ) : // TODO: ROLE SYSTEM ?> <fieldset id="authordiv" class="dbx-box"> <h3 class="dbx-handle"><?php _e('Post author'); ?>:</h3> <div class="dbx-content"> diff --git a/wp-inst/wp-admin/upgrade-schema.php b/wp-inst/wp-admin/upgrade-schema.php index da4565b..6a171a5 100644 --- a/wp-inst/wp-admin/upgrade-schema.php +++ b/wp-inst/wp-admin/upgrade-schema.php @@ -134,7 +134,7 @@ CREATE TABLE $wpdb->users ( user_status int(11) NOT NULL default '0', display_name varchar(250) NOT NULL default '', PRIMARY KEY (ID), - KEY user_login (user_login) + KEY user_login_key (user_login) ); CREATE TABLE $wpdb->usermeta ( umeta_id bigint(20) NOT NULL auto_increment, @@ -282,99 +282,91 @@ function populate_options() { } function populate_roles() { - global $table_prefix; + global $wp_roles; - $roles = array ('administrator' => - array('name' => __('Administrator'), - 'capabilities' => array( - 'edit_posts' => true, - 'edit_others_posts' => true, - 'edit_published_posts' => true, - 'publish_posts' => true, - 'edit_pages' => true, - 'moderate_comments' => true, - 'manage_categories' => true, - 'manage_links' => true, - 'upload_files' => true, - 'manage_options' => true, - 'switch_themes' => true, - 'edit_themes' => true, - 'activate_plugins' => true, - 'edit_plugins' => true, - 'edit_users' => true, - 'edit_files' => true, - 'unfiltered_html' => true, - 'import' => true, - 'read' => true, - 'level_10' => true, - 'level_9' => true, - 'level_8' => true, - 'level_7' => true, - 'level_6' => true, - 'level_5' => true, - 'level_4' => true, - 'level_3' => true, - 'level_2' => true, - 'level_1' => true, - 'level_0' => true - )), - - 'editor' => - array('name' => __('Editor'), - 'capabilities' => array( - 'edit_posts' => true, - 'edit_others_posts' => true, - 'edit_published_posts' => true, - 'publish_posts' => true, - 'edit_pages' => true, - 'moderate_comments' => true, - 'manage_categories' => true, - 'manage_links' => true, - 'upload_files' => true, - 'unfiltered_html' => true, - 'read' => true, - 'level_7' => true, - 'level_6' => true, - 'level_5' => true, - 'level_4' => true, - 'level_3' => true, - 'level_2' => true, - 'level_1' => true, - 'level_0' => true - )), - - 'author' => - array('name' => __('Author'), - 'capabilities' => array( - 'edit_posts' => true, - 'publish_posts' => true, - 'upload_files' => true, - 'read' => true, - 'level_2' => true, - 'level_1' => true, - 'level_0' => true - )), - - 'contributor' => - array('name' => __('Contributor'), - 'capabilities' => array( - 'edit_posts' => true, - 'read' => true, - 'level_1' => true, - 'level_0' => true - )), - - 'subscriber' => - array('name' => __('Subscriber'), - 'capabilities' => array( - 'read' => true, - 'level_0' => true - )) - ); - // FIXME: Temporary code to reset roles and caps if flag is set. - if ( defined('RESET_CAPS') ) - update_option($table_prefix . 'user_roles', $roles); - else - add_option($table_prefix . 'user_roles', $roles); + // Add roles + $wp_roles->add_role('administrator', __('Administrator')); + $wp_roles->add_role('editor', __('Editor')); + $wp_roles->add_role('author', __('Author')); + $wp_roles->add_role('contributor', __('Contributor')); + $wp_roles->add_role('subscriber', __('Subscriber')); + + // Add caps for Administrator role + $role = $wp_roles->get_role('administrator'); + $role->add_cap('switch_themes'); + $role->add_cap('edit_themes'); + $role->add_cap('activate_plugins'); + $role->add_cap('edit_plugins'); + $role->add_cap('edit_users'); + $role->add_cap('edit_files'); + $role->add_cap('manage_options'); + $role->add_cap('moderate_comments'); + $role->add_cap('manage_categories'); + $role->add_cap('manage_links'); + $role->add_cap('upload_files'); + $role->add_cap('import'); + $role->add_cap('unfiltered_html'); + $role->add_cap('edit_posts'); + $role->add_cap('edit_others_posts'); + $role->add_cap('edit_published_posts'); + $role->add_cap('publish_posts'); + $role->add_cap('edit_pages'); + $role->add_cap('read'); + $role->add_cap('level_10'); + $role->add_cap('level_9'); + $role->add_cap('level_8'); + $role->add_cap('level_7'); + $role->add_cap('level_6'); + $role->add_cap('level_6'); + $role->add_cap('level_4'); + $role->add_cap('level_3'); + $role->add_cap('level_2'); + $role->add_cap('level_1'); + $role->add_cap('level_0'); + + // Add caps for Editor role + $role = $wp_roles->get_role('editor'); + $role->add_cap('moderate_comments'); + $role->add_cap('manage_categories'); + $role->add_cap('manage_links'); + $role->add_cap('upload_files'); + $role->add_cap('unfiltered_html'); + $role->add_cap('edit_posts'); + $role->add_cap('edit_others_posts'); + $role->add_cap('edit_published_posts'); + $role->add_cap('publish_posts'); + $role->add_cap('edit_pages'); + $role->add_cap('read'); + $role->add_cap('level_7'); + $role->add_cap('level_6'); + $role->add_cap('level_6'); + $role->add_cap('level_4'); + $role->add_cap('level_3'); + $role->add_cap('level_2'); + $role->add_cap('level_1'); + $role->add_cap('level_0'); + + // Add caps for Author role + $role = $wp_roles->get_role('author'); + $role->add_cap('upload_files'); + $role->add_cap('edit_posts'); + $role->add_cap('publish_posts'); + $role->add_cap('read'); + $role->add_cap('level_2'); + $role->add_cap('level_1'); + $role->add_cap('level_0'); + + // Add caps for Contributor role + $role = $wp_roles->get_role('contributor'); + $role->add_cap('edit_posts'); + $role->add_cap('read'); + $role->add_cap('level_1'); + $role->add_cap('level_0'); + + // Add caps for Subscriber role + $role = $wp_roles->get_role('subscriber'); + $role->add_cap('read'); + $role->add_cap('level_0'); } + ?> diff --git a/wp-inst/wp-includes/kses.php b/wp-inst/wp-includes/kses.php index 28b84e7..f1cf941 100644 --- a/wp-inst/wp-includes/kses.php +++ b/wp-inst/wp-includes/kses.php @@ -1,4 +1,5 @@ <?php + // Added wp_ prefix to avoid conflicts with existing kses users # kses 0.2.1 - HTML/XHTML filter that only allows some elements and attributes # Copyright (C) 2002, 2003 Ulf Harnhammar @@ -17,88 +18,72 @@ if (!defined('CUSTOM_TAGS')) // You can override this in your my-hacks.php file if (!CUSTOM_TAGS) { -$allowedtags = array( - 'a' => array( - 'href' => array(), - 'title' => array() - ), - 'abbr' => array('title' => array()), - 'acronym' => array('title' => array()), - 'b' => array(), - 'blockquote' => array('cite' => array()), -// 'br' => array(), - 'code' => array(), -// 'del' => array('datetime' => array()), -// 'dd' => array(), -// 'dl' => array(), -// 'dt' => array(), - 'em' => array(), - 'i' => array(), -// 'ins' => array('datetime' => array(), 'cite' => array()), -// 'li' => array(), -// 'ol' => array(), -// 'p' => array(), -// 'q' => array(), - 'strike' => array(), - 'strong' => array(), -// 'sub' => array(), -// 'sup' => array(), -// 'u' => array(), -// 'ul' => array(), + $allowedposttags = array ('address' => array (), 'applet' => array ('codebase' => array (), 'code' => array (), 'name' => array (), 'alt' => array ()), 'area' => array ('shape' => array (), 'coords' => array (), 'href' => array (), 'alt' => array ()), 'a' => array ('href' => array (), 'title' => array (), 'rel' => array (), 'rev' => array (), 'name' => array ()), 'abbr' => array ('title' => array ()), 'acronym' => array ('title' => array ()), 'b' => array (), 'base' => array ('href' => array ()), 'basefont' => array ('size' => array ()), 'bdo' => array ('dir' => array ()), 'big' => array (), 'blockquote' => array ('cite' => array ()), 'body' => array ('alink' => array (), 'background' => array (), 'bgcolor' => array (), 'link' => array (), 'text' => array (), 'vlink' => array ()), 'br' => array (), 'button' => array ('disabled' => array (), 'name' => array (), 'type' => array (), 'value' => array ()), 'caption' => array ('align' => array ()), 'code' => array (), 'col' => array ('align' => array (), 'char' => array (), 'charoff' => array (), 'span' => array (), 'valign' => array (), 'width' => array ()), 'del' => array ('datetime' => array ()), 'dd' => array (), 'div' => array ('align' => array ()), 'dl' => array (), 'dt' => array (), 'em' => array (), 'fieldset' => array (), 'font' => array ('color' => array (), 'face' => array (), 'size' => array ()), 'form' => array ('action' => array (), 'accept' => array (), 'accept-charset' => array (), 'enctype' => array (), 'method' => array (), 'name' => array (), 'target' => array ()), 'frame' => array ('frameborder' => array (), 'longsesc' => array (), 'marginheight' => array (), 'marginwidth' => array (), 'name' => array (), 'noresize' => array (), 'scrolling' => array (), 'src' => array ()), 'frameset' => array ('cols' => array (), 'rows' => array ()), 'head' => array ('profile' => array ()), 'h1' => array ('align' => array ()), 'h2' => array ('align' => array ()), 'h3' => array ('align' => array ()), 'h4' => array ('align' => array ()), 'h5' => array ('align' => array ()), 'h6' => array ('align' => array ()), 'hr' => array ('align' => array (), 'noshade' => array (), 'size' => array (), 'width' => array ()), 'html' => array ('xmlns' => array ()), 'i' => array (), 'iframe' => array ('align' => array (), 'frameborder' => array (), 'height' => array (), 'londesc' => array (), 'marginheight' => array (), 'marginwidth' => array (), 'name' => array (), 'scrolling' => array (), 'src' => array (), 'width' => array ()), 'img' => array ('alt' => array (), 'align' => array (), 'border' => array (), 'height' => array (), 'hspace' => array (), 'ismap' => array (), 'longdesc' => array (), 'usemap' => array (), 'vspace' => array (), 'src' => array (), 'width' => array ()), 'input' => array ('accept' => array (), 'align' => array (), 'alt' => array (), 'checked' => array (), 'disabled' => array (), 'maxlength' => array (), 'name' => array (), 'readonly' => array (), 'size' => array (), 'src' => array (), 'type' => array (), 'value' => array ()), 'ins' => array ('datetime' => array (), 'cite' => array ()), 'kbd' => array (), 'label' => array ('for' => array ()), 'legend' => array ('align' => array ()), 'li' => array (), 'link' => array ('charset' => array (), 'href' => array (), 'hreflang' => array (), 'media' => array (), 'rel' => array (), 'rev' => array (), 'target' => array (), 'type' => array ()), 'map' => array ('id' => array (), 'name' => array ()), 'menu' => array (), 'meta' => array ('content' => array (), 'http-equiv' => array (), 'name' => array (), 'scheme' => array ()), 'noframes' => array (), 'noscript' => array (), 'object' => array ('align' => array (), 'archive' => array (), 'border' => array (), 'classid' => array (), 'codebase' => array (), 'codetype' => array (), 'data' => array (), 'declare' => array (), 'height' => array (), 'hspace' => array (), 'name' => array (), 'standby' => array (), 'type' => array (), 'usemap' => array (), 'vspace' => array (), 'width' => array ()), 'ol' => array ('compact' => array (), 'start' => array (), 'type' => array ()), 'optgroup' => array ('label' => array (), 'disabled' => array ()), 'option' => array ('disabled' => array (), 'label' => array (), 'selected' => array (), 'value' => array ()), 'p' => array ('align' => array ()), 'param' => array ('name' => array (), 'type' => array (), 'value' => array (), 'valuetype' => array ()), 'pre' => array ('width' => array ()), 'q' => array ('cite' => array ()), 's' => array (), 'strike' => array (), 'strong' => array (), 'style' => array ('type' => array (), 'media' => array ()), 'sub' => array (), 'sup' => array (), 'table' => array ('align' => array (), 'bgcolor' => array (), 'border' => array (), 'cellpadding' => array (), 'cellspacing' => array (), 'frame' => array (), 'rules' => array (), 'summary' => array (), 'width' => array ()), 'tbody' => array ('align' => array (), 'char' => array (), 'charoff' => array (), 'valign' => array ()), 'td' => array ('abbr' => array (), 'align' => array (), 'axis' => array (), 'bgcolor' => array (), 'char' => array (), 'charoff' => array (), 'colspan' => array (), 'headers' => array (), 'height' => array (), 'nowrap' => array (), 'rowspan' => array (), 'scope' => array (), 'valign' => array (), 'width' => array ()), 'textarea' => array ('cols' => array (), 'rows' => array (), 'disabled' => array (), 'name' => array (), 'readonly' => array ()), 'tfoot' => array ('align' => array (), 'char' => array (), 'charoff' => array (), 'valign' => array ()), 'th' => array ('abbr' => array (), 'align' => array (), 'axis' => array (), 'bgcolor' => array (), 'char' => array (), 'charoff' => array (), 'colspan' => array (), 'headers' => array (), 'height' => array (), 'nowrap' => array (), 'rowspan' => array (), 'scope' => array (), 'valign' => array (), 'width' => array ()), 'thead' => array ('align' => array (), 'char' => array (), 'charoff' => array (), 'valign' => array ()), 'title' => array (), 'tr' => array ('align' => array (), 'bgcolor' => array (), 'char' => array (), 'charoff' => array (), 'valign' => array ()), 'tt' => array (), 'u' => array (), 'ul' => array (), 'var' => array ()); + $allowedtags = array ('a' => array ('href' => array (), 'title' => array ()), 'abbr' => array ('title' => array ()), 'acronym' => array ('title' => array ()), 'b' => array (), 'blockquote' => array ('cite' => array ()), + // 'br' => array(), + 'code' => array (), + // 'del' => array('datetime' => array()), + // 'dd' => array(), + // 'dl' => array(), + // 'dt' => array(), + 'em' => array (), 'i' => array (), + // 'ins' => array('datetime' => array(), 'cite' => array()), + // 'li' => array(), + // 'ol' => array(), + // 'p' => array(), + // 'q' => array(), + 'strike' => array (), 'strong' => array (), + // 'sub' => array(), + // 'sup' => array(), + // 'u' => array(), + // 'ul' => array(), ); } -function wp_kses($string, $allowed_html, $allowed_protocols = - array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'feed', 'gopher', 'mailto')) -############################################################################### -# This function makes sure that only the allowed HTML element names, attribute -# names and attribute values plus only sane HTML entities will occur in -# $string. You have to remove any slashes from PHP's magic quotes before you -# call this function. -############################################################################### -{ - $string = wp_kses_no_null($string); - $string = wp_kses_js_entities($string); - $string = wp_kses_normalize_entities($string); - $string = wp_kses_hook($string); - $allowed_html_fixed = wp_kses_array_lc($allowed_html); - return wp_kses_split($string, $allowed_html_fixed, $allowed_protocols); +function wp_kses($string, $allowed_html, $allowed_protocols = array ('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'feed', 'gopher', 'mailto')) + ############################################################################### + # This function makes sure that only the allowed HTML element names, attribute + # names and attribute values plus only sane HTML entities will occur in + # $string. You have to remove any slashes from PHP's magic quotes before you + # call this function. + ############################################################################### + { + $string = wp_kses_no_null($string); + $string = wp_kses_js_entities($string); + $string = wp_kses_normalize_entities($string); + $string = wp_kses_hook($string); + $allowed_html_fixed = wp_kses_array_lc($allowed_html); + return wp_kses_split($string, $allowed_html_fixed, $allowed_protocols); } # function wp_kses - function wp_kses_hook($string) ############################################################################### # You add any kses hooks here. ############################################################################### { - return $string; + return $string; } # function wp_kses_hook - function wp_kses_version() ############################################################################### # This function returns kses' version number. ############################################################################### { - return '0.2.2'; + return '0.2.2'; } # function wp_kses_version - function wp_kses_split($string, $allowed_html, $allowed_protocols) ############################################################################### # This function searches for HTML tags, no matter how malformed. It also # matches stray ">" characters. ############################################################################### { - return preg_replace('%(<'. # EITHER: < - '[^>]*'. # things that aren't > - '(>|$)'. # > or end of string - '|>)%e', # OR: just a > - "wp_kses_split2('\\1', \$allowed_html, ". - '$allowed_protocols)', - $string); + return preg_replace('%(<'.# EITHER: < + '[^>]*'.# things that aren't > + '(>|$)'.# > or end of string + '|>)%e', # OR: just a > + "wp_kses_split2('\\1', \$allowed_html, ".'$allowed_protocols)', $string); } # function wp_kses_split - function wp_kses_split2($string, $allowed_html, $allowed_protocols) ############################################################################### # This function does a lot of work. It rejects some very malformed things @@ -107,33 +92,31 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) # attribute list. ############################################################################### { - $string = wp_kses_stripslashes($string); + $string = wp_kses_stripslashes($string); - if (substr($string, 0, 1) != '<') - return '>'; - # It matched a ">" character + if (substr($string, 0, 1) != '<') + return '>'; + # It matched a ">" character - if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) - return ''; - # It's seriously malformed + if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) + return ''; + # It's seriously malformed - $slash = trim($matches[1]); - $elem = $matches[2]; - $attrlist = $matches[3]; + $slash = trim($matches[1]); + $elem = $matches[2]; + $attrlist = $matches[3]; - if (!@is_array($allowed_html[strtolower($elem)])) - return ''; - # They are using a not allowed HTML element + if (!@ is_array($allowed_html[strtolower($elem)])) + return ''; + # They are using a not allowed HTML element - if ($slash != '') - return "<$slash$elem>"; - # No attributes are allowed for closing elements + if ($slash != '') + return "<$slash$elem>"; + # No attributes are allowed for closing elements - return wp_kses_attr("$slash$elem", $attrlist, $allowed_html, - $allowed_protocols); + return wp_kses_attr("$slash$elem", $attrlist, $allowed_html, $allowed_protocols); } # function wp_kses_split2 - function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) ############################################################################### # This function removes all attributes, if none are allowed for this element. @@ -144,62 +127,59 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) # it puts one in the returned code as well. ############################################################################### { -# Is there a closing XHTML slash at the end of the attributes? + # Is there a closing XHTML slash at the end of the attributes? - $xhtml_slash = ''; - if (preg_match('%\s/\s*$%', $attr)) - $xhtml_slash = ' /'; + $xhtml_slash = ''; + if (preg_match('%\s/\s*$%', $attr)) + $xhtml_slash = ' /'; -# Are any attributes allowed at all for this element? + # Are any attributes allowed at all for this element? - if (@count($allowed_html[strtolower($element)]) == 0) - return "<$element$xhtml_slash>"; + if (@ count($allowed_html[strtolower($element)]) == 0) + return "<$element$xhtml_slash>"; -# Split it + # Split it - $attrarr = wp_kses_hair($attr, $allowed_protocols); + $attrarr = wp_kses_hair($attr, $allowed_protocols); -# Go through $attrarr, and save the allowed attributes for this element -# in $attr2 + # Go through $attrarr, and save the allowed attributes for this element + # in $attr2 - $attr2 = ''; + $attr2 = ''; - foreach ($attrarr as $arreach) - { - if (!@isset($allowed_html[strtolower($element)] [strtolower($arreach['name'])])) - continue; # the attribute is not allowed + foreach ($attrarr as $arreach) { + if (!@ isset ($allowed_html[strtolower($element)][strtolower($arreach['name'])])) + continue; # the attribute is not allowed - $current = $allowed_html[strtolower($element)] - [strtolower($arreach['name'])]; - if ($current == '') - continue; # the attribute is not allowed + $current = $allowed_html[strtolower($element)][strtolower($arreach['name'])]; + if ($current == '') + continue; # the attribute is not allowed - if (!is_array($current)) - $attr2 .= ' '.$arreach['whole']; - # there are no checks + if (!is_array($current)) + $attr2 .= ' '.$arreach['whole']; + # there are no checks - else - { - # there are some checks - $ok = true; - foreach ($current as $currkey => $currval) - if (!wp_kses_check_attr_val($arreach['value'], $arreach['vless'], - $currkey, $currval)) - { $ok = false; break; } + else { + # there are some checks + $ok = true; + foreach ($current as $currkey => $currval) + if (!wp_kses_check_attr_val($arreach['value'], $arreach['vless'], $currkey, $currval)) { + $ok = false; + break; + } - if ($ok) - $attr2 .= ' '.$arreach['whole']; # it passed them - } # if !is_array($current) - } # foreach + if ($ok) + $attr2 .= ' '.$arreach['whole']; # it passed them + } # if !is_array($current) + } # foreach -# Remove any "<" or ">" characters + # Remove any "<" or ">" characters - $attr2 = preg_replace('/[<>]/', '', $attr2); + $attr2 = preg_replace('/[<>]/', '', $attr2); - return "<$element$attr2$xhtml_slash>"; + return "<$element$attr2$xhtml_slash>"; } # function wp_kses_attr - function wp_kses_hair($attr, $allowed_protocols) ############################################################################### # This function does a lot of work. It parses an attribute list into an array @@ -210,121 +190,102 @@ function wp_kses_hair($attr, $allowed_protocols) # from attribute values. ############################################################################### { - $attrarr = array(); - $mode = 0; - $attrname = ''; - -# Loop through the whole attribute list - - while (strlen($attr) != 0) - { - $working = 0; # Was the last operation successful? - - switch ($mode) - { - case 0: # attribute name, href for instance - - if (preg_match('/^([-a-zA-Z]+)/', $attr, $match)) - { - $attrname = $match[1]; - $working = $mode = 1; - $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr); - } - - break; - - case 1: # equals sign or valueless ("selected") - - if (preg_match('/^\s*=\s*/', $attr)) # equals sign - { - $working = 1; $mode = 2; - $attr = preg_replace('/^\s*=\s*/', '', $attr); - break; - } - - if (preg_match('/^\s+/', $attr)) # valueless - { - $working = 1; $mode = 0; - $attrarr[] = array - ('name' => $attrname, - 'value' => '', - 'whole' => $attrname, - 'vless' => 'y'); - $attr = preg_replace('/^\s+/', '', $attr); - } - - break; - - case 2: # attribute value, a URL after href= for instance - - if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) - # "value" - { - $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols); - - $attrarr[] = array - ('name' => $attrname, - 'value' => $thisval, - 'whole' => "$attrname=\"$thisval\"", - 'vless' => 'n'); - $working = 1; $mode = 0; - $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr); - break; - } - - if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) - # 'value' - { - $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols); - - $attrarr[] = array - ('name' => $attrname, - 'value' => $thisval, - 'whole' => "$attrname='$thisval'", - 'vless' => 'n'); - $working = 1; $mode = 0; - $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr); - break; - } - - if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) - # value - { - $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols); - - $attrarr[] = array - ('name' => $attrname, - 'value' => $thisval, - 'whole' => "$attrname=\"$thisval\"", - 'vless' => 'n'); - # We add quotes to conform to W3C's HTML spec. - $working = 1; $mode = 0; - $attr = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr); - } - - break; - } # switch - - if ($working == 0) # not well formed, remove and try again - { - $attr = wp_kses_html_error($attr); - $mode = 0; - } - } # while - - if ($mode == 1) - # special case, for when the attribute list ends with a valueless - # attribute like "selected" - $attrarr[] = array - ('name' => $attrname, - 'value' => '', - 'whole' => $attrname, - 'vless' => 'y'); - - return $attrarr; + $attrarr = array (); + $mode = 0; + $attrname = ''; + + # Loop through the whole attribute list + + while (strlen($attr) != 0) { + $working = 0; # Was the last operation successful? + + switch ($mode) { + case 0 : # attribute name, href for instance + + if (preg_match('/^([-a-zA-Z]+)/', $attr, $match)) { + $attrname = $match[1]; + $working = $mode = 1; + $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr); + } + + break; + + case 1 : # equals sign or valueless ("selected") + + if (preg_match('/^\s*=\s*/', $attr)) # equals sign + { + $working = 1; + $mode = 2; + $attr = preg_replace('/^\s*=\s*/', '', $attr); + break; + } + + if (preg_match('/^\s+/', $attr)) # valueless + { + $working = 1; + $mode = 0; + $attrarr[] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y'); + $attr = preg_replace('/^\s+/', '', $attr); + } + + break; + + case 2 : # attribute value, a URL after href= for instance + + if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) + # "value" + { + $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols); + + $attrarr[] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n'); + $working = 1; + $mode = 0; + $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr); + break; + } + + if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) + # 'value' + { + $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols); + + $attrarr[] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n'); + $working = 1; + $mode = 0; + $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr); + break; + } + + if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) + # value + { + $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols); + + $attrarr[] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n'); + # We add quotes to conform to W3C's HTML spec. + $working = 1; + $mode = 0; + $attr = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr); + } + + break; + } # switch + + if ($working == 0) # not well formed, remove and try again + { + $attr = wp_kses_html_error($attr); + $mode = 0; + } + } # while + + if ($mode == 1) + # special case, for when the attribute list ends with a valueless + # attribute like "selected" + $attrarr[] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y'); + + return $attrarr; } # function wp_kses_hair - function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) ############################################################################### # This function performs different checks for attribute values. The currently @@ -332,65 +293,63 @@ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) # with even more checks to come soon. ############################################################################### { - $ok = true; - - switch (strtolower($checkname)) - { - case 'maxlen': - # The maxlen check makes sure that the attribute value has a length not - # greater than the given value. This can be used to avoid Buffer Overflows - # in WWW clients and various Internet servers. - - if (strlen($value) > $checkvalue) - $ok = false; - break; - - case 'minlen': - # The minlen check makes sure that the attribute value has a length not - # smaller than the given value. - - if (strlen($value) < $checkvalue) - $ok = false; - break; - - case 'maxval': - # The maxval check does two things: it checks that the attribute value is - # an integer from 0 and up, without an excessive amount of zeroes or - # whitespace (to avoid Buffer Overflows). It also checks that the attribute - # value is not greater than the given value. - # This check can be used to avoid Denial of Service attacks. - - if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) - $ok = false; - if ($value > $checkvalue) - $ok = false; - break; - - case 'minval': - # The minval check checks that the attribute value is a positive integer, - # and that it is not smaller than the given value. - - if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) - $ok = false; - if ($value < $checkvalue) - $ok = false; - break; - - case 'valueless': - # The valueless check checks if the attribute has a value - # (like <a href="blah">) or not (<option selected>). If the given value - # is a "y" or a "Y", the attribute must not have a value. - # If the given value is an "n" or an "N", the attribute must have one. - - if (strtolower($checkvalue) != $vless) - $ok = false; - break; - } # switch - - return $ok; + $ok = true; + + switch (strtolower($checkname)) { + case 'maxlen' : + # The maxlen check makes sure that the attribute value has a length not + # greater than the given value. This can be used to avoid Buffer Overflows + # in WWW clients and various Internet servers. + + if (strlen($value) > $checkvalue) + $ok = false; + break; + + case 'minlen' : + # The minlen check makes sure that the attribute value has a length not + # smaller than the given value. + + if (strlen($value) < $checkvalue) + $ok = false; + break; + + case 'maxval' : + # The maxval check does two things: it checks that the attribute value is + # an integer from 0 and up, without an excessive amount of zeroes or + # whitespace (to avoid Buffer Overflows). It also checks that the attribute + # value is not greater than the given value. + # This check can be used to avoid Denial of Service attacks. + + if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) + $ok = false; + if ($value > $checkvalue) + $ok = false; + break; + + case 'minval' : + # The minval check checks that the attribute value is a positive integer, + # and that it is not smaller than the given value. + + if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) + $ok = false; + if ($value < $checkvalue) + $ok = false; + break; + + case 'valueless' : + # The valueless check checks if the attribute has a value + # (like <a href="blah">) or not (<option selected>). If the given value + # is a "y" or a "Y", the attribute must not have a value. + # If the given value is an "n" or an "N", the attribute must have one. + + if (strtolower($checkvalue) != $vless) + $ok = false; + break; + } # switch + + return $ok; } # function wp_kses_check_attr_val - function wp_kses_bad_protocol($string, $allowed_protocols) ############################################################################### # This function removes all non-allowed protocols from the beginning of @@ -399,33 +358,30 @@ function wp_kses_bad_protocol($string, $allowed_protocols) # fooled by a string like "javascript:javascript:alert(57)". ############################################################################### { - $string = wp_kses_no_null($string); - $string2 = $string.'a'; + $string = wp_kses_no_null($string); + $string2 = $string.'a'; - while ($string != $string2) - { - $string2 = $string; - $string = wp_kses_bad_protocol_once($string, $allowed_protocols); - } # while + while ($string != $string2) { + $string2 = $string; + $string = wp_kses_bad_protocol_once($string, $allowed_protocols); + } # while - return $string; + return $string; } # function wp_kses_bad_protocol - function wp_kses_no_null($string) ############################################################################### # This function removes any NULL or chr(173) characters in $string. ############################################################################### { - $string = preg_replace('/\0+/', '', $string); - $string = preg_replace('/(\\\\0)+/', '', $string); + $string = preg_replace('/\0+/', '', $string); + $string = preg_replace('/(\\\\0)+/', '', $string); - $string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature" + $string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature" - return $string; + return $string; } # function wp_kses_no_null - function wp_kses_stripslashes($string) ############################################################################### # This function changes the character sequence \" to just " @@ -433,43 +389,38 @@ function wp_kses_stripslashes($string) # preg_replace(//e) seems to require this. ############################################################################### { - return preg_replace('%\\\\"%', '"', $string); + return preg_replace('%\\\\"%', '"', $string); } # function wp_kses_stripslashes - function wp_kses_array_lc($inarray) ############################################################################### # This function goes through an array, and changes the keys to all lower case. ############################################################################### { - $outarray = array(); + $outarray = array (); - foreach ($inarray as $inkey => $inval) - { - $outkey = strtolower($inkey); - $outarray[$outkey] = array(); + foreach ($inarray as $inkey => $inval) { + $outkey = strtolower($inkey); + $outarray[$outkey] = array (); - foreach ($inval as $inkey2 => $inval2) - { - $outkey2 = strtolower($inkey2); - $outarray[$outkey][$outkey2] = $inval2; - } # foreach $inval - } # foreach $inarray + foreach ($inval as $inkey2 => $inval2) { + $outkey2 = strtolower($inkey2); + $outarray[$outkey][$outkey2] = $inval2; + } # foreach $inval + } # foreach $inarray - return $outarray; + return $outarray; } # function wp_kses_array_lc - function wp_kses_js_entities($string) ############################################################################### # This function removes the HTML JavaScript entities found in early versions of # Netscape 4. ############################################################################### { - return preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string); + return preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string); } # function wp_kses_js_entities - function wp_kses_html_error($string) ############################################################################### # This function deals with parsing errors in wp_kses_hair(). The general plan is @@ -477,82 +428,70 @@ function wp_kses_html_error($string) # quotes and apostrophes as well. ############################################################################### { - return preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $string); + return preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $string); } # function wp_kses_html_error - function wp_kses_bad_protocol_once($string, $allowed_protocols) ############################################################################### # This function searches for URL protocols at the beginning of $string, while # handling whitespace and HTML entities. ############################################################################### { - return preg_replace('/^((&[^;]*;|[\sA-Za-z0-9])*)'. - '(:|:|&#[Xx]3[Aa];)\s*/e', - 'wp_kses_bad_protocol_once2("\\1", $allowed_protocols)', - $string); + return preg_replace('/^((&[^;]*;|[\sA-Za-z0-9])*)'.'(:|:|&#[Xx]3[Aa];)\s*/e', 'wp_kses_bad_protocol_once2("\\1", $allowed_protocols)', $string); } # function wp_kses_bad_protocol_once - function wp_kses_bad_protocol_once2($string, $allowed_protocols) ############################################################################### # This function processes URL protocols, checks to see if they're in the white- # list or not, and returns different data depending on the answer. ############################################################################### { - $string2 = wp_kses_decode_entities($string); - $string2 = preg_replace('/\s/', '', $string2); - $string2 = wp_kses_no_null($string2); - $string2 = strtolower($string2); - - $allowed = false; - foreach ($allowed_protocols as $one_protocol) - if (strtolower($one_protocol) == $string2) - { - $allowed = true; - break; - } - - if ($allowed) - return "$string2:"; - else - return ''; + $string2 = wp_kses_decode_entities($string); + $string2 = preg_replace('/\s/', '', $string2); + $string2 = wp_kses_no_null($string2); + $string2 = strtolower($string2); + + $allowed = false; + foreach ($allowed_protocols as $one_protocol) + if (strtolower($one_protocol) == $string2) { + $allowed = true; + break; + } + + if ($allowed) + return "$string2:"; + else + return ''; } # function wp_kses_bad_protocol_once2 - function wp_kses_normalize_entities($string) ############################################################################### # This function normalizes HTML entities. It will convert "AT&T" to the correct # "AT&T", ":" to ":", "&#XYZZY;" to "&#XYZZY;" and so on. ############################################################################### { -# Disarm all entities by converting & to & + # Disarm all entities by converting & to & - $string = str_replace('&', '&', $string); + $string = str_replace('&', '&', $string); -# Change back the allowed entities in our entity whitelist + # Change back the allowed entities in our entity whitelist - $string = preg_replace('/&([A-Za-z][A-Za-z0-9]{0,19});/', - '&\\1;', $string); - $string = preg_replace('/&#0*([0-9]{1,5});/e', - 'wp_kses_normalize_entities2("\\1")', $string); - $string = preg_replace('/&#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/', - '&#\\1\\2;', $string); + $string = preg_replace('/&([A-Za-z][A-Za-z0-9]{0,19});/', '&\\1;', $string); + $string = preg_replace('/&#0*([0-9]{1,5});/e', 'wp_kses_normalize_entities2("\\1")', $string); + $string = preg_replace('/&#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/', '&#\\1\\2;', $string); - return $string; + return $string; } # function wp_kses_normalize_entities - function wp_kses_normalize_entities2($i) ############################################################################### # This function helps wp_kses_normalize_entities() to only accept 16 bit values # and nothing more for &#number; entities. ############################################################################### { - return (($i > 65535) ? "&#$i;" : "&#$i;"); + return (($i > 65535) ? "&#$i;" : "&#$i;"); } # function wp_kses_normalize_entities2 - function wp_kses_decode_entities($string) ############################################################################### # This function decodes numeric HTML entities (A and A). It doesn't @@ -560,11 +499,10 @@ function wp_kses_decode_entities($string) # URL protocol whitelisting system anyway. ############################################################################### { - $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string); - $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))', - $string); + $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string); + $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))', $string); - return $string; + return $string; } # function wp_kses_decode_entities function wp_filter_kses($data) { @@ -572,19 +510,20 @@ function wp_filter_kses($data) { return wp_kses($data, $allowedtags); } +function wp_filter_post_kses($data) { + global $allowedposttags; + return wp_kses($data, $allowedposttags); +} function kses_init() { global $current_user; get_currentuserinfo(); // set $current_user - //if( current_user_can( 'administrator' ) == false ) { - // Filter untrusted content - add_filter('comment_author', 'wp_filter_kses'); - add_filter('comment_text', 'wp_filter_kses'); - add_filter('comment_post', 'wp_filter_kses'); - //add_filter('format_to_edit', 'wp_filter_kses'); - //add_filter('the_content', 'wp_filter_kses'); - //} + if (current_user_can('unfiltered_html') == false) { + add_filter('pre_comment_author', 'wp_filter_kses'); + add_filter('pre_comment_content', 'wp_filter_kses'); + add_filter('content_save_pre', 'wp_filter_post_kses'); + } } -add_action( 'init', 'kses_init' ); +add_action('init', 'kses_init'); ?> diff --git a/wp-inst/wp-includes/registration-functions.php b/wp-inst/wp-includes/registration-functions.php index 2d848b6..c55bab1 100644 --- a/wp-inst/wp-includes/registration-functions.php +++ b/wp-inst/wp-includes/registration-functions.php @@ -95,7 +95,7 @@ function wp_update_user($userdata) { $user_id = wp_insert_user($userdata); // Update the cookies if the password changed. - if( $current_user->data->ID == $ID ) { + if( $current_user->id == $ID ) { if ( isset($plaintext_pass) ) { wp_clearcookie(); wp_setcookie($userdata['user_login'], $plaintext_pass); |