Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1942) +++ branches/2.8.x/CHANGELOG (revision 1943) @@ -11,6 +11,8 @@ ! = Update/Change =============================================================================== +31 Jul-2013 Build 1943 M.v.d.Decken(DarkViper) +# fixed/updated /admin/groups - permissions 30 Jul-2013 Build 1942 M.v.d.Decken(DarkViper) # Tooltips in backend 30 Jul-2013 Build 1941 M.v.d.Decken(DarkViper) Index: branches/2.8.x/wb/admin/groups/groups_mask.inc.php =================================================================== --- branches/2.8.x/wb/admin/groups/groups_mask.inc.php (revision 1942) +++ branches/2.8.x/wb/admin/groups/groups_mask.inc.php (revision 1943) @@ -69,7 +69,7 @@ { $group_id = $rec_group['group_id']; // Explode system permissions - $system_permissions = $rec_group['system_permissions']; + $system_permissions = explode(',', $rec_group['system_permissions']); // Explode module permissions $module_permissions = explode(',', $rec_group['module_permissions']); // Explode template permissions Index: branches/2.8.x/wb/admin/groups/upgradePermissions.php =================================================================== --- branches/2.8.x/wb/admin/groups/upgradePermissions.php (revision 1942) +++ branches/2.8.x/wb/admin/groups/upgradePermissions.php (revision 1943) @@ -146,24 +146,19 @@ * @param * @return string: parsed HTML-content */ - function set_system_permissions ($system_permissions = array()) + function set_system_permissions ($aSystemPermissions = array()) { // Implode system permissions - $imploded_system_permissions = ''; - $system_permissions = !is_array($system_permissions) ? array() : $system_permissions; - foreach($system_permissions AS $key => $value) + $aSystemPermissions = !is_array($aSystemPermissions) ? array() : $aSystemPermissions; + $aSystemPermissionsSet = array(); + foreach($aSystemPermissions AS $key => $value) { if($value == true) { - if($imploded_system_permissions == '') - { - $imploded_system_permissions = $key; - } else { - $imploded_system_permissions .= ','.$key; - } + $aSystemPermissionsSet[] = $key; } } - return $imploded_system_permissions; + return implode(',', $aSystemPermissionsSet); } /* ***************************************************************************** @@ -302,7 +297,8 @@ } if(is_array($SystemPermissions)&& sizeof($SystemPermissions)>0) { $aPermissions = convertStringToKeyArray($SystemPermissions); - $sTempPermissions = convertKeyArrayToString($aPermissions).','; +// $sTempPermissions = convertKeyArrayToString($aPermissions).','; + $sTempPermissions = implode(",", $aPermissions).','; } // workout setting preferences if($admin->is_group_match('preferences_view',$sTempPermissions)) @@ -383,8 +379,8 @@ { // if(strpos($key,'_view')) { continue; } $checked=''; - if(array_key_exists($key, $aPermissions)) { - continue; + if(array_key_exists($key, $aPermissions)) { + continue; } $tpl->set_var('SYS_NAME', "system_permissions[$key]" ); $tpl->set_var('SYS_VALUE', 1 ); @@ -400,8 +396,8 @@ foreach($array AS $key => $value) { $checked=''; - if(strpos($key,'_view')) { - continue; + if(strpos($key,'_view')) { + continue; } $tpl->set_var('SYS_NAME', "system_permissions[$key]" ); $tpl->set_var('SYS_VALUE', 1 ); @@ -498,4 +494,4 @@ } } return !$database->is_error(); -} +} \ No newline at end of file Index: branches/2.8.x/wb/admin/groups/save.inc.php =================================================================== --- branches/2.8.x/wb/admin/groups/save.inc.php (revision 1942) +++ branches/2.8.x/wb/admin/groups/save.inc.php (revision 1943) @@ -41,14 +41,27 @@ // check for valid group_id $sql = ''; -// $system_settings = getSystemDefaultPermissions(); - $system_settings = isset($_POST['system_permissions']) ? $_POST['system_permissions'] : array(); + $aSystemPermissionsPages = (isset($_POST["sp_pages"])) ? $_POST["sp_pages"] : array(); + $aSystemPermissionsMedia = (isset($_POST["sp_media"])) ? $_POST["sp_media"] : array(); + $aSystemPermissionsModules = (isset($_POST["sp_modules"])) ? $_POST["sp_modules"] : array(); + $aSystemPermissionsTemplates = (isset($_POST["sp_templates"])) ? $_POST["sp_templates"] : array(); + $aSystemPermissionsLanguages = (isset($_POST["sp_languages"])) ? $_POST["sp_languages"] : array(); + $aSystemPermissionsSettings = (isset($_POST["sp_settings"])) ? $_POST["sp_settings"] : array(); + $aSystemPermissionsAdmintools = (isset($_POST["sp_admintools"])) ? $_POST["sp_admintools"] : array(); + $aSystemPermissionsUsers = (isset($_POST["sp_users"])) ? $_POST["sp_users"] : array(); + $aSystemPermissionsGroups = (isset($_POST["sp_groups"])) ? $_POST["sp_groups"] : array(); + $aSystemPermissionsPreferences = (isset($_POST["sp_preferences"])) ? $_POST["sp_preferences"] : array(); + $aSystemPermissions = array_merge($aSystemPermissionsPages, $aSystemPermissionsMedia, $aSystemPermissionsModules, + $aSystemPermissionsTemplates, $aSystemPermissionsLanguages, $aSystemPermissionsSettings, + $aSystemPermissionsAdmintools, $aSystemPermissionsUsers, $aSystemPermissionsGroups, + $aSystemPermissionsPreferences); + //addons,modules,modules_advanced,modules_install,modules_view,preferences,preferences_view // 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); + $aSystemPermissions = get_system_permissions ($admin,$aSystemPermissions); + $sSystemPermissions = set_system_permissions($aSystemPermissions); $module_permissions = set_module_permissions($admin); $module_permissions = implode (',', $module_permissions); @@ -58,8 +71,6 @@ // prepare empty record to add new group $group_name = $database->escapeString(strip_tags(trim($admin->get_post('name')))); -// print '
function '.__FUNCTION__.'( '.''.' );  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> 
';
-//	print_r( $_POST ); print '
'; $sql = 'SELECT COUNT(*) FROM `'.TABLE_PREFIX.'groups` '; $sql .= 'WHERE `group_id` <> '.$group_id.' AND `name` LIKE BINARY \''.$group_name.'\''; @@ -88,7 +99,7 @@ if( msgQueue::isEmpty() ) { $sql .= 'SET `name` = \''.$group_name.'\', '; - $sql .= '`system_permissions` = \''.$system_permissions.'\', '; + $sql .= '`system_permissions` = \''.$sSystemPermissions.'\', '; $sql .= '`module_permissions` = \''.$module_permissions.'\', '; $sql .= '`template_permissions` = \''.$template_permissions.'\' '; $sql .= $where; @@ -104,4 +115,4 @@ } $admin->print_header(); return $group_id; - } + } \ No newline at end of file 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 1942) +++ branches/2.8.x/wb/admin/skel/themes/htt/groups_form.htt (revision 1943) @@ -11,11 +11,6 @@ -
- - - -

