Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1788) +++ branches/2.8.x/CHANGELOG (revision 1789) @@ -13,6 +13,9 @@ +14 Oct-2012 Build 1789 Dietmar Woellbrink (Luisehahne) +! update Group Permission, add module_advanced +! upgrade-script will be updating Adminitrator Group 13 Oct-2012 Build 1788 Dietmar Woellbrink (Luisehahne) # fixed page settings for php Version less 5.2.9 13 Oct-2012 Build 1787 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1788) +++ branches/2.8.x/wb/upgrade-script.php (revision 1789) @@ -66,7 +66,7 @@ '[ADMIN]/themes/', ); -if(version_compare(WB_REVISION, '1785', '<')) +if(version_compare(WB_REVISION, '1788', '<')) { $filesRemove['0'] = array( @@ -735,7 +735,33 @@ if($bDebugModus) { echo implode(PHP_EOL,$aDebugMessage); + $aDebugMessage = array(); } + + /********************************************************** + * Modify Administrator on groups table + */ + echo "

Update group Administrator on table groups

"; + $aDebugMessage[] = "Modify Administrator on groups table"; + $sModulePermissions = ''; + $sTemplatePermissions = ''; + $sSystemPermissions = 'access,addons,admintools,admintools_view,groups,groups_add,groups_delete,groups_modify,groups_view,'; + $sSystemPermissions .= 'languages,languages_install,languages_uninstall,languages_view,media,media_create,media_delete,media_rename,media_upload,media_view,'; + $sSystemPermissions .= 'modules,modules_advanced,modules_install,modules_uninstall,modules_view,pages,pages_add,pages_add_l0,pages_delete,pages_intro,pages_modify,pages_settings,pages_view,'; + $sSystemPermissions .= 'preferences,preferences_view,settings,settings_advanced,settings_basic,settings_view,templates,templates_install,templates_uninstall,templates_view,users,users_add,users_delete,users_modify,users_view'; + + $sql = 'UPDATE `'.TABLE_PREFIX.'groups` '; + $sql .= 'SET `name` = \'Administrators\', '; + $sql .= '`system_permissions` = \''.$sSystemPermissions.'\', '; + $sql .= '`module_permissions` = \''.$sModulePermissions.'\', '; + $sql .= '`template_permissions` = \''.$sTemplatePermissions.'\' '; + $sql .= 'WHERE `group_id` = \'1\' '; + $aDebugMessage[] = ($database->query($sql)) ? " $OK
" : " $FAIL!
"; + + if($bDebugModus) { + echo implode(PHP_EOL,$aDebugMessage); + $aDebugMessage = array(); + } echo ''; } @@ -779,10 +805,10 @@ echo '

Upgrade media directory '.MEDIA_DIRECTORY.'/ index.php protect files

