Changeset 585
- Timestamp:
- 01/08/09 16:35:48 (15 years ago)
- Location:
- trunk/expressoAdmin1_2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/access_denied.php
r309 r585 20 20 21 21 $var = Array( 22 'lang_access_denied' => lang('You do nt have access to this module.'),22 'lang_access_denied' => lang('You do not have access to this module') . '.', 23 23 'lang_back' => lang('Back'), 24 24 'back_url' => $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php') -
trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r540 r585 76 76 */ 77 77 78 // Este if é para utilizar o master. (para replicação) 78 79 if ( (!empty($GLOBALS['phpgw_info']['server']['ldap_master_host'])) && ($ldap_connection = ldap_connect($GLOBALS['phpgw_info']['server']['ldap_master_host'])) ) 79 80 { … … 905 906 if (ldap_errno($ldapMasterConnect) == '50') 906 907 { 907 908 $return['msg'] = $this->functions->lang('You do not have right to create institutional accounts') . "."; 909 910 $result['msg'] = $this->functions->lang('Error on the function') . ' ldap_functions->add_user2maillist' . ".\n" . 908 $result['msg'] = $this->functions->lang('Error on the function') . ' ldap_functions->remove_user2maillist' . ".\n" . 911 909 $this->functions->lang('The user used for record on LPDA, must have write access') . ".\n"; 912 910 $this->functions->lang('The user') . ' ' . $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['acc'] . ' ' . $this->functions->lang('does not have this access') . ".\n"; … … 914 912 } 915 913 else 916 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions-> add_user2maillist ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($ldapMasterConnect);914 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->remove_user2maillist ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($ldapMasterConnect); 917 915 } 918 916 ldap_close($ldapMasterConnect); … … 1947 1945 { 1948 1946 $result['status'] = false; 1949 $result['msg'] = $this->functions->lang('Error in function') . ' ldap_functions->create_institutional_accounts';1947 $result['msg'] = $this->functions->lang('Error on function') . ' ldap_functions->create_institutional_accounts'; 1950 1948 $result['msg'] .= "\n" . $this->functions->lang('Server return') . ': ' . ldap_error($this->ldap); 1951 1949 } -
trunk/expressoAdmin1_2/inc/class.maillist.inc.php
r493 r585 252 252 { 253 253 sort($add_users); 254 $result = $this->ldap_functions->add_user2maillist($new_values['uid'], $add_users); 255 256 /* log */ 257 if (!$result['status']) 258 { 259 $return['status'] = false; 260 $return['msg'] .= $result['msg']; 254 $result_add_users = $this->ldap_functions->add_user2maillist($new_values['uid'], $add_users); 255 256 if (!$result_add_users['status']) 257 { 258 $return['status'] = false; 259 $return['msg'] .= $result_add_users['msg']; 261 260 } 262 261 else … … 272 271 { 273 272 sort($remove_users); 274 $result = $this->ldap_functions->remove_user2maillist($new_values['uid'], $remove_users); 275 276 /* log */ 277 if (!$result['status']) 278 { 279 $return['status'] = false; 280 $return['msg'] .= $result['msg']; 273 $result_remove_users = $this->ldap_functions->remove_user2maillist($new_values['uid'], $remove_users); 274 275 if (!$result_remove_users['status']) 276 { 277 $return['status'] = false; 278 $return['msg'] .= $result_remove_users['msg']; 281 279 } 282 280 else
Note: See TracChangeset
for help on using the changeset viewer.