Changeset 8234
- Timestamp:
- 10/09/13 12:01:22 (10 years ago)
- Location:
- sandbox/2.5.1-evolucao
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.5.1-evolucao/expressoAdmin1_2/inc/class.functions.inc.php
r8231 r8234 48 48 function check_acl($account_lid, $access) 49 49 { 50 51 52 $array_acl = $this->db_functions->read_acl($account_lid); 53 50 $array_acl = $this->db_functions->read_acl($account_lid); 54 51 switch($access) 55 52 { 56 case list_users:53 case 'list_users': 57 54 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'] ) 58 55 return true; 59 56 break; 60 case list_groups:57 case 'list_groups': 61 58 if ($array_acl['acl_add_groups'] || $array_acl['acl_edit_groups'] || $array_acl['acl_delete_groups']) 62 59 return true; 63 60 break; 64 case list_maillists:61 case 'list_maillists': 65 62 if ($array_acl['acl_add_maillists'] || $array_acl['acl_edit_maillists'] || $array_acl['acl_delete_maillists']) 66 63 return true; 67 64 break; 68 case list_sectors:65 case 'list_sectors': 69 66 if ($array_acl['acl_create_sectors'] || $array_acl['acl_edit_sectors'] || $array_acl['acl_delete_sectors']) 70 67 return true; 71 68 break; 72 case list_computers:69 case 'list_computers': 73 70 if ($array_acl['acl_create_computers'] || $array_acl['acl_edit_computers'] || $array_acl['acl_delete_computers']) 74 71 return true; 75 72 break; 76 73 77 case display_groups:74 case 'display_groups': 78 75 if ( $array_acl['acl_edit_users'] || $array_acl['acl_view_users'] || ($array_acl['acl_edit_sambausers_attributes'] && ($this->current_config['expressoAdmin_samba_support'] == 'true')) ) 79 76 return true; 80 77 break; 81 case display_emailconfig:78 case 'display_emailconfig': 82 79 if ($array_acl['acl_edit_users'] || $array_acl['acl_view_users']) 83 80 return true; 84 81 break; 85 case display_applications:82 case 'display_applications': 86 83 if ($array_acl['acl_edit_users'] || $array_acl['acl_view_users']) 87 84 return true; 88 85 break; 89 case display_emaillists:86 case 'display_emaillists': 90 87 if ($array_acl['acl_edit_users'] || $array_acl['acl_view_users']) 91 88 return true; 92 89 break; 93 90 94 case list_institutional_accounts:91 case 'list_institutional_accounts': 95 92 if ($array_acl['acl_add_institutional_accounts'] || $array_acl['acl_edit_institutional_accounts'] || $array_acl['acl_delete_institutional_accounts']) 96 93 return true; 97 98 case list_shared_accounts:94 break; 95 case 'list_shared_accounts': 99 96 if ($array_acl['acl_add_shared_accounts'] || $array_acl['acl_edit_shared_accounts'] || $array_acl['acl_delete_shared_accounts']) 100 97 return true; 101 98 break; 102 case configurations:99 case 'configurations': 103 100 if ($array_acl['acl_active_blocking_sending_email_to_shared_accounts'] || $array_acl['acl_add_blocking_sending_email_to_shared_accounts_exception'] || $array_acl['acl_edit_and_remove_blocking_sending_email_to_shared_accounts_exception'] || $array_acl['acl_edit_maximum_number_of_recipients_generally'] || $array_acl['acl_add_maximum_number_of_recipients_by_user'] || $array_acl['acl_edit_and_remove_maximum_number_of_recipients_by_user'] || $array_acl['acl_add_maximum_number_of_recipients_by_group'] || $array_acl['acl_edit_and_remove_maximum_number_of_recipients_by_group']) 104 101 return true; 105 102 break; 106 case messages_size:103 case 'messages_size': 107 104 if($array_acl['acl_add_messages_size_rule'] || $array_acl['acl_edit_messages_size_rule'] || $array_acl['acl_remove_messages_size_rule']) 108 105 return true; 109 106 break; 110 111 107 default: 112 108 return $array_acl["acl_$access"]; -
sandbox/2.5.1-evolucao/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r8197 r8234 681 681 $uid = $params['uid']; 682 682 $mail = $params['mail']; 683 $mailalternateaddress = $params['mailalternateaddress'];683 $mailalternateaddress = isset($params['mailalternateaddress']) ? $params['mailalternateaddress'] : ''; 684 684 $cpf = $params['cpf']; 685 685 686 if ( $_SESSION['phpgw_info']['expresso']['global_denied_users'][$uid])686 if (isset($_SESSION['phpgw_info']['expresso']['global_denied_users'][$uid])) 687 687 { 688 688 $result['status'] = false; … … 896 896 } 897 897 } 898 else if ( $this->current_config['expressoAdmin_cpf_obligation'])898 else if (isset($this->current_config['expressoAdmin_cpf_obligation']) && $this->current_config['expressoAdmin_cpf_obligation']) 899 899 { 900 900 $result['status'] = false; … … 2175 2175 $search = ldap_search($this->ldap,$context, $filter, $justthese); 2176 2176 $entry = ldap_get_entries($this->ldap, $search); 2177 return $entry[0]['associateddomain'][0];2177 return ( ($entry['count'] > 0) ? $entry[0]['associateddomain'][0] : $entry); 2178 2178 } 2179 2179 -
sandbox/2.5.1-evolucao/phpgwapi/inc/class.db.inc.php
r1738 r8234 209 209 $GLOBALS[ 'phpgw' ]->ADOdb = NULL; 210 210 } 211 212 211 if (!is_object($GLOBALS['phpgw']->ADOdb) || // we have no connection so far 213 (is _object($GLOBALS['phpgw']->db) && // we connect to a different db, then the global one212 (isset($GLOBALS['phpgw']->db) && is_object($GLOBALS['phpgw']->db) && // we connect to a different db, then the global one 214 213 ($this->Type != $GLOBALS['phpgw']->db->Type || 215 214 $this->Database != $GLOBALS['phpgw']->db->Database ||
Note: See TracChangeset
for help on using the changeset viewer.