Changeset 1527 for trunk

Timestamp:

08/10/2004 05:35:59 AM (21 years ago)

Author:

rboren

Message:

Static pages. Take 1.

Location:

trunk

Files:

• wp-admin/categories.php (modified) (2 diffs)
• wp-admin/edit-comments.php (modified) (1 diff)
• wp-admin/edit.php (modified) (1 diff)
• wp-admin/moderation.php (modified) (1 diff)
• wp-admin/post.php (modified) (4 diffs)
• wp-blog-header.php (modified) (1 diff)
• wp-includes/classes.php (modified) (1 diff)
• wp-includes/functions.php (modified) (6 diffs)
• wp-includes/template-functions-category.php (modified) (1 diff)
• wp-includes/template-functions-links.php (modified) (2 diffs)

trunk/wp-admin/categories.php

@@ -94 +94 @@
 <ul id="adminmenu2"> 
   <li><a href="edit.php"><?php _e('Posts') ?></a></li> 
+  <li><a href="edit-pages.php"><?php _e('Pages') ?></a></li> 
   <li><a href="categories.php" class="current"><?php _e('Categories') ?></a></li>
   <li><a href="edit-comments.php"><?php _e('Comments') ?></a></li> 
@@ -154 +155 @@
 <ul id="adminmenu2"> 
     <li><a href="edit.php"><?php _e('Posts') ?></a></li> 
+    <li><a href="edit-pages.php"><?php _e('Pages') ?></a></li> 
     <li><a class="current"><?php _e('Categories') ?></a></li>
     <li><a href="edit-comments.php"><?php _e('Comments') ?></a></li> 

trunk/wp-admin/edit-comments.php

@@ -10 +10 @@
 <ul id="adminmenu2">
     <li><a href="edit.php"><?php _e('Posts') ?></a></li>
+  <li><a href="edit-pages.php"><?php _e('Pages') ?></a></li> 
     <li><a href="categories.php"><?php _e('Categories') ?></a></li>
     <li><a href="edit-comments.php" class="current"><?php _e('Comments') ?></a></li>

trunk/wp-admin/edit.php

@@ -8 +8 @@
  <ul id="adminmenu2"> 
   <li><a href="edit.php" class="current"><?php _e('Posts') ?></a></li> 
+  <li><a href="edit-pages.php"><?php _e('Pages') ?></a></li> 
   <li><a href="categories.php"><?php _e('Categories') ?></a></li>
   <li><a href="edit-comments.php"><?php _e('Comments') ?></a></li> 

trunk/wp-admin/moderation.php

@@ -100 +100 @@
 <ul id="adminmenu2">
     <li><a href="edit.php"> <?php _e('Posts') ?></a></li>
+    <li><a href="edit-pages.php"><?php _e('Pages') ?></a></li> 
     <li><a href="categories.php"><?php _e('Categories') ?></a></li>
     <li><a href="edit-comments.php"> <?php _e('Comments') ?></a></li>

trunk/wp-admin/post.php

@@ -108 +108 @@
     if ('' != $_POST['publish']) $post_status = 'publish';
     if ('' != $_POST['advanced']) $post_status = 'draft';
