Changeset 3573

Timestamp:

02/28/2006 03:57:08 AM (19 years ago)

Author:

ryan

Message:

wp_dropdown_pages() and walk_page_tree()

Location:

trunk/wp-includes

Files:

• functions.php (modified) (1 diff)
• template-functions-post.php (modified) (7 diffs)

trunk/wp-includes/functions.php

@@ -744 +744 @@
         return $_page;
     }
+}
+
+function walk_page_tree($pages, $to_depth, $start_element_callback, $end_element_callback = '', $start_level_callback = '', $end_level_callback = '') {
+    $args = array_slice(func_get_args(), 6);
+    $parents = array();
+    $depth = 0;
+    $previous_page = '';
+    $output = '';
+
+    $last_page->post_parent = 0;
+    $last_page->post_id = 0;
+    $pages[] = $last_page;
+
+    foreach ( $pages as $page ) {
+        if ( !empty($previous_page) && ($page->post_parent == $previous_page->ID) ) {
+            // Previous page is my parent. Descend a level.
+            array_unshift($parents, $page);
+            $depth++;
+            if ( !$to_depth || ($depth < $to_depth) )
+                if ( !empty($start_level_callback) ) {
+                    $cb_args = array_merge( array($output, $depth), $args);
+                    $output = call_user_func_array($start_level_callback, $cb_args);
+                }
+        } else if ( $depth && ($page->post_parent == $parents[0]->ID) ) {
+            // On the same level as previous page.
+            if ( !$to_depth || ($depth < $to_depth) ) {
+                if ( !empty($end_element_callback) ) {
+                    $cb_args = array_merge( array($output, $previous_page, $depth), $args);
+                    $output = call_user_func_array($end_element_callback, $cb_args);
+                }
+            }
+        } else if ( $depth ) {
+            // Ascend one or more levels.
+            if ( !$to_depth || ($depth < $to_depth) ) {
+                if ( !empty($end_element_callback) ) {
+                    $cb_args = array_merge( array($output, $previous_page, $depth), $args);
+                    $output = call_user_func_array($end_element_callback, $cb_args);
+                }
+            }
+
+            while ( $parent = array_shift($parents)) {
+                $depth--;
+                if ( !$to_depth || ($depth < $to_depth) ) {
+                    if ( !empty($end_level_callback) ) {
+                        $cb_args = array_merge( array($output, $depth), $args);
+                        $output = call_user_func_array($end_level_callback, $cb_args);
+                    }
+                    if ( !empty($end_element_callback) ) {
+                        $cb_args = array_merge( array($output, $parent, $depth), $args);
+                        $output = call_user_func_array($end_element_callback, $cb_args);
+                    }
+                }
+                if ( $page->post_parent == $parent->ID ) {
+                    break;
+                }
+            }
+        } else if ( !empty($previous_page) ) {
+            // Close off previous page.
+            if ( !$to_depth || ($depth < $to_depth) ) {
+                if ( !empty($end_element_callback) ) {
+                    $cb_args = array_merge( array($output, $previous_page, $depth), $args);
+                    $output = call_user_func_array($end_element_callback, $cb_args);
+                }
+            }
+        }
+
+        // Start the page.
+        if ( !$to_depth || ($depth < $to_depth) ) {
+            if ( !empty($start_element_callback) && ($page->ID != 0) ) {
+                $cb_args = array_merge( array($output, $page, $depth), $args);
+                $output = call_user_func_array($start_element_callback, $cb_args);
+            }
+        }
+
+        $previous_page = $page;
+    }
+
+    return $output;
 }
 

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

@@ -296 +296 @@
 function &get_pages($args = '') {
     global $wpdb;
-
     parse_str($args, $r);
 
@@ -305 +304 @@
     if ( !isset($r['sort_order']) )
         $r['sort_order'] = 'ASC';
+    if ( !isset($r['hierarchical']) )
+        $r['hierarchical'] = 1;
 
     $exclusions = '';
@@ -328 +329 @@
     update_page_cache($pages);
 
-    if ( $r['child_of'] )
+    if ( $r['child_of'] || $r['hierarchical'] )
         $pages = & get_page_children($r['child_of'], $pages);
 
@@ -334 +335 @@
 }
 
