Index: wp-login.php =================================================================== --- wp-login.php (revision 3516) +++ wp-login.php (working copy) @@ -28,7 +28,7 @@ $redirect_to = 'wp-login.php'; if ( isset($_REQUEST['redirect_to']) ) $redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_REQUEST['redirect_to']); - + wp_redirect($redirect_to); exit(); @@ -139,7 +139,7 @@ $new_pass = substr( md5( uniqid( microtime() ) ), 0, 7); $wpdb->query("UPDATE $wpdb->users SET user_pass = MD5('$new_pass'), user_activation_key = '' WHERE user_login = '$user->user_login'"); wp_cache_delete($user->ID, 'users'); - wp_cache_delete($user->user_login, 'userlogins'); + wp_cache_delete($user->user_login, 'userlogins'); $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n"; $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n"; $message .= get_settings('siteurl') . "/wp-login.php\r\n"; @@ -190,11 +190,11 @@ if ( $user_login && $user_pass ) { $user = new WP_User(0, $user_login); - + // If the user can't edit posts, send them to their profile. if ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' ) ) $redirect_to = get_settings('siteurl') . '/wp-admin/profile.php'; - + if ( wp_login($user_login, $user_pass, $using_cookie) ) { if ( !$using_cookie ) wp_setcookie($user_login, $user_pass, false, '', '', $rememberme); @@ -202,7 +202,7 @@ wp_redirect($redirect_to); exit; } else { - if ( $using_cookie ) + if ( $using_cookie ) $error = __('Your session has expired.'); } } Index: wp-includes/class-snoopy.php =================================================================== --- wp-includes/class-snoopy.php (revision 3516) +++ wp-includes/class-snoopy.php (working copy) @@ -39,7 +39,7 @@ class Snoopy { /**** Public variables ****/ - + /* user definable vars */ var $host = "www.php.net"; // host name we are connecting to @@ -48,7 +48,7 @@ var $proxy_port = ""; // proxy port to use var $proxy_user = ""; // proxy user to use var $proxy_pass = ""; // proxy password to use - + var $agent = "Snoopy v1.2.3"; // agent we masquerade as var $referer = ""; // referer info to pass var $cookies = array(); // array of cookies to pass @@ -66,15 +66,15 @@ var $passcookies = true; // pass set cookies back through redirects // NOTE: this currently does not respect // dates, domains or paths. - + var $user = ""; // user for http authentication var $pass = ""; // password for http authentication - + // http accept types var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*"; - + var $results = ""; // where the content is put - + var $error = ""; // error messages sent here var $response_code = ""; // response code returned from server var $headers = array(); // headers returned from server sent here @@ -100,11 +100,11 @@ // library functions built into php, // as these functions are not stable // as of this Snoopy release. - - /**** Private variables ****/ - + + /**** Private variables ****/ + var $_maxlinelen = 4096; // max line length (headers) - + var $_httpmethod = "GET"; // default http request method var $_httpversion = "HTTP/1.0"; // default http request version var $_submit_method = "POST"; // default submit method @@ -114,7 +114,7 @@ var $_redirectdepth = 0; // increments on an http redirect var $_frameurls = array(); // frame src urls var $_framedepth = 0; // increments on frame depth - + var $_isproxy = false; // set if using a proxy server var $_fp_timeout = 30; // timeout for socket connection @@ -129,7 +129,7 @@ function fetch($URI) { - + //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS); $URI_PARTS = parse_url($URI); if (!empty($URI_PARTS["user"])) @@ -140,7 +140,7 @@ $URI_PARTS["query"] = ''; if (empty($URI_PARTS["path"])) $URI_PARTS["path"] = ''; - + switch(strtolower($URI_PARTS["scheme"])) { case "http": @@ -160,7 +160,7 @@ // no proxy, send only the path $this->_httprequest($path, $fp, $URI, $this->_httpmethod); } - + $this->_disconnect($fp); if($this->_redirectaddr) @@ -183,7 +183,7 @@ { $frameurls = $this->_frameurls; $this->_frameurls = array(); - + while(list(,$frameurl) = each($frameurls)) { if($this->_framedepth < $this->maxframes) @@ -194,13 +194,13 @@ else break; } - } + } } else { return false; } - return true; + return true; break; case "https": if(!$this->curl_path) @@ -254,15 +254,15 @@ else break; } - } - return true; + } + return true; break; default: // not a valid protocol $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n'; return false; break; - } + } return true; } @@ -280,9 +280,9 @@ function submit($URI, $formvars="", $formfiles="") { unset($postdata); - + $postdata = $this->_prepare_post_body($formvars, $formfiles); - + $URI_PARTS = parse_url($URI); if (!empty($URI_PARTS["user"])) $this->user = $URI_PARTS["user"]; @@ -312,17 +312,17 @@ // no proxy, send only the path $this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata); } - + $this->_disconnect($fp); if($this->_redirectaddr) { /* url was redirected, check if we've hit the max depth */ if($this->maxredirs > $this->_redirectdepth) - { + { if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr)) - $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]); - + $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]); + // only follow redirect if it's on this site, or offsiteok is true if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) { @@ -341,9 +341,9 @@ { $frameurls = $this->_frameurls; $this->_frameurls = array(); - + while(list(,$frameurl) = each($frameurls)) - { + { if($this->_framedepth < $this->maxframes) { $this->fetch($frameurl); @@ -352,14 +352,14 @@ else break; } - } - + } + } else { return false; } - return true; + return true; break; case "https": if(!$this->curl_path) @@ -386,9 +386,9 @@ { /* url was redirected, check if we've hit the max depth */ if($this->maxredirs > $this->_redirectdepth) - { + { if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr)) - $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]); + $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]); // only follow redirect if it's on this site, or offsiteok is true if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok) @@ -410,7 +410,7 @@ $this->_frameurls = array(); while(list(,$frameurl) = each($frameurls)) - { + { if($this->_framedepth < $this->maxframes) { $this->fetch($frameurl); @@ -419,16 +419,16 @@ else break; } - } - return true; + } + return true; break; - + default: // not a valid protocol $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n'; return false; break; - } + } return true; } @@ -442,7 +442,7 @@ function fetchlinks($URI) { if ($this->fetch($URI)) - { + { if($this->lastredirectaddr) $URI = $this->lastredirectaddr; if(is_array($this->results)) @@ -470,9 +470,9 @@ function fetchform($URI) { - + if ($this->fetch($URI)) - { + { if(is_array($this->results)) { @@ -481,14 +481,14 @@ } else $this->results = $this->_stripform($this->results); - + return true; } else return false; } - - + + /*======================================================================*\ Function: fetchtext Purpose: fetch the text from a web page, stripping the links @@ -499,7 +499,7 @@ function fetchtext($URI) { if($this->fetch($URI)) - { + { if(is_array($this->results)) { for($x=0;$xresults);$x++) @@ -523,7 +523,7 @@ function submitlinks($URI, $formvars="", $formfiles="") { if($this->submit($URI,$formvars, $formfiles)) - { + { if($this->lastredirectaddr) $URI = $this->lastredirectaddr; if(is_array($this->results)) @@ -557,7 +557,7 @@ function submittext($URI, $formvars = "", $formfiles = "") { if($this->submit($URI,$formvars, $formfiles)) - { + { if($this->lastredirectaddr) $URI = $this->lastredirectaddr; if(is_array($this->results)) @@ -581,8 +581,8 @@ return false; } - + /*======================================================================*\ Function: set_submit_multipart Purpose: Set the form submission content type to @@ -593,7 +593,7 @@ $this->_submit_type = "multipart/form-data"; } - + /*======================================================================*\ Function: set_submit_normal Purpose: Set the form submission content type to @@ -604,14 +604,14 @@ $this->_submit_type = "application/x-www-form-urlencoded"; } - - + + /*======================================================================*\ Private functions \*======================================================================*/ - - + + /*======================================================================*\ Function: _striplinks Purpose: strip the hyperlinks from an html document @@ -620,28 +620,28 @@ \*======================================================================*/ function _striplinks($document) - { + { preg_match_all("'<\s*a\s.*?href\s*=\s* # find ]+)) # if quote found, match up to next matching # quote, otherwise match up to next space 'isx",$document,$links); - + // catenate the non-empty matches from the conditional subpattern while(list($key,$val) = each($links[2])) { if(!empty($val)) $match[] = $val; - } - + } + while(list($key,$val) = each($links[3])) { if(!empty($val)) $match[] = $val; - } - + } + // return the links return $match; } @@ -654,18 +654,18 @@ \*======================================================================*/ function _stripform($document) - { + { preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements); - + // catenate the matches $match = implode("\r\n",$elements[0]); - + // return the links return $match; } - - + + /*======================================================================*\ Function: _striptext Purpose: strip the text from an html document @@ -675,11 +675,11 @@ function _striptext($document) { - + // I didn't use preg eval (//e) since that is only available in PHP 4.0. // so, list your entities one by one here. I included some of the // more common ones. - + $search = array("']*?>.*?'si", // strip out javascript "'<[\/\!]*?[^<>]*?>'si", // strip out html tags "'([\r\n])[\s]+'", // strip out white space @@ -728,9 +728,9 @@ "Ü", "ß", ); - + $text = preg_replace($search,$replace,$document); - + return $text; } @@ -744,7 +744,7 @@ function _expandlinks($links,$URI) { - + preg_match("/^[^\?]+/",$URI,$match); $match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]); @@ -752,21 +752,21 @@ $match_part = parse_url($match); $match_root = $match_part["scheme"]."://".$match_part["host"]; - + $search = array( "|^http://".preg_quote($this->host)."|i", "|^(\/)|i", "|^(?!http://)(?!mailto:)|i", "|/\./|", "|/[^\/]+/\.\./|" ); - + $replace = array( "", $match_root."/", $match."/", "/", "/" - ); - + ); + $expandedLinks = preg_replace($search,$replace,$links); return $expandedLinks; @@ -779,19 +779,19 @@ $fp the current open file pointer $URI the full URI $body body contents to send if any (POST) - Output: + Output: \*======================================================================*/ - + function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="") { $cookie_headers = ''; if($this->passcookies && $this->_redirectaddr) $this->setcookies(); - + $URI_PARTS = parse_url($URI); if(empty($url)) $url = "/"; - $headers = $http_method." ".$url." ".$this->_httpversion."\r\n"; + $headers = $http_method." ".$url." ".$this->_httpversion."\r\n"; if(!empty($this->agent)) $headers .= "User-Agent: ".$this->agent."\r\n"; if(!empty($this->host) && !isset($this->rawheaders['Host'])) { @@ -805,10 +805,10 @@ if(!empty($this->referer)) $headers .= "Referer: ".$this->referer."\r\n"; if(!empty($this->cookies)) - { + { if(!is_array($this->cookies)) $this->cookies = (array)$this->cookies; - + reset($this->cookies); if ( count($this->cookies) > 0 ) { $cookie_headers .= 'Cookie: '; @@ -831,28 +831,28 @@ $headers .= "; boundary=".$this->_mime_boundary; $headers .= "\r\n"; } - if(!empty($body)) + if(!empty($body)) $headers .= "Content-length: ".strlen($body)."\r\n"; - if(!empty($this->user) || !empty($this->pass)) + if(!empty($this->user) || !empty($this->pass)) $headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n"; - + //add proxy auth headers - if(!empty($this->proxy_user)) + if(!empty($this->proxy_user)) $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass)."\r\n"; $headers .= "\r\n"; - + // set the read timeout if needed if ($this->read_timeout > 0) socket_set_timeout($fp, $this->read_timeout); $this->timed_out = false; - + fwrite($fp,$headers.$body,strlen($headers.$body)); - + $this->_redirectaddr = false; unset($this->headers); - + while($currentHeader = fgets($fp,$this->_maxlinelen)) { if ($this->read_timeout > 0 && $this->_check_timeout($fp)) @@ -860,10 +860,10 @@ $this->status=-100; return false; } - + if($currentHeader == "\r\n") break; - + // if a header begins with Location: or URI:, set the redirect if(preg_match("/^(Location:|URI:)/i",$currentHeader)) { @@ -883,16 +883,16 @@ else $this->_redirectaddr = $matches[2]; } - + if(preg_match("|^HTTP/|",$currentHeader)) { if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status)) { $this->status= $status[1]; - } + } $this->response_code = $currentHeader; } - + $this->headers[] = $currentHeader; } @@ -910,13 +910,13 @@ $this->status=-100; return false; } - + // check if there is a a redirect meta tag - + if(preg_match("']*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match)) { - $this->_redirectaddr = $this->_expandlinks($match[1],$URI); + $this->_redirectaddr = $this->_expandlinks($match[1],$URI); } // have we hit our frame depth and is there frame src to fetch? @@ -932,7 +932,7 @@ // no framed content else $this->results = $results; - + return true; } @@ -942,21 +942,21 @@ Input: $url the url to fetch $URI the full URI $body body contents to send if any (POST) - Output: + Output: \*======================================================================*/ - + function _httpsrequest($url,$URI,$http_method,$content_type="",$body="") { if($this->passcookies && $this->_redirectaddr) $this->setcookies(); - $headers = array(); - + $headers = array(); + $URI_PARTS = parse_url($URI); if(empty($url)) $url = "/"; // GET ... header not needed for curl - //$headers[] = $http_method." ".$url." ".$this->_httpversion; + //$headers[] = $http_method." ".$url." ".$this->_httpversion; if(!empty($this->agent)) $headers[] = "User-Agent: ".$this->agent; if(!empty($this->host)) @@ -969,10 +969,10 @@ if(!empty($this->referer)) $headers[] = "Referer: ".$this->referer; if(!empty($this->cookies)) - { + { if(!is_array($this->cookies)) $this->cookies = (array)$this->cookies; - + reset($this->cookies); if ( count($this->cookies) > 0 ) { $cookie_str = 'Cookie: '; @@ -995,44 +995,44 @@ else $headers[] = "Content-type: $content_type"; } - if(!empty($body)) + if(!empty($body)) $headers[] = "Content-length: ".strlen($body); - if(!empty($this->user) || !empty($this->pass)) + if(!empty($this->user) || !empty($this->pass)) $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass); - + for($curr_header = 0; $curr_header < count($headers); $curr_header++) { $safer_header = strtr( $headers[$curr_header], "\"", " " ); $cmdline_params .= " -H \"".$safer_header."\""; } - + if(!empty($body)) $cmdline_params .= " -d \"$body\""; - + if($this->read_timeout > 0) $cmdline_params .= " -m ".$this->read_timeout; - + $headerfile = tempnam($temp_dir, "sno"); $safer_URI = strtr( $URI, "\"", " " ); // strip quotes from the URI to avoid shell access exec(escapeshellcmd($this->curl_path." -D \"$headerfile\"".$cmdline_params." \"".$safer_URI."\""),$results,$return); - + if($return) { $this->error = "Error: cURL could not retrieve the document, error $return."; return false; } - - + + $results = implode("\r\n",$results); - + $result_headers = file("$headerfile"); - + $this->_redirectaddr = false; unset($this->headers); - + for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++) { - + // if a header begins with Location: or URI:, set the redirect if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader])) { @@ -1052,7 +1052,7 @@ else $this->_redirectaddr = $matches[2]; } - + if(preg_match("|^HTTP/|",$result_headers[$currentHeader])) $this->response_code = $result_headers[$currentHeader]; @@ -1060,10 +1060,10 @@ } // check if there is a a redirect meta tag - + if(preg_match("']*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match)) { - $this->_redirectaddr = $this->_expandlinks($match[1],$URI); + $this->_redirectaddr = $this->_expandlinks($match[1],$URI); } // have we hit our frame depth and is there frame src to fetch? @@ -1081,7 +1081,7 @@ $this->results = $results; unlink("$headerfile"); - + return true; } @@ -1089,7 +1089,7 @@ Function: setcookies() Purpose: set cookies for a redirection \*======================================================================*/ - + function setcookies() { for($x=0; $xheaders); $x++) @@ -1099,7 +1099,7 @@ } } - + /*======================================================================*\ Function: _check_timeout Purpose: checks whether timeout has occurred @@ -1123,13 +1123,13 @@ Purpose: make a socket connection Input: $fp file pointer \*======================================================================*/ - + function _connect(&$fp) { if(!empty($this->proxy_host) && !empty($this->proxy_port)) { $this->_isproxy = true; - + $host = $this->proxy_host; $port = $this->proxy_port; } @@ -1138,9 +1138,9 @@ $host = $this->host; $port = $this->port; } - + $this->status = 0; - + if($fp = fsockopen( $host, $port, @@ -1176,13 +1176,13 @@ Purpose: disconnect a socket connection Input: $fp file pointer \*======================================================================*/ - + function _disconnect($fp) { return(fclose($fp)); } - + /*======================================================================*\ Function: _prepare_post_body Purpose: Prepare post body according to encoding type @@ -1190,7 +1190,7 @@ $formfiles - form upload files Output: post body \*======================================================================*/ - + function _prepare_post_body($formvars, $formfiles) { settype($formvars, "array"); @@ -1199,7 +1199,7 @@ if (count($formvars) == 0 && count($formfiles) == 0) return; - + switch ($this->_submit_type) { case "application/x-www-form-urlencoded": reset($formvars); @@ -1215,7 +1215,7 @@ case "multipart/form-data": $this->_mime_boundary = "Snoopy".md5(uniqid(microtime())); - + reset($formvars); while(list($key,$val) = each($formvars)) { if (is_array($val) || is_object($val)) { @@ -1230,7 +1230,7 @@ $postdata .= "$val\r\n"; } } - + reset($formfiles); while (list($field_name, $file_names) = each($formfiles)) { settype($file_names, "array"); Index: wp-includes/wp-l10n.php =================================================================== --- wp-includes/wp-l10n.php (revision 3516) +++ wp-includes/wp-l10n.php (working copy) @@ -14,7 +14,7 @@ // WPLANG is defined in wp-config. if (defined('WPLANG')) $locale = WPLANG; - + if (empty($locale)) $locale = 'en_US'; @@ -76,20 +76,20 @@ $locale = get_locale(); $mofile = ABSPATH . "wp-includes/languages/$locale.mo"; - + load_textdomain('default', $mofile); } function load_plugin_textdomain($domain, $path = 'wp-content/plugins') { $locale = get_locale(); - + $mofile = ABSPATH . "$path/$domain-$locale.mo"; load_textdomain($domain, $mofile); } function load_theme_textdomain($domain) { $locale = get_locale(); - + $mofile = get_template_directory() . "/$locale.mo"; load_textdomain($domain, $mofile); } Index: wp-includes/cache.php =================================================================== --- wp-includes/cache.php (revision 3516) +++ wp-includes/cache.php (working copy) @@ -103,12 +103,12 @@ if ( ! $this->acquire_lock() ) return false; - + $this->rm_cache_dir(); $this->cache = array (); $this->dirty_objects = array (); $this->non_existant_objects = array (); - + $this->release_lock(); return true; @@ -248,7 +248,7 @@ while (($file = @ readdir($dh)) !== false) { if ($file == '.' or $file == '..') continue; - + if (@ is_dir($dir . DIRECTORY_SEPARATOR . $file)) $stack[] = $dir . DIRECTORY_SEPARATOR . $file; else if (@ is_file($dir . DIRECTORY_SEPARATOR . $file)) @@ -354,7 +354,7 @@ if (@ copy($temp_file, $cache_file)) @ unlink($temp_file); else - $errors++; + $errors++; } @ chmod($cache_file, $file_perms); } @@ -363,7 +363,7 @@ $this->dirty_objects = array(); $this->release_lock(); - + if ( $errors ) return false; Index: wp-includes/template-functions-post.php =================================================================== --- wp-includes/template-functions-post.php (revision 3516) +++ wp-includes/template-functions-post.php (working copy) @@ -211,7 +211,7 @@ // Force subkeys to be array type: if ( !isset($post_meta_cache[$mpid]) || !is_array($post_meta_cache[$mpid]) ) $post_meta_cache[$mpid] = array(); - + if ( !isset($post_meta_cache[$mpid]["$mkey"]) || !is_array($post_meta_cache[$mpid]["$mkey"]) ) $post_meta_cache[$mpid]["$mkey"] = array(); Index: wp-includes/wp-db.php =================================================================== --- wp-includes/wp-db.php (revision 3516) +++ wp-includes/wp-db.php (working copy) @@ -16,7 +16,7 @@ class wpdb { var $show_errors = true; - var $num_queries = 0; + var $num_queries = 0; var $last_query; var $col_info; var $queries; @@ -75,7 +75,7 @@ // ==================================================================== // Format a string correctly for safe insert under all PHP conditions - + function escape($string) { return addslashes( $string ); // Disable rest for now, causing problems if( !$this->dbh || version_compare( phpversion(), '4.3.0' ) == '-1' ) @@ -101,7 +101,7 @@ $this->last_query

"; } else { - return false; + return false; } } @@ -111,7 +111,7 @@ function show_errors() { $this->show_errors = true; } - + function hide_errors() { $this->show_errors = false; } @@ -142,7 +142,7 @@ // Perform the query via std mysql_query function.. if (SAVEQUERIES) $this->timer_start(); - + $this->result = @mysql_query($query, $this->dbh); ++$this->num_queries; @@ -159,7 +159,7 @@ $this->rows_affected = mysql_affected_rows(); // Take note of the insert_id if ( preg_match("/^\\s*(insert|replace) /i",$query) ) { - $this->insert_id = mysql_insert_id($this->dbh); + $this->insert_id = mysql_insert_id($this->dbh); } // Return number of rows affected $return_val = $this->rows_affected; @@ -179,7 +179,7 @@ // Log number of rows the query returned $this->num_rows = $num_rows; - + // Return number of rows selected $return_val = $this->num_rows; } @@ -293,7 +293,7 @@ $this->time_start = $mtime[1] + $mtime[0]; return true; } - + function timer_stop($precision = 3) { $mtime = microtime(); $mtime = explode(' ', $mtime); @@ -305,7 +305,7 @@ function bail($message) { // Just wraps errors in a nice header and footer if ( !$this->show_errors ) return false; - header( 'Content-Type: text/html; charset=utf-8'); + header( 'Content-Type: text/html; charset=utf-8'); echo << @@ -325,22 +325,22 @@ margin-right: 25%; padding: .2em 2em; } - + h1 { color: #006; font-size: 18px; font-weight: lighter; } - + h2 { font-size: 16px; } - + p, li, dt { line-height: 140%; padding-bottom: 2px; } - + ul, ol { padding: 5px 5px 5px 20px; } Index: wp-includes/template-loader.php =================================================================== --- wp-includes/template-loader.php (revision 3516) +++ wp-includes/template-loader.php (working copy) @@ -31,7 +31,7 @@ exit; } else if ( is_category() && $template = get_category_template()) { include($template); - exit; + exit; } else if ( is_author() && $template = get_author_template() ) { include($template); exit; Index: wp-includes/functions-formatting.php =================================================================== --- wp-includes/functions-formatting.php (revision 3516) +++ wp-includes/functions-formatting.php (working copy) @@ -32,7 +32,7 @@ $curl = preg_replace("/'([\s.]|\Z)/", '’$1', $curl); $curl = preg_replace("/ \(tm\)/i", ' ™', $curl); $curl = str_replace("''", '”', $curl); - + $curl = preg_replace('/(\d+)x(\d+)/', "$1×$2", $curl); } elseif (strstr($curl, ']*>)\s*
!', "$1", $pee); $pee = preg_replace('!
(\s*)!', '$1', $pee); $pee = preg_replace('!()(.*?)!ise', " stripslashes('$1') . stripslashes(clean_pre('$2')) . '' ", $pee); - + return $pee; } @@ -239,7 +239,7 @@ chr(197).chr(190) => 'z', chr(197).chr(191) => 's', // Euro Sign chr(226).chr(130).chr(172) => 'E'); - + $string = strtr($string, $chars); } else { // Assume ISO-8859-1 if not UTF-8 @@ -374,10 +374,10 @@ function funky_javascript_fix($text) { // Fixes for browsers' javascript bugs global $is_macIE, $is_winIE; - + if ( $is_winIE || $is_macIE ) $text = preg_replace("/\%u([0-9A-F]{4,4})/e", "'&#'.base_convert('\\1',16,10).';'", $text); - + return $text; } @@ -401,7 +401,7 @@ 1.0 First Version */ function balanceTags($text, $is_comment = 0) { - + if ( get_option('use_balanceTags') == 0) return $text; Index: wp-includes/js/tw-sack.js =================================================================== --- wp-includes/js/tw-sack.js (revision 3516) +++ wp-includes/js/tw-sack.js (working copy) @@ -32,7 +32,7 @@ this.failed = true; } }; - + this.setVar = function(name, value){ if (this.URLString.length < 3){ this.URLString = name + "=" + value; @@ -40,12 +40,12 @@ this.URLString += "&" + name + "=" + value; } } - + this.encVar = function(name, value){ var varString = encodeURIComponent(name) + "=" + encodeURIComponent(value); return varString; } - + this.encodeURLString = function(string){ varArray = string.split('&'); for (i = 0; i < varArray.length; i++){ @@ -57,11 +57,11 @@ } return varArray.join('&'); } - + this.runResponse = function(){ eval(this.response); } - + this.runAJAX = function(urlstring){ this.responseStatus = new Array(2); if(this.failed && this.AjaxFailedAlert){ Index: wp-includes/js/fat.js =================================================================== --- wp-includes/js/fat.js (revision 3516) +++ wp-includes/js/fat.js (working copy) @@ -31,22 +31,22 @@ if (!duration) duration = 3000; if (!from || from=="#") from = "#FFFF33"; if (!to) to = this.get_bgcolor(id); - + var frames = Math.round(fps * (duration / 1000)); var interval = duration / frames; var delay = interval; var frame = 0; - + if (from.length < 7) from += from.substr(1,3); if (to.length < 7) to += to.substr(1,3); - + var rf = parseInt(from.substr(1,2),16); var gf = parseInt(from.substr(3,2),16); var bf = parseInt(from.substr(5,2),16); var rt = parseInt(to.substr(1,2),16); var gt = parseInt(to.substr(3,2),16); var bt = parseInt(to.substr(5,2),16); - + var r,g,b,h; while (frame < frames) { @@ -54,7 +54,7 @@ g = Math.floor(gf * ((frames-frame)/frames) + gt * (frame/frames)); b = Math.floor(bf * ((frames-frame)/frames) + bt * (frame/frames)); h = this.make_hex(r,g,b); - + setTimeout("Fat.set_bgcolor('"+id+"','"+h+"')", delay); frame++; Index: wp-includes/js/quicktags.js =================================================================== --- wp-includes/js/quicktags.js (revision 3516) +++ wp-includes/js/quicktags.js (working copy) @@ -205,7 +205,7 @@ else { return false; // tag not found } -} +} function edCloseAllTags() { var count = edOpenTags.length; Index: wp-includes/js/colorpicker.js =================================================================== --- wp-includes/js/colorpicker.js (revision 3516) +++ wp-includes/js/colorpicker.js (working copy) @@ -139,7 +139,7 @@ } function AnchorPosition_getWindowOffsetLeft (el) { return AnchorPosition_getPageOffsetLeft(el)-document.body.scrollLeft; - } + } function AnchorPosition_getPageOffsetTop (el) { var ot=el.offsetTop; while((el=el.offsetParent) != null) { ot += el.offsetTop; } @@ -434,7 +434,7 @@ this.populated = false; this.visible = false; this.autoHideEnabled = false; - + this.contents = ""; this.url=""; this.windowProperties="toolbar=no,location=no,status=no,menubar=no,scrollbars=auto,resizable,alwaysRaised,dependent,titlebar=no"; @@ -556,7 +556,7 @@ window.ColorPicker_targetInput = inputobj; this.show(linkname); } - + // This function runs when you move your mouse over a color block, if you have a newer browser function ColorPicker_highlightColor(c) { var thedoc = (arguments.length>1)?arguments[1]:window.document; @@ -579,7 +579,7 @@ else { var divname = arguments[0]; } - + if (divname != "") { var cp = new PopupWindow(divname); } @@ -590,7 +590,7 @@ // Object variables cp.currentValue = "#FFFFFF"; - + // Method Mappings cp.writeDiv = ColorPicker_writeDiv; cp.highlightColor = ColorPicker_highlightColor; Index: wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js =================================================================== --- wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (revision 3516) +++ wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (working copy) @@ -87,13 +87,13 @@ // Is selection a image if (focusElm != null && focusElm.nodeName.toLowerCase() == "img") { flag = getAttrib(focusElm, 'class'); - + if (flag != 'mce_plugin_wordpress_more') // Not a wordpress return true; - + action = "update"; } - + html = '' + '\\s*', 'mg'), '
\n'); content = content.replace(new RegExp('^\\s*', ''), ''); content = content.replace(new RegExp('\\s*$', ''), ''); - + break; } Index: wp-includes/js/tinymce/tiny_mce.js =================================================================== --- wp-includes/js/tinymce/tiny_mce.js (revision 3516) +++ wp-includes/js/tinymce/tiny_mce.js (working copy) @@ -353,7 +353,7 @@ if (inst.formElement == formElement) { var doc = inst.getDoc(); - + tinyMCE._setHTML(doc, inst.formElement.value); if (!tinyMCE.isMSIE) Index: wp-includes/js/tinymce/wp-mce-help.php =================================================================== --- wp-includes/js/tinymce/wp-mce-help.php (revision 3516) +++ wp-includes/js/tinymce/wp-mce-help.php (working copy) @@ -93,7 +93,7 @@ c = d('content'+i.toString()); t = d('tab'+i.toString()); if ( n == i ) { - c.className = ''; + c.className = ''; t.className = 'current'; } else { c.className = 'hidden'; Index: wp-includes/js/tinymce/themes/advanced/jscripts/image.js =================================================================== --- wp-includes/js/tinymce/themes/advanced/jscripts/image.js (revision 3516) +++ wp-includes/js/tinymce/themes/advanced/jscripts/image.js (working copy) @@ -61,7 +61,7 @@ function resetImageData() { var formObj = document.forms[0]; - formObj.width.value = formObj.height.value = ""; + formObj.width.value = formObj.height.value = ""; } function updateImageData() { Index: wp-includes/capabilities.php =================================================================== --- wp-includes/capabilities.php (revision 3516) +++ wp-includes/capabilities.php (working copy) @@ -34,15 +34,15 @@ $this->role_names[$role] = $display_name; return $this->role_objects[$role]; } - + function remove_role($role) { if ( ! isset($this->role_objects[$role]) ) return; - + unset($this->role_objects[$role]); unset($this->role_names[$role]); unset($this->roles[$role]); - + update_option($this->role_key, $this->roles); } @@ -70,7 +70,7 @@ function is_role($role) { return isset($this->role_names[$role]); - } + } } class WP_Role { @@ -150,10 +150,10 @@ $this->caps = array(); $this->get_role_caps(); } - + function get_role_caps() { global $wp_roles; - + if ( ! isset($wp_roles) ) $wp_roles = new WP_Roles(); @@ -169,14 +169,14 @@ } $this->allcaps = array_merge($this->allcaps, $this->caps); } - + function add_role($role) { $this->caps[$role] = true; update_usermeta($this->id, $this->cap_key, $this->caps); $this->get_role_caps(); $this->update_user_level_from_caps(); } - + function remove_role($role) { if ( empty($this->roles[$role]) || (count($this->roles) <= 1) ) return; @@ -184,7 +184,7 @@ update_usermeta($this->id, $this->cap_key, $this->caps); $this->get_role_caps(); } - + function set_role($role) { foreach($this->roles as $oldrole) unset($this->caps[$oldrole]); @@ -203,13 +203,13 @@ return $max; } } - + function update_user_level_from_caps() { global $table_prefix; $this->user_level = array_reduce(array_keys($this->allcaps), array(&$this, 'level_reduction'), 0); update_usermeta($this->id, $table_prefix.'user_level', $this->user_level); } - + function add_cap($cap, $grant = true) { $this->caps[$cap] = $grant; update_usermeta($this->id, $this->cap_key, $this->caps); @@ -220,13 +220,13 @@ unset($this->caps[$cap]); update_usermeta($this->id, $this->cap_key, $this->caps); } - + //has_cap(capability_or_role_name) or //has_cap('edit_post', post_id) function has_cap($cap) { if ( is_numeric($cap) ) $cap = $this->translate_level_to_cap($cap); - + $args = array_slice(func_get_args(), 1); $args = array_merge(array($cap, $this->id), $args); $caps = call_user_func_array('map_meta_cap', $args); @@ -345,12 +345,12 @@ break; case 'read_post': $post = get_post($args[0]); - + if ( 'private' != $post->post_status ) { $caps[] = 'read'; - break; + break; } - + $author_data = get_userdata($user_id); $post_author_data = get_userdata($post->post_author); if ($user_id == $post_author_data->ID) Index: wp-includes/functions-post.php =================================================================== --- wp-includes/functions-post.php (revision 3516) +++ wp-includes/functions-post.php (working copy) @@ -31,7 +31,7 @@ $post_name = apply_filters('name_save_pre', $post_name); $comment_status = apply_filters('comment_status_pre', $comment_status); $ping_status = apply_filters('ping_status_pre', $ping_status); - + // Make sure we set a valid category if (0 == count($post_category) || !is_array($post_category)) { $post_category = array(get_option('default_category')); @@ -59,8 +59,8 @@ } else { $post_name = sanitize_title($post_name); } - + // If the post date is empty (due to having been new or a draft) and status is not 'draft', set date to now if (empty($post_date)) { if ( 'draft' != $post_status ) @@ -150,7 +150,7 @@ (post_author, post_date, post_date_gmt, post_content, post_content_filtered, post_title, post_excerpt, post_status, post_type, comment_status, ping_status, post_password, post_name, to_ping, pinged, post_modified, post_modified_gmt, post_parent, menu_order, post_mime_type) VALUES ('$post_author', '$post_date', '$post_date_gmt', '$post_content', '$post_content_filtered', '$post_title', '$post_excerpt', '$post_status', '$post_type', '$comment_status', '$ping_status', '$post_password', '$post_name', '$to_ping', '$pinged', '$post_date', '$post_date_gmt', '$post_parent', '$menu_order', '$post_mime_type')"); - $post_ID = $wpdb->insert_id; + $post_ID = $wpdb->insert_id; } if ( empty($post_name) && 'draft' != $post_status ) { @@ -177,7 +177,7 @@ $wpdb->query("UPDATE $wpdb->posts SET guid = '" . get_permalink($post_ID) . "' WHERE ID = '$post_ID'"); do_action('private_to_published', $post_ID); } - + do_action('edit_post', $post_ID); } @@ -251,7 +251,7 @@ $update = false; if ( !empty($ID) ) { $update = true; - $post_ID = $ID; + $post_ID = $ID; } // Create a valid post name. @@ -259,7 +259,7 @@ $post_name = sanitize_title($post_title); else $post_name = sanitize_title($post_name); - + if (empty($post_date)) $post_date = current_time('mysql'); if (empty($post_date_gmt)) @@ -332,9 +332,9 @@ (post_author, post_date, post_date_gmt, post_content, post_title, post_excerpt, post_status, post_type, comment_status, ping_status, post_password, post_name, to_ping, pinged, post_modified, post_modified_gmt, post_parent, menu_order, post_mime_type, guid) VALUES ('$post_author', '$post_date', '$post_date_gmt', '$post_content', '$post_title', '$post_excerpt', '$post_status', '$post_type', '$comment_status', '$ping_status', '$post_password', '$post_name', '$to_ping', '$pinged', '$post_date', '$post_date_gmt', '$post_parent', '$menu_order', '$post_mime_type', '$guid')"); - $post_ID = $wpdb->insert_id; + $post_ID = $wpdb->insert_id; } - + if ( empty($post_name) ) { $post_name = sanitize_title($post_title, $post_ID); $wpdb->query( "UPDATE $wpdb->posts SET post_name = '$post_name' WHERE ID = '$post_ID'" ); @@ -352,7 +352,7 @@ } else { do_action('add_attachment', $post_ID); } - + return $post_ID; } @@ -395,7 +395,7 @@ global $wpdb; $post = get_post($postid, $mode); - + // Set categories if($mode == OBJECT) { $post->post_category = wp_get_post_cats('',$postid); @@ -428,7 +428,7 @@ $postarr = get_object_vars($postarr); // First, get all of the original fields - $post = wp_get_single_post($postarr['ID'], ARRAY_A); + $post = wp_get_single_post($postarr['ID'], ARRAY_A); // Escape data pulled from DB. $post = add_magic_quotes($post); @@ -449,7 +449,7 @@ // Merge old and new fields with new fields overwriting old ones. $postarr = array_merge($post, $postarr); - $postarr['post_category'] = $post_cats; + $postarr['post_category'] = $post_cats; if ( $clear_date ) { $postarr['post_date'] = ''; $postarr['post_date_gmt'] = ''; @@ -470,12 +470,12 @@ if ( 'publish' == $post->post_status ) return; - return wp_update_post(array('post_status' => 'publish', 'ID' => $post_id)); + return wp_update_post(array('post_status' => 'publish', 'ID' => $post_id)); } function wp_get_post_cats($blogid = '1', $post_ID = 0) { global $wpdb; - + $sql = "SELECT category_id FROM $wpdb->post2cat WHERE post_id = $post_ID @@ -494,7 +494,7 @@ // If $post_categories isn't already an array, make it one: if (!is_array($post_categories) || 0 == count($post_categories)) $post_categories = array(get_option('default_category')); - + $post_categories = array_unique($post_categories); // First the old categories @@ -502,7 +502,7 @@ SELECT category_id FROM $wpdb->post2cat WHERE post_id = $post_ID"); - + if (!$old_categories) { $old_categories = array(); } else { @@ -532,13 +532,13 @@ VALUES ($post_ID, $new_cat)"); } } - + // Update category counts. $all_affected_cats = array_unique(array_merge($post_categories, $old_categories)); foreach ( $all_affected_cats as $cat_id ) { $count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->post2cat, $wpdb->posts WHERE $wpdb->posts.ID=$wpdb->post2cat.post_id AND post_status = 'publish' AND post_type = 'post' AND category_id = '$cat_id'"); $wpdb->query("UPDATE $wpdb->categories SET category_count = '$count' WHERE cat_ID = '$cat_id'"); - wp_cache_delete($cat_id, 'category'); + wp_cache_delete($cat_id, 'category'); } } // wp_set_post_cats() @@ -568,7 +568,7 @@ $wpdb->query("UPDATE $wpdb->posts SET post_parent = $post->post_parent WHERE post_parent = $postid AND post_type = 'page'"); $wpdb->query("DELETE FROM $wpdb->posts WHERE ID = $postid"); - + $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_post_ID = $postid"); $wpdb->query("DELETE FROM $wpdb->post2cat WHERE post_id = $postid"); @@ -595,17 +595,17 @@ // Get the name of a category from its ID function get_cat_name($cat_id) { global $wpdb; - + $cat_id -= 0; // force numeric $name = $wpdb->get_var("SELECT cat_name FROM $wpdb->categories WHERE cat_ID=$cat_id"); - + return $name; } // Get the ID of a category from its name function get_cat_ID($cat_name='General') { global $wpdb; - + $cid = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$cat_name'"); return $cid?$cid:1; // default to cat 1 @@ -639,14 +639,14 @@ // import postdata as variables extract($postdata); - + // form an excerpt $excerpt = strip_tags($post_excerpt?$post_excerpt:$post_content); - + if (strlen($excerpt) > 255) { $excerpt = substr($excerpt,0,252) . '...'; } - + $trackback_urls = explode(',', $tb_list); foreach($trackback_urls as $tb_url) { $tb_url = trim($tb_url); @@ -684,7 +684,7 @@ // Do some escaping magic so that '#' chars in the // spam words don't break things: $word = preg_quote($word, '#'); - + $pattern = "#$word#i"; if ( preg_match($pattern, $author ) ) return true; if ( preg_match($pattern, $email ) ) return true; @@ -693,7 +693,7 @@ if ( preg_match($pattern, $user_ip ) ) return true; if ( preg_match($pattern, $user_agent) ) return true; } - + if ( isset($_SERVER['REMOTE_ADDR']) ) { if ( wp_proxy_check($_SERVER['REMOTE_ADDR']) ) return true; } @@ -722,7 +722,7 @@ $wpdb->query("UPDATE $wpdb->posts SET to_ping = '' WHERE ID = '$post_id'"); return; } - + if (empty($post->post_excerpt)) $excerpt = apply_filters('the_content', $post->post_content); else @@ -812,7 +812,7 @@ function generate_page_uri_index() { global $wpdb; - + //get pages in order of hierarchy, i.e. children after parents $posts = get_page_hierarchy($wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page'")); //now reverse it, because we need parents after children for rewrite rules to work properly @@ -822,7 +822,7 @@ $page_attachment_uris = array(); if ($posts) { - + foreach ($posts as $id => $post) { // URI => page name @@ -839,7 +839,7 @@ } update_option('page_uris', $page_uris); - + if ( $page_attachment_uris ) update_option('page_attachment_uris', $page_attachment_uris); } @@ -903,7 +903,7 @@ return true; } else { if ( is_dir(dirname($target)) ) - return false; + return false; } // If the above failed, attempt to create the parent node, then try again. @@ -954,7 +954,7 @@ return array('error' => "Empty filename"); $upload = wp_upload_dir(); - + if ( $upload['error'] !== false ) return $upload; @@ -972,7 +972,7 @@ else $filename = str_replace("$number$ext", ++$number . $ext, $filename); } - + $new_file = $upload['path'] . "/$filename"; if ( ! wp_mkdir_p( dirname($new_file) ) ) { $message = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), dirname($new_file)); @@ -982,7 +982,7 @@ $ifp = @ fopen($new_file, 'wb'); if ( ! $ifp ) return array('error' => "Could not write file $new_file."); - + $success = @ fwrite($ifp, $bits); fclose($ifp); // Set correct file permissions Index: wp-includes/classes.php =================================================================== --- wp-includes/classes.php (revision 3516) +++ wp-includes/classes.php (working copy) @@ -53,7 +53,7 @@ $this->is_admin = false; $this->is_attachment = false; } - + function init () { unset($this->posts); unset($this->query); @@ -63,7 +63,7 @@ $this->post_count = 0; $this->current_post = -1; $this->in_the_loop = false; - + $this->init_query_flags(); } @@ -97,7 +97,7 @@ $qv['attachment'] = $qv['subpost']; if ( '' != $qv['subpost_id'] ) $qv['attachment_id'] = $qv['subpost_id']; - + if ( ('' != $qv['attachment']) || (int) $qv['attachment_id'] ) { $this->is_single = true; $this->is_attachment = true; @@ -226,7 +226,7 @@ if ('' != $qv['comments_popup']) { $this->is_comments_popup = true; } - + //if we're previewing inside the write screen if ('' != $qv['preview']) { $this->is_preview = true; @@ -247,9 +247,9 @@ function set_404() { $this->init_query_flags(); - $this->is_404 = true; + $this->is_404 = true; } - + function get($query_var) { if (isset($this->query_vars[$query_var])) { return $this->query_vars[$query_var]; @@ -268,7 +268,7 @@ do_action('pre_get_posts', array(&$this)); // Shorthand. - $q = $this->query_vars; + $q = $this->query_vars; // First let's clear some variables $whichcat = ''; @@ -306,7 +306,7 @@ $q['page'] = trim($q['page'], '/'); $q['page'] = (int) $q['page']; } - + $add_hours = intval(get_settings('gmt_offset')); $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours)); $wp_posts_post_date_field = "post_date"; // "DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)"; @@ -372,7 +372,7 @@ $page_paths = '/' . trim($q['pagename'], '/'); $q['pagename'] = sanitize_title(basename($page_paths)); $q['name'] = $q['pagename']; - + $where .= " AND (ID = '$reqpage')"; } elseif ('' != $q['attachment']) { $q['attachment'] = str_replace('%2F', '/', urlencode(urldecode($q['attachment']))); @@ -489,11 +489,11 @@ $partial_match = $cat_id; } } - + //if we don't match the entire hierarchy fallback on just matching the nicename if (!$q['cat'] && $partial_match) { $q['cat'] = $partial_match; - } + } $tables = ", $wpdb->post2cat, $wpdb->categories"; $join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) LEFT JOIN $wpdb->categories ON ($wpdb->post2cat.category_id = $wpdb->categories.cat_ID) "; @@ -541,7 +541,7 @@ $q['author'] = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_nicename='".$q['author_name']."'"); $whichauthor .= ' AND (post_author = '.intval($q['author']).')'; } - + $where .= $search.$whichcat.$whichauthor; if ((empty($q['order'])) || ((strtoupper($q['order']) != 'ASC') && (strtoupper($q['order']) != 'DESC'))) { @@ -572,7 +572,7 @@ } //$now = gmdate('Y-m-d H:i:59'); - + //only select past-dated posts, except if a logged in user is viewing a single: then, if they //can edit the post, we let them through //if ($pagenow != 'post.php' && $pagenow != 'edit.php' && !($this->is_single && $user_ID)) { @@ -593,11 +593,11 @@ $where .= " OR post_status = 'future'"; else $distinct = 'DISTINCT'; - + if ( is_user_logged_in() ) $where .= " OR post_author = $user_ID AND post_status = 'private')"; else - $where .= ')'; + $where .= ')'; } // Apply filters on where and join prior to paging so that any @@ -680,7 +680,7 @@ if ($this->post_count > 0) { $this->post = $this->posts[0]; } - + // Save any changes made to the query vars. $this->query_vars = $q; return $this->posts; @@ -841,7 +841,7 @@ $head = '

' . __('Check Comments Results:') . '

'; $foot .= '

' . __('« Return to Discussion Options page.') . '

'; - + return $head . $body . $foot; } // End function display_edit_form @@ -922,7 +922,7 @@ return false; else return true; - } + } function using_index_permalinks() { if (empty($this->permalink_structure)) { @@ -942,7 +942,7 @@ return true; else return false; - } + } function preg_index($number) { $match_prefix = '$'; @@ -987,7 +987,7 @@ $this->date_structure = ''; return false; } - + // The date permalink must have year, month, and day separated by slashes. $endians = array('%year%/%monthnum%/%day%', '%day%/%monthnum%/%year%', '%monthnum%/%day%/%year%'); @@ -1070,7 +1070,7 @@ $this->category_structure = $this->category_base . '/'; $this->category_structure .= '%category%'; - + return $this->category_structure; } @@ -1153,10 +1153,10 @@ // If the tag already exists, replace the existing pattern and query for // that tag, otherwise add the new tag, pattern, and query to the end of // the arrays. - $position = array_search($tag, $this->rewritecode); + $position = array_search($tag, $this->rewritecode); if (FALSE !== $position && NULL !== $position) { $this->rewritereplace[$position] = $pattern; - $this->queryreplace[$position] = $query; + $this->queryreplace[$position] = $query; } else { $this->rewritecode[] = $tag; $this->rewritereplace[] = $pattern; @@ -1174,7 +1174,7 @@ $trackbackregex = 'trackback/?$'; $pageregex = 'page/?([0-9]{1,})/?$'; - + $front = substr($permalink_structure, 0, strpos($permalink_structure, '%')); preg_match_all('/%.+?%/', $permalink_structure, $tokens); @@ -1304,7 +1304,7 @@ // Date $date_rewrite = $this->generate_rewrite_rules($this->get_date_permastruct()); $date_rewrite = apply_filters('date_rewrite_rules', $date_rewrite); - + // Root $root_rewrite = $this->generate_rewrite_rules($this->root . '/'); $root_rewrite = apply_filters('root_rewrite_rules', $root_rewrite); @@ -1372,7 +1372,7 @@ $rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" . "RewriteCond %{REQUEST_FILENAME} -d\n" . "RewriteRule ^.*$ - [S=$num_rules]\n"; - + foreach ($rewrite as $match => $query) { // Apache 1.3 does not support the reluctant (non-greedy) modifier. $match = str_replace('.+?', '.+', $match); @@ -1382,7 +1382,7 @@ if ($match == '(.+)/?$' || $match == '([^/]+)/?$' ) { //nada. } - + if (strstr($query, $this->index)) { $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n"; } else { @@ -1413,7 +1413,7 @@ function init() { $this->permalink_structure = get_settings('permalink_structure'); - $this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%')); + $this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%')); $this->root = ''; if ($this->using_index_permalinks()) { $this->root = $this->index . '/'; @@ -1493,7 +1493,7 @@ // Trim path info from the end and the leading home path from the // front. For path info requests, this leaves us with the requesting // filename, if any. For 404 requests, this leaves us with the - // requested permalink. + // requested permalink. $req_uri = str_replace($pathinfo, '', $req_uri); $req_uri = trim($req_uri, '/'); $req_uri = preg_replace("|^$home_path|", '', $req_uri); @@ -1562,10 +1562,10 @@ if (isset($error)) unset($error); - + if ( isset($query_vars) && strstr($_SERVER['PHP_SELF'], 'wp-admin/') ) unset($query_vars); - + $this->did_permalink = false; } } @@ -1619,7 +1619,7 @@ // If string is empty, return 0. If not, attempt to parse into a timestamp $client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0; - // Make a timestamp for our most recent modification... + // Make a timestamp for our most recent modification... $wp_modified_timestamp = strtotime($wp_last_modified); if ( ($client_last_modified && $client_etag) ? Index: wp-includes/template-functions-links.php =================================================================== --- wp-includes/template-functions-links.php (revision 3516) +++ wp-includes/template-functions-links.php (working copy) @@ -271,7 +271,7 @@ return null; $current_post_date = $post->post_date; - + $join = ''; if ( $in_same_cat ) { $join = " INNER JOIN $wpdb->post2cat ON $wpdb->posts.ID= $wpdb->post2cat.post_id "; @@ -437,7 +437,7 @@ if ( $permalink ) $qstr = trailingslashit($qstr); $qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_settings('home') ) . $qstr ); - + // showing /page/1/ or ?paged=1 is redundant if ( 1 === $pagenum ) { $qstr = str_replace('page/1/', '', $qstr); // for mod_rewrite style Index: wp-includes/pluggable-functions.php =================================================================== --- wp-includes/pluggable-functions.php (revision 3516) +++ wp-includes/pluggable-functions.php (working copy) @@ -62,7 +62,7 @@ return false; $user = wp_cache_get($user_id, 'users'); - + if ( $user ) return $user; @@ -93,10 +93,10 @@ $user->user_lastname = $user->last_name; if ( isset($user->description) ) $user->user_description = $user->description; - + wp_cache_add($user_id, $user, 'users'); wp_cache_add($user->user_login, $user, 'userlogins'); - + return $user; } endif; @@ -114,7 +114,7 @@ if ( empty( $user_login ) ) return false; - + $userdata = wp_cache_get($user_login, 'userlogins'); if ( $userdata ) return $userdata; @@ -202,7 +202,7 @@ if ( !function_exists('is_user_logged_in') ) : function is_user_logged_in() { global $current_user; - + if ( $current_user->id == 0 ) return false; return true; @@ -216,7 +216,7 @@ !wp_login($_COOKIE[USER_COOKIE], $_COOKIE[PASS_COOKIE], true)) || (empty($_COOKIE[USER_COOKIE])) ) { nocache_headers(); - + header('Location: ' . get_settings('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI'])); exit(); } @@ -303,9 +303,9 @@ $comment_author_domain = gethostbyaddr($comment->comment_author_IP); $blogname = get_settings('blogname'); - + if ( empty( $comment_type ) ) $comment_type = 'comment'; - + if ('comment' == $comment_type) { $notify_message = sprintf( __('New comment on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n"; $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; @@ -407,14 +407,14 @@ if ( !function_exists('wp_new_user_notification') ) : function wp_new_user_notification($user_id, $plaintext_pass = '') { $user = new WP_User($user_id); - + $user_login = stripslashes($user->user_login); $user_email = stripslashes($user->user_email); - + $message = sprintf(__('New user registration on your blog %s:'), get_settings('blogname')) . "\r\n\r\n"; $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n"; - + @wp_mail(get_settings('admin_email'), sprintf(__('[%s] New User Registration'), get_settings('blogname')), $message); if ( empty($plaintext_pass) ) @@ -423,9 +423,9 @@ $message = sprintf(__('Username: %s'), $user_login) . "\r\n"; $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n"; $message .= get_settings('siteurl') . "/wp-login.php\r\n"; - + wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_settings('blogname')), $message); - + } endif; Index: wp-includes/comment-functions.php =================================================================== --- wp-includes/comment-functions.php (revision 3516) +++ wp-includes/comment-functions.php (working copy) @@ -41,8 +41,8 @@ $commentdata['comment_date'] = current_time('mysql'); $commentdata['comment_date_gmt'] = current_time('mysql', 1); - + $commentdata = wp_filter_comment($commentdata); $commentdata['comment_approved'] = wp_allow_comment($commentdata); @@ -230,7 +230,7 @@ if ( !isset($comment_count_cache[$post_id]) ) $comment_count_cache[$id] = $wpdb->get_var("SELECT comment_count FROM $wpdb->posts WHERE ID = '$post_id'"); - + return apply_filters('get_comments_number', $comment_count_cache[$post_id]); } @@ -277,13 +277,13 @@ function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') { global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post, $wpdb; global $comment_count_cache; - + if (! is_single() && ! is_page()) { if ( !isset($comment_count_cache[$id]) ) $comment_count_cache[$id] = $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved = '1';"); - + $number = $comment_count_cache[$id]; - + if (0 == $number && 'closed' == $post->comment_status && 'closed' == $post->ping_status) { echo $none; return; @@ -344,7 +344,7 @@ function get_comment_author_email() { global $comment; - return apply_filters('get_comment_author_email', $comment->comment_author_email); + return apply_filters('get_comment_author_email', $comment->comment_author_email); } function comment_author_email() { @@ -616,7 +616,7 @@ // Debug debug_fwrite($log, 'Post contents:'); debug_fwrite($log, $content."\n"); - + // Step 2. // Walking thru the links array // first we get rid of links pointing to sites, not to specific files @@ -658,7 +658,7 @@ // when set to true, this outputs debug messages by itself $client->debug = false; - + if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto ) ) add_ping( $post_ID, $pagelinkedto ); else @@ -769,7 +769,7 @@ $post = & get_post($id); if ( 'attachment' == $post->post_status ) return true; - } + } return false; } @@ -795,7 +795,7 @@ if ($wpdb->query($query)) { do_action('wp_set_comment_status', $comment_id, $comment_status); - + $comment = get_comment($comment_id); $comment_post_ID = $comment->comment_post_ID; $c = $wpdb->get_row( "SELECT count(*) as c FROM {$wpdb->comments} WHERE comment_post_ID = '$comment_post_ID' AND comment_approved = '1'" ); @@ -809,7 +809,7 @@ function wp_get_comment_status($comment_id) { global $wpdb; - + $result = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_ID='$comment_id' LIMIT 1"); if ($result == NULL) { return 'deleted'; @@ -845,7 +845,7 @@ // Do some escaping magic so that '#' chars in the // spam words don't break things: $word = preg_quote($word, '#'); - + $pattern = "#$word#i"; if ( preg_match($pattern, $author) ) return false; if ( preg_match($pattern, $email) ) return false; Index: wp-includes/functions.php =================================================================== --- wp-includes/functions.php (revision 3516) +++ wp-includes/functions.php (working copy) @@ -22,7 +22,7 @@ return false; } $i = mktime(substr($m,11,2),substr($m,14,2),substr($m,17,2),substr($m,5,2),substr($m,8,2),substr($m,0,4)); - + if ( -1 == $i || false == $i ) $i = 0; @@ -304,7 +304,7 @@ function get_user_option( $option, $user = 0 ) { global $wpdb, $current_user; - + if ( empty($user) ) $user = $current_user; else @@ -657,7 +657,7 @@ $curpage = get_page($curpage->post_parent); $path = '/' . $curpage->post_name . $path; } - + $page->fullpath = $path; return $page; @@ -726,7 +726,7 @@ wp_cache_add($_page->ID, $_page, 'pages'); } } - + if (!isset($_page->fullpath)) { $_page = set_page_path($_page); wp_cache_replace($_page->ID, $_page, 'pages'); @@ -751,7 +751,7 @@ $curcat = get_category($curcat->category_parent); $path = '/' . $curcat->category_nicename . $path; } - + $cat->fullpath = $path; return $cat; @@ -777,7 +777,7 @@ if ( !isset($_category->fullpath) ) { $_category = set_category_path($_category); - wp_cache_replace($_category->cat_ID, $_category, 'category'); + wp_cache_replace($_category->cat_ID, $_category, 'category'); } if ( $output == OBJECT ) { @@ -830,23 +830,23 @@ function get_all_category_ids() { global $wpdb; - + if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category') ) { $cat_ids = $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories"); wp_cache_add('all_category_ids', $cat_ids, 'category'); } - + return $cat_ids; } function get_all_page_ids() { global $wpdb; - + if ( ! $page_ids = wp_cache_get('all_page_ids', 'pages') ) { $page_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type = 'page'"); wp_cache_add('all_page_ids', $page_ids, 'pages'); } - + return $page_ids; } @@ -1416,7 +1416,7 @@ if ( empty($dogs) ) return; - + foreach ($dogs as $catt) $category_cache[$catt->post_id][$catt->category_id] = &get_category($catt->category_id); } @@ -1523,7 +1523,7 @@ function is_preview() { global $wp_query; - + return $wp_query->is_preview; } @@ -2175,7 +2175,7 @@ function wp($query_vars = '') { global $wp; - + $wp->main($query_vars); } @@ -2245,7 +2245,7 @@ if ( is_array($meta_value) || is_object($meta_value) ) $meta_value = serialize($meta_value); $meta_value = trim( $meta_value ); - + if (empty($meta_value)) { delete_usermeta($user_id, $meta_key); } @@ -2258,13 +2258,13 @@ } else if ( $cur->meta_value != $meta_value ) { $wpdb->query("UPDATE $wpdb->usermeta SET meta_value = '$meta_value' WHERE user_id = '$user_id' AND meta_key = '$meta_key'"); } else { - return false; + return false; } - + $user = get_userdata($user_id); wp_cache_delete($user_id, 'users'); wp_cache_delete($user->user_login, 'userlogins'); - + return true; } @@ -2282,11 +2282,11 @@ $wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key' AND meta_value = '$meta_value'"); else $wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key'"); - + $user = get_userdata($user_id); wp_cache_delete($user_id, 'users'); wp_cache_delete($user->user_login, 'userlogins'); - + return true; } Index: wp-includes/rss-functions.php =================================================================== --- wp-includes/rss-functions.php (revision 3516) +++ wp-includes/rss-functions.php (working copy) @@ -30,37 +30,37 @@ var $inimage = false; var $current_field = ''; var $current_namespace = false; - + //var $ERROR = ""; - + var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright'); function MagpieRSS ($source) { - + # if PHP xml isn't compiled in, die # if ( !function_exists('xml_parser_create') ) trigger_error( "Failed to load PHP's XML Extension. http://www.php.net/manual/en/ref.xml.php" ); - + $parser = @xml_parser_create(); - + if ( !is_resource($parser) ) trigger_error( "Failed to create an instance of PHP's XML parser. http://www.php.net/manual/en/ref.xml.php"); - + $this->parser = $parser; - + # pass in parser, and a reference to this object # setup handlers # xml_set_object( $this->parser, $this ); xml_set_element_handler($this->parser, 'feed_start_element', 'feed_end_element' ); - + xml_set_character_data_handler( $this->parser, 'feed_cdata' ); - + $status = xml_parse( $this->parser, $source ); - + if (! $status ) { $errorcode = xml_get_error_code( $this->parser ); if ( $errorcode != XML_ERROR_NONE ) { @@ -72,16 +72,16 @@ $this->error( $errormsg ); } } - + xml_parser_free( $this->parser ); $this->normalize(); } - + function feed_start_element($p, $element, &$attrs) { $el = $element = strtolower($element); $attrs = array_change_key_case($attrs, CASE_LOWER); - + // check for a namespace, and split if found $ns = false; if ( strpos( $element, ':' ) ) { @@ -90,7 +90,7 @@ if ( $ns and $ns != 'rdf' ) { $this->current_namespace = $ns; } - + # if feed type isn't set, then this is first element of feed # identify feed from root element # @@ -110,7 +110,7 @@ } return; } - + if ( $el == 'channel' ) { $this->inchannel = true; @@ -119,10 +119,10 @@ { $this->initem = true; if ( isset($attrs['rdf:about']) ) { - $this->current_item['about'] = $attrs['rdf:about']; + $this->current_item['about'] = $attrs['rdf:about']; } } - + // if we're in the default namespace of an RSS feed, // record textinput or image fields elseif ( @@ -132,7 +132,7 @@ { $this->intextinput = true; } - + elseif ( $this->feed_type == RSS and $this->current_namespace == '' and @@ -140,7 +140,7 @@ { $this->inimage = true; } - + # handle atom content constructs elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) ) { @@ -148,12 +148,12 @@ if ($el == 'content' ) { $el = 'atom_content'; } - + $this->incontent = $el; - - + + } - + // if inside an Atom content construct (e.g. content or summary) field treat tags as text elseif ($this->feed_type == ATOM and $this->incontent ) { @@ -162,12 +162,12 @@ array_map('map_attrs', array_keys($attrs), array_values($attrs) ) ); - + $this->append_content( "<$element $attrs_str>" ); - + array_unshift( $this->stack, $el ); } - + // Atom support many links per containging element. // Magpie treats link elements of type rel='alternate' // as being equivalent to RSS's simple link element. @@ -181,7 +181,7 @@ else { $link_el = 'link_' . $attrs['rel']; } - + $this->append($link_el, $attrs['href']); } // set stack[0] to current element @@ -189,11 +189,11 @@ array_unshift($this->stack, $el); } } - - + + function feed_cdata ($p, $text) { - + if ($this->feed_type == ATOM and $this->incontent) { $this->append_content( $text ); @@ -203,10 +203,10 @@ $this->append($current_el, $text); } } - + function feed_end_element ($p, $el) { $el = strtolower($el); - + if ( $el == 'item' or $el == 'entry' ) { $this->items[] = $this->current_item; @@ -222,7 +222,7 @@ $this->inimage = false; } elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) ) - { + { $this->incontent = false; } elseif ($el == 'channel' or $el == 'feed' ) @@ -245,17 +245,17 @@ else { array_shift( $this->stack ); } - + $this->current_namespace = false; } - + function concat (&$str1, $str2="") { if (!isset($str1) ) { $str1=""; } $str1 .= $str2; } - + function append_content($text) { if ( $this->initem ) { $this->concat( $this->current_item[ $this->incontent ], $text ); @@ -264,7 +264,7 @@ $this->concat( $this->channel[ $this->incontent ], $text ); } } - + // smart append - field and namespace aware function append($el, $text) { if (!$el) { @@ -306,10 +306,10 @@ $this->concat( $this->channel[ $el ], $text ); } - + } } - + function normalize () { // if atom populate rss fields if ( $this->is_atom() ) { @@ -320,9 +320,9 @@ $item['description'] = $item['summary']; if ( isset($item['atom_content'])) $item['content']['encoded'] = $item['atom_content']; - + $this->items[$i] = $item; - } + } } elseif ( $this->is_rss() ) { $this->channel['tagline'] = $this->channel['description']; @@ -332,21 +332,21 @@ $item['summary'] = $item['description']; if ( isset($item['content']['encoded'] ) ) $item['atom_content'] = $item['content']['encoded']; - + $this->items[$i] = $item; } } } - + function is_rss () { if ( $this->feed_type == RSS ) { - return $this->feed_version; + return $this->feed_version; } else { return false; } } - + function is_atom() { if ( $this->feed_type == ATOM ) { return $this->feed_version; @@ -378,12 +378,12 @@ function fetch_rss ($url) { // initialize constants init(); - + if ( !isset($url) ) { // error("fetch_rss called without a url"); return false; } - + // if cache is disabled if ( !MAGPIE_CACHE_ON ) { // fetch file, and parse it @@ -403,19 +403,19 @@ // 2. if there is a hit, make sure its fresh // 3. if cached obj fails freshness check, fetch remote // 4. if remote fails, return stale object, or error - + $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE ); - + if (MAGPIE_DEBUG and $cache->ERROR) { debug($cache->ERROR, E_USER_WARNING); } - - + + $cache_status = 0; // response of check_cache $request_headers = array(); // HTTP headers to send with fetch $rss = 0; // parsed RSS object $errormsg = 0; // errors, if any - + if (!$cache->ERROR) { // return cache HIT, MISS, or STALE $cache_status = $cache->check_cache( $url ); @@ -432,9 +432,9 @@ return $rss; } } - + // else attempt a conditional get - + // setup headers if ( $cache_status == 'STALE' ) { $rss = $cache->get( $url ); @@ -443,9 +443,9 @@ $request_headers['If-Last-Modified'] = $rss->last_modified; } } - + $resp = _fetch_remote_file( $url, $request_headers ); - + if (isset($resp) and $resp) { if ($resp->status == '304' ) { // we have the most current copy @@ -483,9 +483,9 @@ else { $errormsg = "Unable to retrieve RSS file for unknown reasons."; } - + // else fetch failed - + // attempt to return cached object if ($rss) { if ( MAGPIE_DEBUG ) { @@ -493,12 +493,12 @@ } return $rss; } - + // else we totally failed - // error( $errormsg ); - + // error( $errormsg ); + return false; - + } // end if ( !MAGPIE_CACHE_ON ) { } // end fetch_rss() @@ -511,7 +511,7 @@ if (is_array($headers) ) { $client->rawheaders = $headers; } - + @$client->fetch($url); return $client; @@ -519,10 +519,10 @@ function _response_to_rss ($resp) { $rss = new MagpieRSS( $resp->results ); - - // if RSS parsed successfully + + // if RSS parsed successfully if ( $rss and !$rss->ERROR) { - + // find Etag, and Last-Modified foreach($resp->headers as $h) { // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1" @@ -533,26 +533,26 @@ $field = $h; $val = ""; } - + if ( $field == 'ETag' ) { $rss->etag = $val; } - + if ( $field == 'Last-Modified' ) { $rss->last_modified = $val; } } - - return $rss; + + return $rss; } // else construct error message else { $errormsg = "Failed to parse RSS file."; - + if ($rss) { $errormsg .= " (" . $rss->ERROR . ")"; } // error($errormsg); - + return false; } // end if ($rss and !$rss->error) } @@ -569,7 +569,7 @@ else { define('MAGPIE_INITALIZED', 1); } - + if ( !defined('MAGPIE_CACHE_ON') ) { define('MAGPIE_CACHE_ON', 1); } @@ -585,31 +585,31 @@ if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) { define('MAGPIE_CACHE_FRESH_ONLY', 0); } - + if ( !defined('MAGPIE_DEBUG') ) { define('MAGPIE_DEBUG', 0); } if ( !defined('MAGPIE_USER_AGENT') ) { $ua = 'WordPress/' . $wp_version; - + if ( MAGPIE_CACHE_ON ) { $ua = $ua . ')'; } else { $ua = $ua . '; No cache)'; } - + define('MAGPIE_USER_AGENT', $ua); } - + if ( !defined('MAGPIE_FETCH_TIME_OUT') ) { define('MAGPIE_FETCH_TIME_OUT', 2); // 2 second timeout } - + // use gzip encoding to fetch rss files if supported? if ( !defined('MAGPIE_USE_GZIP') ) { - define('MAGPIE_USE_GZIP', true); + define('MAGPIE_USE_GZIP', true); } } @@ -641,7 +641,7 @@ var $BASE_CACHE = 'wp-content/cache'; // where the cache files are stored var $MAX_AGE = 43200; // when are files stale, default twelve hours var $ERROR = ''; // accumulate error messages - + function RSSCache ($base='', $age='') { if ( $base ) { $this->BASE_CACHE = $base; @@ -649,50 +649,50 @@ if ( $age ) { $this->MAX_AGE = $age; } - + } - + /*=======================================================================*\ Function: set Purpose: add an item to the cache, keyed on url Input: url from wich the rss file was fetched - Output: true on sucess + Output: true on sucess \*=======================================================================*/ function set ($url, $rss) { global $wpdb; $cache_option = 'rss_' . $this->file_name( $url ); $cache_timestamp = 'rss_' . $this->file_name( $url ) . '_ts'; - + if ( !$wpdb->get_var("SELECT option_name FROM $wpdb->options WHERE option_name = '$cache_option'") ) add_option($cache_option, '', '', 'no'); if ( !$wpdb->get_var("SELECT option_name FROM $wpdb->options WHERE option_name = '$cache_timestamp'") ) add_option($cache_timestamp, '', '', 'no'); - + update_option($cache_option, $rss); update_option($cache_timestamp, time() ); - + return $cache_option; } - + /*=======================================================================*\ Function: get Purpose: fetch an item from the cache Input: url from wich the rss file was fetched - Output: cached object on HIT, false on MISS -\*=======================================================================*/ + Output: cached object on HIT, false on MISS +\*=======================================================================*/ function get ($url) { $this->ERROR = ""; $cache_option = 'rss_' . $this->file_name( $url ); - + if ( ! get_option( $cache_option ) ) { $this->debug( "Cache doesn't contain: $url (cache option: $cache_option)" ); return 0; } - + $rss = get_option( $cache_option ); - + return $rss; } @@ -701,8 +701,8 @@ Purpose: check a url for membership in the cache and whether the object is older then MAX_AGE (ie. STALE) Input: url from wich the rss file was fetched - Output: cached object on HIT, false on MISS -\*=======================================================================*/ + Output: cached object on HIT, false on MISS +\*=======================================================================*/ function check_cache ( $url ) { $this->ERROR = ""; $cache_option = $this->file_name( $url ); @@ -729,32 +729,32 @@ /*=======================================================================*\ Function: serialize -\*=======================================================================*/ +\*=======================================================================*/ function serialize ( $rss ) { return serialize( $rss ); } /*=======================================================================*\ Function: unserialize -\*=======================================================================*/ +\*=======================================================================*/ function unserialize ( $data ) { return unserialize( $data ); } - + /*=======================================================================*\ Function: file_name Purpose: map url to location in cache Input: url from wich the rss file was fetched Output: a file name -\*=======================================================================*/ +\*=======================================================================*/ function file_name ($url) { return md5( $url ); } - + /*=======================================================================*\ Function: error Purpose: register error -\*=======================================================================*/ +\*=======================================================================*/ function error ($errormsg, $lvl=E_USER_WARNING) { // append PHP's error message if track_errors enabled if ( isset($php_errormsg) ) { @@ -776,17 +776,17 @@ } function parse_w3cdtf ( $date_str ) { - + # regex to match wc3dtf $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/"; - + if ( preg_match( $pat, $date_str, $match ) ) { list( $year, $month, $day, $hours, $minutes, $seconds) = array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[6]); - + # calc epoch for current date assuming GMT $epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year); - + $offset = 0; if ( $match[10] == 'Z' ) { # zulu time, aka GMT @@ -794,20 +794,20 @@ else { list( $tz_mod, $tz_hour, $tz_min ) = array( $match[8], $match[9], $match[10]); - + # zero out the variables if ( ! $tz_hour ) { $tz_hour = 0; } if ( ! $tz_min ) { $tz_min = 0; } - + $offset_secs = (($tz_hour*60)+$tz_min)*60; - + # is timezone ahead of GMT? then subtract offset # if ( $tz_mod == '+' ) { $offset_secs = $offset_secs * -1; } - - $offset = $offset_secs; + + $offset = $offset_secs; } $epoch = $epoch + $offset; return $epoch; @@ -829,7 +829,7 @@ echo htmlentities($item['title']); echo "
\n"; echo "\n"; - } + } echo ""; } else { Index: wp-includes/registration-functions.php =================================================================== --- wp-includes/registration-functions.php (revision 3516) +++ wp-includes/registration-functions.php (working copy) @@ -23,9 +23,9 @@ $valid = true; if ( $name != $username ) - $valid = false; + $valid = false; - return apply_filters('validate_username', $valid, $username); + return apply_filters('validate_username', $valid, $username); } function wp_insert_user($userdata) { @@ -41,7 +41,7 @@ // Password is not hashed when creating new user. $user_pass = md5($user_pass); } - + $user_login = sanitize_user($user_login, true); if ( empty($user_nicename) ) @@ -49,10 +49,10 @@ if ( empty($display_name) ) $display_name = $user_login; - + if ( empty($nickname) ) $nickname = $user_login; - + if ( empty($user_registered) ) $user_registered = gmdate('Y-m-d H:i:s'); @@ -70,7 +70,7 @@ $wpdb->query( $query ); $user_id = $wpdb->insert_id; } - + update_usermeta( $user_id, 'first_name', $first_name); update_usermeta( $user_id, 'last_name', $last_name); update_usermeta( $user_id, 'nickname', $nickname ); @@ -91,22 +91,22 @@ wp_cache_delete($user_id, 'users'); wp_cache_delete($user_login, 'userlogins'); - + if ( $update ) do_action('profile_update', $user_id); else do_action('user_register', $user_id); - - return $user_id; + + return $user_id; } function wp_update_user($userdata) { global $wpdb, $current_user; $ID = (int) $userdata['ID']; - + // First, get all of the original fields - $user = get_userdata($ID); + $user = get_userdata($ID); // Escape data pulled from DB. $user = add_magic_quotes(get_object_vars($user)); @@ -121,20 +121,20 @@ $userdata = array_merge($user, $userdata); $user_id = wp_insert_user($userdata); - // Update the cookies if the password changed. + // Update the cookies if the password changed. if( $current_user->id == $ID ) { if ( isset($plaintext_pass) ) { wp_clearcookie(); wp_setcookie($userdata['user_login'], $plaintext_pass); } } - + return $user_id; } function wp_create_user( $username, $password, $email = '') { global $wpdb; - + $user_login = $wpdb->escape( $username ); $user_email = $wpdb->escape( $email ); $user_pass = $password; @@ -145,7 +145,7 @@ function create_user( $username, $password, $email ) { - return wp_create_user( $username, $password, $email ); + return wp_create_user( $username, $password, $email ); } Index: xmlrpc.php =================================================================== --- xmlrpc.php (revision 3516) +++ xmlrpc.php (working copy) @@ -577,7 +577,7 @@ $post_category[] = get_cat_ID($cat); } } - + // We've got all the data -- post it: $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping'); @@ -623,7 +623,7 @@ $catnames = $content_struct['categories']; $post_category = array(); - + if (is_array($catnames)) { foreach ($catnames as $cat) { $post_category[] = get_cat_ID($cat); @@ -861,7 +861,7 @@ logIO('O', '(MW) Could not write file '.$name); return new IXR_Error(500, 'Could not write file '.$name); } - + return array('url' => $upload['url']); } @@ -995,7 +995,7 @@ foreach($categories as $cat) { $catids[] = $cat['categoryId']; } - + wp_set_post_cats('', $post_ID, $catids); return true; @@ -1199,11 +1199,11 @@ $linea = strip_tags( $linea, '' ); // just keep the tag we need $p = explode( "\n\n", $linea ); - + $sem_regexp_pb = "/(\\/|\\\|\*|\?|\+|\.|\^|\\$|\(|\)|\[|\]|\||\{|\})/"; $sem_regexp_fix = "\\\\$1"; $link = preg_replace( $sem_regexp_pb, $sem_regexp_fix, $pagelinkedfrom ); - + $finished = false; foreach ( $p as $para ) { if ( $finished ) @@ -1238,7 +1238,7 @@ wp_new_comment($commentdata); do_action('pingback_post', $wpdb->insert_id); - + return "Pingback from $pagelinkedfrom to $pagelinkedto registered. Keep the web talking! :-)"; } Index: wp-mail.php =================================================================== --- wp-mail.php (revision 3516) +++ wp-mail.php (working copy) @@ -81,11 +81,11 @@ } $date_arr = explode(' ', $ddate); $date_time = explode(':', $date_arr[3]); - + $ddate_H = $date_time[0]; $ddate_i = $date_time[1]; $ddate_s = $date_time[2]; - + $ddate_m = $date_arr[1]; $ddate_d = $date_arr[0]; $ddate_Y = $date_arr[2]; Index: wp-content/plugins/wp-db-backup.php =================================================================== --- wp-content/plugins/wp-db-backup.php (revision 3516) +++ wp-content/plugins/wp-db-backup.php (working copy) @@ -36,12 +36,12 @@ } function wpdbBackup() { - + add_action('wp_cron_daily', array(&$this, 'wp_cron_daily')); $this->backup_dir = trailingslashit($this->backup_dir); $this->basename = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', __FILE__); - + if (isset($_POST['do_backup'])) { switch($_POST['do_backup']) { case 'backup': @@ -49,7 +49,7 @@ break; case 'fragments': add_action('admin_menu', array(&$this, 'fragment_menu')); - break; + break; } } elseif (isset($_GET['fragment'] )) { add_action('init', array(&$this, 'init')); @@ -59,7 +59,7 @@ add_action('admin_menu', array(&$this, 'admin_menu')); } } - + function init() { global $user_level; get_currentuserinfo(); @@ -68,9 +68,9 @@ if (isset($_GET['backup'])) { $via = isset($_GET['via']) ? $_GET['via'] : 'http'; - + $this->backup_file = $_GET['backup']; - + switch($via) { case 'smtp': case 'email': @@ -101,14 +101,14 @@ die(); } - + function build_backup_script() { global $table_prefix, $wpdb; - + $datum = date("Ymd_B"); $backup_filename = DB_NAME . "_$table_prefix$datum.sql"; if ($this->gzip()) $backup_filename .= '.gz'; - + echo "
"; //echo "
" . print_r($_POST, 1) . "
"; echo '

' . __('Backup') . '

@@ -143,19 +143,19 @@ } function backup(table, segment) { - var fram = document.getElementById("backuploader"); + var fram = document.getElementById("backuploader"); fram.src = "' . $_SERVER['REQUEST_URI'] . '&fragment=" + table + ":" + segment + ":' . $backup_filename . '"; } - + var curStep = 0; - + function nextStep() { backupStep(curStep); curStep++; } - + function finishBackup() { - var fram = document.getElementById("backuploader"); + var fram = document.getElementById("backuploader"); setMeter(100); '; @@ -179,15 +179,15 @@ setProgress("' . sprintf(__("Backup complete, download here."), $download_uri) . '"); '; } - + echo ' } - + function backupStep(step) { switch(step) { case 0: backup("", 0); break; '; - + $also_backup = array(); if (isset($_POST['other_tables'])) { $also_backup = $_POST['other_tables']; @@ -210,7 +210,7 @@ $step_count++; } echo "case {$step_count}: finishBackup(); break;"; - + echo ' } if(step != 0) setMeter(100 * step / ' . $step_count . '); @@ -224,9 +224,9 @@ function backup_fragment($table, $segment, $filename) { global $table_prefix, $wpdb; - + echo "$table:$segment:$filename"; - + if($table == '') { $msg = __('Creating backup file...'); } else { @@ -236,12 +236,12 @@ $msg = sprintf(__('Backing up table \\"%s\\"...'), $table); } } - + echo ' '; } - + die(); } @@ -304,7 +304,7 @@ if (isset($_POST['other_tables'])) { $also_backup = $_POST['other_tables']; } - + $core_tables = $_POST['core_tables']; $this->backup_file = $this->db_backup($core_tables, $also_backup); if (FALSE !== $backup_file) { @@ -318,7 +318,7 @@ $this->backup_complete = true; } } - + /////////////////////////////// function admin_menu() { add_management_page(__('Backup'), __('Backup'), 9, basename(__FILE__), array(&$this, 'backup_menu')); @@ -387,7 +387,7 @@ fclose($fp); } } - + ////////////// function stow($query_line) { if ($this->gzip()) { @@ -402,7 +402,7 @@ } } } - + function backup_error($err) { if(count($this->backup_errors) < 20) { $this->backup_errors[] = $err; @@ -410,16 +410,16 @@ $this->backup_errors[] = __('Subsequent errors have been omitted from this log.'); } } - + ///////////////////////////// function backup_table($table, $segment = 'none') { global $wpdb; - + /* Taken partially from phpMyAdmin and partially from Alain Wolf, Zurich - Switzerland Website: http://restkultur.ch/personal/wolf/scripts/db_backup/ - + Modified by Scott Merril (http://www.skippy.net/) to use the WordPress $wpdb object */ @@ -429,7 +429,7 @@ backup_errors(__('Error getting table details') . ": $table"); return FALSE; } - + if(($segment == 'none') || ($segment == 0)) { // // Add SQL statement to drop existing table @@ -439,7 +439,7 @@ $this->stow("#\n"); $this->stow("\n"); $this->stow("DROP TABLE IF EXISTS " . $this->backquote($table) . ";\n"); - + // //Table structure // Comment in SQL-file @@ -448,19 +448,19 @@ $this->stow("# Table structure of table " . $this->backquote($table) . "\n"); $this->stow("#\n"); $this->stow("\n"); - + $create_table = $wpdb->get_results("SHOW CREATE TABLE $table", ARRAY_N); if (FALSE === $create_table) { $this->backup_error(sprintf(__("Error with SHOW CREATE TABLE for %s."), $table)); $this->stow("#\n# Error with SHOW CREATE TABLE for $table!\n#\n"); } $this->stow($create_table[0][1] . ' ;'); - + if (FALSE === $table_structure) { $this->backup_error(sprintf(__("Error getting table structure of %s"), $table)); $this->stow("#\n# Error getting table structure of $table!\n#\n"); } - + // // Comment in SQL-file $this->stow("\n\n"); @@ -468,7 +468,7 @@ $this->stow('# Data contents of table ' . $this->backquote($table) . "\n"); $this->stow("#\n"); } - + if(($segment == 'none') || ($segment >= 0)) { $ints = array(); foreach ($table_structure as $struct) { @@ -481,10 +481,10 @@ $ints[strtolower($struct->Field)] = "1"; } } - - + + // Batch by $row_inc - + if($segment == 'none') { $row_start = 0; $row_inc = ROWS_PER_SEGMENT; @@ -492,8 +492,8 @@ $row_start = $segment * ROWS_PER_SEGMENT; $row_inc = ROWS_PER_SEGMENT; } - - do { + + do { if ( !ini_get('safe_mode')) @set_time_limit(15*60); $table_data = $wpdb->get_results("SELECT * FROM $table LIMIT {$row_start}, {$row_inc}", ARRAY_A); @@ -503,8 +503,8 @@ fwrite($fp, "#\n# Error getting table contents fom $table!\n#\n"); } */ - - $entries = 'INSERT INTO ' . $this->backquote($table) . ' VALUES ('; + + $entries = 'INSERT INTO ' . $this->backquote($table) . ' VALUES ('; // \x08\\x09, not required $search = array("\x00", "\x0a", "\x0d", "\x1a"); $replace = array('\0', '\n', '\r', '\Z'); @@ -524,8 +524,8 @@ } } while((count($table_data) > 0) and ($segment=='none')); } - - + + if(($segment == 'none') || ($segment < 0)) { // Create footer/closing comment in SQL-file $this->stow("\n"); @@ -534,9 +534,9 @@ $this->stow("# --------------------------------------------------------\n"); $this->stow("\n"); } - + } // end backup_table() - + function return_bytes($val) { $val = trim($val); $last = strtolower($val{strlen($val)-1}); @@ -549,20 +549,20 @@ case 'k': $val *= 1024; } - + return $val; } - + //////////////////////////// function db_backup($core_tables, $other_tables) { global $table_prefix, $wpdb; - + $datum = date("Ymd_B"); $wp_backup_filename = DB_NAME . "_$table_prefix$datum.sql"; if ($this->gzip()) { $wp_backup_filename .= '.gz'; } - + if (is_writable(ABSPATH . $this->backup_dir)) { $this->fp = $this->open(ABSPATH . $this->backup_dir . $wp_backup_filename); if(!$this->fp) { @@ -573,7 +573,7 @@ $this->backup_error(__('The backup directory is not writeable!')); return false; } - + //Begin new backup of MySql $this->stow("# WordPress MySQL database backup\n"); $this->stow("#\n"); @@ -581,12 +581,12 @@ $this->stow("# Hostname: " . DB_HOST . "\n"); $this->stow("# Database: " . $this->backquote(DB_NAME) . "\n"); $this->stow("# --------------------------------------------------------\n"); - + if ( (is_array($other_tables)) && (count($other_tables) > 0) ) $tables = array_merge($core_tables, $other_tables); else $tables = $core_tables; - + foreach ($tables as $table) { // Increase script execution time-limit to 15 min for every table. if ( !ini_get('safe_mode')) @set_time_limit(15*60); @@ -596,21 +596,21 @@ $this->stow("# --------------------------------------------------------\n"); $this->backup_table($table); } - + $this->close($this->fp); - + if (count($this->backup_errors)) { return false; } else { return $wp_backup_filename; } - + } //wp_db_backup - + /////////////////////////// function deliver_backup ($filename = '', $delivery = 'http', $recipient = '') { if ('' == $filename) { return FALSE; } - + $diskfile = ABSPATH . $this->backup_dir . $filename; if ('http' == $delivery) { if (! file_exists($diskfile)) { @@ -640,7 +640,7 @@ $headers = "MIME-Version: 1.0\n"; $headers .= "Content-Type: multipart/mixed; boundary=\"$boundary\"\n"; $headers .= 'From: ' . get_settings('admin_email') . "\n"; - + $message = sprintf(__("Attached to this email is\n %1s\n Size:%2s kilobytes\n"), $filename, round(filesize($diskfile)/1024)); // Add a multipart boundary above the plain message $message = "This is a multi-part message in MIME format.\n\n" . @@ -648,7 +648,7 @@ "Content-Type: text/plain; charset=\"utf-8\"\n" . "Content-Transfer-Encoding: 7bit\n\n" . $message . "\n\n"; - + // Add file attachment to the message $message .= "--{$boundary}\n" . "Content-Type: application/octet-stream;\n" . @@ -658,24 +658,24 @@ "Content-Transfer-Encoding: base64\n\n" . $data . "\n\n" . "--{$boundary}--\n"; - + if (function_exists('wp_mail')) { wp_mail ($recipient, get_bloginfo('name') . ' ' . __('Database Backup'), $message, $headers); } else { mail ($recipient, get_bloginfo('name') . ' ' . __('Database Backup'), $message, $headers); } - + unlink($diskfile); } return; } - + //////////////////////////// function backup_menu() { global $table_prefix, $wpdb; $feedback = ''; $WHOOPS = FALSE; - + // did we just do a backup? If so, let's report the status if ( $this->backup_complete ) { $feedback = '

' . __('Backup Successful') . '!'; @@ -698,7 +698,7 @@ } $feedback .= '

'; } - + if (count($this->backup_errors)) { $feedback .= '
' . __('The following errors were reported:') . "
";
 			foreach($this->backup_errors as $error) {
@@ -706,7 +706,7 @@
 			}
 			$feedback .= "
"; } - + // did we just save options for wp-cron? if ( (function_exists('wp_cron_init')) && isset($_POST['wp_cron_backup_options']) ) { update_option('wp_cron_backup_schedule', intval($_POST['cron_schedule']), FALSE); @@ -716,23 +716,23 @@ } $feedback .= '

' . __('Scheduled Backup Options Saved!') . '

'; } - + // Simple table name storage $wp_table_names = explode(',','categories,comments,linkcategories,links,options,post2cat,postmeta,posts,users,usermeta'); // Apply WP DB prefix to table names $wp_table_names = array_map(create_function('$a', 'global $table_prefix;return "{$table_prefix}{$a}";'), $wp_table_names); - + $other_tables = array(); $also_backup = array(); - - // Get complete db table list + + // Get complete db table list $all_tables = $wpdb->get_results("SHOW TABLES", ARRAY_N); $all_tables = array_map(create_function('$a', 'return $a[0];'), $all_tables); // Get list of WP tables that actually exist in this DB (for 1.6 compat!) $wp_backup_default_tables = array_intersect($all_tables, $wp_table_names); // Get list of non-WP tables $other_tables = array_diff($all_tables, $wp_backup_default_tables); - + if ('' != $feedback) { echo $feedback; } @@ -749,7 +749,7 @@ $WHOOPS = TRUE; } } - + if ( !is_writable( ABSPATH . $this->backup_dir) ) { echo '

' . __('WARNING: Your backup directory is NOT writable! We can not create the backup directory.') . '
' . ABSPATH . "

"; } @@ -781,21 +781,21 @@ echo ''; echo '
'; echo ''; - + // Check DB dize. $table_status = $wpdb->get_results("SHOW TABLE STATUS FROM " . $this->backquote(DB_NAME)); $core_size = $db_size = 0; foreach($table_status as $table) { $table_size = $table->Data_length - $table->Data_free; if(in_array($table->Name, $wp_backup_default_tables)) { - $core_size += $table_size; + $core_size += $table_size; } $db_size += $table_size; } $mem_limit = ini_get('memory_limit'); $mem_limit = $this->return_bytes($mem_limit); $mem_limit = ($mem_limit == 0) ? 8*1024*1024 : $mem_limit - 2000000; - + if (! $WHOOPS) { echo '
'; echo '

'; @@ -804,7 +804,7 @@ } echo ''; echo ''; - + // this stuff only displays if wp_cron is installed if (function_exists('wp_cron_init')) { echo '
' . __('Scheduled Backup') . ''; @@ -850,20 +850,20 @@ echo '
'; } // end of wp_cron section - + echo '
'; - + }// end wp_backup_menu() - + ///////////////////////////// function wp_cron_daily() { - + $schedule = intval(get_option('wp_cron_backup_schedule')); if (0 == $schedule) { // Scheduled backup is disabled return; } - + global $table_prefix, $wpdb; $wp_table_names = explode(',','categories,comments,linkcategories,links,options,post2cat,postmeta,posts,users,usermeta'); @@ -872,14 +872,14 @@ $all_tables = array_map(create_function('$a', 'return $a[0];'), $all_tables); $core_tables = array_intersect($all_tables, $wp_table_names); $other_tables = get_option('wp_cron_backup_tables'); - + $recipient = get_option('wp_cron_backup_recipient'); - + $backup_file = $this->db_backup($core_tables, $other_tables); if (FALSE !== $backup_file) { $this->deliver_backup ($backup_file, 'smtp', $recipient); } - + return; } // wp_cron_db_backup } Index: wp-content/themes/classic/sidebar.php =================================================================== --- wp-content/themes/classic/sidebar.php (revision 3516) +++ wp-content/themes/classic/sidebar.php (working copy) @@ -11,7 +11,7 @@