-
+    if ('' != $_POST['savepage']) $post_status = 'static';
 
     if((get_settings('use_geo_positions')) && (strlen($latstr) > 2) && (strlen($lonstr) > 2) ) {
@@ -143 +143 @@
     if ( '' != $_POST['advanced'] || isset($_POST['save']) )
         $location = "post.php?action=edit&post=$post_ID";
+
+    if ( '' != $_POST['savepage'] )
+        $location = "post.php?action=createpage";
 
     header("Location: $location"); // Send user on their way while we keep working
@@ -234 +237 @@
         $post_name = $postdata->post_name;
 
-        include('edit-form-advanced.php');
+        if ($post_status == 'static') {
+            include('edit-page-form.php');
+        } else {
+            include('edit-form-advanced.php');
+        }
 
         $post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = '$post_ID'");
@@ -712 +719 @@
     do_action('edit_comment', $comment_ID);
     break;
+
+ case 'createpage':
+    $standalone = 0;
+    $title = __('Create New Page');
+    require_once ('./admin-header.php');
+
+    if ($user_level > 0) {
+        $action = 'post';
+        get_currentuserinfo();
+        //set defaults
+        $post_status = 'static';
+        $comment_status = get_settings('default_comment_status');
+        $ping_status = get_settings('default_ping_status');
+        $post_pingback = get_settings('default_pingback_flag');
+        $default_post_cat = get_settings('default_post_category');
+
+        include('edit-page-form.php');
+    } else {
+?>
+<div class="wrap">
+        <p><?php printf(__('Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to raise your level to 1, in order to be authorized to post.<br />
+You can also <a href="mailto:%s?subject=Promotion?">e-mail the admin</a> to ask for a promotion.<br />
+When you&#8217;re promoted, just reload this page and you&#8217;ll be able to blog. :)'), get_settings('admin_email')); ?>
+        </p>
+</div>
+<?php
+
+    }
+
+     break;
 
 default:

trunk/wp-blog-header.php

@@ -51 +51 @@
 }
 
-$wpvarstoreset = array('m','p','posts','w', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name');
+$wpvarstoreset = array('m','p','posts','w', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static');
 
 for ($i=0; $i<count($wpvarstoreset); $i += 1) {

trunk/wp-includes/classes.php

@@ -455 +455 @@
             $distinct = 'DISTINCT';
         }
-        $where .= ' AND (post_status = "publish"';
+
+    if ('' != $q['static']) {
+      $where .= ' AND (post_status = "static"';
+    } else {
+      $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')";
+            $where .= " OR post_author = $user_ID AND post_status != 'draft' AND post_status != 'static')";
         else
             $where .= ')';

trunk/wp-includes/functions.php

@@ -1176 +1176 @@
 }
 
+
+function page_permastruct() {
+    $permalink_structure = get_settings('permalink_structure');
+        
+    if (empty($permalink_structure)) {
+        return '';
+    }
+
+    $front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));    
+    $index = get_settings('blogfilename');
+    $prefix = '';
+    if (preg_match('#^/*' . $index . '#', $front)) {
+        $prefix = $index . '/';
+    }
+
+    return '/' . $prefix . 'site/%pagename%';    
+}
+
 function generate_rewrite_rules($permalink_structure = '', $matches = '') {
     $rewritecode = 
@@ -1188 +1206 @@
     '%post_id%',
     '%category%',
-    '%author%'
+    '%author%',
+    '%pagename%'
     );
 
@@ -1202 +1221 @@
     '([0-9]+)',
     '([/_0-9a-z-]+)',
-    '([_0-9a-z-]+)'
+    '([_0-9a-z-]+)',
+    '([_0-9a-z-]+)',
     );
 
@@ -1216 +1236 @@
     'p=',
     'category_name=',
-    'author_name='
+    'author_name=',
+    'static=1&name=',    
     );
 
@@ -1356 +1377 @@
     $author_rewrite = generate_rewrite_rules($author_structure, $matches);
 
+    // Site static pages
+    $page_structure = $prefix . 'site/%pagename%';
+    $page_rewrite = generate_rewrite_rules($page_structure, $matches);
+
     // Put them together.
-    $rewrite = $site_rewrite + $category_rewrite + $author_rewrite;
+    $rewrite = $site_rewrite + $page_rewrite + $category_rewrite + $author_rewrite;
 
     // Add on archive rewrite rules if needed.
@@ -1465 +1490 @@
         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;
+    if (!empty($dogs)) {
+        foreach ($dogs as $catt) {
+            $category_cache[$catt->ID][] = $catt;
+        }
     }
 

trunk/wp-includes/template-functions-category.php

@@ -65 +65 @@
 function the_category($seperator = '', $parents='') {
     $categories = get_the_category();
+    if (empty($categories)) {
+        _e('Uncategorized');
+        return;
+    }
+
     $thelist = '';
     if ('' == $seperator) {

trunk/wp-includes/template-functions-links.php

@@ -40 +40 @@
         '%postname%',
         '%post_id%',
-        '%category%'
+        '%category%',
+        '%pagename%'
     );
 
     if ($id) {
-        $idpost = $wpdb->get_row("SELECT ID, post_date, post_name FROM $wpdb->posts WHERE ID = $id");
+        $idpost = $wpdb->get_row("SELECT ID, post_date, post_name, post_status FROM $wpdb->posts WHERE ID = $id");
     } else {
         $idpost = $post;
     }
-       
-    if ('' != get_settings('permalink_structure')) {
+
+    $permalink = get_settings('permalink_structure');
+
+    if ('' != $permalink) {
+        if ($idpost->post_status == 'static') {
+            $permalink = page_permastruct();
+        }
+
         $unixtime = strtotime($idpost->post_date);
 
@@ -64 +71 @@
                                 $idpost->post_name,
                                 $idpost->ID,
-                                $category
+                                $category,
+                                $idpost->post_name,
                                 );
-        return get_settings('home') . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
+        return get_settings('home') . str_replace($rewritecode, $rewritereplace, $permalink);
     } else { // if they're not using the fancy permalink option
-        return get_settings('home') . '/' . get_settings('blogfilename').$querystring_start.'p'.$querystring_equal.$idpost->ID;
+        $permalink = get_settings('home') . '/' . get_settings('blogfilename').$querystring_start.'p'.$querystring_equal.$idpost->ID;
+        if ($idpost->post_status == 'static') {
+            $permalink .=  $querystring_separator . "static=1";
+        }
     }
 }