Changeset 317 for trunk/expressoAdmin1_2/inc/class.functions.inc.php
- Timestamp:
- 06/17/08 14:43:30 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.functions.inc.php
r283 r317 49 49 { 50 50 case list_users: 51 if ($array_acl[acl_add_users] || $array_acl[acl_edit_users] || $array_acl[acl_delete_users] || $array_acl[acl_change_users_password] || $array_acl[acl_change_users_quote] || $array_acl[acl_edit_sambausers_attributes] || $array_acl[acl_view_users] || $array_acl[acl_manipulate_corporative_information] )51 if ($array_acl[acl_add_users] || $array_acl[acl_edit_users] || $array_acl[acl_delete_users] || $array_acl[acl_change_users_password] || $array_acl[acl_change_users_quote] || $array_acl[acl_edit_sambausers_attributes] || $array_acl[acl_view_users] || $array_acl[acl_manipulate_corporative_information] || $array_acl[acl_edit_users_phonenumber] ) 52 52 return true; 53 53 break; … … 85 85 return true; 86 86 break; 87 88 case list_institutional_accounts: 89 if ($array_acl[acl_add_institutional_accounts] || $array_acl[acl_edit_institutional_accounts] || $array_acl[acl_delete_institutional_accounts]) 90 return true; 91 break; 92 87 93 88 94 default: … … 288 294 289 295 // Make a array read humam 290 // Last acl: 1.073.741.824 296 // Last acl: 2.147.483.648 -> edit users phonephone 297 // Last acl: 4.294.967.296 -> add institutional accounts 298 // Last acl: 8.589.934.592 -> edit institutional accounts 299 // Last acl: 17.179.869.184 -> remove institutional accounts 291 300 function make_array_acl($acl) 292 301 { … … 322 331 "acl_manipulate_corporative_information", 323 332 "acl_edit_users_picture", 324 "acl_edit_scl_email_lists" 333 "acl_edit_scl_email_lists", 334 "acl_edit_users_phonenumber", 335 "acl_add_institutional_accounts", 336 "acl_edit_institutional_accounts", 337 "acl_remove_institutional_accounts" 325 338 ); 326 339 … … 334 347 $bin = '1' . $bin; 335 348 336 $array_acl[$right] = $ acl & bindec($bin);337 } 349 $array_acl[$right] = $this->safeBitCheck(bindec($bin), $acl); 350 } 338 351 return $array_acl; 339 /* 340 $array_acl['acl_add_users'] = $acl & 1; 341 $array_acl['acl_edit_users'] = $acl & 2; 342 $array_acl['acl_delete_users'] = $acl & 4; 343 //8 344 $array_acl['acl_add_groups'] = $acl & 16; 345 $array_acl['acl_edit_groups'] = $acl & 32; 346 $array_acl['acl_delete_groups'] = $acl & 64; 347 $array_acl['acl_change_users_password'] = $acl & 128; 348 $array_acl['acl_add_maillists'] = $acl & 256; 349 $array_acl['acl_edit_maillists'] = $acl & 512; 350 $array_acl['acl_delete_maillists'] = $acl & 1024; 351 //2048 352 $array_acl['acl_create_sectors'] = $acl & 4096; 353 $array_acl['acl_edit_sectors'] = $acl & 8192; 354 $array_acl['acl_delete_sectors'] = $acl & 16384; 355 $array_acl['acl_edit_sambausers_attributes'] = $acl & 32768; 356 $array_acl['acl_view_global_sessions'] = $acl & 65536; 357 $array_acl['acl_view_logs'] = $acl & 131072; 358 $array_acl['acl_change_users_quote'] = $acl & 262144; 359 $array_acl['acl_set_user_default_password'] = $acl & 524288; 360 $array_acl['acl_create_computers'] = $acl & 1048576; 361 $array_acl['acl_edit_computers'] = $acl & 2097152; 362 $array_acl['acl_delete_computers'] = $acl & 4194304; 363 $array_acl['acl_rename_users'] = $acl & 8388608; 364 $array_acl['acl_edit_sambadomains'] = $acl & 16777216; 365 $array_acl['acl_view_users'] = $acl & 33554432; 366 $array_acl['acl_edit_email_groups'] = $acl & 67108864; 367 $array_acl['acl_empty_user_inbox'] = $acl & 134217728; 368 $array_acl['acl_manipulate_corporative_information'] = $acl & 268435456; 369 $array_acl['acl_edit_users_picture'] = $acl & 536870912; 370 return $array_acl; 371 */ 352 } 353 354 function safeBitCheck($number,$comparison) 355 { 356 $binNumber = base_convert($number,10,2); 357 $binComparison = strrev(base_convert($comparison,10,2)); 358 $str = strlen($binNumber); 359 360 if ( ($str <= strlen($binComparison)) && ($binComparison{$str-1}==="1") ) 361 return '1'; 362 else 363 return '0'; 372 364 } 373 365 … … 748 740 } 749 741 742 function lang($key) 743 { 744 if ($_SESSION['phpgw_info']['expressoAdmin']['lang'][$key]) 745 return $_SESSION['phpgw_info']['expressoAdmin']['lang'][$key]; 746 else 747 return $key . '*'; 748 } 750 749 } 751 750
Note: See TracChangeset
for help on using the changeset viewer.