+function wp_dropdown_pages($args = '') {
+    parse_str($args, $r);
+    if ( !isset($r['depth']) )
+        $r['depth'] = 0;
+    if ( !isset($r['child_of']) )
+        $r['child_of'] = 0;
+    if ( !isset($r['echo']) )
+        $r['echo'] = 1;
+    if ( !isset($r['selected']) )
+        $r['selected'] = 0;
+
+    extract($r);
+
+    $pages = get_pages($args);
+    $output = '';
+
+    if ( ! empty($pages) ) {
+        $output = "<select name='page_id'>\n";
+        $output .= walk_page_tree($pages, $depth, '_page_dropdown_element', '', '', '', $selected);
+        $output .= "</select>\n";
+    }
+
+    $output = apply_filters('wp_dropdown_pages', $output);
+
+    if ( $echo )
+        echo $output;
+
+    return $output;
+}
+
+function _page_dropdown_element($output, $page, $depth, $selected) {
+    $pad = str_repeat('&nbsp;', $depth * 3);
+
+    $output .= "\t<option value=\"$page->ID\"";
+    if ( $page->ID == $selected )
+        $output .= ' selected="selected"';
+    $output .= '>';
+    $title = wp_specialchars($page->post_title);
+    $output .= "$pad$title";
+    $output .= "</option>\n";
+
+    return $output;
+}
 
 function wp_list_pages($args = '') {
@@ -341 +385 @@
     if ( !isset($r['show_date']) )
         $r['show_date'] = '';
+    if ( !isset($r['date_format']) )
+        $r['date_format'] = get_settings('date_format');
     if ( !isset($r['child_of']) )
         $r['child_of'] = 0;
@@ -351 +397 @@
 
     // Query pages.
-    $pages = & get_pages($args);
-    if ( $pages ) {
-
+    $pages = get_pages($args);
+
+    if ( !empty($pages) ) {
         if ( $r['title_li'] )
             $output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
 
-        // Now loop over all pages that were selected
-        $page_tree = Array();
-        foreach ( $pages as $page ) {
-            // set the title for the current page
-            $page_tree[$page->ID]['title'] = $page->post_title;
-            $page_tree[$page->ID]['name'] = $page->post_name;
-
-            // set the selected date for the current page
-            // depending on the query arguments this is either
-            // the createtion date or the modification date
-            // as a unix timestamp. It will also always be in the
-            // ts field.
-            if ( !empty($r['show_date']) ) {
-                if ( 'modified' == $r['show_date'] )
-                    $page_tree[$page->ID]['ts'] = $page->post_modified;
-                else
-                    $page_tree[$page->ID]['ts'] = $page->post_date;
-            }
-
-            // The tricky bit!!
-            // Using the parent ID of the current page as the
-            // array index we set the curent page as a child of that page.
-            // We can now start looping over the $page_tree array
-            // with any ID which will output the page links from that ID downwards.
-            if ( $page->post_parent != $page->ID)
-                $page_tree[$page->post_parent]['children'][] = $page->ID;
-        }
-        // Output of the pages starting with child_of as the root ID.
-        // child_of defaults to 0 if not supplied in the query.
-        $output .= _page_level_out($r['child_of'],$page_tree, $r, 0, false);
+        global $wp_query;
+        $current_page = $wp_query->get_queried_object_id();
+        $output .= walk_page_tree($pages, $depth, '_page_list_element_start', '_page_list_element_end', '_page_list_level_start', '_page_list_level_end', $current_page, $r['show_date'], $r['date_format']);
+
         if ( $r['title_li'] )
             $output .= '</ul></li>';
@@ -399 +419 @@
 }
 
-
-function _page_level_out($parent, $page_tree, $args, $depth = 0, $echo = true) {
-    global $wp_query;
-    $queried_obj = $wp_query->get_queried_object();
-    $output = '';
-
+function _page_list_level_start($output, $depth) {
+    $indent = str_repeat("\t", $depth);
+    $output .= "$indent<ul>\n";
+    return $output;
+}
+
+function _page_list_level_end($output, $depth) {
+    $indent = str_repeat("\t", $depth);
+    $output .= "$indent</ul>\n";
+    return $output;
+}
+
+function _page_list_element_start($output, $page, $depth, $current_page, $show_date, $date_format) {
     if ( $depth )
         $indent = str_repeat("\t", $depth);
-        //$indent = join('', array_fill(0,$depth,"\t"));
-
-    if ( !is_array($page_tree[$parent]['children']) )
-        return false;
-
-    foreach ( $page_tree[$parent]['children'] as $page_id ) {
-        $cur_page = $page_tree[$page_id];
-        $title = $cur_page['title'];
-
-        $css_class = 'page_item';
-        if ( $page_id == $queried_obj->ID )
-            $css_class .= ' current_page_item';
-
-        $output .= $indent . '<li class="' . $css_class . '"><a href="' . get_page_link($page_id) . '" title="' . wp_specialchars($title) . '">' . $title . '</a>';
-
-        if ( isset($cur_page['ts']) ) {
-            $format = get_settings('date_format');
-            if ( isset($args['date_format']) )
-                $format = $args['date_format'];
-            $output .= " " . mysql2date($format, $cur_page['ts']);
-        }
-
-        if ( isset($cur_page['children']) && is_array($cur_page['children']) ) {
-            $new_depth = $depth + 1;
-
-            if ( !$args['depth'] || $depth < ($args['depth']-1) ) {
-                $output .= "$indent<ul>\n";
-                $output .= _page_level_out($page_id, $page_tree, $args, $new_depth, false);
-                $output .= "$indent</ul>\n";
-            }
-        }
-        $output .= "$indent</li>\n";
-    }
-    if ( $echo )
-        echo $output;
-    else
-        return $output;
+
+    $css_class = 'page_item';
+    if ( $page->ID == $current_page )
+        $css_class .= ' current_page_item';
+
+    $output .= $indent . '<li class="' . $css_class . '"><a href="' . get_page_link($page->ID) . '" title="' . wp_specialchars($page->post_title) . '">' . $page->post_title . '</a>';
+
+    if ( !empty($show_date) ) {
+        if ( 'modified' == $show_date )
+            $time = $page->post_modified;
+        else
+            $time = $page->post_date;
+
+        $output .= " " . mysql2date($date_format, $time);
+    }
+
+    return $output;
+}
+
+function _page_list_element_end($output, $page, $depth) {
+    $output .= "</li>\n";
+
+    return $output;
 }