Index: trunk/wb/admin/groups/get_permissions.php =================================================================== --- trunk/wb/admin/groups/get_permissions.php (revision 15) +++ trunk/wb/admin/groups/get_permissions.php (revision 16) @@ -1,244 +1,244 @@ - - Copyright (C) 2004-2005, 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 system permissions -if($admin->get_post('advanced') != 'yes') { - $system_permissions['pages'] = $admin->get_post('pages'); + + Copyright (C) 2004-2005, 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 system permissions +if($admin->get_post('advanced') != 'yes') { + $system_permissions['pages'] = $admin->get_post('pages'); $system_permissions['pages_view'] = $system_permissions['pages']; - $system_permissions['pages_add'] = $system_permissions['pages']; + $system_permissions['pages_add'] = $system_permissions['pages']; $system_permissions['pages_add_l0'] = $system_permissions['pages']; $system_permissions['pages_settings'] = $system_permissions['pages']; - $system_permissions['pages_modify'] = $system_permissions['pages']; + $system_permissions['pages_modify'] = $system_permissions['pages']; $system_permissions['pages_intro'] = $system_permissions['pages']; - $system_permissions['pages_delete'] = $system_permissions['pages']; - $system_permissions['media'] = $admin->get_post('media'); + $system_permissions['pages_delete'] = $system_permissions['pages']; + $system_permissions['media'] = $admin->get_post('media'); $system_permissions['media_view'] = $system_permissions['media']; $system_permissions['media_upload'] = $system_permissions['media']; $system_permissions['media_rename'] = $system_permissions['media']; - $system_permissions['media_delete'] = $system_permissions['media']; - $system_permissions['media_create'] = $system_permissions['media']; - if($admin->get_post('modules') != '' AND $admin->get_post('templates') != '' AND $admin->get_post('languages') != '') { - $system_permissions['addons'] = 1; - } else { - $system_permissions['addons'] = 0; - } - $system_permissions['modules'] = $admin->get_post('modules'); + $system_permissions['media_delete'] = $system_permissions['media']; + $system_permissions['media_create'] = $system_permissions['media']; + if($admin->get_post('modules') != '' AND $admin->get_post('templates') != '' AND $admin->get_post('languages') != '') { + $system_permissions['addons'] = 1; + } else { + $system_permissions['addons'] = 0; + } + $system_permissions['modules'] = $admin->get_post('modules'); $system_permissions['modules_view'] = $system_permissions['modules']; $system_permissions['modules_install'] = $system_permissions['modules']; - $system_permissions['modules_uninstall'] = $system_permissions['modules']; - $system_permissions['templates'] = $admin->get_post('templates'); + $system_permissions['modules_uninstall'] = $system_permissions['modules']; + $system_permissions['templates'] = $admin->get_post('templates'); $system_permissions['templates_view'] = $system_permissions['templates']; $system_permissions['templates_install'] = $system_permissions['templates']; - $system_permissions['templates_uninstall'] = $system_permissions['templates']; - $system_permissions['languages'] = $admin->get_post('languages'); + $system_permissions['templates_uninstall'] = $system_permissions['templates']; + $system_permissions['languages'] = $admin->get_post('languages'); $system_permissions['languages_view'] = $system_permissions['languages']; $system_permissions['languages_install'] = $system_permissions['languages']; - $system_permissions['languages_uninstall'] = $system_permissions['languages']; - $system_permissions['settings'] = $admin->get_post('settings'); + $system_permissions['languages_uninstall'] = $system_permissions['languages']; + $system_permissions['settings'] = $admin->get_post('settings'); $system_permissions['settings_basic'] = $system_permissions['settings']; - $system_permissions['settings_advanced'] = $system_permissions['settings']; - if($admin->get_post('users') != '' AND $admin->get_post('groups') != '') { - $system_permissions['access'] = 1; - } else { - $system_permissions['access'] = 0; - } - $system_permissions['users'] = $admin->get_post('users'); + $system_permissions['settings_advanced'] = $system_permissions['settings']; + if($admin->get_post('users') != '' AND $admin->get_post('groups') != '') { + $system_permissions['access'] = 1; + } else { + $system_permissions['access'] = 0; + } + $system_permissions['users'] = $admin->get_post('users'); $system_permissions['users_view'] = $system_permissions['users']; $system_permissions['users_add'] = $system_permissions['users']; $system_permissions['users_modify'] = $system_permissions['users']; - $system_permissions['users_delete'] = $system_permissions['users']; - $system_permissions['groups'] = $admin->get_post('groups'); + $system_permissions['users_delete'] = $system_permissions['users']; + $system_permissions['groups'] = $admin->get_post('groups'); $system_permissions['groups_view'] = $system_permissions['groups']; $system_permissions['groups_add'] = $system_permissions['groups']; $system_permissions['groups_modify'] = $system_permissions['groups']; - $system_permissions['groups_delete'] = $system_permissions['groups']; -} else { - // Pages - $system_permissions['pages_view'] = $admin->get_post('pages_view'); - $system_permissions['pages_add'] = $admin->get_post('pages_add'); - if($admin->get_post('pages_add') != 1 AND $admin->get_post('pages_add_l0') == 1) { - $system_permissions['pages_add'] = $admin->get_post('pages_add_l0'); + $system_permissions['groups_delete'] = $system_permissions['groups']; +} else { + // Pages + $system_permissions['pages_view'] = $admin->get_post('pages_view'); + $system_permissions['pages_add'] = $admin->get_post('pages_add'); + if($admin->get_post('pages_add') != 1 AND $admin->get_post('pages_add_l0') == 1) { + $system_permissions['pages_add'] = $admin->get_post('pages_add_l0'); } $system_permissions['pages_add_l0'] = $admin->get_post('pages_add_l0'); - $system_permissions['pages_settings'] = $admin->get_post('pages_settings'); - $system_permissions['pages_modify'] = $admin->get_post('pages_modify'); + $system_permissions['pages_settings'] = $admin->get_post('pages_settings'); + $system_permissions['pages_modify'] = $admin->get_post('pages_modify'); $system_permissions['pages_intro'] = $admin->get_post('pages_intro'); - $system_permissions['pages_delete'] = $admin->get_post('pages_delete'); - if($system_permissions['pages_view'] == 1 OR $system_permissions['pages_add'] == 1 OR $system_permissions['pages_settings'] == 1 OR $system_permissions['pages_modify'] == 1 OR $system_permissions['pages_intro'] == 1 OR $system_permissions['pages_delete'] == 1) { - $system_permissions['pages'] = 1; - } else { - $system_permissions['pages'] = ''; - } - // Media + $system_permissions['pages_delete'] = $admin->get_post('pages_delete'); + if($system_permissions['pages_view'] == 1 OR $system_permissions['pages_add'] == 1 OR $system_permissions['pages_settings'] == 1 OR $system_permissions['pages_modify'] == 1 OR $system_permissions['pages_intro'] == 1 OR $system_permissions['pages_delete'] == 1) { + $system_permissions['pages'] = 1; + } else { + $system_permissions['pages'] = ''; + } + // Media $system_permissions['media_view'] = $admin->get_post('media_view'); $system_permissions['media_upload'] = $admin->get_post('media_upload'); $system_permissions['media_rename'] = $admin->get_post('media_rename'); - $system_permissions['media_delete'] = $admin->get_post('media_delete'); - $system_permissions['media_create'] = $admin->get_post('media_create'); - if($system_permissions['media_view'] == 1 OR $system_permissions['media_upload'] == 1 OR $system_permissions['media_rename'] == 1 OR $system_permissions['media_delete'] == 1 OR $system_permissions['media_create'] == 1) { - $system_permissions['media'] = 1; - } else { - $system_permissions['media'] = ''; - } - // Add-ons - // Modules + $system_permissions['media_delete'] = $admin->get_post('media_delete'); + $system_permissions['media_create'] = $admin->get_post('media_create'); + if($system_permissions['media_view'] == 1 OR $system_permissions['media_upload'] == 1 OR $system_permissions['media_rename'] == 1 OR $system_permissions['media_delete'] == 1 OR $system_permissions['media_create'] == 1) { + $system_permissions['media'] = 1; + } else { + $system_permissions['media'] = ''; + } + // Add-ons + // Modules $system_permissions['modules_view'] = $admin->get_post('modules_view'); $system_permissions['modules_install'] = $admin->get_post('modules_install'); - $system_permissions['modules_uninstall'] = $admin->get_post('modules_uninstall'); - if($system_permissions['modules_view'] == 1 OR $system_permissions['modules_install'] == 1 OR $system_permissions['modules_uninstall'] == 1) { - $system_permissions['modules'] = 1; - } else { - $system_permissions['modules'] = ''; - } - // Templates + $system_permissions['modules_uninstall'] = $admin->get_post('modules_uninstall'); + if($system_permissions['modules_view'] == 1 OR $system_permissions['modules_install'] == 1 OR $system_permissions['modules_uninstall'] == 1) { + $system_permissions['modules'] = 1; + } else { + $system_permissions['modules'] = ''; + } + // Templates $system_permissions['templates_view'] = $admin->get_post('templates_view'); $system_permissions['templates_install'] = $admin->get_post('templates_install'); - $system_permissions['templates_uninstall'] = $admin->get_post('templates_uninstall'); - if($system_permissions['templates_view'] == 1 OR $system_permissions['templates_install'] == 1 OR $system_permissions['templates_uninstall'] == 1) { - $system_permissions['templates'] = 1; - } else { - $system_permissions['templates'] = ''; - } - // Languages + $system_permissions['templates_uninstall'] = $admin->get_post('templates_uninstall'); + if($system_permissions['templates_view'] == 1 OR $system_permissions['templates_install'] == 1 OR $system_permissions['templates_uninstall'] == 1) { + $system_permissions['templates'] = 1; + } else { + $system_permissions['templates'] = ''; + } + // Languages $system_permissions['languages_view'] = $admin->get_post('languages_view'); $system_permissions['languages_install'] = $admin->get_post('languages_install'); - $system_permissions['languages_uninstall'] = $admin->get_post('languages_uninstall'); - if($system_permissions['languages_install'] == 1 OR $system_permissions['languages_uninstall'] == 1) { - $system_permissions['languages'] = 1; - } else { - $system_permissions['languages'] = ''; - } - if($system_permissions['modules'] == 1 OR $system_permissions['templates'] == 1 OR $system_permissions['languages'] == 1) { - $system_permissions['addons'] = 1; - } else { - $system_permissions['addons'] = ''; - } - // Settings + $system_permissions['languages_uninstall'] = $admin->get_post('languages_uninstall'); + if($system_permissions['languages_install'] == 1 OR $system_permissions['languages_uninstall'] == 1) { + $system_permissions['languages'] = 1; + } else { + $system_permissions['languages'] = ''; + } + if($system_permissions['modules'] == 1 OR $system_permissions['templates'] == 1 OR $system_permissions['languages'] == 1) { + $system_permissions['addons'] = 1; + } else { + $system_permissions['addons'] = ''; + } + // Settings $system_permissions['settings_basic'] = $admin->get_post('settings_basic'); - $system_permissions['settings_advanced'] = $admin->get_post('settings_advanced'); - if($system_permissions['settings_basic'] == 1 OR $system_permissions['settings_advanced'] == 1) { - $system_permissions['settings'] = 1; - } else { - $system_permissions['settings'] = ''; - } - // Access - // Users + $system_permissions['settings_advanced'] = $admin->get_post('settings_advanced'); + if($system_permissions['settings_basic'] == 1 OR $system_permissions['settings_advanced'] == 1) { + $system_permissions['settings'] = 1; + } else { + $system_permissions['settings'] = ''; + } + // Access + // Users $system_permissions['users_view'] = $admin->get_post('users_view'); $system_permissions['users_add'] = $admin->get_post('users_add'); $system_permissions['users_modify'] = $admin->get_post('users_modify'); - $system_permissions['users_delete'] = $admin->get_post('users_delete'); - if($system_permissions['users_view'] == 1 OR $system_permissions['users_add'] == 1 OR $system_permissions['users_modify'] == 1 OR $system_permissions['users_delete'] == 1) { - $system_permissions['users'] = 1; - } else { - $system_permissions['users'] = ''; - } - // Groups + $system_permissions['users_delete'] = $admin->get_post('users_delete'); + if($system_permissions['users_view'] == 1 OR $system_permissions['users_add'] == 1 OR $system_permissions['users_modify'] == 1 OR $system_permissions['users_delete'] == 1) { + $system_permissions['users'] = 1; + } else { + $system_permissions['users'] = ''; + } + // Groups $system_permissions['groups_view'] = $admin->get_post('groups_view'); $system_permissions['groups_add'] = $admin->get_post('groups_add'); $system_permissions['groups_modify'] = $admin->get_post('groups_modify'); - $system_permissions['groups_delete'] = $admin->get_post('groups_delete'); - if($system_permissions['groups_view'] == 1 OR $system_permissions['groups_add'] == 1 OR $system_permissions['groups_modify'] == 1 OR $system_permissions['groups_delete'] == 1) { - $system_permissions['groups'] = 1; - } else { - $system_permissions['groups'] = ''; - } - if($system_permissions['users'] == 1 OR $system_permissions['groups'] == 1) { - $system_permissions['access'] = 1; - } else { - $system_permissions['access'] = ''; - } -} - -// Implode system permissions -$imploded_system_permissions = ''; -foreach($system_permissions AS $name => $value) { - if($value == true) { - if($imploded_system_permissions == '') { - $imploded_system_permissions = $name; - } else { - $imploded_system_permissions .= ','.$name; - } - } -} - -$system_permissions = $imploded_system_permissions; - -// Get module permissions -$module_permissions = ''; + $system_permissions['groups_delete'] = $admin->get_post('groups_delete'); + if($system_permissions['groups_view'] == 1 OR $system_permissions['groups_add'] == 1 OR $system_permissions['groups_modify'] == 1 OR $system_permissions['groups_delete'] == 1) { + $system_permissions['groups'] = 1; + } else { + $system_permissions['groups'] = ''; + } + if($system_permissions['users'] == 1 OR $system_permissions['groups'] == 1) { + $system_permissions['access'] = 1; + } else { + $system_permissions['access'] = ''; + } +} + +// Implode system permissions +$imploded_system_permissions = ''; +foreach($system_permissions AS $name => $value) { + if($value == true) { + if($imploded_system_permissions == '') { + $imploded_system_permissions = $name; + } else { + $imploded_system_permissions .= ','.$name; + } + } +} + +$system_permissions = $imploded_system_permissions; + +// Get module permissions +$module_permissions = ''; if($handle = opendir(WB_PATH.'/modules/')) { while (false !== ($file = readdir($handle))) { - if($file != "." AND $file != ".." AND $file != "CVS" AND is_dir(WB_PATH."/modules/$file") AND file_exists(WB_PATH."/modules/$file/info.php")) { - // Include the modules info file - require(WB_PATH.'/modules/'.$file.'/info.php'); - // Check if it was selected to be used or not - $count = 0; - if(is_array($admin->get_post('module_permissions'))) { - foreach($admin->get_post('module_permissions') AS $selected_name) { - if($file == $selected_name) { - $count = $count+1; - } - } - } - if($count == 0) { - // Add unselected modules to list - if($module_permissions == '') { - $module_permissions = $file; - } else { - $module_permissions .= ','.$file; - } - } - } - } -} - -// Get template permissions -$template_permissions = ''; + if($file != "." AND $file != ".." AND $file != ".svn" AND is_dir(WB_PATH."/modules/$file") AND file_exists(WB_PATH."/modules/$file/info.php")) { + // Include the modules info file + require(WB_PATH.'/modules/'.$file.'/info.php'); + // Check if it was selected to be used or not + $count = 0; + if(is_array($admin->get_post('module_permissions'))) { + foreach($admin->get_post('module_permissions') AS $selected_name) { + if($file == $selected_name) { + $count = $count+1; + } + } + } + if($count == 0) { + // Add unselected modules to list + if($module_permissions == '') { + $module_permissions = $file; + } else { + $module_permissions .= ','.$file; + } + } + } + } +} + +// Get template permissions +$template_permissions = ''; if($handle = opendir(WB_PATH.'/templates/')) { while (false !== ($file = readdir($handle))) { - if($file != "." AND $file != ".." AND $file != "CVS" AND is_dir(WB_PATH."/templates/$file") AND file_exists(WB_PATH."/templates/$file/info.php")) { - // Include the modules info file - require(WB_PATH.'/templates/'.$file.'/info.php'); - // Check if it was selected to be used or not - $count = 0; - if(is_array($admin->get_post('template_permissions'))) { - foreach($admin->get_post('template_permissions') AS $selected_name) { - if($file == $selected_name) { - $count = $count+1; - } - } - } - if($count == 0) { - // Add unselected modules to list - if($template_permissions == '') { - $template_permissions = $file; - } else { - $template_permissions .= ','.$file; - } - } - } - } -} - -?> \ No newline at end of file + if($file != "." AND $file != ".." AND $file != ".svn" AND is_dir(WB_PATH."/templates/$file") AND file_exists(WB_PATH."/templates/$file/info.php")) { + // Include the modules info file + require(WB_PATH.'/templates/'.$file.'/info.php'); + // Check if it was selected to be used or not + $count = 0; + if(is_array($admin->get_post('template_permissions'))) { + foreach($admin->get_post('template_permissions') AS $selected_name) { + if($file == $selected_name) { + $count = $count+1; + } + } + } + if($count == 0) { + // Add unselected modules to list + if($template_permissions == '') { + $template_permissions = $file; + } else { + $template_permissions .= ','.$file; + } + } + } + } +} + +?> Index: trunk/wb/admin/groups/groups.php =================================================================== --- trunk/wb/admin/groups/groups.php (revision 15) +++ trunk/wb/admin/groups/groups.php (revision 16) @@ -1,191 +1,191 @@ - - Copyright (C) 2004-2005, 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 - -*/ - -// Include config file and admin class file -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); - -// Create new database object -$database = new database(); - -if(!isset($_POST['action']) OR $_POST['action'] != "modify" AND $_POST['action'] != "delete") { - header("Location: index.php"); -} - -// Check if group group_id is a valid number and doesnt equal 1 -if(!isset($_POST['group_id']) OR !is_numeric($_POST['group_id']) OR $_POST['group_id'] == 1) { - header("Location: index.php"); -} - -if($_POST['action'] == 'modify') { - // Create new admin object - $admin = new admin('Access', 'groups_modify', false); - // Print header - $admin->print_header(); - // Get existing values - $results = $database->query("SELECT * FROM ".TABLE_PREFIX."groups WHERE group_id = '".$_POST['group_id']."'"); - $group = $results->fetchRow(); - // Setup template object - $template = new Template(ADMIN_PATH.'/groups'); - $template->set_file('page', 'group_form.html'); - $template->set_block('page', 'main_block', 'main'); - $template->set_var( array( - 'ACTION_URL' => ADMIN_URL.'/groups/save.php', - 'SUBMIT_TITLE' => $TEXT['SAVE'], - 'GROUP_ID' => $group['group_id'], - 'GROUP_NAME' => $group['name'], - 'ADVANCED_ACTION' => 'groups.php' - ) - ); - // Tell the browser whether or not to show advanced options - if(isset($_POST['advanced']) AND $_POST['advanced'] == $TEXT['SHOW_ADVANCED'].' >>') { - $template->set_var('DISPLAY_ADVANCED', ''); - $template->set_var('DISPLAY_BASIC', 'none'); - $template->set_var('ADVANCED', 'yes'); - $template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']); - } else { - $template->set_var('DISPLAY_ADVANCED', 'none'); - $template->set_var('DISPLAY_BASIC', ''); - $template->set_var('ADVANCED', 'no'); - $template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>'); - } - - // Explode system permissions - $system_permissions = explode(',', $group['system_permissions']); - // Check system permissions boxes - foreach($system_permissions AS $name) { - $template->set_var($name.'_checked', 'checked'); - } - // Explode module permissions - $module_permissions = explode(',', $group['module_permissions']); - // Explode template permissions - $template_permissions = explode(',', $group['template_permissions']); - - // Insert values into module list - $template->set_block('main_block', 'module_list_block', 'module_list'); + + Copyright (C) 2004-2005, 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 + +*/ + +// Include config file and admin class file +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); + +// Create new database object +$database = new database(); + +if(!isset($_POST['action']) OR $_POST['action'] != "modify" AND $_POST['action'] != "delete") { + header("Location: index.php"); +} + +// Check if group group_id is a valid number and doesnt equal 1 +if(!isset($_POST['group_id']) OR !is_numeric($_POST['group_id']) OR $_POST['group_id'] == 1) { + header("Location: index.php"); +} + +if($_POST['action'] == 'modify') { + // Create new admin object + $admin = new admin('Access', 'groups_modify', false); + // Print header + $admin->print_header(); + // Get existing values + $results = $database->query("SELECT * FROM ".TABLE_PREFIX."groups WHERE group_id = '".$_POST['group_id']."'"); + $group = $results->fetchRow(); + // Setup template object + $template = new Template(ADMIN_PATH.'/groups'); + $template->set_file('page', 'group_form.html'); + $template->set_block('page', 'main_block', 'main'); + $template->set_var( array( + 'ACTION_URL' => ADMIN_URL.'/groups/save.php', + 'SUBMIT_TITLE' => $TEXT['SAVE'], + 'GROUP_ID' => $group['group_id'], + 'GROUP_NAME' => $group['name'], + 'ADVANCED_ACTION' => 'groups.php' + ) + ); + // Tell the browser whether or not to show advanced options + if(isset($_POST['advanced']) AND $_POST['advanced'] == $TEXT['SHOW_ADVANCED'].' >>') { + $template->set_var('DISPLAY_ADVANCED', ''); + $template->set_var('DISPLAY_BASIC', 'none'); + $template->set_var('ADVANCED', 'yes'); + $template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']); + } else { + $template->set_var('DISPLAY_ADVANCED', 'none'); + $template->set_var('DISPLAY_BASIC', ''); + $template->set_var('ADVANCED', 'no'); + $template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>'); + } + + // Explode system permissions + $system_permissions = explode(',', $group['system_permissions']); + // Check system permissions boxes + foreach($system_permissions AS $name) { + $template->set_var($name.'_checked', 'checked'); + } + // Explode module permissions + $module_permissions = explode(',', $group['module_permissions']); + // Explode template permissions + $template_permissions = explode(',', $group['template_permissions']); + + // Insert values into module list + $template->set_block('main_block', 'module_list_block', 'module_list'); if ($handle = opendir(WB_PATH.'/modules/')) { while (false !== ($file = readdir($handle))) { - if($file != "." AND $file != ".." AND $file != "CVS" AND is_dir(WB_PATH."/modules/$file") AND file_exists(WB_PATH."/modules/$file/info.php")) { - // Include the modules info file - require(WB_PATH.'/modules/'.$file.'/info.php'); - $template->set_var('VALUE', $file); - $template->set_var('NAME', $module_name); - if(!is_numeric(array_search($file, $module_permissions))) { - $template->set_var('CHECKED', 'checked'); - } else { - $template->set_var('CHECKED', ''); - } - $template->parse('module_list', 'module_list_block', true); - } - } - } - - // Insert values into template list - $template->set_block('main_block', 'template_list_block', 'template_list'); + if($file != "." AND $file != ".." AND $file != ".svn" AND is_dir(WB_PATH."/modules/$file") AND file_exists(WB_PATH."/modules/$file/info.php")) { + // Include the modules info file + require(WB_PATH.'/modules/'.$file.'/info.php'); + $template->set_var('VALUE', $file); + $template->set_var('NAME', $module_name); + if(!is_numeric(array_search($file, $module_permissions))) { + $template->set_var('CHECKED', 'checked'); + } else { + $template->set_var('CHECKED', ''); + } + $template->parse('module_list', 'module_list_block', true); + } + } + } + + // Insert values into template list + $template->set_block('main_block', 'template_list_block', 'template_list'); if ($handle = opendir(WB_PATH.'/templates/')) { while (false !== ($file = readdir($handle))) { - if($file != "." AND $file != ".." AND $file != "CVS" AND is_dir(WB_PATH."/templates/$file") AND file_exists(WB_PATH."/templates/$file/info.php")) { - // Include the modules info file - require(WB_PATH.'/templates/'.$file.'/info.php'); - $template->set_var('VALUE', $file); - $template->set_var('NAME', $template_name); - if(!is_numeric(array_search($file, $template_permissions))) { - $template->set_var('CHECKED', 'checked'); - } else { - $template->set_var('CHECKED', ''); - } - $template->parse('template_list', 'template_list_block', true); - } - } - } - - // Insert language text and messages - $template->set_var(array( - 'TEXT_RESET' => $TEXT['RESET'], - 'TEXT_ACTIVE' => $TEXT['ACTIVE'], - 'TEXT_DISABLED' => $TEXT['DISABLED'], - 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], - 'TEXT_USERNAME' => $TEXT['USERNAME'], - 'TEXT_PASSWORD' => $TEXT['PASSWORD'], - 'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'], - 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], - 'TEXT_EMAIL' => $TEXT['EMAIL'], - 'TEXT_GROUP' => $TEXT['GROUP'], - 'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'], - 'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'], - 'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'], - 'TEXT_NAME' => $TEXT['NAME'], - 'SECTION_PAGES' => $MENU['PAGES'], - 'SECTION_MEDIA' => $MENU['MEDIA'], - 'SECTION_MODULES' => $MENU['MODULES'], - 'SECTION_TEMPLATES' => $MENU['TEMPLATES'], - 'SECTION_LANGUAGES' => $MENU['LANGUAGES'], - 'SECTION_SETTINGS' => $MENU['SETTINGS'], - 'SECTION_USERS' => $MENU['USERS'], - 'SECTION_GROUPS' => $MENU['GROUPS'], - 'TEXT_VIEW' => $TEXT['VIEW'], - 'TEXT_ADD' => $TEXT['ADD'], - 'TEXT_LEVEL' => $TEXT['LEVEL'], - 'TEXT_MODIFY' => $TEXT['MODIFY'], - 'TEXT_DELETE' => $TEXT['DELETE'], - 'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'], - 'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'], - 'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'], - 'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'], - 'TEXT_RENAME' => $TEXT['RENAME'], - 'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'], - 'TEXT_BASIC' => $TEXT['BASIC'], - 'TEXT_ADVANCED' => $TEXT['ADVANCED'], - 'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'] - ) - ); - - // Parse template object - $template->parse('main', 'main_block', false); - $template->pparse('output', 'page'); -} elseif($_POST['action'] == 'delete') { - // Create new admin object - $admin = new admin('Access', 'groups_delete', false); - // Print header - $admin->print_header(); - // Delete the group - $database->query("DELETE FROM ".TABLE_PREFIX."groups WHERE group_id = '".$_POST['group_id']."' LIMIT 1"); - if($database->is_error()) { - $admin->print_error($database->get_error()); - } else { - // Delete users in the group - $database->query("DELETE FROM ".TABLE_PREFIX."users WHERE group_id = '".$_POST['group_id']."'"); - if($database->is_error()) { - $admin->print_error($database->get_error()); - } else { - $admin->print_success($MESSAGE['GROUPS']['DELETED']); - } - } -} - -// Print admin footer -$admin->print_footer(); - -?> \ No newline at end of file + if($file != "." AND $file != ".." AND $file != ".svn" AND is_dir(WB_PATH."/templates/$file") AND file_exists(WB_PATH."/templates/$file/info.php")) { + // Include the modules info file + require(WB_PATH.'/templates/'.$file.'/info.php'); + $template->set_var('VALUE', $file); + $template->set_var('NAME', $template_name); + if(!is_numeric(array_search($file, $template_permissions))) { + $template->set_var('CHECKED', 'checked'); + } else { + $template->set_var('CHECKED', ''); + } + $template->parse('template_list', 'template_list_block', true); + } + } + } + + // Insert language text and messages + $template->set_var(array( + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_ACTIVE' => $TEXT['ACTIVE'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_PASSWORD' => $TEXT['PASSWORD'], + 'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'], + 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], + 'TEXT_EMAIL' => $TEXT['EMAIL'], + 'TEXT_GROUP' => $TEXT['GROUP'], + 'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'], + 'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'], + 'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'], + 'TEXT_NAME' => $TEXT['NAME'], + 'SECTION_PAGES' => $MENU['PAGES'], + 'SECTION_MEDIA' => $MENU['MEDIA'], + 'SECTION_MODULES' => $MENU['MODULES'], + 'SECTION_TEMPLATES' => $MENU['TEMPLATES'], + 'SECTION_LANGUAGES' => $MENU['LANGUAGES'], + 'SECTION_SETTINGS' => $MENU['SETTINGS'], + 'SECTION_USERS' => $MENU['USERS'], + 'SECTION_GROUPS' => $MENU['GROUPS'], + 'TEXT_VIEW' => $TEXT['VIEW'], + 'TEXT_ADD' => $TEXT['ADD'], + 'TEXT_LEVEL' => $TEXT['LEVEL'], + 'TEXT_MODIFY' => $TEXT['MODIFY'], + 'TEXT_DELETE' => $TEXT['DELETE'], + 'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'], + 'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'], + 'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'], + 'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'], + 'TEXT_RENAME' => $TEXT['RENAME'], + 'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'], + 'TEXT_BASIC' => $TEXT['BASIC'], + 'TEXT_ADVANCED' => $TEXT['ADVANCED'], + 'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'] + ) + ); + + // Parse template object + $template->parse('main', 'main_block', false); + $template->pparse('output', 'page'); +} elseif($_POST['action'] == 'delete') { + // Create new admin object + $admin = new admin('Access', 'groups_delete', false); + // Print header + $admin->print_header(); + // Delete the group + $database->query("DELETE FROM ".TABLE_PREFIX."groups WHERE group_id = '".$_POST['group_id']."' LIMIT 1"); + if($database->is_error()) { + $admin->print_error($database->get_error()); + } else { + // Delete users in the group + $database->query("DELETE FROM ".TABLE_PREFIX."users WHERE group_id = '".$_POST['group_id']."'"); + if($database->is_error()) { + $admin->print_error($database->get_error()); + } else { + $admin->print_success($MESSAGE['GROUPS']['DELETED']); + } + } +} + +// Print admin footer +$admin->print_footer(); + +?> Index: trunk/wb/admin/groups/index.php =================================================================== --- trunk/wb/admin/groups/index.php (revision 15) +++ trunk/wb/admin/groups/index.php (revision 16) @@ -1,198 +1,198 @@ - - Copyright (C) 2004-2005, 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 - -*/ - -// Print admin header -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Access', 'groups'); - -// Create new template object for the modify/remove menu -$template = new Template(ADMIN_PATH.'/groups'); -$template->set_file('page', 'template.html'); -$template->set_block('page', 'main_block', 'main'); -$template->set_var('ADMIN_URL', ADMIN_URL); - -// Get existing value from database -$database = new database(); -$query = "SELECT group_id,name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'"; -$results = $database->query($query); -if($database->is_error()) { - $admin->print_error($database->get_error(), 'index.php'); -} - -// Insert values into the modify/remove menu -$template->set_block('main_block', 'list_block', 'list'); -if($results->numRows() > 0) { - // Insert first value to say please select - $template->set_var('VALUE', ''); - $template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...'); - $template->parse('list', 'list_block', true); - // Loop through groups - while($group = $results->fetchRow()) { - $template->set_var('VALUE', $group['group_id']); - $template->set_var('NAME', $group['name']); - $template->parse('list', 'list_block', true); - } -} else { - // Insert single value to say no groups were found - $template->set_var('NAME', $TEXT['NONE_FOUND']); - $template->parse('list', 'list_block', true); -} - -// Insert permissions values -if($admin->get_permission('groups_add') != true) { - $template->set_var('DISPLAY_ADD', 'hide'); -} -if($admin->get_permission('groups_modify') != true) { - $template->set_var('DISPLAY_MODIFY', 'hide'); -} -if($admin->get_permission('groups_delete') != true) { - $template->set_var('DISPLAY_DELETE', 'hide'); -} - -// Insert language headings -$template->set_var(array( - 'HEADING_MODIFY_DELETE_GROUP' => $HEADING['MODIFY_DELETE_GROUP'], - 'HEADING_ADD_GROUP' => $HEADING['ADD_GROUP'] - ) - ); -// Insert language text and messages -$template->set_var(array( - 'TEXT_MODIFY' => $TEXT['MODIFY'], - 'TEXT_DELETE' => $TEXT['DELETE'], - 'TEXT_MANAGE_USERS' => $TEXT['MANAGE_USERS'], - 'CONFIRM_DELETE' => $MESSAGE['GROUPS']['CONFIRM_DELETE'] - ) - ); - -// Parse template object -$template->parse('main', 'main_block', false); -$template->pparse('output', 'page'); - -// Setup template for add group form -$template = new Template(ADMIN_PATH.'/groups'); -$template->set_file('page', 'group_form.html'); -$template->set_block('page', 'main_block', 'main'); -$template->set_var('DISPLAY_EXTRA', 'none'); -$template->set_var('ACTION_URL', ADMIN_URL.'/groups/add.php'); -$template->set_var('SUBMIT_TITLE', $TEXT['ADD']); -$template->set_var('ADVANCED_ACTION', 'index.php'); - -// Tell the browser whether or not to show advanced options -if(isset($_POST['advanced']) AND $_POST['advanced'] == $TEXT['SHOW_ADVANCED'].' >>') { - $template->set_var('DISPLAY_ADVANCED', ''); - $template->set_var('DISPLAY_BASIC', 'none'); - $template->set_var('ADVANCED', 'yes'); - $template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']); -} else { - $template->set_var('DISPLAY_ADVANCED', 'none'); - $template->set_var('DISPLAY_BASIC', ''); - $template->set_var('ADVANCED', 'no'); - $template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>'); -} - -// Insert permissions values -if($admin->get_permission('groups_add') != true) { - $template->set_var('DISPLAY_ADD', 'hide'); -} - -// Insert values into module list -$template->set_block('main_block', 'module_list_block', 'module_list'); + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Access', 'groups'); + +// Create new template object for the modify/remove menu +$template = new Template(ADMIN_PATH.'/groups'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var('ADMIN_URL', ADMIN_URL); + +// Get existing value from database +$database = new database(); +$query = "SELECT group_id,name FROM ".TABLE_PREFIX."groups WHERE group_id != '1'"; +$results = $database->query($query); +if($database->is_error()) { + $admin->print_error($database->get_error(), 'index.php'); +} + +// Insert values into the modify/remove menu +$template->set_block('main_block', 'list_block', 'list'); +if($results->numRows() > 0) { + // Insert first value to say please select + $template->set_var('VALUE', ''); + $template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...'); + $template->parse('list', 'list_block', true); + // Loop through groups + while($group = $results->fetchRow()) { + $template->set_var('VALUE', $group['group_id']); + $template->set_var('NAME', $group['name']); + $template->parse('list', 'list_block', true); + } +} else { + // Insert single value to say no groups were found + $template->set_var('NAME', $TEXT['NONE_FOUND']); + $template->parse('list', 'list_block', true); +} + +// Insert permissions values +if($admin->get_permission('groups_add') != true) { + $template->set_var('DISPLAY_ADD', 'hide'); +} +if($admin->get_permission('groups_modify') != true) { + $template->set_var('DISPLAY_MODIFY', 'hide'); +} +if($admin->get_permission('groups_delete') != true) { + $template->set_var('DISPLAY_DELETE', 'hide'); +} + +// Insert language headings +$template->set_var(array( + 'HEADING_MODIFY_DELETE_GROUP' => $HEADING['MODIFY_DELETE_GROUP'], + 'HEADING_ADD_GROUP' => $HEADING['ADD_GROUP'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_MODIFY' => $TEXT['MODIFY'], + 'TEXT_DELETE' => $TEXT['DELETE'], + 'TEXT_MANAGE_USERS' => $TEXT['MANAGE_USERS'], + 'CONFIRM_DELETE' => $MESSAGE['GROUPS']['CONFIRM_DELETE'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Setup template for add group form +$template = new Template(ADMIN_PATH.'/groups'); +$template->set_file('page', 'group_form.html'); +$template->set_block('page', 'main_block', 'main'); +$template->set_var('DISPLAY_EXTRA', 'none'); +$template->set_var('ACTION_URL', ADMIN_URL.'/groups/add.php'); +$template->set_var('SUBMIT_TITLE', $TEXT['ADD']); +$template->set_var('ADVANCED_ACTION', 'index.php'); + +// Tell the browser whether or not to show advanced options +if(isset($_POST['advanced']) AND $_POST['advanced'] == $TEXT['SHOW_ADVANCED'].' >>') { + $template->set_var('DISPLAY_ADVANCED', ''); + $template->set_var('DISPLAY_BASIC', 'none'); + $template->set_var('ADVANCED', 'yes'); + $template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']); +} else { + $template->set_var('DISPLAY_ADVANCED', 'none'); + $template->set_var('DISPLAY_BASIC', ''); + $template->set_var('ADVANCED', 'no'); + $template->set_var('ADVANCED_BUTTON', $TEXT['SHOW_ADVANCED'].' >>'); +} + +// Insert permissions values +if($admin->get_permission('groups_add') != true) { + $template->set_var('DISPLAY_ADD', 'hide'); +} + +// Insert values into module list +$template->set_block('main_block', 'module_list_block', 'module_list'); if($handle = opendir(WB_PATH.'/modules/')) { while (false !== ($file = readdir($handle))) { - if($file != '.' AND $file != '..' AND $file != 'CVS' AND is_dir(WB_PATH."/modules/$file") AND file_exists(WB_PATH."/modules/$file/info.php")) { - // Include the modules info file - require(WB_PATH.'/modules/'.$file.'/info.php'); - $template->set_var('VALUE', $file); - $template->set_var('NAME', $module_name); - $template->parse('module_list', 'module_list_block', true); - } - } -} - -// Insert values into template list -$template->set_block('main_block', 'template_list_block', 'template_list'); + if($file != '.' AND $file != '..' AND $file != '.svn' AND is_dir(WB_PATH."/modules/$file") AND file_exists(WB_PATH."/modules/$file/info.php")) { + // Include the modules info file + require(WB_PATH.'/modules/'.$file.'/info.php'); + $template->set_var('VALUE', $file); + $template->set_var('NAME', $module_name); + $template->parse('module_list', 'module_list_block', true); + } + } +} + +// Insert values into template list +$template->set_block('main_block', 'template_list_block', 'template_list'); if($handle = opendir(WB_PATH.'/templates/')) { while (false !== ($file = readdir($handle))) { - if($file != '.' AND $file != '..' AND $file != 'CVS' AND is_dir(WB_PATH."/templates/$file") AND file_exists(WB_PATH."/templates/$file/info.php")) { - // Include the modules info file - require(WB_PATH.'/templates/'.$file.'/info.php'); - $template->set_var('VALUE', $file); - $template->set_var('NAME', $template_name); - $template->parse('template_list', 'template_list_block', true); - } - } -} - -// Insert language text and messages -$template->set_var(array( - 'TEXT_RESET' => $TEXT['RESET'], - 'TEXT_ACTIVE' => $TEXT['ACTIVE'], - 'TEXT_DISABLED' => $TEXT['DISABLED'], - 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], - 'TEXT_USERNAME' => $TEXT['USERNAME'], - 'TEXT_PASSWORD' => $TEXT['PASSWORD'], - 'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'], - 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], - 'TEXT_EMAIL' => $TEXT['EMAIL'], - 'TEXT_GROUP' => $TEXT['GROUP'], - 'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'], - 'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'], - 'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'], - 'TEXT_NAME' => $TEXT['NAME'], - 'SECTION_PAGES' => $MENU['PAGES'], - 'SECTION_MEDIA' => $MENU['MEDIA'], - 'SECTION_MODULES' => $MENU['MODULES'], - 'SECTION_TEMPLATES' => $MENU['TEMPLATES'], - 'SECTION_SETTINGS' => $MENU['SETTINGS'], - 'SECTION_LANGUAGES' => $MENU['LANGUAGES'], - 'SECTION_USERS' => $MENU['USERS'], - 'SECTION_GROUPS' => $MENU['GROUPS'], - 'TEXT_VIEW' => $TEXT['VIEW'], - 'TEXT_ADD' => $TEXT['ADD'], - 'TEXT_LEVEL' => $TEXT['LEVEL'], - 'TEXT_MODIFY' => $TEXT['MODIFY'], - 'TEXT_DELETE' => $TEXT['DELETE'], - 'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'], - 'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'], - 'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'], - 'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'], - 'TEXT_RENAME' => $TEXT['RENAME'], - 'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'], - 'TEXT_BASIC' => $TEXT['BASIC'], - 'TEXT_ADVANCED' => $TEXT['ADVANCED'], - 'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'], - 'CHECKED' => 'checked' - ) - ); - -// Parse template for add group form -$template->parse('main', 'main_block', false); -$template->pparse('output', 'page'); - -// Print the admin footer -$admin->print_footer(); - -?> + if($file != '.' AND $file != '..' AND $file != '.svn' AND is_dir(WB_PATH."/templates/$file") AND file_exists(WB_PATH."/templates/$file/info.php")) { + // Include the modules info file + require(WB_PATH.'/templates/'.$file.'/info.php'); + $template->set_var('VALUE', $file); + $template->set_var('NAME', $template_name); + $template->parse('template_list', 'template_list_block', true); + } + } +} + +// Insert language text and messages +$template->set_var(array( + 'TEXT_RESET' => $TEXT['RESET'], + 'TEXT_ACTIVE' => $TEXT['ACTIVE'], + 'TEXT_DISABLED' => $TEXT['DISABLED'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'], + 'TEXT_USERNAME' => $TEXT['USERNAME'], + 'TEXT_PASSWORD' => $TEXT['PASSWORD'], + 'TEXT_RETYPE_PASSWORD' => $TEXT['RETYPE_PASSWORD'], + 'TEXT_DISPLAY_NAME' => $TEXT['DISPLAY_NAME'], + 'TEXT_EMAIL' => $TEXT['EMAIL'], + 'TEXT_GROUP' => $TEXT['GROUP'], + 'TEXT_SYSTEM_PERMISSIONS' => $TEXT['SYSTEM_PERMISSIONS'], + 'TEXT_MODULE_PERMISSIONS' => $TEXT['MODULE_PERMISSIONS'], + 'TEXT_TEMPLATE_PERMISSIONS' => $TEXT['TEMPLATE_PERMISSIONS'], + 'TEXT_NAME' => $TEXT['NAME'], + 'SECTION_PAGES' => $MENU['PAGES'], + 'SECTION_MEDIA' => $MENU['MEDIA'], + 'SECTION_MODULES' => $MENU['MODULES'], + 'SECTION_TEMPLATES' => $MENU['TEMPLATES'], + 'SECTION_SETTINGS' => $MENU['SETTINGS'], + 'SECTION_LANGUAGES' => $MENU['LANGUAGES'], + 'SECTION_USERS' => $MENU['USERS'], + 'SECTION_GROUPS' => $MENU['GROUPS'], + 'TEXT_VIEW' => $TEXT['VIEW'], + 'TEXT_ADD' => $TEXT['ADD'], + 'TEXT_LEVEL' => $TEXT['LEVEL'], + 'TEXT_MODIFY' => $TEXT['MODIFY'], + 'TEXT_DELETE' => $TEXT['DELETE'], + 'TEXT_MODIFY_CONTENT' => $TEXT['MODIFY_CONTENT'], + 'TEXT_MODIFY_SETTINGS' => $TEXT['MODIFY_SETTINGS'], + 'HEADING_MODIFY_INTRO_PAGE' => $HEADING['MODIFY_INTRO_PAGE'], + 'TEXT_CREATE_FOLDER' => $TEXT['CREATE_FOLDER'], + 'TEXT_RENAME' => $TEXT['RENAME'], + 'TEXT_UPLOAD_FILES' => $TEXT['UPLOAD_FILES'], + 'TEXT_BASIC' => $TEXT['BASIC'], + 'TEXT_ADVANCED' => $TEXT['ADVANCED'], + 'CHANGING_PASSWORD' => $MESSAGE['USERS']['CHANGING_PASSWORD'], + 'CHECKED' => 'checked' + ) + ); + +// Parse template for add group form +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print the admin footer +$admin->print_footer(); + +?> Index: trunk/wb/admin/languages/index.php =================================================================== --- trunk/wb/admin/languages/index.php (revision 15) +++ trunk/wb/admin/languages/index.php (revision 16) @@ -1,86 +1,86 @@ - - Copyright (C) 2004-2005, 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 - -*/ - -// Print admin header -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Addons', 'languages'); - -// Setup template object -$template = new Template(ADMIN_PATH.'/languages'); -$template->set_file('page', 'template.html'); -$template->set_block('page', 'main_block', 'main'); - -// Insert values into language list -$template->set_block('main_block', 'language_list_block', 'language_list'); + + Copyright (C) 2004-2005, 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 + +*/ + +// Print admin header +require('../../config.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'languages'); + +// Setup template object +$template = new Template(ADMIN_PATH.'/languages'); +$template->set_file('page', 'template.html'); +$template->set_block('page', 'main_block', 'main'); + +// Insert values into language list +$template->set_block('main_block', 'language_list_block', 'language_list'); if ($handle = opendir(WB_PATH.'/languages/')) { while (false !== ($file = readdir($handle))) { - if($file != '.' AND $file != '..' AND $file != 'CVS' AND $file != 'index.php') { - // Include the languages info file - require(WB_PATH.'/languages/'.$file); - $template->set_var('VALUE', $language_code); - $template->set_var('NAME', $language_name.' ('.$language_code.')'); - $template->parse('language_list', 'language_list_block', true); - } - } - // Restore language to original file - require(WB_PATH.'/languages/'.LANGUAGE.'.php'); -} - -// Insert permissions values -if($admin->get_permission('languages_install') != true) { - $template->set_var('DISPLAY_INSTALL', 'hide'); -} -if($admin->get_permission('languages_uninstall') != true) { - $template->set_var('DISPLAY_UNINSTALL', 'hide'); -} -if($admin->get_permission('languages_view') != true) { - $template->set_var('DISPLAY_LIST', 'hide'); -} - -// Insert language headings -$template->set_var(array( - 'HEADING_INSTALL_LANGUAGE' => $HEADING['INSTALL_LANGUAGE'], - 'HEADING_UNINSTALL_LANGUAGE' => $HEADING['UNINSTALL_LANGUAGE'], - 'HEADING_LANGUAGE_DETAILS' => $HEADING['LANGUAGE_DETAILS'] - ) - ); -// Insert language text and messages -$template->set_var(array( - 'TEXT_INSTALL' => $TEXT['INSTALL'], - 'TEXT_UNINSTALL' => $TEXT['UNINSTALL'], - 'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'], - 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'] - ) - ); - -// Parse template object -$template->parse('main', 'main_block', false); -$template->pparse('output', 'page'); - -// Print admin footer -$admin->print_footer(); - -?> \ No newline at end of file + if($file != '.' AND $file != '..' AND $file != '.svn' AND $file != 'index.php') { + // Include the languages info file + require(WB_PATH.'/languages/'.$file); + $template->set_var('VALUE', $language_code); + $template->set_var('NAME', $language_name.' ('.$language_code.')'); + $template->parse('language_list', 'language_list_block', true); + } + } + // Restore language to original file + require(WB_PATH.'/languages/'.LANGUAGE.'.php'); +} + +// Insert permissions values +if($admin->get_permission('languages_install') != true) { + $template->set_var('DISPLAY_INSTALL', 'hide'); +} +if($admin->get_permission('languages_uninstall') != true) { + $template->set_var('DISPLAY_UNINSTALL', 'hide'); +} +if($admin->get_permission('languages_view') != true) { + $template->set_var('DISPLAY_LIST', 'hide'); +} + +// Insert language headings +$template->set_var(array( + 'HEADING_INSTALL_LANGUAGE' => $HEADING['INSTALL_LANGUAGE'], + 'HEADING_UNINSTALL_LANGUAGE' => $HEADING['UNINSTALL_LANGUAGE'], + 'HEADING_LANGUAGE_DETAILS' => $HEADING['LANGUAGE_DETAILS'] + ) + ); +// Insert language text and messages +$template->set_var(array( + 'TEXT_INSTALL' => $TEXT['INSTALL'], + 'TEXT_UNINSTALL' => $TEXT['UNINSTALL'], + 'TEXT_VIEW_DETAILS' => $TEXT['VIEW_DETAILS'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'] + ) + ); + +// Parse template object +$template->parse('main', 'main_block', false); +$template->pparse('output', 'page'); + +// Print admin footer +$admin->print_footer(); + +?> Index: trunk/wb/account/forgot.php =================================================================== --- trunk/wb/account/forgot.php (revision 15) +++ trunk/wb/account/forgot.php (revision 16) @@ -1,6 +1,6 @@ \ No newline at end of file +?> Index: trunk/wb/account/preferences.php =================================================================== --- trunk/wb/account/preferences.php (revision 15) +++ trunk/wb/account/preferences.php (revision 16) @@ -1,6 +1,6 @@ \ No newline at end of file +?> Index: trunk/wb/account/preferences_form.php =================================================================== --- trunk/wb/account/preferences_form.php (revision 15) +++ trunk/wb/account/preferences_form.php (revision 16) @@ -1,231 +1,231 @@ - - Copyright (C) 2004-2005, 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 - -*/ - -if(!defined('WB_URL')) { - header('Location: ../index.php'); -} - -?> - -

 

- -
- - - - - - - - - - + + + + + + + + + + + + + + + + + +
: - -
: - + + + + + + + + + - - - - - - - - - - - - - - - - - -
: + +
: + -
: - -
: - -
: - -
  - - -
- - - - -

 

- -
- - - - - - - - - - - - - - - -
: - -
: - -
  - - -
- -
- - -

 

- -
- - - - - - - - - - - - - - - - - - - - -
: - -
: - -
: - -
  - - -
- -
\ No newline at end of file + while (false !== ($file = readdir($handle))) { + if($file != '.' AND $file != '..' AND $file != '.svn' AND $file != 'index.php') { + // Get language name + require(WB_PATH.'/languages/'.$file); + // Check if it is selected + if(LANGUAGE == $language_code) { + ?> + + + + + +
: + +
: + +
: + +
  + + +
+ + + + +

 

+ +
+ + + + + + + + + + + + + + + +
: + +
: + +
  + + +
+ +
+ + +

 

+ +
+ + + + + + + + + + + + + + + + + + + + +
: + +
: + +
: + +
  + + +
+ +
Index: trunk/wb/framework/class.frontend.php =================================================================== --- trunk/wb/framework/class.frontend.php (revision 15) +++ trunk/wb/framework/class.frontend.php (revision 16) @@ -379,7 +379,7 @@ function page_content($block = 1) { // Get outside objects - global $database,$TEXT,$MENU,$HEADING,$MESSAGE; + global $database,$admin,$TEXT,$MENU,$HEADING,$MESSAGE; global $globals; if ($this->page_access_denied==true) { echo $MESSAGE['FRONTEND']['SORRY_NO_VIEWING_PERMISSIONS'];