[wp-cvs] wordpress wp-blog-header.php,1.63,1.64

Ryan Boren rboren at users.sourceforge.net
Sun May 23 21:55:41 CDT 2004


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

Modified Files:
	wp-blog-header.php 
Log Message:
Introducing query_posts(), update_post_caches(), update_user_cache(), and update_category_cache().

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** wp-blog-header.php	21 May 2004 22:33:47 -0000	1.63
--- wp-blog-header.php	24 May 2004 02:55:37 -0000	1.64
***************
*** 120,437 ****
  if (!isset($what_to_show))
      $what_to_show = get_settings('what_to_show');
- $archive_mode = get_settings('archive_mode');
- $use_gzipcompression = get_settings('gzipcompression');
- 
- // First let's clear some variables
- $whichcat = '';
- $whichauthor = '';
- $result = '';
- $where = '';
- $limits = '';
- $distinct = '';
- $join = '';
- 
- if ($pagenow != 'post.php') { timer_start(); }
- 
  if (isset($showposts) && $showposts) {
      $showposts = (int)$showposts;
      $posts_per_page = $showposts;
  }
  
! $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)";
! 
! // If a month is specified in the querystring, load that month
! if ('' != $m) {
!     $m = '' . preg_replace('|[^0-9]|', '', $m);
!     $where .= ' AND YEAR(post_date)=' . substr($m, 0, 4);
!     if (strlen($m)>5)
!         $where .= ' AND MONTH(post_date)=' . substr($m, 4, 2);
!     if (strlen($m)>7)
!         $where .= ' AND DAYOFMONTH(post_date)=' . substr($m, 6, 2);
!     if (strlen($m)>9)
!         $where .= ' AND HOUR(post_date)=' . substr($m, 8, 2);
!     if (strlen($m)>11)
!         $where .= ' AND MINUTE(post_date)=' . substr($m, 10, 2);
!     if (strlen($m)>13)
!         $where .= ' AND SECOND(post_date)=' . substr($m, 12, 2);
! }
! 
! if ('' != $hour) {
! 	$hour = '' . intval($hour);
! 	$where .= " AND HOUR(post_date)='$hour'";
! }
! 
! if ('' != $minute) {
! 	$minute = '' . intval($minute);
! 	$where .= " AND MINUTE(post_date)='$minute'";
! }
! 
! if ('' != $second) {
! 	$second = '' . intval($second);
! 	$where .= " AND SECOND(post_date)='$second'";
! }
! 
! if ('' != $year) {
!     $year = '' . intval($year);
!     $where .= " AND YEAR(post_date)='$year'";
! }
! 
! if ('' != $monthnum) {
!     $monthnum = '' . intval($monthnum);
!     $where .= " AND MONTH(post_date)='$monthnum'";
! }
! 
! if ('' != $day) {
!     $day = '' . intval($day);
!     $where .= " AND DAYOFMONTH(post_date)='$day'";
! }
! 
! if ('' != $name) {
!     $name = preg_replace('/[^a-z0-9-_]/', '', $name);
!     $where .= " AND post_name = '$name'";
! }
! 
! if ('' != $w) {
!     $w = ''.intval($w);
!     $where .= " AND WEEK(post_date, 1)='$w'";
! }
! 
! // If a post number is specified, load that post
! if (($p != '') && ($p != 'all')) {
!     $p = intval($p);
!     $where = ' AND ID = '.$p;
! }
! 
! // If a search pattern is specified, load the posts that match
! if (!empty($s)) {
!     $s = addslashes_gpc($s);
!     $search = ' AND (';
!     $s = preg_replace('/, +/', ' ', $s);
!     $s = str_replace(',', ' ', $s);
!     $s = str_replace('"', ' ', $s);
!     $s = trim($s);
!     if ($exact) {
!         $n = '';
!     } else {
!         $n = '%';
!     }
!     if (!$sentence) {
!         $s_array = explode(' ',$s);
!         $search .= '((post_title LIKE \''.$n.$s_array[0].$n.'\') OR (post_content LIKE \''.$n.$s_array[0].$n.'\'))';
!         for ( $i = 1; $i < count($s_array); $i = $i + 1) {
!             $search .= ' AND ((post_title LIKE \''.$n.$s_array[$i].$n.'\') OR (post_content LIKE \''.$n.$s_array[$i].$n.'\'))';
!         }
!         $search .= ' OR (post_title LIKE \''.$n.$s.$n.'\') OR (post_content LIKE \''.$n.$s.$n.'\')';
!         $search .= ')';
!     } else {
!         $search = ' AND ((post_title LIKE \''.$n.$s.$n.'\') OR (post_content LIKE \''.$n.$s.$n.'\'))';
!     }
! }
! 
! // Category stuff
! $dogs = $wpdb->get_results("SELECT * FROM $tablecategories WHERE 1=1");
! foreach ($dogs as $catt) {
!     $cache_categories[$catt->cat_ID] = $catt;
! }
! 
! if ((empty($cat)) || ($cat == 'all') || ($cat == '0') || 
! 	// Bypass cat checks if fetching specific posts
! 	(
! 		intval($year) || intval($monthnum) || intval($day) || intval($w) ||
! 		intval($p) || !empty($name) || !empty($s)
! 	)
! 		) {
!     $whichcat='';
! } else {
!     $cat = ''.urldecode($cat).'';
!     $cat = addslashes_gpc($cat);
!     if (stristr($cat,'-')) {
!         // Note: if we have a negative, we ignore all the positives. It must
!         // always mean 'everything /except/ this one'. We should be able to do
!         // multiple negatives but we don't :-(
!         $eq = '!=';
!         $andor = 'AND';
!         $cat = explode('-',$cat);
!         $cat = intval($cat[1]);
!     } else {
!         $eq = '=';
!         $andor = 'OR';
!     }
!     $join = " LEFT JOIN $tablepost2cat ON ($tableposts.ID = $tablepost2cat.post_id) ";
!     $cat_array = explode(' ',$cat);
!     $whichcat .= ' AND (category_id '.$eq.' '.intval($cat_array[0]);
!     $whichcat .= get_category_children($cat_array[0], ' '.$andor.' category_id '.$eq.' ');
!     for ($i = 1; $i < (count($cat_array)); $i = $i + 1) {
!             $whichcat .= ' '.$andor.' category_id '.$eq.' '.intval($cat_array[$i]);
!         $whichcat .= get_category_children($cat_array[$i], ' '.$andor.' category_id '.$eq.' ');
!     }
!     $whichcat .= ')';
!     if ($eq == '!=') {
!         $cat = '-'.$cat; // Put back the knowledge that we are excluding a category.
!     }
! }
! 
! // Category stuff for nice URIs
! 
! if ('' != $category_name) {
!     if (stristr($category_name,'/')) {
!         $category_name = explode('/',$category_name);
!         if ($category_name[count($category_name)-1]) {
!         $category_name = $category_name[count($category_name)-1]; // no trailing slash
!         } else {
!         $category_name = $category_name[count($category_name)-2]; // there was a trailling slash
!         }
!     }
!     $category_name = preg_replace('|[^a-z0-9-_]|i', '', $category_name);
!     $tables = ", $tablepost2cat, $tablecategories";
!     $join = " LEFT JOIN $tablepost2cat ON ($tableposts.ID = $tablepost2cat.post_id) LEFT JOIN $tablecategories ON ($tablepost2cat.category_id = $tablecategories.cat_ID) ";
!     $whichcat = " AND (category_nicename = '$category_name'";
!     $cat = $wpdb->get_var("SELECT cat_ID FROM $tablecategories WHERE category_nicename = '$category_name'");
!     $whichcat .= get_category_children($cat, " OR category_id = ");
!     $whichcat .= ")";
! }
! 
! // Author/user stuff
! $users = $wpdb->get_results("SELECT * FROM $tableusers WHERE user_level > 0");
! foreach ($users as $user) {
!     $cache_userdata[$user->ID] = $user;
! }
! 
! if ((empty($author)) || ($author == 'all') || ($author == '0')) {
!     $whichauthor='';
! } else {
!     $author = ''.urldecode($author).'';
!     $author = addslashes_gpc($author);
!     if (stristr($author, '-')) {
!         $eq = '!=';
!         $andor = 'AND';
!         $author = explode('-', $author);
!         $author = ''.intval($author[1]);
!     } else {
!         $eq = '=';
!         $andor = 'OR';
!     }
!     $author_array = explode(' ', $author);
!     $whichauthor .= ' AND (post_author '.$eq.' '.intval($author_array[0]);
!     for ($i = 1; $i < (count($author_array)); $i = $i + 1) {
!         $whichauthor .= ' '.$andor.' post_author '.$eq.' '.intval($author_array[$i]);
!     }
!     $whichauthor .= ')';
! }
! 
! // Author stuff for nice URIs
  