@@ -27,43 +22,43 @@

{TEXT_FILESYSTEM_PERMISSIONS}

- + - + - + - + - + - + - + - + - + - +
@@ -80,31 +75,31 @@
{FILESYSTEM_PERMISSIONS} {MENU_PAGES}
@@ -111,29 +106,29 @@
-
+
{TEXT_FILESYSTEM_PERMISSIONS} {MENU_MEDIA}
  • - +
  • - +
  • - +
  • - +
  • - +
  • @@ -149,19 +144,19 @@
    {FILESYSTEM_PERMISSIONS} {MENU_MODULES}
    • - +
    • - +
    • - +
    • - +
    @@ -175,15 +170,15 @@
    {FILESYSTEM_PERMISSIONS} {MENU_TEMPLATES}
    • - +
    • - +
    • - +
    •  
      • @@ -197,15 +192,15 @@
      {FILESYSTEM_PERMISSIONS} {MENU_LANGUAGES}
      • - +
      • - +
      • - +
      •  
        • @@ -219,11 +214,11 @@
        {FILESYSTEM_PERMISSIONS} {MENU_SETTINGS}
        • - +
        • - +
        @@ -237,7 +232,7 @@
        {FILESYSTEM_PERMISSIONS} {MENU_ADMINTOOLS}
        • - +
        @@ -250,19 +245,19 @@
        {FILESYSTEM_PERMISSIONS} {MENU_USERS}
        • - +
        • - +
        • - +
        • - +
        @@ -275,19 +270,19 @@
        {FILESYSTEM_PERMISSIONS} {MENU_GROUPS}
        • - +
        • - +
        • - +
        • - +
        @@ -301,7 +296,7 @@
        {FILESYSTEM_PERMISSIONS} {MENU_USER_PREFERENCES}
        • - +
        @@ -370,7 +365,7 @@
