Formatting cleanups. see #11817
git-svn-id: http://svn.automattic.com/wordpress/trunk@13317 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
parent
09e8d27130
commit
766de41c58
|
|
@ -32,35 +32,23 @@ function wp_custom_navigation_get_menu_items( $menu_objects, $key = 'ID' ) {
|
|||
|
||||
function wp_custom_navigation_setup($override = false) {
|
||||
|
||||
$nav_version = '1.1.0';
|
||||
//Custom Navigation Menu Setup
|
||||
// Custom Navigation Menu Setup
|
||||
|
||||
//Check for Upgrades
|
||||
if (get_option('wp_settings_custom_nav_version') <> '') {
|
||||
$nav_version_in_db = get_option('wp_settings_custom_nav_version');
|
||||
}
|
||||
else {
|
||||
$nav_version_in_db = '0';
|
||||
}
|
||||
|
||||
//Override for menu descriptions
|
||||
update_option('wp_settings_custom_nav_advanced_options','yes');
|
||||
|
||||
if(($nav_version_in_db <> $nav_version) || ($override))
|
||||
update_option('wp_settings_custom_nav_version',$nav_version);
|
||||
// Override for menu descriptions
|
||||
update_option('wp_settings_custom_nav_advanced_options', 'yes');
|
||||
|
||||
$custom_menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
|
||||
if ( !empty( $custom_menus ) ) {
|
||||
foreach( $custom_menus as $menu ) {
|
||||
foreach ( $custom_menus as $menu ) {
|
||||
$menu_objects = get_objects_in_term( $menu->term_id, 'nav_menu' );
|
||||
if ( !empty( $menu_objects ) ) {
|
||||
foreach( $menu_objects as $item )
|
||||
foreach ( $menu_objects as $item ) {
|
||||
wp_delete_post( $item );
|
||||
}
|
||||
}
|
||||
wp_delete_term( $menu->term_id, 'nav_menu' );
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------------------------------*/
|
||||
|
|
@ -83,27 +71,17 @@ function wp_custom_navigation_setup($override = false) {
|
|||
/* after_title - html after title is outputted in <a> tag
|
||||
/*-----------------------------------------------------------------------------------*/
|
||||
|
||||
function wp_custom_navigation_output($args = array()) {
|
||||
function wp_custom_navigation_output( $args = array() ) {
|
||||
|
||||
//DEFAULT ARGS
|
||||
$type = 'frontend';
|
||||
$name = 'Menu 1';
|
||||
$id = 0;
|
||||
$desc = 2;
|
||||
$before_title = '';
|
||||
$after_title = '';
|
||||
// Defaults
|
||||
$defaults = array( 'type' => 'frontend', 'name' => 'Menu 1', 'id' => 0, 'desc' => 2, 'before_title' => '', 'after_title' => '');
|
||||
|
||||
if (isset($args)) {
|
||||
|
||||
if ( !is_array($args) )
|
||||
parse_str( $args, $args );
|
||||
|
||||
extract($args);
|
||||
}
|
||||
$args = wp_parse_args($args, $defaults);
|
||||
extract($args, EXTR_SKIP);
|
||||
|
||||
$menu_objects = get_objects_in_term( $id, 'nav_menu' );
|
||||
$menu_items = wp_custom_navigation_get_menu_items( $menu_objects, 'menu_order' );
|
||||
//Override for menu descriptions
|
||||
//O verride for menu descriptions
|
||||
$advanced_option_descriptions = get_option('wp_settings_custom_nav_advanced_options');
|
||||
if ( $advanced_option_descriptions == 'no' )
|
||||
$desc = 2;
|
||||
|
|
@ -211,14 +189,9 @@ function wp_custom_navigation_output($args = array()) {
|
|||
// 2 widget override do NOT display descriptions
|
||||
// 1 widget override display descriptions
|
||||
// 0 widget override not set
|
||||
if (($desc == 1) || ($desc == 0) )
|
||||
{
|
||||
if ( ($desc == 1) || ($desc == 0) ) {
|
||||
?><span class="nav-description"><?php echo $description; ?></span><?php
|
||||
}
|
||||
elseif ($desc == 2)
|
||||
{ }
|
||||
else
|
||||
{ }
|
||||
} else {
|
||||
// 2 widget override do NOT display descriptions
|
||||
// 1 widget override display descriptions
|
||||
|
|
@ -226,10 +199,6 @@ function wp_custom_navigation_output($args = array()) {
|
|||
if ( $desc == 1 ) {
|
||||
?><span class="nav-description"><?php echo $description; ?></span><?php
|
||||
}
|
||||
elseif (($desc == 2) || ($desc == 0))
|
||||
{ }
|
||||
else
|
||||
{ }
|
||||
}
|
||||
|
||||
?></a><?php
|
||||
|
|
@ -287,7 +256,7 @@ function wp_custom_navigation_output($args = array()) {
|
|||
}
|
||||
//@todo: implement menu heirarchy
|
||||
//RECURSIVE Sub Menu Items
|
||||
function wp_custom_navigation_sub_items($post_id,$type,$table_name,$output_type,$menu_id = 0) {
|
||||
function wp_custom_navigation_sub_items($post_id, $type, $table_name, $output_type, $menu_id = 0) {
|
||||
|
||||
$parent_id = 0;
|
||||
global $wpdb;
|
||||
|
|
@ -466,8 +435,8 @@ function wp_custom_navigation_sub_items($post_id,$type,$table_name,$output_type,
|
|||
}
|
||||
|
||||
|
||||
//Outputs All Pages and Sub Items
|
||||
function wp_custom_nav_get_pages($counter,$type) {
|
||||
// Outputs All Pages and Sub Items
|
||||
function wp_custom_nav_get_pages($counter, $type) {
|
||||
|
||||
$pages_args = array(
|
||||
'child_of' => 0,
|
||||
|
|
@ -490,17 +459,16 @@ function wp_custom_nav_get_pages($counter,$type) {
|
|||
$intCounter = $counter;
|
||||
$parentli = $intCounter;
|
||||
|
||||
if ($pages_array)
|
||||
{
|
||||
//DISPLAY Loop
|
||||
foreach ($pages_array as $post)
|
||||
{
|
||||
if ( !$pages_array ) {
|
||||
echo 'Not Found';
|
||||
return $intCounter;
|
||||
}
|
||||
|
||||
if ($post->post_parent == 0)
|
||||
{
|
||||
//Custom Menu
|
||||
if ($type == 'menu')
|
||||
{
|
||||
// Display Loop
|
||||
foreach ( $pages_array as $post ) {
|
||||
if ($post->post_parent == 0) {
|
||||
// Custom Menu
|
||||
if ( $type == 'menu' ) {
|
||||
$description = get_post_meta($post->ID, 'page-description', true);
|
||||
?>
|
||||
|
||||
|
|
@ -548,10 +516,8 @@ function wp_custom_nav_get_pages($counter,$type) {
|
|||
|
||||
<?php
|
||||
|
||||
}
|
||||
//Sidebar Menu
|
||||
elseif ($type == 'default')
|
||||
{
|
||||
} elseif ( $type == 'default' ) {
|
||||
// Sidebar Menu
|
||||
?>
|
||||
|
||||
<li>
|
||||
|
|
@ -584,17 +550,8 @@ function wp_custom_nav_get_pages($counter,$type) {
|
|||
<?php
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
echo 'Not Found';
|
||||
}
|
||||
|
||||
return $intCounter;
|
||||
}
|
||||
|
|
@ -615,24 +572,22 @@ function wp_custom_nav_get_categories($counter, $type) {
|
|||
'number' => '',
|
||||
'pad_counts' => false );
|
||||
|
||||
|
||||
|
||||
$intCounter = $counter;
|
||||
|
||||
//GET all categories
|
||||
// Get all categories
|
||||
$categories_array = get_categories($category_args);
|
||||
|
||||
if ($categories_array)
|
||||
{
|
||||
//DISPLAY Loop
|
||||
foreach ($categories_array as $cat_item)
|
||||
{
|
||||
if ( !$categories_array ) {
|
||||
echo 'Not Found';
|
||||
return $intCounter;
|
||||
}
|
||||
|
||||
if ($cat_item->parent == 0)
|
||||
{
|
||||
//Custom Menu
|
||||
if ($type == 'menu')
|
||||
{
|
||||
// Display Loop
|
||||
foreach ( $categories_array as $cat_item ) {
|
||||
|
||||
if ( $cat_item->parent == 0 ) {
|
||||
// Custom Menu
|
||||
if ( $type == 'menu' ) {
|
||||
?>
|
||||
|
||||
<li id="menu-<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>">
|
||||
|
|
@ -656,7 +611,7 @@ function wp_custom_nav_get_categories($counter, $type) {
|
|||
<?php
|
||||
$use_cats_raw = get_option('wp_settings_custom_nav_descriptions');
|
||||
$use_cats = strtolower($use_cats_raw);
|
||||
if ($use_cats == 'yes') { ?>
|
||||
if ( $use_cats == 'yes' ) { ?>
|
||||
<br/> <span><?php echo $cat_item->category_description; ?></span>
|
||||
<?php } ?>
|
||||
</a>
|
||||
|
|
@ -683,10 +638,8 @@ function wp_custom_nav_get_categories($counter, $type) {
|
|||
</li>
|
||||
|
||||
<?php
|
||||
}
|
||||
//Sidebar Menu
|
||||
elseif ($type == 'default')
|
||||
{
|
||||
} elseif ($type == 'default') {
|
||||
// Sidebar Menu
|
||||
?>
|
||||
<li>
|
||||
<dl>
|
||||
|
|
@ -714,11 +667,6 @@ function wp_custom_nav_get_categories($counter, $type) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
echo 'Not Found';
|
||||
}
|
||||
|
||||
return $intCounter;
|
||||
}
|
||||
|
|
@ -728,53 +676,42 @@ function wp_custom_navigation_default_sub_items($childof, $intCounter, $parentli
|
|||
|
||||
$counter = $intCounter;
|
||||
|
||||
//Custom Menu
|
||||
if ($output_type == 'menu')
|
||||
{
|
||||
// Custom Menu
|
||||
if ($output_type == 'menu') {
|
||||
$sub_args = array(
|
||||
'child_of' => $childof,
|
||||
'hide_empty' => false,
|
||||
'parent' => $childof);
|
||||
} elseif ($output_type == 'default') {
|
||||
// Sidebar Menu
|
||||
$sub_args = array(
|
||||
'child_of' => $childof,
|
||||
'hide_empty' => false,
|
||||
'parent' => $childof);
|
||||
}
|
||||
//Sidebar Menu
|
||||
elseif ($output_type == 'default')
|
||||
{
|
||||
$sub_args = array(
|
||||
'child_of' => $childof,
|
||||
'hide_empty' => false,
|
||||
'parent' => $childof);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
//Get Sub Category Items
|
||||
if ($type == 'categories')
|
||||
{
|
||||
if ( $type == 'categories' ) {
|
||||
// Get Sub Category Items
|
||||
$sub_array = get_categories($sub_args);
|
||||
}
|
||||
//Get Sub Page Items
|
||||
elseif ($type == 'pages')
|
||||
{
|
||||
} elseif ($type == 'pages') {
|
||||
// Get Sub Page Items
|
||||
$sub_array = get_pages($sub_args);
|
||||
} else {
|
||||
$sub_array = array();
|
||||
}
|
||||
|
||||
|
||||
if ($sub_array)
|
||||
{
|
||||
if ( $sub_array ) {
|
||||
?>
|
||||
|
||||
<ul id="sub-custom-nav-<?php echo $type ?>">
|
||||
|
||||
<?php
|
||||
//DISPLAY Loop
|
||||
foreach ($sub_array as $sub_item)
|
||||
{
|
||||
// Display Loop
|
||||
foreach ( $sub_array as $sub_item ) {
|
||||
//Prepare Menu Data
|
||||
//Category Menu Item
|
||||
if ($type == 'categories')
|
||||
{
|
||||
if ( $type == 'categories' ) {
|
||||
$link = get_category_link($sub_item->cat_ID);
|
||||
$title = htmlentities($sub_item->cat_name);
|
||||
$parent_id = $sub_item->cat_ID;
|
||||
|
|
@ -782,10 +719,8 @@ function wp_custom_navigation_default_sub_items($childof, $intCounter, $parentli
|
|||
$linktype = 'category';
|
||||
$appendtype = 'Category';
|
||||
$description = htmlentities(strip_tags($sub_item->description));
|
||||
}
|
||||
} elseif ( $type == 'pages' ) {
|
||||
//Page Menu Item
|
||||
elseif ($type == 'pages')
|
||||
{
|
||||
$link = get_permalink($sub_item->ID);
|
||||
$title = htmlentities($sub_item->post_title);
|
||||
$parent_id = $sub_item->ID;
|
||||
|
|
@ -793,18 +728,15 @@ function wp_custom_navigation_default_sub_items($childof, $intCounter, $parentli
|
|||
$itemid = $sub_item->ID;
|
||||
$appendtype = 'Page';
|
||||
$description = htmlentities(get_post_meta($itemid, 'page-description', true));
|
||||
}
|
||||
//Custom Menu Item
|
||||
else
|
||||
{
|
||||
} else {
|
||||
// Custom Menu Item
|
||||
$title = '';
|
||||
$linktype = 'custom';
|
||||
$appendtype= 'Custom';
|
||||
}
|
||||
|
||||
//Custom Menu
|
||||
if ($output_type == 'menu')
|
||||
{
|
||||
// Custom Menu
|
||||
if ( $output_type == 'menu' ) {
|
||||
?>
|
||||
<li id="menu-<?php echo $counter; ?>" value="<?php echo $counter; ?>">
|
||||
<dl>
|
||||
|
|
@ -846,11 +778,8 @@ function wp_custom_navigation_default_sub_items($childof, $intCounter, $parentli
|
|||
|
||||
</li>
|
||||
<?php
|
||||
}
|
||||
//Sidebar Menu
|
||||
elseif ($output_type == 'default')
|
||||
{
|
||||
|
||||
} elseif ($output_type == 'default') {
|
||||
// Sidebar Menu
|
||||
?>
|
||||
<li>
|
||||
<dl>
|
||||
|
|
@ -879,7 +808,6 @@ function wp_custom_navigation_default_sub_items($childof, $intCounter, $parentli
|
|||
}
|
||||
|
||||
return $counter;
|
||||
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------------------------------*/
|
||||
|
|
@ -887,16 +815,12 @@ function wp_custom_navigation_default_sub_items($childof, $intCounter, $parentli
|
|||
/*-----------------------------------------------------------------------------------*/
|
||||
|
||||
function get_children_menu_elements($childof, $intCounter, $parentli, $type, $menu_id, $table_name) {
|
||||
global $wpdb;
|
||||
|
||||
$counter = $intCounter;
|
||||
|
||||
global $wpdb;
|
||||
|
||||
|
||||
|
||||
//Get Sub Category Items
|
||||
if ($type == 'categories')
|
||||
{
|
||||
if ( $type == 'categories' ) {
|
||||
$sub_args = array(
|
||||
'child_of' => $childof,
|
||||
'hide_empty' => false,
|
||||
|
|
@ -912,31 +836,24 @@ function get_children_menu_elements($childof, $intCounter, $parentli, $type, $me
|
|||
|
||||
$sub_array = get_pages($sub_args);
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
} else {
|
||||
$sub_array = array();
|
||||
}
|
||||
|
||||
if ($sub_array)
|
||||
{
|
||||
if ( $sub_array ) {
|
||||
//DISPLAY Loop
|
||||
foreach ($sub_array as $sub_item)
|
||||
{
|
||||
if (isset($sub_item->parent)) {
|
||||
foreach ( $sub_array as $sub_item ) {
|
||||
if ( isset($sub_item->parent) ) {
|
||||
$sub_item_parent = $sub_item->parent;
|
||||
}
|
||||
elseif (isset($sub_item->post_parent)) {
|
||||
} elseif (isset($sub_item->post_parent)) {
|
||||
$sub_item_parent = $sub_item->post_parent;
|
||||
}
|
||||
else {
|
||||
}
|
||||
//Is child
|
||||
if ($sub_item_parent == $childof)
|
||||
{
|
||||
|
||||
// Is child
|
||||
if ( $sub_item_parent == $childof ) {
|
||||
//Prepare Menu Data
|
||||
//Category Menu Item
|
||||
if ($type == 'categories')
|
||||
{
|
||||
if ( $type == 'categories' ) {
|
||||
$link = get_category_link($sub_item->cat_ID);
|
||||
$title = htmlentities($sub_item->cat_name);
|
||||
$parent_id = $sub_item->category_parent;
|
||||
|
|
@ -945,8 +862,7 @@ function get_children_menu_elements($childof, $intCounter, $parentli, $type, $me
|
|||
$appendtype= 'Category';
|
||||
}
|
||||
//Page Menu Item
|
||||
elseif ($type == 'pages')
|
||||
{
|
||||
elseif ( $type == 'pages' ) {
|
||||
$link = get_permalink($sub_item->ID);
|
||||
$title = htmlentities($sub_item->post_title);
|
||||
$parent_id = $sub_item->post_parent;
|
||||
|
|
@ -955,8 +871,7 @@ function get_children_menu_elements($childof, $intCounter, $parentli, $type, $me
|
|||
$appendtype= 'Page';
|
||||
}
|
||||
//Custom Menu Item
|
||||
else
|
||||
{
|
||||
else {
|
||||
$title = '';
|
||||
$linktype = 'custom';
|
||||
$appendtype= 'Custom';
|
||||
|
|
@ -967,8 +882,7 @@ function get_children_menu_elements($childof, $intCounter, $parentli, $type, $me
|
|||
$wp_result = $wpdb->get_results("SELECT id FROM ".$table_name." WHERE post_id='".$parent_id."' AND link_type='".$linktype."' AND menu_id='".$menu_id."'");
|
||||
if ($wp_result > 0 && isset($wp_result[0]->id)) {
|
||||
$parent_id = $wp_result[0]->id;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
//$parent_id = 0;
|
||||
}
|
||||
|
||||
|
|
@ -979,14 +893,9 @@ function get_children_menu_elements($childof, $intCounter, $parentli, $type, $me
|
|||
$counter++;
|
||||
$counter = get_children_menu_elements($itemid, $counter, $parent_id, $type, $menu_id, $table_name);
|
||||
}
|
||||
//Do nothing
|
||||
else {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
return $counter;
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue