Changeset 1752

Timestamp:

10/06/2004 02:18:37 AM (22 years ago)

Author:

rboren

Message:

Page/subpage URIs.

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (4 diffs)
• wp-admin/edit-page-form.php (modified) (1 diff)
• wp-admin/edit-pages.php (modified) (1 diff)
• wp-admin/options-permalink.php (modified) (2 diffs)
• wp-admin/post.php (modified) (7 diffs)
• wp-admin/upgrade-schema.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/template-functions-links.php (modified) (2 diffs)

trunk/wp-admin/admin-functions.php

@@ -486 +486 @@
 }
 
+function save_mod_rewrite_rules() {
+        global $is_apache;
+        $home = get_settings('home');
+        if ( $home != '' && $home != get_settings('siteurl') ) {
+                $home_path = parse_url($home);
+                $home_path = $home_root['path'];
+                $root = str_replace($_SERVER["PHP_SELF"], '', $_SERVER["PATH_TRANSLATED"]);
+                $home_path = $root . $home_path . "/";
+        } else {
+                $home_path = ABSPATH;
+        }
+
+        if ( (!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess') )
+                $writable = true;
+        else
+                $writable = false;
+
+        $permalink_structure = get_settings('permalink_structure');
+
+        if ( strstr($permalink_structure, 'index.php') ) // If they're using 
+                $usingpi = true;
+        else
+                $usingpi = false;
+
+        if ( $writable && !$usingpi && $is_apache ) {
+                $rules = explode("\n", mod_rewrite_rules($permalink_structure));
+                insert_with_markers($home_path.'.htaccess', 'WordPress', $rules);
+        }
+}
+
+function generate_page_rewrite_rules() {
+        global $wpdb;
+        $posts = $wpdb->get_results("SELECT ID, post_name FROM $wpdb->posts WHERE post_status = 'static'");
+
+        $page_rewrite_rules = array();
+
+        foreach ($posts as $post) {
+                // URI => page name
+                $uri = get_page_uri($post->ID);
+
+                $page_rewrite_rules[$uri] = $post->post_name;
+        }
+
+        update_option('page_uris', $page_rewrite_rules);
+
+        save_mod_rewrite_rules();
+}
+
 function the_quicktags () {
 // Browser detection sucks, but until Safari supports the JS needed for this to work people just assume it's a bug in WP
@@ -708 +756 @@
 }
 
-function parent_dropdown($parent = 0, $level = 0) {
+function parent_dropdown($default = 0, $parent = 0, $level = 0) {
         global $wpdb;
         $items = $wpdb->get_results("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = $parent AND post_status = 'static' ORDER BY menu_order");
@@ -714 +762 @@
                 foreach ($items as $item) {
                         $pad = str_repeat(' ', $level * 3);
-                        if ($item->ID == $current)
+                        if ($item->ID == $default)
                                 $current = ' selected="selected"';
                         else
@@ -720 +768 @@
 
                         echo "\n\t<option value='$item->ID'$current>$pad $item->post_title</a></option>";
-                                parent_dropdown($item->ID, $level + 1);
+                        parent_dropdown($default, $item->ID, $level + 1);
                 }
         } else {

trunk/wp-admin/edit-page-form.php

@@ -53 +53 @@
           <div><select name="parent_id">
                 <option value='0'>Main Page (no parent)</option>
-                        <?php parent_dropdown(); ?>
+                        <?php parent_dropdown($post_parent); ?>
         </select>
           </div>

trunk/wp-admin/edit-pages.php

@@ -68 +68 @@
         $ping_status = get_settings('default_ping_status');
         $post_pingback = get_settings('default_pingback_flag');
+        $post_parent = 0;
 
         include('edit-page-form.php');

trunk/wp-admin/options-permalink.php

@@ -32 +32 @@
 }
 
+generate_page_rewrite_rules();
+
 if ( (!file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess') )
         $writable = true;
@@ -42 +44 @@
         $usingpi = false;
 
-if ( $writable && !$usingpi && $is_apache ) {
-        $rules = explode("\n", mod_rewrite_rules($permalink_structure));
-        insert_with_markers($home_path.'.htaccess', 'WordPress', $rules);
-}
+save_mod_rewrite_rules();
 ?>
 

trunk/wp-admin/post.php

@@ -57 +57 @@
                 $post_status = $_POST['post_status'];
                 $post_name = $_POST['post_name'];
+                $post_parent = 0;
+                if (isset($_POST['parent_id'])) {
+                        $post_parent = $_POST['parent_id'];
+                }
 
                 if (empty($post_status)) $post_status = 'draft';
@@ -109 +113 @@
 
         $postquery ="INSERT INTO $wpdb->posts
-                        (ID, post_author, post_date, post_date_gmt, post_content, post_title, post_excerpt,  post_status, comment_status, ping_status, post_password, post_name, to_ping, post_modified, post_modified_gmt)
+                        (ID, post_author, post_date, post_date_gmt, post_content, post_title, post_excerpt,  post_status, comment_status, ping_status, post_password, post_name, to_ping, post_modified, post_modified_gmt, post_parent)
                         VALUES
-                        ('0', '$user_ID', '$now', '$now_gmt', '$content', '$post_title', '$excerpt', '$post_status', '$comment_status', '$ping_status', '$post_password', '$post_name', '$trackback', '$now', '$now_gmt')
+                        ('0', '$user_ID', '$now', '$now_gmt', '$content', '$post_title', '$excerpt', '$post_status', '$comment_status', '$ping_status', '$post_password', '$post_name', '$trackback', '$now', '$now_gmt', '$post_parent')
                         ";
 
@@ -195 +199 @@
         } // end if publish
 
+        if ($post_status = 'static') {
+                generate_page_rewrite_rules();
+        }
+
         exit();
         break;
@@ -223 +231 @@
                 $pinged = $postdata->pinged;
                 $post_name = $postdata->post_name;
-
-        if ($post_status == 'static') {
-            include('edit-page-form.php');
-        } else {
-            include('edit-form-advanced.php');
-        }
+                $post_parent = $postdata->post_parent;
+
+                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'");
@@ -287 +296 @@
                 if (empty($post_name)) {
                   $post_name = $post_title;
+                }
+
+                $post_parent = 0;
+                if (isset($_POST['parent_id'])) {
+                        $post_parent = $_POST['parent_id'];
                 }
 
@@ -354 +368 @@
                         to_ping = '$trackback',
                         post_modified = '$now',
-                        post_modified_gmt = '$now_gmt'
+                        post_modified_gmt = '$now_gmt',
+      post_parent = '$post_parent'
                 WHERE ID = $post_ID ");
 
@@ -421 +436 @@
                 }
         } // end if publish
+
+        if ($post_status = 'static') {
+                generate_page_rewrite_rules();
+        }
 
         do_action('edit_post', $post_ID);

trunk/wp-admin/upgrade-schema.php

@@ -212 +212 @@
         add_option('stylesheet', 'default');
         add_option('comment_whitelist', 0);
+        add_option('page_uris');
 
         // Delete unused options

trunk/wp-includes/functions.php

@@ -1216 +1216 @@
 }
 
+function get_page_uri($page) {
+        global $wpdb;
+        $page = $wpdb->get_row("SELECT post_name, post_parent FROM $wpdb->posts WHERE ID = '$page'");
+
+        $uri = $page->post_name;
+
+        while ($page->post_parent != 0) {
+                $page = $wpdb->get_row("SELECT post_name, post_parent FROM $wpdb->posts WHERE ID = '$page->post_parent'");
+                $uri = $page->post_name . "/" . $uri;
+        }
+
+        return $uri;
+}
+
+function page_rewrite_rules() {
+        $uris = get_settings('page_uris');
+
+        $rewrite_rules = array();
+        foreach ($uris as $uri => $pagename) {
+                $rewrite_rules += array($uri . '/?$' => "index.php?pagename=$pagename");
+        }
+
+        return $rewrite_rules;
+}
+
 function generate_rewrite_rules($permalink_structure = '', $matches = '') {
     $rewritecode = 
@@ -1410 +1435 @@
     $page_rewrite = generate_rewrite_rules($page_structure, $matches);
 
+                // Pages
+                $pages_rewrite = page_rewrite_rules();
+
     // Put them together.
-    $rewrite = $site_rewrite + $page_rewrite + $search_rewrite + $category_rewrite + $author_rewrite;
+    $rewrite = $pages_rewrite + $site_rewrite + $page_rewrite + $search_rewrite + $category_rewrite + $author_rewrite;
 
     // Add on archive rewrite rules if needed.

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

@@ -50 +50 @@
         }
 
+        if ($idpost->post_status == 'static') {
+                return get_page_link();
+        }
+        
         $permalink = get_settings('permalink_structure');
 
         if ('' != $permalink) {
-                if ($idpost->post_status == 'static')
-                        $permalink = page_permastruct();
-
                 $unixtime = strtotime($idpost->post_date);
 
@@ -79 +80 @@
         } else { // if they're not using the fancy permalink option
                 $permalink = get_settings('home') . '/' . get_settings('blogfilename') . '?p=' . $idpost->ID;
-                if ($idpost->post_status == 'static')
-                        $permalink .=  '&static=1';
                 return $permalink;
         }
+}
+
+function get_page_link($id = false) {
+        global $post;
+
+        if (! $id) {
+                $id = $post->ID;
+        }
+
+        $permalink = get_settings('permalink_structure');
+
+        if ('' != $permalink) {
+                $link = get_page_uri($id);
+                $link = get_settings('home') . "/$link/";
+        } else {
+                $link = get_settings('home') . "/index.php?p=$id&static=1";
+        }
+
+        return $link;
 }