Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 681) +++ trunk/CHANGELOG (revision 682) @@ -12,6 +12,7 @@ ------------------------------------- 2.7.0 ------------------------------------- 09-Feb-2008 Christian Sommer +# fixed bug in menu_link module (IE 7 did not show the select boxes at all) # fixed bug in user signup ! output_filter: added word boundary for the mailto regex part 09-Feb-2008 Thomas Hornwik Index: trunk/wb/modules/menu_link/modify.php =================================================================== --- trunk/wb/modules/menu_link/modify.php (revision 681) +++ trunk/wb/modules/menu_link/modify.php (revision 682) @@ -1,179 +1,179 @@ - - Copyright (C) 2004-2008, 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"); } - -// 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']; -$anchor = $sql_row['anchor']; -$sel = ' selected'; - -// Get list of all visible page-links, except menu_links and actual page -$links = array(); -$table_p = TABLE_PREFIX."pages"; -$table_s = TABLE_PREFIX."sections"; -if($query_page = $database->query("SELECT DISTINCT p.* FROM $table_p AS p INNER JOIN $table_s AS s ON p.page_id=s.page_id WHERE s.module != 'menu_link' AND p.page_id != '$page_id' AND parent = '0' ORDER BY position")) { - while($page = $query_page->fetchRow()) { - if($admin->page_is_visible($page)) { - $links[$page['page_id']]='/'.$page['menu_title']; - if($query_subpage = $database->query("SELECT DISTINCT p.* FROM $table_p AS p INNER JOIN $table_s AS s ON p.page_id=s.page_id WHERE s.module != 'menu_link' AND p.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'],$links))?$links[$sub['parent']]:""; - $links[$sub['page_id']]=$parent_link.'/'.$sub['page_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()) { - $targets[$pid][] = "wb_section_{$section['section_id']}"; - 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*"(.*)"/iuU',$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-2008, 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"); } + +// 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']; +$anchor = $sql_row['anchor']; +$sel = ' selected'; + +// Get list of all visible page-links, except menu_links and actual page +$links = array(); +$table_p = TABLE_PREFIX."pages"; +$table_s = TABLE_PREFIX."sections"; +if($query_page = $database->query("SELECT DISTINCT p.* FROM $table_p AS p INNER JOIN $table_s AS s ON p.page_id=s.page_id WHERE s.module != 'menu_link' AND p.page_id != '$page_id' AND parent = '0' ORDER BY position")) { + while($page = $query_page->fetchRow()) { + if($admin->page_is_visible($page)) { + $links[$page['page_id']]='/'.$page['menu_title']; + if($query_subpage = $database->query("SELECT DISTINCT p.* FROM $table_p AS p INNER JOIN $table_s AS s ON p.page_id=s.page_id WHERE s.module != 'menu_link' AND p.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'],$links))?$links[$sub['parent']]:""; + $links[$sub['page_id']]=$parent_link.'/'.$sub['page_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()) { + $targets[$pid][] = "wb_section_{$section['section_id']}"; + 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*"(.*)"/iuU',$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 +?> + + +
+ + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ +
+ + + + + + +
+ + + + +
+ + +