! if ('' != $author_name) {
!     if (stristr($author_name,'/')) {
!         $author_name = explode('/',$author_name);
!         if ($author_name[count($author_name)-1]) {
!         $author_name = $author_name[count($author_name)-1];#no trailing slash
!         } else {
!         $author_name = $author_name[count($author_name)-2];#there was a trailling slash
!         }
      }
-     $author_name = preg_replace('|[^a-z0-9-_]|', '', strtolower($author_name));
-     $author = $wpdb->get_var("SELECT ID FROM $tableusers WHERE user_nicename='".$author_name."'");
-     $whichauthor .= ' AND (post_author = '.intval($author).')';
  }
  
! $where .= $search.$whichcat.$whichauthor;
  
! if ((empty($order)) || ((strtoupper($order) != 'ASC') && (strtoupper($order) != 'DESC'))) {
!     $order='DESC';
! }
  
! // Order by
! if (empty($orderby)) {
!     $orderby='date '.$order;
! } else {
!     // Used to filter values
!     $allowed_keys = array('author','date','category','title');
!     $orderby = urldecode($orderby);
!     $orderby = addslashes_gpc($orderby);
!     $orderby_array = explode(' ',$orderby);
!     if (!in_array($orderby_array[0],$allowed_keys)) {
!         $orderby_array[0] = 'date';
!     }
!     $orderby = $orderby_array[0].' '.$order;
!     if (count($orderby_array)>1) {
!         for ($i = 1; $i < (count($orderby_array)); $i = $i + 1) {
!             // Only allow certain values for safety
!             if (in_array($orderby_array[$i],$allowed_keys)) {
!                 $orderby .= ',post_'.$orderby_array[$i].' '.$order;
!             }
!         }
!     }
! }
  