'; $array = rebuildFolderProtectFile($dir); if( sizeof( $array ) ){ - print 'Upgrade '.sizeof( $array ).' directory '.MEDIA_DIRECTORY.'/ protect files'." $OK
"; + echo 'Upgrade '.sizeof( $array ).' directory '.MEDIA_DIRECTORY.'/ protect files'." $OK
"; } else { - print 'Upgrade directory '.MEDIA_DIRECTORY.'/ protect files'." $FAIL!
"; - print implode ('
',$array); + echo 'Upgrade directory '.MEDIA_DIRECTORY.'/ protect files'." $FAIL!
"; + echo implode ('
',$array); } /********************************************************** @@ -796,7 +822,7 @@ $sPagePath = (defined('PAGES_DIRECTORY') && (PAGES_DIRECTORY != '') ? PAGES_DIRECTORY : ''); $msg = rebuild_all_accessfiles(); - print implode ('
',$msg); + echo implode ('
',$msg); echo ''; /* ***************************************************************************** * - check for deprecated / never needed files Index: branches/2.8.x/wb/admin/groups/upgradePermissions.php =================================================================== --- branches/2.8.x/wb/admin/groups/upgradePermissions.php (revision 1788) +++ branches/2.8.x/wb/admin/groups/upgradePermissions.php (revision 1789) @@ -196,7 +196,7 @@ function addons(& $val, $key, $vars = '') { $val = rtrim($val, '_'); - $val = ($val == 'modules') || ($val == 'templates') || ($val == 'languages') ? 'addons' : $val; + $val = ($val == 'modules_view') || ($val == 'templates_view') || ($val == 'languages_view') ? 'addons' : $val; } } @@ -211,7 +211,7 @@ if(!function_exists('access')){ function access(& $val, $key, $vars = '') { - $val = ($val == 'groups') || ($val == 'users') ? 'access' : $val; + $val = ($val == 'groups_view') || ($val == 'users_view') ? 'access' : $val; } } function convertArrayToString ($val=null) Index: branches/2.8.x/wb/admin/templates/index.php =================================================================== --- branches/2.8.x/wb/admin/templates/index.php (revision 1788) +++ branches/2.8.x/wb/admin/templates/index.php (revision 1789) @@ -73,7 +73,7 @@ '' . $mLang->MENU_MODULES . '' : ''.$mLang->MENU_MODULES.'', 'URL_LANGUAGES' => $admin->get_permission('languages') ? '' . $mLang->MENU_LANGUAGES . '' : ''.$mLang->MENU_LANGUAGES.'', - 'URL_ADVANCED' => $admin->get_permission('settings_advanced') + 'URL_ADVANCED' => $admin->get_permission('modules_advanced') ? '' . $mLang->TEXT_ADVANCED . '' : ''.$mLang->TEXT_ADVANCED.'' , ) ); Index: branches/2.8.x/wb/admin/skel/themes/htt/groups_form.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/groups_form.htt (revision 1788) +++ branches/2.8.x/wb/admin/skel/themes/htt/groups_form.htt (revision 1789) @@ -194,6 +194,10 @@ +
  • + + +
    • @@ -215,6 +219,9 @@ +
  • + +
    • @@ -236,6 +243,9 @@ +
  • + +
    • Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1788) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1789) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1788'); +if(!defined('REVISION')) define('REVISION', '1789'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/admin/modules/index.php =================================================================== --- branches/2.8.x/wb/admin/modules/index.php (revision 1788) +++ branches/2.8.x/wb/admin/modules/index.php (revision 1789) @@ -118,7 +118,7 @@ '' . $mLang->MENU_TEMPLATES . '' : ''.$mLang->MENU_TEMPLATES.'', 'URL_LANGUAGES' => $admin->get_permission('languages') ? '' . $mLang->MENU_LANGUAGES . '' : ''.$mLang->MENU_LANGUAGES.'', - 'URL_ADVANCED' => $admin->get_permission('settings_advanced') ? + 'URL_ADVANCED' => $admin->get_permission('modules_advanced') ? '' . $mLang->TEXT_ADVANCED . '' : ''.$mLang->TEXT_ADVANCED.'' , 'HEADING_CHANGE_TEMPLATE_NOTICE' => '' ) Index: branches/2.8.x/wb/admin/addons/index.php =================================================================== --- branches/2.8.x/wb/admin/addons/index.php (revision 1788) +++ branches/2.8.x/wb/admin/addons/index.php (revision 1789) @@ -49,9 +49,9 @@ if($admin->get_permission('modules') != true) { $template->set_var('DISPLAY_MODULES', $display_none); } if($admin->get_permission('templates') != true) { $template->set_var('DISPLAY_TEMPLATES', $display_none); } if($admin->get_permission('languages') != true) { $template->set_var('DISPLAY_LANGUAGES', $display_none); } -if($admin->get_permission('admintools') != true) { $template->set_var('DISPLAY_ADVANCED', $display_none); } +if($admin->get_permission('modules_advanced') != true) { $template->set_var('DISPLAY_ADVANCED', $display_none); } -if(!isset($_GET['advanced']) || $admin->get_permission('admintools') != true) { +if(!isset($_GET['advanced']) || $admin->get_permission('modules_advanced') != true) { $template->set_var('DISPLAY_RELOAD', $display_none); } /** @@ -59,6 +59,7 @@ */ $template->set_var(array( 'ADDONS_OVERVIEW' => $MENU['ADDONS'], + 'FTAN'=> $admin->getFTAN(), 'MODULES' => $MENU['MODULES'], 'TEMPLATES' => $MENU['TEMPLATES'], 'LANGUAGES' => $MENU['LANGUAGES'], @@ -66,14 +67,15 @@ 'TEMPLATES_OVERVIEW' => $OVERVIEW['TEMPLATES'], 'LANGUAGES_OVERVIEW' => $OVERVIEW['LANGUAGES'], 'TXT_ADMIN_SETTINGS' => $TEXT['ADMIN'] . ' ' . $TEXT['SETTINGS'], - 'MESSAGE_RELOAD_ADDONS' => $MESSAGE['ADDON']['RELOAD'], + 'MESSAGE_RELOAD_ADDONS' => $MESSAGE['ADDON_RELOAD'], 'TEXT_RELOAD' => $TEXT['RELOAD'], + 'RELOAD_URL' => ADMIN_URL . '/addons/reload.php', - 'URL_ADVANCED' => $admin->get_permission('admintools') + 'URL_ADVANCED' => $admin->get_permission('modules_advanced') ? '' . $TEXT['ADVANCED'] . '' : '', - 'ADVANCED_URL' => $admin->get_permission('admintools') ? ADMIN_URL . '/addons/index.php' : '', + 'ADVANCED_URL' => $admin->get_permission('modules_advanced') ? ADMIN_URL . '/addons/index.php' : '', 'TEXT_ADVANCED' => $TEXT['ADVANCED'], - 'FTAN' => $admin->getFTAN() + 'TEXT_EMPTY' => ' ', ) ); @@ -84,7 +86,7 @@ if ( $admin->get_permission('templates') == true) { $template->parse('main_block', "templates_block", true); } if ( $admin->get_permission('languages') == true) { $template->parse('main_block', "languages_block", true); } // start advanced block -if ( isset($_GET['advanced']) AND $admin->get_permission('admintools') == true) { +if ( isset($_GET['advanced']) AND $admin->get_permission('modules_advanced') == true) { $template->set_var(array( 'TXT_THEME_COPY_CURRENT' => $TEXT['THEME_COPY_CURRENT'], 'TXT_THEME_NEW_NAME' => $TEXT['THEME_NEW_NAME'], Index: branches/2.8.x/wb/framework/class.login.php =================================================================== --- branches/2.8.x/wb/framework/class.login.php (revision 1788) +++ branches/2.8.x/wb/framework/class.login.php (revision 1789) @@ -80,7 +80,7 @@ $sql = 'SELECT * FROM `'.$this->users_table.'` '; $sql .= 'WHERE `user_id`=\''.$this->get_safe_remember_key().'\''; $query_details = $database->query($sql); - $fetch_details = $query_details->fetchRow(); + $fetch_details = $query_details->fetchRow(MYSQL_ASSOC); $this->username = $fetch_details['username']; $this->password = $fetch_details['password']; // Check if the user exists (authenticate them) @@ -188,19 +188,31 @@ $_SESSION['TEMPLATE_PERMISSIONS'] = array(); $_SESSION['GROUP_NAME'] = array(); + $aGroupsIds = ((explode(',', $this->get_session('GROUPS_ID')))); + $bOnlyAdminGroup = $this->ami_group_member('1') && (sizeof($aGroupsIds) == 1); + $first_group = true; - - $first_group = true; - foreach (explode(",", $this->get_session('GROUPS_ID')) as $cur_group_id) + foreach ( $aGroupsIds as $cur_group_id) { $sql = 'SELECT * FROM `'.$this->groups_table.'` WHERE `group_id`=\''.$cur_group_id.'\''; - $results = $database->query($sql); - $results_array = $results->fetchRow(); - $_SESSION['GROUP_NAME'][$cur_group_id] = $results_array['name']; + if($results = $database->query($sql)) { + $results_array = $results->fetchRow(MYSQL_ASSOC); + $_SESSION['GROUP_NAME'][$cur_group_id] = $results_array['name']; + } + // Set system permissions - if( $results_array['system_permissions'] != '' ) { - $_SESSION['SYSTEM_PERMISSIONS'] = array_merge($_SESSION['SYSTEM_PERMISSIONS'], explode(',', $results_array['system_permissions'])); + if( ($results_array['system_permissions'] != '') ) { + switch ($cur_group_id) : + case 1: + if($bOnlyAdminGroup) { + $_SESSION['SYSTEM_PERMISSIONS'] = array_merge($_SESSION['SYSTEM_PERMISSIONS'], explode(',', $results_array['system_permissions'])); + } + break; + default: + $_SESSION['SYSTEM_PERMISSIONS'] = array_merge($_SESSION['SYSTEM_PERMISSIONS'], explode(',', $results_array['system_permissions'])); + endswitch; } + // Set module permissions if( $results_array['module_permissions'] != '' ) { if ($first_group) { @@ -220,7 +232,7 @@ $first_group = false; } - if( $this->ami_group_member('1')) { + if( $$bOnlyAdminGroup ) { $_SESSION['MODULE_PERMISSIONS'] = array(); $_SESSION['TEMPLATE_PERMISSIONS'] = array(); } Index: branches/2.8.x/wb/templates/wb_theme/css/screen.css =================================================================== --- branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1788) +++ branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1789) @@ -260,7 +260,7 @@ div.page-settings-leftcol label a:link { text-decoration :none; color :#003366; } div.page-settings-leftcol label a:hover { color :#006699; text-decoration :underline; } div.page-settings-leftcol textarea { resize :vertical; } -#overDiv { max-width :450px; background-position :center; background-attachment :fixed; text-align :left; padding :1px; font-size :120%; } +#overDiv { max-width :450px; background-position :center; background-attachment :fixed; text-align :left; line-height :1em; padding :1px; font-size :120%; } div.page-settings span.overlib { width :20px; margin-left :-20px; } /* */ Index: branches/2.8.x/wb/templates/argos_theme/css/screen.css =================================================================== --- branches/2.8.x/wb/templates/argos_theme/css/screen.css (revision 1788) +++ branches/2.8.x/wb/templates/argos_theme/css/screen.css (revision 1789) @@ -294,7 +294,7 @@ div.page-settings-leftcol label a:link { text-decoration :none; color :#003366; } div.page-settings-leftcol label a:hover { color : #006699; text-decoration : underline; } div.page-settings-leftcol textarea { resize :vertical; } -#overDiv { max-width :450px; background-position :center; background-attachment :fixed; text-align :left; padding :1px; font-size :120%; } +#overDiv { max-width :450px; background-position :center; background-attachment :fixed; text-align :left; line-height :1em; padding :1px; font-size :120%; } div.page-settings span.overlib { width :20px; margin-left :-20px; } /* */ div.page_group { height: 180px;max-height: 260px; margin: 0; padding: 0; overflow: auto; } Index: branches/2.8.x/wb/install/save.php =================================================================== --- branches/2.8.x/wb/install/save.php (revision 1788) +++ branches/2.8.x/wb/install/save.php (revision 1789) @@ -549,7 +549,7 @@ // Admin group $full_system_permissions = 'access,addons,admintools,admintools_view,groups,groups_add,groups_delete,groups_modify,groups_view,'; $full_system_permissions .= 'languages,languages_install,languages_uninstall,languages_view,media,media_create,media_delete,media_rename,media_upload,media_view,'; - $full_system_permissions .= 'modules,modules_install,modules_uninstall,modules_view,pages,pages_add,pages_add_l0,pages_delete,pages_intro,pages_modify,pages_settings,pages_view,'; + $full_system_permissions .= 'modules,modules_advanced,modules_install,modules_uninstall,modules_view,pages,pages_add,pages_add_l0,pages_delete,pages_intro,pages_modify,pages_settings,pages_view,'; $full_system_permissions .= 'preferences,preferences_view,settings,settings_advanced,settings_basic,settings_view,templates,templates_install,templates_uninstall,templates_view,users,users_add,users_delete,users_modify,users_view'; $insert_admin_group = "INSERT INTO `".TABLE_PREFIX."groups` VALUES ('1', 'Administrators', '$full_system_permissions', '', '')"; $database->query($insert_admin_group);