Project

General

Profile

« Previous | Next » 

Revision 1790

Added by Dietmar over 11 years ago

! update group permission,

View differences:

branches/2.8.x/CHANGELOG
13 13

  
14 14

  
15 15

  
16
14 Oct-2012 Build 1790 Dietmar Woellbrink (Luisehahne)
17
! update group permission, 
16 18
14 Oct-2012 Build 1789 Dietmar Woellbrink (Luisehahne)
17 19
! update Group Permission, add module_advanced
18 20
! upgrade-script will be updating Adminitrator Group
branches/2.8.x/wb/admin/groups/groups_list.inc.php
76 76
		{
77 77
			while($rec_group = $res_groups->fetchRow(MYSQL_ASSOC))
78 78
			{
79
                if( in_array($rec_group['group_id'], explode( ',', $admin->get_session('GROUPS_ID') ) ) ) { continue; }
79 80
				// $tpl->set_var('GROUP_ID', $admin->getIDKEY($rec_group['group_id']));
80 81
				$tpl->set_var('GROUP_ID', $rec_group['group_id']);
81 82
				$tpl->set_var('GROUP_NAME', $rec_group['name']);
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.3');
54
if(!defined('REVISION')) define('REVISION', '1789');
54
if(!defined('REVISION')) define('REVISION', '1790');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/framework/class.login.php
204 204
				if( ($results_array['system_permissions'] != '') ) {
205 205
                    switch ($cur_group_id) :
206 206
                        case 1:
207
                            if($bOnlyAdminGroup) {
208
                                $_SESSION['SYSTEM_PERMISSIONS'] = array_merge($_SESSION['SYSTEM_PERMISSIONS'], explode(',', $results_array['system_permissions']));
207
                            if( $this->user_id == 1) {
208
               					$_SESSION['SYSTEM_PERMISSIONS'] = array_merge($_SESSION['SYSTEM_PERMISSIONS'], explode(',', $results_array['system_permissions']));
209
                            } else {
210
                                $_SESSION['SYSTEM_PERMISSIONS'] = explode(',', $results_array['system_permissions']);
209 211
                            }
212

  
210 213
                            break;
211 214
                        default:
212 215
        					$_SESSION['SYSTEM_PERMISSIONS'] = array_merge($_SESSION['SYSTEM_PERMISSIONS'], explode(',', $results_array['system_permissions']));
......
232 235
				$first_group = false;
233 236
			}
234 237

  
235
            if( $$bOnlyAdminGroup ) {
236
    			$_SESSION['MODULE_PERMISSIONS'] = array();
237
    			$_SESSION['TEMPLATE_PERMISSIONS'] = array();
238
            }
238
//            if( $$bOnlyAdminGroup ) {
239
//    			$_SESSION['MODULE_PERMISSIONS'] = array();
240
//    			$_SESSION['TEMPLATE_PERMISSIONS'] = array();
241
//            }
239 242

  
240 243
			// Update the users table with current ip and timestamp
241 244
			$get_ts = time();

Also available in: Unified diff