! if ((!$whichcat) && (!$m) && (!$p) && (!$w) && (!$s) && empty($poststart) && empty($postend)) {
!     if ($what_to_show == 'posts') {
!         $limits = ' LIMIT '.$posts_per_page;
!     } elseif ($what_to_show == 'days' && empty($monthnum) && empty($year) && empty($day)) {
!         $lastpostdate = get_lastpostdate();
!         $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate);
!         $lastpostdate = mysql2date('U',$lastpostdate);
!         $otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($posts_per_page-1) * 86400)));
!         $where .= " AND post_date > '$otherdate'";
!     }
! }
  
! if ( !empty($postend) && ($postend > $poststart) && (!$m) && empty($monthnum) && empty($year) && empty($day) &&(!$w) && (!$whichcat) && (!$s) && (!$p)) {
!     if ($what_to_show == 'posts' || ($what_to_show == 'paged' && (!$paged))) {
!         $poststart = intval($poststart);
!         $postend = intval($postend);
!         $limposts = $postend - $poststart;
!         $limits = ' LIMIT '.$poststart.','.$limposts;
!     } elseif ($what_to_show == 'days') {
!         $poststart = intval($poststart);
!         $postend = intval($postend);
!         $limposts = $postend - $poststart;
!         $lastpostdate = get_lastpostdate();
!         $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate);
!         $lastpostdate = mysql2date('U',$lastpostdate);
!         $startdate = date('Y-m-d H:i:s', ($lastpostdate - (($poststart -1) * 86400)));
!         $otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($postend -1) * 86400)));
!         $where .= " AND post_date > '$otherdate' AND post_date < '$startdate'";
!     }
! } else {
!     if (($what_to_show == 'paged') && (!$p) && (!$more)) {
!         if ($pagenow != 'post.php') {
!             $pgstrt = '';
!             if ($paged) {
!                 $pgstrt = (intval($paged) -1) * $posts_per_page . ', ';
!             }
!             $limits = 'LIMIT '.$pgstrt.$posts_per_page;
!         } else {
!             if (($m) || ($p) || ($w) || ($s) || ($whichcat)) {
!                 $limits = '';
!             } else {
!                 $pgstrt = '';
!                 if ($paged) {
!                     $pgstrt = (intval($paged) -1) * $posts_per_page . ', ';
!                 }
!                 $limits = 'LIMIT '.$pgstrt.$posts_per_page;
!             }
!         }
      }
!     elseif (($m) || ($p) || ($w) || ($s) || ($whichcat) || ($author) || $monthnum || $year || $day) {
!         $limits = '';
      }
  }
  
