Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 992) +++ trunk/CHANGELOG (revision 993) @@ -12,6 +12,7 @@ ------------------------------------- 2.8.0 ------------------------------------- 15-June-2009 Matthias Gallas +# Fixed bug in menu_link modul with wrong displayed pages tree (Thanks to thorn) # Fixed small bug introduced in changeset [989] + Added missing id tags and copyright notices to droplets modul 15-June-2009 Dietrich Roland Pehlke (aldus) Index: trunk/wb/modules/menu_link/modify.php =================================================================== --- trunk/wb/modules/menu_link/modify.php (revision 992) +++ trunk/wb/modules/menu_link/modify.php (revision 993) @@ -1,216 +1,232 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -// Must include code to stop this file being accessed directly -if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } - -// check if module language file exists for the language set by the user (e.g. DE, EN) -if(!file_exists(WB_PATH .'/modules/menu_link/languages/'.LANGUAGE .'.php')) { - // no module language file exists for the language set by the user, include default module language file EN.php - require_once(WB_PATH .'/modules/menu_link/languages/EN.php'); -} else { - // a module language file exists for the language defined by the user, load it - require_once(WB_PATH .'/modules/menu_link/languages/'.LANGUAGE .'.php'); -} - -// get target page_id -$table = TABLE_PREFIX.'mod_menu_link'; -$sql_result = $database->query("SELECT * FROM $table WHERE section_id = '$section_id'"); -$sql_row = $sql_result->fetchRow(); -$target_page_id = $sql_row['target_page_id']; -$r_type = $sql_row['redirect_type']; -$extern = $sql_row['extern']; -$anchor = $sql_row['anchor']; -$sel = ' selected'; - -// Get list of all visible pages, except actual one -$links = array(); -$table_p = TABLE_PREFIX."pages"; -if($query_page = $database->query("SELECT * FROM $table_p WHERE parent = '0' ORDER BY position")) { - while($page = $query_page->fetchRow()) { - $all_links[$page['page_id']]='/'.$page['menu_title']; - if($admin->page_is_visible($page) && $page['page_id']!=$page_id) { - $links[$page['page_id']]='/'.$page['menu_title']; - } - if($query_subpage = $database->query("SELECT * FROM $table_p WHERE page_id != '$page_id' AND root_parent = '{$page['page_id']}' ORDER BY level")) { - while($sub = $query_subpage->fetchRow()) { - if($admin->page_is_visible($sub)) { - $parent_link = (array_key_exists($sub['parent'],$all_links))?$all_links[$sub['parent']]:""; - $links[$sub['page_id']]=$parent_link.'/'.$sub['menu_title']; - } - } - } - } -} -// Get list of targets (id=... or ) from pages in $links -$targets = array(); -$table_mw = TABLE_PREFIX."mod_wysiwyg"; -$table_s = TABLE_PREFIX."sections"; -foreach($links as $pid=>$l) { - if($query_section = $database->query("SELECT section_id, module FROM $table_s WHERE page_id = '$pid' ORDER BY position")) { - while($section = $query_section->fetchRow()) { - // get section-anchor - if(defined('SEC_ANCHOR') && SEC_ANCHOR!='') { - $targets[$pid][] = SEC_ANCHOR.$section['section_id']; - } else { - $targets[$pid] = array(); - } - if($section['module'] == 'wysiwyg') { - if($query_page = $database->query("SELECT content FROM $table_mw WHERE section_id = '{$section['section_id']}' LIMIT 1")) { - $page = $query_page->fetchRow(); - if(preg_match_all('/<(?:[^>]+id|\s*a[^>]+name)\s*=\s*"([^"]+)"/i',$page['content'], $match)) { - foreach($match[1] AS $t) { - $targets[$pid][] = $t; - } - } - } - } - } - } -} -// get target-window for actual page -$table = TABLE_PREFIX."pages"; -$query_page = $database->query("SELECT target FROM $table WHERE page_id = '$page_id'"); -$page = $query_page->fetchRow(); -$target = $page['target']; - - -// script for target-select-box -?> - - -
- - - - - - - - - - - - - - - - - - - -
- - - -   - /> -
- - - -
- - - -
- - - -
- -
- - - - - - -
- - - - -
- - - + + Copyright (C) 2004-2009, Ryan Djurovich + + Website Baker is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + Website Baker is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Website Baker; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +// Must include code to stop this file being accessed directly +if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } + +// check if module language file exists for the language set by the user (e.g. DE, EN) +if(!file_exists(WB_PATH .'/modules/menu_link/languages/'.LANGUAGE .'.php')) { + // no module language file exists for the language set by the user, include default module language file EN.php + require_once(WB_PATH .'/modules/menu_link/languages/EN.php'); +} else { + // a module language file exists for the language defined by the user, load it + require_once(WB_PATH .'/modules/menu_link/languages/'.LANGUAGE .'.php'); +} + +// get target page_id +$table = TABLE_PREFIX.'mod_menu_link'; +$sql_result = $database->query("SELECT * FROM $table WHERE section_id = '$section_id'"); +$sql_row = $sql_result->fetchRow(); +$target_page_id = $sql_row['target_page_id']; +$r_type = $sql_row['redirect_type']; +$extern = $sql_row['extern']; +$anchor = $sql_row['anchor']; +$sel = ' selected'; + +// Get list of all visible pages, except actual one, and build a page-tree + +// this function will fetch the page_tree, recursive +if(!function_exists('menulink_make_tree')) { +function menulink_make_tree($parent, $link_pid, $tree) { + global $database, $admin, $menulink_titles; + $table_p = TABLE_PREFIX."pages"; + // get list of page-trails, recursive + if($query_page = $database->query("SELECT * FROM `$table_p` WHERE `parent`=$parent ORDER BY `position`")) { + while($page = $query_page->fetchRow()) { + if($admin->page_is_visible($page) && $page['page_id']!=$link_pid) { + $pids = explode(',', $page['page_trail']); + $entry = ''; + foreach($pids as $pid) + $entry .= $menulink_titles[$pid].' / '; + $tree[$page['page_id']] = rtrim($entry, '/ '); + $tree = menulink_make_tree($page['page_id'], $link_pid, $tree); + } + } + } + return($tree); +} +} +// get list of all page_ids and page_titles +global $menulink_titles; +$menulink_titles = array(); +$table_p = TABLE_PREFIX."pages"; +if($query_page = $database->query("SELECT `page_id`,`page_title` FROM `$table_p`")) { + while($page = $query_page->fetchRow()) + $menulink_titles[$page['page_id']] = $page['page_title']; +} +// now get the tree +$links = array(); +$links = menulink_make_tree(0, $page_id, $links); + +// Get list of targets (id=... or ) from pages in $links +$targets = array(); +$table_mw = TABLE_PREFIX."mod_wysiwyg"; +$table_s = TABLE_PREFIX."sections"; +foreach($links as $pid=>$l) { + if($query_section = $database->query("SELECT section_id, module FROM $table_s WHERE page_id = '$pid' ORDER BY position")) { + while($section = $query_section->fetchRow()) { + // get section-anchor + if(defined('SEC_ANCHOR') && SEC_ANCHOR!='') { + $targets[$pid][] = SEC_ANCHOR.$section['section_id']; + } else { + $targets[$pid] = array(); + } + if($section['module'] == 'wysiwyg') { + if($query_page = $database->query("SELECT content FROM $table_mw WHERE section_id = '{$section['section_id']}' LIMIT 1")) { + $page = $query_page->fetchRow(); + if(preg_match_all('/<(?:a[^>]+name|[^>]+id)\s*=\s*"([^"]+)"/i',$page['content'], $match)) { + foreach($match[1] AS $t) { + $targets[$pid][$t] = $t; + } + } + } + } + } + } +} +// get target-window for actual page +$table = TABLE_PREFIX."pages"; +$query_page = $database->query("SELECT target FROM $table WHERE page_id = '$page_id'"); +$page = $query_page->fetchRow(); +$target = $page['target']; + + +// script for target-select-box +?> + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + +   + /> +
+ + + +
+ + + +
+ + + +
+ +
+ + + + + + +
+ + + + +
+ + +