- +
Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1942) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1943) @@ -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', '1942'); +if(!defined('REVISION')) define('REVISION', '1943'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js =================================================================== --- branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js (revision 1942) +++ branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js (revision 1943) @@ -28,94 +28,7 @@ } /* toggler for group permissions */ - if($('form[name="group"]').length) { - - function toggleBox(checkbox, toggleID) - { - var $checkbox = checkbox; - if( $checkbox.attr('checked')) - { - $(toggleID).removeClass("hide"); - return true; - } else { - $(toggleID).addClass("hide"); - return false; - } - } - - function proveCheckbox(checkbox) - { - if($(checkbox).attr('checked')) - { - $(checkbox).prop('checked', false); - } else { - $(checkbox).prop('checked', true); - } - } - - var $ischecked = false; - /* check toggler on pageload */ - if($ischecked == false) { - if(!$('#pages_view').attr('checked')){ - toggleBox($(this), "#JQPageView"); - } - if(!$('#media_view').attr('checked')){ - toggleBox($(this), "#JQMediaView"); - } - if(!$('#modules_view').attr('checked')){ - toggleBox($(this), "#JQModulesView"); - } - if(!$('#templates_view').attr('checked')){ - toggleBox($(this), "#JQTemplateView"); - } - if(!$('#languages_view').attr('checked')){ - toggleBox($(this), "#JQLanguagesView"); - } - if(!$('#settings_view').attr('checked')){ - toggleBox($(this), "#JQSettingsView"); - } - if(!$('#admintools_view').attr('checked')){ - toggleBox($(this), "#JQAToolsView"); - } - if(!$('#users_view').attr('checked')){ - toggleBox($(this), "#JQUsersView"); - } - if(!$('#groups_view').attr('checked')){ - toggleBox($(this), "#JQGroupsView"); - } - var $ischecked = true; - } - - - $('#pages_view').click(function(){ - if(toggleBox($(this),"#JQPageView")){proveCheckbox("#pages_view_detail")}else{proveCheckbox("#pages_view_detail");proveCheckbox("#pages_add_l0");proveCheckbox("#pages_add");proveCheckbox("#pages_settings");proveCheckbox("#pages_modify");proveCheckbox("#pages_intro");proveCheckbox("#pages_delete")}; - }); - $('#media_view').click(function(){ - if(toggleBox($(this),"#JQMediaView")){proveCheckbox("#media_view_detail")}else{proveCheckbox("#media_view_detail");proveCheckbox("#media_upload");proveCheckbox("#media_rename");proveCheckbox("#media_delete");proveCheckbox("#media_create")}; - }); - $('#modules_view').click(function(){ - if(toggleBox($(this),"#JQModulesView")){proveCheckbox("#modules_view_detail")}else{proveCheckbox("#modules_view_detail");proveCheckbox("#modules_install");proveCheckbox("#modules_uninstall");proveCheckbox("#modules_advanced")}; - }); - $('#templates_view').click(function(){ - if(toggleBox($(this),"#JQTemplateView")){proveCheckbox("#templates_view_detail")}else{proveCheckbox("#templates_view_detail");proveCheckbox("#templates_install");proveCheckbox("#templates_uninstall")}; - }); - $('#languages_view').click(function(){ - if(toggleBox($(this),"#JQLanguagesView")){proveCheckbox("#languages_view_detail")}else{proveCheckbox("#languages_view_detail");proveCheckbox("#languages_install");proveCheckbox("#languages_uninstall")}; - }); - $('#settings_view').click(function(){ - if(toggleBox($(this),"#JQSettingsView")){proveCheckbox("#settings_view_detail")}else{proveCheckbox("#settings_view_detail");proveCheckbox("#settings_advanced")}; - }); - $('#admintools_view').click(function(){ - if(toggleBox($(this),"#JQAToolsView")){proveCheckbox("#admintools_view_detail")}else{proveCheckbox("#admintools_view_detail")}; - }); - $('#users_view').click(function(){ - if(toggleBox($(this),"#JQUsersView")){proveCheckbox("#users_view_detail")}else{proveCheckbox("#users_view_detail");proveCheckbox("#users_add");proveCheckbox("#users_modify");proveCheckbox("#users_delete")}; - }); - $('#groups_view').click(function(){ - if(toggleBox($(this),"#JQGroupsView")){proveCheckbox("#groups_view_detail")}else{proveCheckbox("#groups_view_detail");proveCheckbox("#groups_add");proveCheckbox("#groups_modify");proveCheckbox("#groups_delete")}; - }); - $('#preferences_view').click(function(){ - if(toggleBox($(this),"#JQUSettingsView")){proveCheckbox("#preferences_view_detail")}else{proveCheckbox("#preferences_view_detail")}; - }); + if ($('form[name="group"]').length) { + function toggleBox(a,b){var c=a;if(c.attr("checked")){$(b).removeClass("hide");return true}else{$(b).addClass("hide");return false}}var $ischecked=false;if($ischecked==false){if(!$("#pages_view").attr("checked")){toggleBox($(this),"#JQPageView")}if(!$("#media_view").attr("checked")){toggleBox($(this),"#JQMediaView")}if(!$("#modules_view").attr("checked")){toggleBox($(this),"#JQModulesView")}if(!$("#templates_view").attr("checked")){toggleBox($(this),"#JQTemplateView")}if(!$("#languages_view").attr("checked")){toggleBox($(this),"#JQLanguagesView")}if(!$("#settings_view").attr("checked")){toggleBox($(this),"#JQSettingsView")}if(!$("#admintools_view").attr("checked")){toggleBox($(this),"#JQAToolsView")}if(!$("#users_view").attr("checked")){toggleBox($(this),"#JQUsersView")}if(!$("#groups_view").attr("checked")){toggleBox($(this),"#JQGroupsView")}var $ischecked=true}$("#pages_view").click(function(){if(toggleBox($(this),"#JQPageView")){$("#pages_view_detail").attr("checked",true)}else{$.each(["#pages_view_detail","#pages_add_l0","#pages_add","#pages_settings","#pages_modify","#pages_intro","#pages_delete"],function(b,a){$(a).removeAttr("checked")})}});$("#media_view").click(function(){if(toggleBox($(this),"#JQMediaView")){$("#media_view_detail").attr("checked",true)}else{$.each(["#media_view_detail","#media_upload","#media_rename","#media_delete","#media_create"],function(b,a){$(a).removeAttr("checked")})}});$("#modules_view").click(function(){if(toggleBox($(this),"#JQModulesView")){$("#modules_view_detail").attr("checked",true)}else{$.each(["#modules_view_detail","#modules_install","#modules_uninstall","#modules_advanced"],function(b,a){$(a).removeAttr("checked")})}});$("#templates_view").click(function(){if(toggleBox($(this),"#JQTemplateView")){$("#templates_view_detail").attr("checked",true)}else{$.each(["#templates_view_detail","#templates_install","#templates_uninstall"],function(b,a){$(a).removeAttr("checked")})}});$("#languages_view").click(function(){if(toggleBox($(this),"#JQLanguagesView")){$("#languages_view_detail").attr("checked",true)}else{$.each(["#languages_view_detail","#languages_install","#languages_uninstall"],function(b,a){$(a).removeAttr("checked")})}});$("#settings_view").click(function(){if(toggleBox($(this),"#JQSettingsView")){$("#settings_view_detail").attr("checked",true)}else{$.each(["#settings_view_detail","#settings_advanced"],function(b,a){$(a).removeAttr("checked")})}});$("#admintools_view").click(function(){if(toggleBox($(this),"#JQAToolsView")){$("#admintools_view_detail").attr("checked",true)}else{$.each(["#modules_view_detail","#modules_install","#modules_uninstall","#modules_advanced"],function(b,a){$(a).removeAttr("checked")})}});$("#users_view").click(function(){if(toggleBox($(this),"#JQUsersView")){$("#users_view_detail").attr("checked",true)}else{$.each(["#users_view_detail","#users_add","#users_modify","#users_delete"],function(b,a){$(a).removeAttr("checked")})}});$("#groups_view").click(function(){if(toggleBox($(this),"#JQGroupsView")){$("#groups_view_detail").attr("checked",true)}else{$.each(["#groups_view_detail","#groups_add","#groups_modify","#groups_delete"],function(b,a){$(a).removeAttr("checked")})}});$("#preferences_view").click(function(){if(toggleBox($(this),"#JQUSettingsView")){$("#preferences_view_detail").attr("checked",true)}else{$.each(["#preferences_view_detail"],function(b,a){$(a).removeAttr("checked")})}}); } }); \ No newline at end of file