- if ($p == 'all') {
-     $where = '';
- }
- 
- $now = gmdate('Y-m-d H:i:59');
- 
  if ($pagenow != 'post.php' && $pagenow != 'edit.php') {
-     if ((empty($poststart)) || (empty($postend)) || !($postend > $poststart)) {
-         $where .= " AND post_date_gmt <= '$now'";
-     }
- 
-     $distinct = 'DISTINCT';
- 
      if ($use_gzipcompression) {
          // gzipping the output of the script
--- 120,165 ----
  if (!isset($what_to_show))
      $what_to_show = get_settings('what_to_show');
  if (isset($showposts) && $showposts) {
      $showposts = (int)$showposts;
      $posts_per_page = $showposts;
  }
+ $archive_mode = get_settings('archive_mode');
+ $use_gzipcompression = get_settings('gzipcompression');
  
! $more_wpvars = array('posts_per_page', 'what_to_show', 'showposts');
  
! // Construct the query string.
! $query_string = '';
! foreach (array_merge($wpvarstoreset, $more_wpvars) as $wpvar) {
!     if ($$wpvar != '') {
!         $query_string .= (strlen($query_string) < 1) ? '' : '&';
!         $query_string .= $wpvar . '=' . rawurlencode($$wpvar);
      }
  }
  
! if ($pagenow != 'post.php') { timer_start(); }
  
! // Update some caches.
! update_user_cache();
! update_category_cache();
  
! // Call query posts to do the work.
! $posts = query_posts($query_string);
  
! // Update per post caches.
! update_post_caches($posts);
  
! if (1 == count($posts)) {
!     if ($p || $name) {
!         $more = 1;
!         $single = 1;
      }
!     if ($s && empty($paged)) { // If they were doing a search and got one result
!         if (!strstr($_SERVER['PHP_SELF'], 'wp-admin')) // And not in admin section
!             header('Location: ' . get_permalink($posts[0]->ID));
      }
  }
  
  if ($pagenow != 'post.php' && $pagenow != 'edit.php') {
      if ($use_gzipcompression) {
          // gzipping the output of the script
***************
*** 439,533 ****
      }
  }
- $where .= ' AND (post_status = "publish"';
- 
- // Get private posts
- if (isset($user_ID) && ('' != intval($user_ID)))
-     $where .= " OR post_author = $user_ID AND post_status != 'draft')";
- else
-     $where .= ')';
- $where .= " GROUP BY $tableposts.ID";
- $request = " SELECT $distinct * FROM $tableposts $join WHERE 1=1".$where." ORDER BY post_$orderby $limits";
- 
- 
- if ($preview) {
-     $request = 'SELECT 1-1'; // dummy mysql query for the preview
-     // little funky fix for IEwin, rawk on that code
-     $is_winIE = ((preg_match('/MSIE/',$HTTP_USER_AGENT)) && (preg_match('/Win/',$HTTP_USER_AGENT)));
-     if (($is_winIE) && (!isset($IEWin_bookmarklet_fix))) {
-         $preview_content =  preg_replace('/\%u([0-9A-F]{4,4})/e',  "'&#'.base_convert('\\1',16,10).';'", $preview_content);
-     }
- }
- 
- // error_log("$request");
- // echo $request;
- $posts = $wpdb->get_results($request);
- 
- // No point in doing all this work if we didn't match any posts.
- if ($posts) {
-     // Get the categories for all the posts
-     foreach ($posts as $post) {
-         $post_id_list[] = $post->ID;
-     }
-     $post_id_list = implode(',', $post_id_list);
- 
-     $dogs = $wpdb->get_results("SELECT DISTINCT
-         ID, category_id, cat_name, category_nicename, category_description, category_parent
-         FROM $tablecategories, $tablepost2cat, $tableposts
-         WHERE category_id = cat_ID AND post_id = ID AND post_id IN ($post_id_list)");
-         
-     foreach ($dogs as $catt) {
-         $category_cache[$catt->ID][] = $catt;
-     }
- 
-     // Do the same for comment numbers
-     $comment_counts = $wpdb->get_results("SELECT ID, COUNT( comment_ID ) AS ccount
-         FROM $tableposts
-         LEFT JOIN $tablecomments ON ( comment_post_ID = ID  AND comment_approved =  '1')
-         WHERE post_status =  'publish' AND ID IN ($post_id_list)
-         GROUP BY ID");
-     
- 	if ($comment_counts) {
- 	    foreach ($comment_counts as $comment_count) {
- 	        $comment_count_cache["$comment_count->ID"] = $comment_count->ccount;
- 	    }
- 	}
- 
- 	// Get post-meta info
- 	if ( $meta_list = $wpdb->get_results("
- 			SELECT post_id,meta_key,meta_value 
- 			FROM $tablepostmeta 
- 			WHERE post_id IN($post_id_list)
- 			ORDER BY post_id,meta_key
- 		", ARRAY_A) ) {
- 		
- 		// Change from flat structure to hierarchical:
- 		$post_meta_cache = array();
- 		foreach ($meta_list as $metarow) {
- 			$mpid = $metarow['post_id'];
- 			$mkey = $metarow['meta_key'];
- 			$mval = $metarow['meta_value'];
- 			
- 			// 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();
- 			
- 			// Add a value to the current pid/key:
- 			$post_meta_cache[$mpid][$mkey][] = $mval;
- 		}
- 	}
- 
- 
-     if (1 == count($posts)) {
-         if ($p || $name) {
-             $more = 1;
-             $single = 1;
-         }
- 		if ($s && empty($paged)) { // If they were doing a search and got one result
- 			if (!strstr($_SERVER['PHP_SELF'], 'wp-admin')) // And not in admin section
- 				header('Location: ' . get_permalink($posts[0]->ID));
- 		}
-     }
- } // End if posts.
  ?>
--- 167,169 ----




More information about the cvs mailing list