Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1202) +++ branches/2.8.x/CHANGELOG (revision 1203) @@ -12,6 +12,8 @@ ------------------------------------- 2.8.1 ------------------------------------- 29-Nov-2009 Dietmar Woellbrink (Luisehahne) +! update module info.php (thanks to Waldschwein) +29-Nov-2009 Dietmar Woellbrink (Luisehahne) ! added missing swobject plugin in FCKeditor ! bug fixed in flvplayer 29-Nov-2009 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/pages/settings2.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings2.php (revision 1202) +++ branches/2.8.x/wb/admin/pages/settings2.php (revision 1203) @@ -1,247 +1,269 @@ - - 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 - -*/ - -// Get page id -if(!isset($_POST['page_id']) OR !is_numeric($_POST['page_id'])) { - header("Location: index.php"); - exit(0); -} else { - $page_id = $_POST['page_id']; -} - -// Create new admin object and print admin header -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Pages', 'pages_settings'); - -// Include the WB functions file -require_once(WB_PATH.'/framework/functions.php'); - -// Get values -$page_title = $admin->get_post_escaped('page_title'); -$page_title = htmlspecialchars($page_title); -$menu_title = $admin->get_post_escaped('menu_title'); -$menu_title = htmlspecialchars($menu_title); -$description = htmlspecialchars($admin->add_slashes($admin->get_post('description'))); -$keywords = htmlspecialchars($admin->add_slashes($admin->get_post('keywords'))); -$parent = $admin->get_post_escaped('parent'); -$visibility = $admin->get_post_escaped('visibility'); -$template = $admin->get_post_escaped('template'); -$target = $admin->get_post_escaped('target'); -$admin_groups = $admin->get_post_escaped('admin_groups'); -$viewing_groups = $admin->get_post_escaped('viewing_groups'); -$searching = $admin->get_post_escaped('searching'); -$language = $admin->get_post_escaped('language'); -$menu = $admin->get_post_escaped('menu'); - -// Validate data -if($page_title == '' || substr($page_title,0,1)=='.') { - $admin->print_error($MESSAGE['PAGES']['BLANK_PAGE_TITLE']); -} -if($menu_title == '' || substr($menu_title,0,1)=='.') { - $admin->print_error($MESSAGE['PAGES']['BLANK_MENU_TITLE']); -} - -// Get existing perms -$database = new database(); -$results = $database->query("SELECT parent,link,position,admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); -$results_array = $results->fetchRow(); -$old_parent = $results_array['parent']; -$old_link = $results_array['link']; -$old_position = $results_array['position']; -$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups'])); -$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users'])); - -$in_old_group = FALSE; -foreach($admin->get_groups_id() as $cur_gid){ - if (in_array($cur_gid, $old_admin_groups)) { - $in_old_group = TRUE; - } -} -if((!$in_old_group) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { - $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); -} - -// Setup admin groups -$admin_groups[] = 1; -//if(!in_array(1, $admin->get_groups_id())) { -// $admin_groups[] = implode(",",$admin->get_groups_id()); -//} -$admin_groups = implode(',', $admin_groups); -// Setup viewing groups -$viewing_groups[] = 1; -//if(!in_array(1, $admin->get_groups_id())) { -// $viewing_groups[] = implode(",",$admin->get_groups_id()); -//} -$viewing_groups = implode(',', $viewing_groups); - -// If needed, get new order -if($parent != $old_parent) { - // Include ordering class - require(WB_PATH.'/framework/class.order.php'); - $order = new order(TABLE_PREFIX.'pages', 'position', 'page_id', 'parent'); - // Get new order - $position = $order->get_new($parent); - // Clean new order - $order->clean($parent); -} else { - $position = $old_position; -} - -// Work out level and root parent -if ($parent!='0') { - $level = level_count($parent)+1; - $root_parent = root_parent($parent); -} -else { - $level = '0'; - $root_parent = '0'; -} - -// Work-out what the link should be -if($parent == '0') { - $link = '/'.page_filename($menu_title); - // rename menu titles: index && intro to prevent clashes with intro page feature and WB core file /pages/index.php - if($link == '/index' || $link == '/intro') { - $link .= '_' .$page_id; - $filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).'_'.$page_id .PAGE_EXTENSION; - } else { - $filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).PAGE_EXTENSION; - } -} else { - $parent_section = ''; - $parent_titles = array_reverse(get_parent_titles($parent)); - foreach($parent_titles AS $parent_title) { - $parent_section .= page_filename($parent_title).'/'; - } - if($parent_section == '/') { $parent_section = ''; } - $link = '/'.$parent_section.page_filename($menu_title); - $filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($menu_title).PAGE_EXTENSION; -} - -// Check if a page with same page filename exists -$database = new database(); -$get_same_page = $database->query("SELECT page_id,page_title FROM ".TABLE_PREFIX."pages WHERE link = '$link' and page_id != '$page_id'"); -if($get_same_page->numRows() > 0) { - $admin->print_error($MESSAGE['PAGES']['PAGE_EXISTS']); -} - -// Update page with new order -$query = "UPDATE ".TABLE_PREFIX."pages SET parent = '$parent', position = '$position' WHERE page_id = '$page_id'"; -$database = new database(); -$database->query($query); - -// Get page trail -$page_trail = get_page_trail($page_id); - -// Update page settings in the pages table -$query = "UPDATE ".TABLE_PREFIX."pages SET parent = '$parent', page_title = '$page_title', menu_title = '$menu_title', menu = '$menu', level = '$level', page_trail = '$page_trail', root_parent = '$root_parent', link = '$link', template = '$template', target = '$target', description = '$description', keywords = '$keywords', position = '$position', visibility = '$visibility', searching = '$searching', language = '$language', admin_groups = '$admin_groups', viewing_groups = '$viewing_groups' WHERE page_id = '$page_id'"; -$database->query($query); - -// Clean old order if needed -if($parent != $old_parent) { - $order->clean($old_parent); -} - -/* BEGIN page "access file" code */ - -// Create a new file in the /pages dir if title changed -if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/')) { - $admin->print_error($MESSAGE['PAGES']['CANNOT_CREATE_ACCESS_FILE']); -} else { - // First check if we need to create a new file - if($old_link != $link) { - // Delete old file - $old_filename = WB_PATH.PAGES_DIRECTORY.$old_link.PAGE_EXTENSION; - if(file_exists($old_filename)) { - unlink($old_filename); - } - // Create access file - create_access_file($filename,$page_id,$level); - // Move a directory for this page - if(file_exists(WB_PATH.PAGES_DIRECTORY.$old_link.'/') AND is_dir(WB_PATH.PAGES_DIRECTORY.$old_link.'/')) { - rename(WB_PATH.PAGES_DIRECTORY.$old_link.'/', WB_PATH.PAGES_DIRECTORY.$link.'/'); - } - // Update any pages that had the old link with the new one - $old_link_len = strlen($old_link); - $query_subs = $database->query("SELECT page_id,link,level FROM ".TABLE_PREFIX."pages WHERE link LIKE '%$old_link/%' ORDER BY LEVEL ASC"); - if($query_subs->numRows() > 0) { - while($sub = $query_subs->fetchRow()) { - // Double-check to see if it contains old link - if(substr($sub['link'], 0, $old_link_len) == $old_link) { - // Get new link - $replace_this = $old_link; - $old_sub_link_len =strlen($sub['link']); - $new_sub_link = $link.'/'.substr($sub['link'],$old_link_len+1,$old_sub_link_len); - // Work out level - $new_sub_level = level_count($sub['page_id']); - // Update level and link - $database->query("UPDATE ".TABLE_PREFIX."pages SET link = '$new_sub_link', level = '$new_sub_level' WHERE page_id = '".$sub['page_id']."' LIMIT 1"); - // Re-write the access file for this page - $old_subpage_file = WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION; - if(file_exists($old_subpage_file)) { - unlink($old_subpage_file); - } - create_access_file(WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION, $sub['page_id'], $new_sub_level); - } - } - } - } -} - -// Function to fix page trail of subs -function fix_page_trail($parent,$root_parent) { - // Get objects and vars from outside this function - global $admin, $template, $database, $TEXT, $MESSAGE; - // Get page list from database - $database = new database(); - $query = "SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent'"; - $get_pages = $database->query($query); - // Insert values into main page list - if($get_pages->numRows() > 0) { - while($page = $get_pages->fetchRow()) { - // Fix page trail - $database->query("UPDATE ".TABLE_PREFIX."pages SET ".($root_parent != 0 ?"root_parent = '$root_parent', ":"")." page_trail = '".get_page_trail($page['page_id'])."' WHERE page_id = '".$page['page_id']."'"); - // Run this query on subs - fix_page_trail($page['page_id'],$root_parent); - } - } -} -// Fix sub-pages page trail -fix_page_trail($page_id,$root_parent); - -/* END page "access file" code */ - -// Check if there is a db error, otherwise say successful -if($database->is_error()) { - $admin->print_error($database->get_error(), ADMIN_URL.'/pages/settings.php?page_id='.$page_id); -} else { - $admin->print_success($MESSAGE['PAGES']['SAVED_SETTINGS'], ADMIN_URL.'/pages/index.php'); -} - -// Print admin footer -$admin->print_footer(); - -?> + + 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 + + * @category backend + * @package pages + * @author(s) Dietmar Wöllbrink , Dietrich Roland Pehlke + * @platform WB 2.8.x + * @require PHP 5.2.11 + * @license http://www.gnu.org/licenses/gpl.html + * @link http://project.websitebaker2.org/browser/branches/2.8.x/wb/pages + * @changeset 2009/11/30 workout for page_code field, ex catchwords and multilangual + +*/ + +// Get page id +if(!isset($_POST['page_id']) OR !is_numeric($_POST['page_id'])) { + header("Location: index.php"); + exit(0); +} else { + $page_id = $_POST['page_id']; +} + +// Create new admin object and print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Pages', 'pages_settings'); + +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Get values +$page_title = $admin->get_post_escaped('page_title'); +$page_title = htmlspecialchars($page_title); +$menu_title = $admin->get_post_escaped('menu_title'); +$menu_title = htmlspecialchars($menu_title); +$page_code = $admin->get_post_escaped('page_code'); +$page_code = htmlspecialchars($page_code); +$description = htmlspecialchars($admin->add_slashes($admin->get_post('description'))); +$keywords = htmlspecialchars($admin->add_slashes($admin->get_post('keywords'))); +$parent = $admin->get_post_escaped('parent'); +$visibility = $admin->get_post_escaped('visibility'); +$template = $admin->get_post_escaped('template'); +$target = $admin->get_post_escaped('target'); +$admin_groups = $admin->get_post_escaped('admin_groups'); +$viewing_groups = $admin->get_post_escaped('viewing_groups'); +$searching = $admin->get_post_escaped('searching'); +$language = $admin->get_post_escaped('language'); +$menu = $admin->get_post_escaped('menu'); + +// Validate data +if($page_title == '' || substr($page_title,0,1)=='.') { + $admin->print_error($MESSAGE['PAGES']['BLANK_PAGE_TITLE']); +} +if($menu_title == '' || substr($menu_title,0,1)=='.') { + $admin->print_error($MESSAGE['PAGES']['BLANK_MENU_TITLE']); +} + +// Get existing perms +$database = new database(); +$results = $database->query("SELECT parent,link,position,admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"); +$results_array = $results->fetchRow(); +$old_parent = $results_array['parent']; +$old_link = $results_array['link']; +$old_position = $results_array['position']; +$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups'])); +$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users'])); + +// Work-out if we should check for existing page_code +$field_sql = $database->query("DESCRIBE ".TABLE_PREFIX."pages page_code"); +$field_set = $field_sql->numRows(); + +$in_old_group = FALSE; +foreach($admin->get_groups_id() as $cur_gid){ + if (in_array($cur_gid, $old_admin_groups)) { + $in_old_group = TRUE; + } +} +if((!$in_old_group) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) { + $admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); +} + +// Setup admin groups +$admin_groups[] = 1; +//if(!in_array(1, $admin->get_groups_id())) { +// $admin_groups[] = implode(",",$admin->get_groups_id()); +//} +$admin_groups = implode(',', $admin_groups); +// Setup viewing groups +$viewing_groups[] = 1; +//if(!in_array(1, $admin->get_groups_id())) { +// $viewing_groups[] = implode(",",$admin->get_groups_id()); +//} +$viewing_groups = implode(',', $viewing_groups); + +// If needed, get new order +if($parent != $old_parent) { + // Include ordering class + require(WB_PATH.'/framework/class.order.php'); + $order = new order(TABLE_PREFIX.'pages', 'position', 'page_id', 'parent'); + // Get new order + $position = $order->get_new($parent); + // Clean new order + $order->clean($parent); +} else { + $position = $old_position; +} + +// Work out level and root parent +if ($parent!='0') { + $level = level_count($parent)+1; + $root_parent = root_parent($parent); +} +else { + $level = '0'; + $root_parent = '0'; +} + +// Work-out what the link should be +if($parent == '0') { + $link = '/'.page_filename($menu_title); + // rename menu titles: index && intro to prevent clashes with intro page feature and WB core file /pages/index.php + if($link == '/index' || $link == '/intro') { + $link .= '_' .$page_id; + $filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).'_'.$page_id .PAGE_EXTENSION; + } else { + $filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).PAGE_EXTENSION; + } +} else { + $parent_section = ''; + $parent_titles = array_reverse(get_parent_titles($parent)); + foreach($parent_titles AS $parent_title) { + $parent_section .= page_filename($parent_title).'/'; + } + if($parent_section == '/') { $parent_section = ''; } + $link = '/'.$parent_section.page_filename($menu_title); + $filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($menu_title).PAGE_EXTENSION; +} + +// Check if a page with same page filename exists +$database = new database(); +$get_same_page = $database->query("SELECT page_id,page_title FROM ".TABLE_PREFIX."pages WHERE link = '$link' and page_id != '$page_id'"); +if($get_same_page->numRows() > 0) { + $admin->print_error($MESSAGE['PAGES']['PAGE_EXISTS']); +} + +// Update page with new order +$query = "UPDATE ".TABLE_PREFIX."pages SET parent = '$parent', position = '$position' WHERE page_id = '$page_id'"; +$database = new database(); +$database->query($query); + +// Get page trail +$page_trail = get_page_trail($page_id); + +// Update page settings in the pages table +if((defined('PAGE_LANGUAGES') && PAGE_LANGUAGES) && $field_set ) +{ +$query = "UPDATE ".TABLE_PREFIX."pages SET parent = '$parent', page_title = '$page_title', menu_title = '$menu_title', menu = '$menu', level = '$level', page_trail = '$page_trail', root_parent = '$root_parent', link = '$link', template = '$template', target = '$target', description = '$description', keywords = '$keywords', position = '$position', visibility = '$visibility', searching = '$searching', language = '$language', admin_groups = '$admin_groups', viewing_groups = '$viewing_groups', page_code = '$page_code' WHERE page_id = '$page_id'"; +} else +{ +$query = "UPDATE ".TABLE_PREFIX."pages SET parent = '$parent', page_title = '$page_title', menu_title = '$menu_title', menu = '$menu', level = '$level', page_trail = '$page_trail', root_parent = '$root_parent', link = '$link', template = '$template', target = '$target', description = '$description', keywords = '$keywords', position = '$position', visibility = '$visibility', searching = '$searching', language = '$language', admin_groups = '$admin_groups', viewing_groups = '$viewing_groups' WHERE page_id = '$page_id'"; +} + +$database->query($query); + +// Clean old order if needed +if($parent != $old_parent) { + $order->clean($old_parent); +} + +/* BEGIN page "access file" code */ + +// Create a new file in the /pages dir if title changed +if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/')) { + $admin->print_error($MESSAGE['PAGES']['CANNOT_CREATE_ACCESS_FILE']); +} else { + // First check if we need to create a new file + if($old_link != $link) { + // Delete old file + $old_filename = WB_PATH.PAGES_DIRECTORY.$old_link.PAGE_EXTENSION; + if(file_exists($old_filename)) { + unlink($old_filename); + } + // Create access file + create_access_file($filename,$page_id,$level); + // Move a directory for this page + if(file_exists(WB_PATH.PAGES_DIRECTORY.$old_link.'/') AND is_dir(WB_PATH.PAGES_DIRECTORY.$old_link.'/')) { + rename(WB_PATH.PAGES_DIRECTORY.$old_link.'/', WB_PATH.PAGES_DIRECTORY.$link.'/'); + } + // Update any pages that had the old link with the new one + $old_link_len = strlen($old_link); + $query_subs = $database->query("SELECT page_id,link,level FROM ".TABLE_PREFIX."pages WHERE link LIKE '%$old_link/%' ORDER BY LEVEL ASC"); + if($query_subs->numRows() > 0) { + while($sub = $query_subs->fetchRow()) { + // Double-check to see if it contains old link + if(substr($sub['link'], 0, $old_link_len) == $old_link) { + // Get new link + $replace_this = $old_link; + $old_sub_link_len =strlen($sub['link']); + $new_sub_link = $link.'/'.substr($sub['link'],$old_link_len+1,$old_sub_link_len); + // Work out level + $new_sub_level = level_count($sub['page_id']); + // Update level and link + $database->query("UPDATE ".TABLE_PREFIX."pages SET link = '$new_sub_link', level = '$new_sub_level' WHERE page_id = '".$sub['page_id']."' LIMIT 1"); + // Re-write the access file for this page + $old_subpage_file = WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION; + if(file_exists($old_subpage_file)) { + unlink($old_subpage_file); + } + create_access_file(WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION, $sub['page_id'], $new_sub_level); + } + } + } + } +} + +// Function to fix page trail of subs +function fix_page_trail($parent,$root_parent) { + // Get objects and vars from outside this function + global $admin, $template, $database, $TEXT, $MESSAGE; + // Get page list from database + $database = new database(); + $query = "SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent'"; + $get_pages = $database->query($query); + // Insert values into main page list + if($get_pages->numRows() > 0) { + while($page = $get_pages->fetchRow()) { + // Fix page trail + $database->query("UPDATE ".TABLE_PREFIX."pages SET ".($root_parent != 0 ?"root_parent = '$root_parent', ":"")." page_trail = '".get_page_trail($page['page_id'])."' WHERE page_id = '".$page['page_id']."'"); + // Run this query on subs + fix_page_trail($page['page_id'],$root_parent); + } + } +} +// Fix sub-pages page trail +fix_page_trail($page_id,$root_parent); + +/* END page "access file" code */ + +// Check if there is a db error, otherwise say successful +if($database->is_error()) { + $admin->print_error($database->get_error(), ADMIN_URL.'/pages/settings.php?page_id='.$page_id); +} else { + $admin->print_success($MESSAGE['PAGES']['SAVED_SETTINGS'], ADMIN_URL.'/pages/index.php'); +} + +// Print admin footer +$admin->print_footer(); + +?> Index: branches/2.8.x/wb/modules/wrapper/info.php =================================================================== --- branches/2.8.x/wb/modules/wrapper/info.php (revision 1202) +++ branches/2.8.x/wb/modules/wrapper/info.php (revision 1203) @@ -27,7 +27,7 @@ $module_name = 'Wrapper'; $module_function = 'page'; $module_version = '2.7'; -$module_platform = '2.7.x'; +$module_platform = '2.7 | 2.8.x'; $module_author = 'Ryan Djurovich'; $module_license = 'GNU General Public License'; $module_description = 'This module allows you to wrap your site around another using an inline frame'; Index: branches/2.8.x/wb/modules/menu_link/info.php =================================================================== --- branches/2.8.x/wb/modules/menu_link/info.php (revision 1202) +++ branches/2.8.x/wb/modules/menu_link/info.php (revision 1203) @@ -1,52 +1,52 @@ - - 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 - -*/ - -/* History: -2.8 - June 2009 -- Improved the pagelist (thorn) -- Added different redirect types 301 or 302 (thorn) -- Set platform version 2.8 - -2.7 - 24. Jan. 2008 - doc -- added language support, changed platform to 2.7 - -2.6.1.1 - 16. Jan. 2008 - thorn -- added table mod_menu_link -- added install.php, delete.php, add.php -- changed wb/index.php: redirect if page is menu_link -- removed special-handling of menu_link in: admin/pages/settings2.php - -*/ - -$module_directory = 'menu_link'; -$module_name = 'Menu Link'; -$module_function = 'page'; -$module_version = '2.8'; -$module_platform = '2.8.x'; -$module_author = 'Ryan Djurovich, thorn'; -$module_license = 'GNU General Public License'; -$module_description = 'This module allows you to insert a link into the menu.'; - -?> + + 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 + +*/ + +/* History: +2.8 - June 2009 +- Improved the pagelist (thorn) +- Added different redirect types 301 or 302 (thorn) +- Set platform version 2.8 + +2.7 - 24. Jan. 2008 - doc +- added language support, changed platform to 2.7 + +2.6.1.1 - 16. Jan. 2008 - thorn +- added table mod_menu_link +- added install.php, delete.php, add.php +- changed wb/index.php: redirect if page is menu_link +- removed special-handling of menu_link in: admin/pages/settings2.php + +*/ + +$module_directory = 'menu_link'; +$module_name = 'Menu Link'; +$module_function = 'page'; +$module_version = '2.8'; +$module_platform = '2.8.x'; +$module_author = 'Ryan Djurovich, thorn'; +$module_license = 'GNU General Public License'; +$module_description = 'This module allows you to insert a link into the menu.'; + +?> \ No newline at end of file Index: branches/2.8.x/wb/modules/wysiwyg/info.php =================================================================== --- branches/2.8.x/wb/modules/wysiwyg/info.php (revision 1202) +++ branches/2.8.x/wb/modules/wysiwyg/info.php (revision 1203) @@ -27,7 +27,7 @@ $module_name = 'WYSIWYG'; $module_function = 'page'; $module_version = '2.7'; -$module_platform = '2.7.x'; +$module_platform = '2.7 | 2.8.x'; $module_author = 'Ryan Djurovich'; $module_license = 'GNU General Public License'; $module_description = 'This module allows you to edit the contents of a page using a graphical editor'; Index: branches/2.8.x/wb/modules/jsadmin/info.php =================================================================== --- branches/2.8.x/wb/modules/jsadmin/info.php (revision 1202) +++ branches/2.8.x/wb/modules/jsadmin/info.php (revision 1203) @@ -1,74 +1,74 @@ - + \ No newline at end of file Index: branches/2.8.x/wb/modules/show_menu2/info.php =================================================================== --- branches/2.8.x/wb/modules/show_menu2/info.php (revision 1202) +++ branches/2.8.x/wb/modules/show_menu2/info.php (revision 1203) @@ -40,7 +40,7 @@ $module_name = 'show_menu2'; $module_function = 'snippet'; $module_version = '4.9'; -$module_platform = '2.6.x | 2.7.x'; +$module_platform = '2.7 | 2.8.x'; $module_author = 'Brodie Thiesfield'; $module_license = 'GNU General Public License'; $module_description = 'A code snippet for the Website Baker CMS providing a complete replacement for the builtin menu functions. See http://code.jellycan.com/show_menu2/ for details or view the readme file.'; Index: branches/2.8.x/wb/modules/droplets/info.php =================================================================== --- branches/2.8.x/wb/modules/droplets/info.php (revision 1202) +++ branches/2.8.x/wb/modules/droplets/info.php (revision 1203) @@ -17,7 +17,7 @@ $module_version = '1.0.2'; $module_platform = '2.8.x'; $module_author = 'Ruud and pcwacht'; -$module_license = 'GPL'; +$module_license = 'GNU General Public License'; $module_description = 'This tool allows you to manage your local Droplets.'; $module_home = 'http://www.websitebakers.com/pages/droplets/about-droplets.php'; Index: branches/2.8.x/wb/modules/captcha_control/info.php =================================================================== --- branches/2.8.x/wb/modules/captcha_control/info.php (revision 1202) +++ branches/2.8.x/wb/modules/captcha_control/info.php (revision 1203) @@ -32,7 +32,7 @@ $module_name = 'Captcha and Advanced-Spam-Protection (ASP) Control'; $module_function = 'tool'; $module_version = '1.0'; -$module_platform = '2.7'; +$module_platform = '2.7 | 2.8.x'; $module_author = 'Thomas Hornik (thorn)'; $module_license = 'GNU General Public License'; $module_description = 'Admin-Tool to control CAPTCHA and ASP'; Index: branches/2.8.x/wb/modules/form/info.php =================================================================== --- branches/2.8.x/wb/modules/form/info.php (revision 1202) +++ branches/2.8.x/wb/modules/form/info.php (revision 1203) @@ -32,7 +32,7 @@ $module_name = 'Form'; $module_function = 'page'; $module_version = '2.7'; -$module_platform = '2.6.x'; +$module_platform = '2.7 | 2.8.x'; $module_author = 'Ryan Djurovich & Rudolph Lartey - additions John Maats - PCWacht'; $module_license = 'GNU General Public License'; $module_description = 'This module allows you to create customised online forms, such as a feedback form. '. Index: branches/2.8.x/wb/modules/backup/info.php =================================================================== --- branches/2.8.x/wb/modules/backup/info.php (revision 1202) +++ branches/2.8.x/wb/modules/backup/info.php (revision 1203) @@ -27,7 +27,7 @@ $module_name = 'Backup'; $module_function = 'tool'; $module_version = '2.7'; -$module_platform = '2.7.x'; +$module_platform = '2.7 | 2.8.x'; $module_author = 'Ryan Djurovich, John'; $module_license = 'GNU General Public License'; $module_description = 'This module allows you to backup your database.'; Index: branches/2.8.x/wb/modules/output_filter/info.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/info.php (revision 1202) +++ branches/2.8.x/wb/modules/output_filter/info.php (revision 1203) @@ -37,7 +37,7 @@ $module_name = 'Frontend Output Filter'; $module_function = 'tool'; $module_version = '0.11'; -$module_platform = '2.7.x'; +$module_platform = '2.7 | 2.8.x'; $module_author = 'Christian Sommer (doc)'; $module_license = 'GNU General Public License'; $module_description = 'This module allows to filter the output before displaying it on the frontend. Support for filtering mailto links and mail addresses in strings.'; Index: branches/2.8.x/wb/modules/code/info.php =================================================================== --- branches/2.8.x/wb/modules/code/info.php (revision 1202) +++ branches/2.8.x/wb/modules/code/info.php (revision 1203) @@ -27,7 +27,7 @@ $module_name = 'Code'; $module_function = 'page'; $module_version = '2.8'; -$module_platform = '2.7.x'; +$module_platform = '2.7 | 2.8.x'; $module_author = 'Ryan Djurovich'; $module_license = 'GNU General Public License'; $module_description = 'This module allows you to execute PHP commands (limit access to users you trust!!)'; Index: branches/2.8.x/wb/modules/fckeditor/info.php =================================================================== --- branches/2.8.x/wb/modules/fckeditor/info.php (revision 1202) +++ branches/2.8.x/wb/modules/fckeditor/info.php (revision 1203) @@ -136,7 +136,7 @@ $module_version = '2.9.3'; $module_guid = 'ED3B82C1-DB1E-447A-A0FD-E952AFC5F3B9'; $module_status = 'Beta'; -$module_platform = '2.7'; +$module_platform = '2.7 | 2.8.x'; $module_requirements = 'PHP 4.3.11 or higher, WB 2.7 or higher'; $module_author = 'Christian Sommer, P. Widlund, S. Braunewell, M. Gallas, Wouldlouper, Aldus, Luisehahne'; $module_license = 'GNU General Public License'; Index: branches/2.8.x/wb/modules/news/info.php =================================================================== --- branches/2.8.x/wb/modules/news/info.php (revision 1202) +++ branches/2.8.x/wb/modules/news/info.php (revision 1203) @@ -27,7 +27,7 @@ $module_name = 'News v3.1'; $module_function = 'page'; $module_version = '3.1'; -$module_platform = '2.8'; +$module_platform = '2.8.x'; $module_author = 'Ryan Djurovich, Rob Smith'; $module_license = 'GNU General Public License'; $module_description = 'This page type is designed for making a news page.';