Changeset 470

Timestamp:

10/26/2003 05:25:26 AM (22 years ago)

Author:

saxmatt

Message:

Alpha functionality of new permalink structure as per previous discussions.

Location:

trunk

Files:

• b2-include/b2template.functions.php (modified) (2 diffs)
• blog.header.php (modified) (5 diffs)
• index.php (modified) (1 diff)
• wp-admin/upgrade-072-to-073.php (modified) (2 diffs)
• wp-admin/wp-options-permalink.php (added)
• wp-admin/wp-options.php (modified) (1 diff)

trunk/b2-include/b2template.functions.php

@@ -1406 +1406 @@
 
 /***** Permalink tags *****/
+function get_permalink($id=false) {
+    global $post;
+    if (!$id) {
+        if (get_settings('permalink_structure')) {
+            $unixtime = strtotime($post->post_date);
+            $rewritecode = array(
+                '%year%',
+                '%monthnum%',
+                '%day%',
+                '%postname%'
+            );
+            $rewritereplace = array(
+                date('Y', $unixtime),
+                date('n', $unixtime),
+                date('j', $unixtime),
+                $post->post_name
+            );
+            return str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
+        } else { // if they're not using the fancy permalink option
+            return $file.$querystring_start.'p'.$querystring_equal.$post->ID;
+        }
+    }
+}
 
 function permalink_anchor($mode = 'id') {
@@ -1435 +1458 @@
             break;
     }
-    $archive_mode = get_settings('archive_mode');
-    switch($archive_mode) {
-        case 'daily':
-            echo $file.$querystring_start.'m'.$querystring_equal.substr($post->post_date,0,4).substr($post->post_date,5,2).substr($postdata['Date'],8,2).'#post-'.$anchor;
-            break;
-        case 'monthly':
-            echo $file.$querystring_start.'m'.$querystring_equal.substr($post->post_date,0,4).substr($post->post_date,5,2).'#post-'.$anchor;
-            break;
-        case 'weekly':
-            if((!isset($cacheweekly)) || (empty($cacheweekly[$postdata['Date']]))) {
-                $cacheweekly[$post->post_date] = $wpdb->get_var("SELECT WEEK('$post->post_date')");
-                ++$querycount;
-            }
-            echo $file.$querystring_start.'m'.$querystring_equal.substr($post->post_date,0,4).$querystring_separator.'w'.$querystring_equal.$cacheweekly[$post->post_date].'#post-'.$anchor;
-            break;
-        case 'postbypost':
-            echo $file.$querystring_start.'p'.$querystring_equal.$id;
-            break;
-    }
+    echo get_permalink();
 }
 

trunk/blog.header.php

@@ -14 +14 @@
 require_once ($curpath.$b2inc.'/xmlrpcs.inc');
 
-$b2varstoreset = array('m','p','posts','w','c', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby');
+$b2varstoreset = array('m','p','posts','w','c', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'monthnum');
 
     for ($i=0; $i<count($b2varstoreset); $i += 1) {
@@ -83 +83 @@
 }
 
+if ($year != '') {
+    $year = '' . intval($year);
+    $where .= ' AND YEAR(post_date)=' . $year;
+}
+
+if ($monthnum != '') {
+    $monthnum = '' . intval($monthnum);
+    $where .= ' AND MONTH(post_date)=' . $monthnum;
+}
+
+if ($day != '') {
+    $hay = '' . 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;
+    $where .= ' AND WEEK(post_date, 1)=' . $w;
 }
 
@@ -207 +227 @@
 }
 
-if ( !empty($postend) && ($postend > $poststart) && (!$m) &&(!$w) && (!$whichcat) && (!$s) && (!$p)) {
+if ( !empty($postend) && ($postend > $poststart) && (!$m) && !$month && !$year && !$day &&(!$w) && (!$whichcat) && (!$s) && (!$p)) {
     if ($what_to_show == 'posts' || ($what_to_show == 'paged' && (!$paged))) {
         $poststart = intval($poststart);
@@ -244 +264 @@
         }
     }
-    elseif (($m) || ($p) || ($w) || ($s) || ($whichcat) || ($author)) {
+    elseif (($m) || ($p) || ($w) || ($s) || ($whichcat) || ($author) || $month || $year || $day) {
         $limits = '';
     }
@@ -282 +302 @@
 }
 
-//error_log("$request");
-//echo $request;
+// error_log("$request");
+// echo $request;
 $posts = $wpdb->get_results($request);
+
+if (1 == count($posts)) {
+    $more = 1; $c = 1; $single = 1;
+}
 ?>

trunk/index.php

@@ -56 +56 @@
 <?php include($abspath . 'b2comments.php'); ?>
 
-<?php } } // end foreach, end if any posts ?>
-
+<?php } } else { // end foreach, end if any posts ?>
+<p>Sorry, no posts matched your criteria.</p>
+<?php } ?>
 </div>
 

trunk/wp-admin/upgrade-072-to-073.php

@@ -6 +6 @@
 if (!$step) $step = 0;
 if (!step) $step = 0;
+update_option('blogdescription', 'hahahah');
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -77 +78 @@
 }
 
+$wpdb->query("INSERT INTO `$tableoptions` (`option_id`, `blog_id`, `option_name`, `option_can_override`, `option_type`, `option_value`, `option_width`, `option_height`, `option_description`, `option_admin_level`) VALUES ('', '0', 'permalink_structure', 'Y', '3', '', '20', '8', 'How the permalinks for your site are constructed.', '8');");
 ?> 
   <strong>Done.</strong> </p> 

trunk/wp-admin/wp-options.php

@@ -120 +120 @@
     } // end for each group
 ?>
+<li><a href="wp-options-permalink.php">Permalinks</a></li>
 </ul>
     <br clear="all" />