{ACCESS}
+
-
-
|
function '.__FUNCTION__.'( '.'frm_modify_group'.' ); basename: '.basename(__FILE__).' line: '.__LINE__.' ->'; // flush ();sleep(10); die(); +*/ + +/* ***************************************************************************** + * Show groupsmask to edit group + * @access public + * @param object $admin: admin-object + * @param int $user_id: ID from group to modify or 0 for a new group + * @return string: parsed HTML-content + */ + function show_groupmask($admin, $group_id = 0) + { +// global $TEXT, $MESSAGE, $HEADING, $MENU; + + $database = WbDatabase::getInstance(); + $mLang = ModLanguage::getInstance(); +// $mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE); + include_once('upgradePermissions.php'); + include_once(WB_PATH.'/framework/functions.php'); + // Create new template object for the modify/remove menu + $tpl = new Template(dirname($admin->correct_theme_source('groups_form.htt')),'keep'); + $tpl->set_file('page', 'groups_form.htt'); + $tpl->debug = false; // false, true + + $tpl->set_block('page', 'main_block', 'main'); + $tpl->set_block('main_block', 'show_cmd_permission_block', 'show_cmd_permission'); + $tpl->set_var('FTAN', $admin->getFTAN()); + $rec_group = array(); +// admin settings +// $system_settings = getSystemDefaultPermissions(); +// $aSystemDefaultSettings = getSystemDefaultPermissions(); + if( $group_id > 1 ) // load groupdata from db + { + // only read the first time from db to set checkboxes + if( $admin->get_post('frm_modify_group') == null ) + { + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'groups` '; + $sql .= 'WHERE `group_id` = '.(int)$group_id; + // $group_id = 0; // reset to 0 if error occures + if( ($res_group = $database->query($sql)) != false ) + { + if( ($rec_group = $res_group->fetchRow(MYSQL_ASSOC)) != false ) + { + $group_id = $rec_group['group_id']; + // Explode system permissions + $system_permissions = $rec_group['system_permissions']; + // Explode module permissions + $module_permissions = explode(',', $rec_group['module_permissions']); + // Explode template permissions + $template_permissions = explode(',', $rec_group['template_permissions']); + } + } + + $tpl->set_var(array( + 'SUBMIT_TITLE' => ($admin->get_permission('groups_modify') == true) ? $mLang->TEXT_SAVE : $mLang->TEXT_BACK, + 'ACTION_HIDDEN' => ($admin->get_permission('groups_modify') == true) ? 'action_modify' : 'action_cancel', + 'ACTION_HANDLE' => ($admin->get_permission('groups_modify') == true) ? 'action_save' : 'action_cancel', + 'GROUP_ID' => $rec_group['group_id'], + 'GROUP_NAME' => $rec_group['name'], + 'FORM_NAME_GROUPMASK' => 'frm_modify_group', + )); + } else { + // set changed checkboxes and prepare db data + $module_permissions = set_module_permissions($admin); + $template_permissions = set_template_permissions($admin); + $rec_group['group_id'] = $group_id; + $rec_group['name'] = $admin->add_slashes($admin->get_post('name')); + $rec_group['module_permissions'] = convertArrayToString($module_permissions); + $rec_group['template_permissions'] = convertArrayToString($template_permissions); + + $tpl->set_var(array( + 'SUBMIT_TITLE' => ($admin->get_permission('groups_modify') == true) ? $mLang->TEXT_SAVE : $mLang->TEXT_BACK, + 'ACTION_HANDLE' => ($admin->get_permission('groups_modify') == true) ? 'action_save' : 'action_cancel', + 'ACTION_HIDDEN' => ($admin->get_permission('groups_modify') == true) ? 'action_modify' : 'action_cancel', + 'TEXT_GROUPS_NAME' => $mLang->TEXT_GROUP.': ', + 'FORM_NAME_GROUPMASK' => 'frm_modify_group', + // 'GROUPNAME_DISABLED' => ' readonly="readonly"', + // 'GROUPNAME_INPUT_DISABLED' => ' input_text_disabled no_input' + 'GROUP_NAME' => $rec_group['name'], + 'GROUPNAME_DISABLED' => '', + 'GROUPNAME_INPUT_DISABLED' => '' + )); + } + } else { +// set default no rights + $system_permissions = array('preferences' => 1,'preferences_view' => 1); +// $system_permissions = array(); +// $system_permissions = isset($_POST['system_permissions']) ? $_POST['system_permissions'] : $system_permissions; + $module_permissions = array(); + $template_permissions = array(); + // create a empty group-record with permissions masks and advanced button handle + // check for existing groupname and junp to start handling, do the same in save + // set changed checkboxes and prepare db data + $module_permissions = set_module_permissions($admin); + $template_permissions = set_template_permissions($admin); + $rec_group['group_id'] = intval($admin->get_post('group_id')); + $rec_group['name'] = $admin->add_slashes($admin->get_post('name')); + $rec_group['module_permissions'] = $module_permissions; + $rec_group['template_permissions'] = $template_permissions; + + $tpl->set_var(array( + 'SUBMIT_TITLE' => ($admin->get_permission('groups_add') == true) ? $mLang->TEXT_ADD : $mLang->TEXT_BACK, + 'ACTION_HANDLE' => ($admin->get_permission('groups_add') == true) ? 'action_save' : 'action_cancel', + 'ACTION_HIDDEN' => ($admin->get_permission('groups_add') == true) ? 'action_modify' : 'action_cancel', + 'TEXT_GROUPS_NAME' => '', + 'GROUP_NAME' => $rec_group['name'], + 'FORM_NAME_GROUPMASK' => 'frm_addnew_group', + 'GROUPNAME_DISABLED' => '', + 'GROUPNAME_INPUT_DISABLED' => '' + )); +// $group_id = $rec_group['group_id']; + } +// set changed checkboxes and prepare db data + if( isset($_POST['system_permissions']) ) + { + $system_permissions = get_system_permissions($admin,$_POST['system_permissions'] ); + $rec_group['system_permissions'] = set_system_permissions($_POST['system_permissions']); + } else { + $system_permissions = get_system_permissions($admin,$system_permissions); + $rec_group['system_permissions'] = set_system_permissions($system_permissions); + } +//print '
'; +print_r( $_POST ); print '
function '.__FUNCTION__.'( '.'frm_modify_group'.' ); basename: '.basename(__FILE__).' line: '.__LINE__.' ->'; + $tpl->set_var(array( + 'GROUP_ID' => $rec_group['group_id'], + 'GROUP_NAME' => $rec_group['name'], + 'DISPLAY_ADD' => '', + )); + $tpl->parse('show_cmd_permission', 'show_cmd_permission_block', true); + // if the requested group doesn't exist, or $group_id contains 0 so it + // will be shown a empty mask to add a new group + // otherwise the $rec_group object contains existing data from requested group + // $tpl->set_var('GROUP_ID', $group_id != 0 ? $admin->getIDKEY($group_id) : 0); + $tpl->set_var('GROUP_ACTION_URL', $_SERVER['SCRIPT_NAME']); + $header_extra = $mLang->TEXT_FILESYSTEM_PERMISSIONS.' '; + if( ($admin->get_permission('groups_view') == true) ) + { + $tpl->set_var('GROUPS_HEADER', $header_extra.$mLang->HEADING_VIEW_GROUP ); + if( ($admin->get_permission('groups_modify') == true) ) + { + $tpl->set_var('GROUPS_HEADER', ($group_id == 0 ? $header_extra.$mLang->HEADING_ADD_GROUP : $header_extra.$mLang->HEADING_MODIFY_GROUP) ); + } + } + +// Insert language text and messages + $tpl->set_var('MODULE_FUNCTION', ''); + $tpl->set_var($mLang->getLangArray()); + +// ------------------------ +// Tell the browser whether or not to show advanced options + $tpl->set_block('show_cmd_permission', 'show_cmd_manage_permission_block', 'permission_block'); +// $tpl->set_block('show_cmd_manage_permission_block', 'show_cmd_hidden_permission_list_block', 'hidden_permission_list'); + $tpl->set_block('show_cmd_permission', 'show_cmd_advanced_permission_block', 'advanced_permission_block'); +// first set the var {hidden_permission_list} to empty +// $tpl->parse('hidden_permission_list', ''); +// Check and set system permissions boxes in main_block + + if ( true == (isset( $_POST['advanced_action']) && (( $_POST['advanced_action'] == 'no') || strpos( $_POST['advanced_action'], ">>") > 0 ) ) ) + { + $tpl->parse('hidden_permission_list', ''); + $tpl->set_block('show_cmd_advanced_permission_block', 'show_cmd_hidden_advanced_permission_list_block', 'hidden_advanced_permission_list'); + setSystemCheckboxes( $tpl, $admin, isset($_POST['system_permissions']) ? $_POST['system_permissions'] : $rec_group['system_permissions'] ); + $tpl->set_var('DISPLAY_ADVANCED', ''); + $tpl->set_var('DISPLAY_BASIC', 'display:none;'); + $tpl->set_var('ADVANCED', 'yes'); + $tpl->set_var('ADVANCED_ACTION', 'advance_action'); + $tpl->set_var('ADVANCED_BUTTON', ($admin->get_permission('groups') == true) ? '<< '.$mLang->TEXT_HIDE_ADVANCED : '<< '.$mLang->TEXT_HIDE_ADVANCED); + $tpl->set_var('FILESYSTEM_PERMISSIONS', $mLang->TEXT_FILESYSTEM_PERMISSIONS); + + $tpl->parse('advanced_permission_block', 'show_cmd_advanced_permission_block', true); + $tpl->parse('permission_block', ''); + } else { + $tpl->parse('hidden_advanced_permission_list', ''); + $tpl->set_block('show_cmd_manage_permission_block', 'show_cmd_hidden_permission_list_block', 'hidden_permission_list'); + setSystemCheckboxes( $tpl, $admin, isset($_POST['system_permissions']) ? $_POST['system_permissions'] : $rec_group['system_permissions'] ); + $tpl->set_var('DISPLAY_ADVANCED', ''); + $tpl->set_var('DISPLAY_BASIC', ''); + $tpl->set_var('ADVANCED', 'no'); + $tpl->set_var('ADVANCED_ACTION', 'advance_action'); + $tpl->set_var('ADVANCED_BUTTON', ($admin->get_permission('groups_add') == true) ? $mLang->TEXT_SHOW_ADVANCED.' >>' : $mLang->TEXT_SHOW_ADVANCED.' >>'); + $tpl->set_var('FILESYSTEM_PERMISSIONS', $mLang->TEXT_FILESYSTEM_PERMISSIONS.' '); + + $tpl->parse('advanced_permission_block', ''); + $tpl->parse('permission_block', 'show_cmd_manage_permission_block', true); + } + +// ------------------------ + + $tpl->set_var('HEADER_MODULE_FUNCTION', '
'; +//print_r( $rec_group['system_permissions'] ); print '
function '.__FUNCTION__.'( '.''.' ); basename: '.basename(__FILE__).' line: '.__LINE__.' ->'; + +/** + * setSystemCheckboxes() + * + * @param mixed $tpl + * @param mixed $permissions + * @return + */ +function setSystemCheckboxes( &$tpl, $admin, $permissions = null ) +{ + $array = array(); + if(!is_array($permissions)) + { + $array = convertStringToKeyArray($permissions); + } else { + $array = $permissions; + } + + if ( true == (isset( $_POST['advanced_action']) && (( $_POST['advanced_action'] == 'no') || strpos( $_POST['advanced_action'], ">>") > 0 ) ) ) + { + // set adbanced modus + $tpl->parse('hidden_advanced_permission_list', '', true); + $array = !is_array($array) ? array() : $array; + $aPermissions = isset($_POST['system_permissions']) ? $_POST['system_permissions'] : array(); + foreach($array AS $key => $value) + { + // if(strpos($key,'_view')) { continue; } + if(array_key_exists($key, $aPermissions)) { continue; } + $tpl->set_var('SYS_NAME', "system_permissions[$key]" ); + $tpl->set_var('SYS_VALUE', 1 ); + $tpl->parse('hidden_advanced_permission_list', 'show_cmd_hidden_advanced_permission_list_block', true); + $checked = ''; + } + + } else { + // set baisc modus + $tpl->set_var('SYS_NAME', "none" ); + $tpl->set_var('SYS_VALUE', '' ); + $tpl->parse('hidden_permission_list', 'show_cmd_hidden_permission_list_block', true); + $array = !is_array($array) ? array() : $array; + foreach($array AS $key => $value) + { + if(strpos($key,'_view')) { continue; } + $tpl->set_var('SYS_NAME', "system_permissions[$key]" ); + $tpl->set_var('SYS_VALUE', 1 ); + $tpl->parse('hidden_permission_list', 'show_cmd_hidden_permission_list_block', true); + $checked = ''; + } + } + reset($array); + // set checked + foreach($array AS $key => $value) + { + $checked=''; + if( $key != '' ) + { + $checked = ' checked="checked"'; + } + $tpl->set_var('VALUE', 1); + $tpl->set_var($key.'_checked', $checked); + } + + return $array; +} + +/** + * upgrade_group_system_permissions() + * + * @return void + */ +function upgrade_group_system_permissions ( ) +{ + global $admin; + $database = WbDatabase::getInstance(); + $aGroups = array(); + $sTempPermissions = ''; + $aTempPermissions = array(); + $aAllowedPermissions = array( + 'admintools','groups','languages','media','modules','pages','preferences','settings','templates','users' + ); + $aPermissions = $aMatches = array(); + $sql = 'SELECT `group_id`,`name`,`system_permissions` FROM `'.TABLE_PREFIX.'groups` '; +// $sql .= 'WHERE `group_id` != 1 '; + $sql .= 'ORDER BY `group_id` '; + if($oRes = $database->query($sql) ) + { + while( $aPage = $oRes->fetchRow(MYSQL_ASSOC) ) + { + $sTempPermissions = convertKeyArrayToString (getSystemDefaultPermissions()).','; + $sPermissions = $aPage['group_id']!= 1 ? $aPage['system_permissions'].',' : $sTempPermissions; +// check if old groups system_permissions format, there was no prferences + if( !preg_match_all( '/(preferences[a-z_0-9]*)\,/iU', $sPermissions, $aMatches) ) + { +// fetch all known permission entries to set the permission_view + foreach($aAllowedPermissions as $PermissionFound) + { + $aMatches = array(); + if( preg_match_all( "/(($PermissionFound)[a-z_0-9]*)\,/i", $sPermissions, $aMatches) ) + { + $val1 = $admin->is_group_match("$PermissionFound".'_view',$sPermissions); + $val2 = $admin->is_group_match("$PermissionFound",$sPermissions); + if(!$val1 && $val2) + { + $sPermissions .= $PermissionFound.'_view,'; + } + } + $aTempPermissions = explode(',',$sPermissions); + if(!$admin->is_group_match('preferences_view',$sPermissions)) + { + $sPermissions .= 'preferences,preferences_view,'; + } + } + } +// upgrade all groups system permission + $aTempPermissions = convertStringToArray(trim($sPermissions,',')); + natsort($aTempPermissions); +// reindex + $aTempPermissions = array_merge(($aTempPermissions)); + $retVal = array_fill_keys($aTempPermissions, 1); + $aPermissions[$aPage['name']] = get_system_permissions($admin, $retVal); + $aGroups[$aPage['name']] = convertKeyArrayToString($aPermissions[$aPage['name']]); +// and update DB + $sql = 'UPDATE `'.TABLE_PREFIX.'groups` SET '; + $sql .= '`system_permissions` =\''.$aGroups[$aPage['name']].'\' '; + $sql .= 'WHERE `name` = \''.$aPage['name'].'\' '; + if(!$database->query($sql) ) + { + } + } + } + return !$database->is_error(); +} Property changes on: branches/2.8.x/wb/admin/groups/upgradePermissions.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/admin/groups/save.inc.php =================================================================== --- branches/2.8.x/wb/admin/groups/save.inc.php (nonexistent) +++ branches/2.8.x/wb/admin/groups/save.inc.php (revision 1710) @@ -0,0 +1,106 @@ +Cannot access this file directly'); +} +/* -------------------------------------------------------- */ + +/* ***************************************************************************** + * Modify existing groups or insert a new group + * @access public + * @param object &$admin: reference to admin-object + * @param object &$database: reference to database object + * @param int $group_id: ID from group to modify or 0 for a new group + * @return string: parsed HTML-content + */ + function save_group($admin, $group_id = 0) + { + global $TEXT, $MESSAGE, $HEADING, $MENU; + include_once('upgradePermissions.php'); + include_once(WB_PATH.'/framework/functions.php'); + $database = WbDatabase::getInstance(); + // check for valid group_id + $sql = ''; + +// $system_settings = getSystemDefaultPermissions(); + $system_settings = isset($_POST['system_permissions']) ? $_POST['system_permissions'] : array(); + + // check FTAN and prevent 'admin'[id=1] from become changed + if( $admin->checkFTAN() && $group_id != 1 ) + { + $system_permissions = get_system_permissions ($admin,$system_settings); + $system_permissions = set_system_permissions($system_permissions); + + $module_permissions = set_module_permissions($admin); + $module_permissions = implode (',', $module_permissions); + + $template_permissions = set_template_permissions($admin); + $template_permissions = implode (',', $template_permissions); + + // prepare empty record to add new group + $group_name = mysql_real_escape_string(strip_tags(trim($admin->get_post('name')))); +// print '
'; +//print_r( $_POST ); print '
function '.__FUNCTION__.'( '.''.' ); basename: '.basename(__FILE__).' line: '.__LINE__.' ->'; + + $sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'groups` '; + $sql .= 'WHERE `group_id` <> '.$group_id.' AND `name` LIKE BINARY \''.$group_name.'\''; + + if($group_name == '') + { + msgQueue::add($MESSAGE['GROUPS_GROUP_NAME_BLANK']); + } elseif($group_name != '') { + // check request vars and assign values to record + if( $database->get_one($sql) != false ) + { + msgQueue::add($MESSAGE['GROUPS_GROUP_NAME_EXISTS']); + } else { + if( $group_id == 0 ) + { + $sql = 'INSERT INTO `'.TABLE_PREFIX.'groups` '; + $where = ''; + } else { + $sql = 'UPDATE `'.TABLE_PREFIX.'groups` '; + $where = 'WHERE `group_id` = '.$group_id; + } + } + } + + // save new/changed values if no error given before + if( msgQueue::isEmpty() ) + { + $sql .= 'SET `name` = \''.$group_name.'\', '; + $sql .= '`system_permissions` = \''.$system_permissions.'\', '; + $sql .= '`module_permissions` = \''.$module_permissions.'\', '; + $sql .= '`template_permissions` = \''.$template_permissions.'\' '; + $sql .= $where; + if( $database->query($sql) ) + { + msgQueue::add($MESSAGE['GROUPS_SAVED'],true); + } else { + msgQueue::add($MESSAGE['RECORD_MODIFIED_FAILED']); + } + } + } else { + msgQueue::add('FTAN-check failed or tried to change admin'); + } + $admin->print_header(); + return $group_id; + } Property changes on: branches/2.8.x/wb/admin/groups/save.inc.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/admin/groups/index.php =================================================================== --- branches/2.8.x/wb/admin/groups/index.php (revision 1709) +++ branches/2.8.x/wb/admin/groups/index.php (revision 1710) @@ -4,7 +4,7 @@ * @category admin * @package groups * @author Ryan Djurovich, WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. + * @copyright 2009-2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -12,189 +12,126 @@ * @version $Id$ * @filesource $HeadURL$ * @lastmodified $Date$ + * @description action dispatcher of this module. * -*/ + */ +/* ************************************************************************** */ -// Print admin header -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Access', 'groups'); -$ftan = $admin->getFTAN(); + function admin_groups_index() + { + $database = WbDatabase::getInstance(); + $mLang = ModLanguage::getInstance(); + $mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE); -// Setup template object, parse vars to it, then parse it -// Create new template object -$template = new Template(dirname($admin->correct_theme_source('groups.htt'))); -// $template->debug = true; -$template->set_file('page', 'groups.htt'); -$template->set_block('page', 'main_block', 'main'); -$template->set_block('main_block', 'manage_users_block', 'users'); -// insert urls -$template->set_var(array( - 'ADMIN_URL' => ADMIN_URL, - 'WB_URL' => WB_URL, - 'THEME_URL' => THEME_URL, - 'FTAN' => $ftan - ) -); + $mod_path = dirname(str_replace('\\', '/', __FILE__)); + $mod_name = basename($mod_path); + $output = ''; -// 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'); -} + if( isset($_POST['action_cancel'])) + { + unset($_POST); + } -// 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',$admin->getIDKEY($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); -} + $submit_action = 'show'; // default action + $submit_action = ( isset($_POST['action_cancel']) ? 'cancel' : $submit_action ); + $submit_action = ( isset($_POST['action_delete']) ? 'delete' : $submit_action ); + // $submit_action = ( isset($_POST['action_add']) ? 'modify' : $submit_action ); + $submit_action = ( isset($_POST['action_modify']) ? 'modify' : $submit_action ); + $submit_action = ( isset($_POST['action_save']) ? 'save' : $submit_action ); -// 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'); -} + $group_id = ( isset($_POST['group_id']) ? intval($_POST['group_id']) : '0' ); -// 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' => ( $admin->get_permission('users') == true ) ? $TEXT['MANAGE_USERS']: "", - 'CONFIRM_DELETE' => $MESSAGE['GROUPS']['CONFIRM_DELETE'] - ) -); -if ( $admin->get_permission('users') == true ) $template->parse("users", "manage_users_block", true); -// Parse template object -$template->parse('main', 'main_block', false); -$template->pparse('output', 'page'); + switch($submit_action) : + case 'delete': // delete the group + $admin = new admin('Access', 'groups_delete'); + // $group_id = $admin->checkIDKEY($_POST['group_id']); + msgQueue::clear(); + include($mod_path.'/delete.inc.php'); + delete_group($admin, $group_id); + if( ($msg = msgQueue::getSuccess()) != '') + { + include($mod_path.'/groups_list.inc.php'); + $output = show_grouplist($admin); + } + if( ($msg = msgQueue::getError()) != '') + { + include($mod_path.'/groups_list.inc.php'); + $output = show_grouplist($admin); + } + break; + case 'save': // insert/update group + if( $group_id == 0 ) + { + $admin = new admin('Access', 'groups_add',false); + }else { + $admin = new admin('Access', 'groups_modify',false); + } + msgQueue::clear(); + include($mod_path.'/save.inc.php'); + $group_id = save_group($admin, $group_id); + if(!msgQueue::isEmpty()) + { + } + if( ($msg = msgQueue::getSuccess()) != '') + { + include($mod_path.'/groups_list.inc.php'); + $output = show_grouplist($admin); + } + if( ($msg = msgQueue::getError()) != '') + { + // $group_id = $admin->checkIDKEY($_POST['group_id']); + include($mod_path.'/groups_mask.inc.php'); + $output = show_groupmask($admin, $group_id); + } + break; + case 'modify': // insert/update group + $admin = new admin('Access', 'groups'); + msgQueue::clear(); + if( ($group_id != 1 ) && ($admin->get_permission('groups')) ) + { + // $group_id = $admin->checkIDKEY($_POST['group_id']); + include($mod_path.'/groups_mask.inc.php'); + $output = show_groupmask($admin, $group_id); + } else { + include($mod_path.'/groups_list.inc.php'); + $output = show_grouplist($admin, $group_id); + } + break; + default: // show grouplist with empty modify mask + $admin = new admin('Access', 'groups'); + $group_id = isset($_POST['group_id']) ? (int)$_POST['group_id'] : 0; + msgQueue::clear(); + if($group_id > 1) // prevent 'admin' [ID 1] from modify + { + // $group_id = $admin->checkIDKEY($_POST['group_id']); + include($mod_path.'/groups_mask.inc.php'); + $output .= show_groupmask($admin, $group_id); + }else { // if invalid GroupID is called, fall back to 'show-mode' + include($mod_path.'/groups_list.inc.php'); + $output = show_grouplist($admin); + } + endswitch; // end of switch -// Setup template object, parse vars to it, then parse it -// Create new template object -$template = new Template(dirname($admin->correct_theme_source('groups_form.htt'))); -// $template->debug = true; -$template->set_file('page', 'groups_form.htt'); -$template->set_block('page', 'main_block', 'main'); -$template->set_var('DISPLAY_EXTRA', 'display:none;'); -$template->set_var('ACTION_URL', ADMIN_URL.'/groups/add.php'); -$template->set_var('SUBMIT_TITLE', $TEXT['ADD']); -$template->set_var('ADVANCED_LINK', 'index.php'); - -// Tell the browser whether or not to show advanced options -if ( true == (isset( $_POST['advanced']) AND ( strpos( $_POST['advanced'], ">>") > 0 ) ) ) { - $template->set_var('DISPLAY_ADVANCED', ''); - $template->set_var('DISPLAY_BASIC', 'display:none;'); - $template->set_var('ADVANCED', 'yes'); - $template->set_var('ADVANCED_BUTTON', '<< '.$TEXT['HIDE_ADVANCED']); -} else { - $template->set_var('DISPLAY_ADVANCED', 'display: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'); -$result = $database->query('SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "module" AND `function` = "page" ORDER BY `name`'); -if($result->numRows() > 0) { - while($addon = $result->fetchRow()) { - $template->set_var('VALUE', $addon['directory']); - $template->set_var('NAME', $addon['name']); - $template->parse('module_list', 'module_list_block', true); + if(!msgQueue::isEmpty()) + { + } + if( ($msg = msgQueue::getSuccess()) != '') + { + $output = $admin->format_message($msg, 'ok').$output; + } + if( ($msg = msgQueue::getError()) != '') + { + $output = $admin->format_message($msg, 'error').$output; + } + print $output; + $admin->print_footer(); } -} - -// Insert values into template list -$template->set_block('main_block', 'template_list_block', 'template_list'); -$result = $database->query('SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "template" ORDER BY `name`'); -if($result->numRows() > 0) { - while($addon = $result->fetchRow()) { - $template->set_var('VALUE', $addon['directory']); - $template->set_var('NAME', $addon['name']); - $template->parse('template_list', 'template_list_block', true); + // start dispatcher maintenance + if(!defined('WB_PATH')) + { + require('../../config.php'); + require_once(WB_PATH.'/framework/class.admin.php'); } -} - -// 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'], - 'SECTION_ADMINTOOLS' => $MENU['ADMINTOOLS'], - '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="checked"', - 'ADMIN_URL' => ADMIN_URL, - 'WB_URL' => WB_URL, - 'THEME_URL' => THEME_URL, - 'FTAN' => $ftan - ) - ); - -// Parse template for add group form -$template->parse('main', 'main_block', false); -$template->pparse('output', 'page'); - -// Print the admin footer -$admin->print_footer(); + admin_groups_index(); + exit; +// end of file Index: branches/2.8.x/wb/admin/skel/themes/htt/users.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/users.htt (revision 1709) +++ branches/2.8.x/wb/admin/skel/themes/htt/users.htt (revision 1710) @@ -1,19 +1,21 @@ - -
'; +// print_r( $_POST ); print '
-
-
|
