Changeset 367 for trunk/phpgwapi/inc
- Timestamp:
- 07/24/08 14:24:33 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/phpgwapi/inc/class.accounts_ldap.inc.php
r2 r367 39 39 { 40 40 $this->ds = $GLOBALS['phpgw']->common->ldapConnect(); 41 if(!$this->ds) 42 $this->ds = $GLOBALS['phpgw']->common->ldapConnect(); 41 43 if(!@is_object($GLOBALS['phpgw']->translation)) 42 44 { … … 54 56 if(($acct_type == 'g') && $this->group_context) 55 57 { 56 $sri = ldap_search($this->ds, $this->user_context, ("(&(gidnumber=" . (int)$this->account_id.")(phpgwaccounttype=g))")); 57 } 58 else 59 { 60 $sri = ldap_search($this->ds, $this->group_context, ("(&(uidnumber=" . (int)$this->account_id.")(phpgwaccounttype=u))")); 61 } 58 $sri = @ldap_search($this->ds, $this->user_context, ("(&(gidnumber=" . (int)$this->account_id.")(phpgwaccounttype=g))")); 59 } 60 else 61 { 62 $sri = @ldap_search($this->ds, $this->group_context, ("(&(uidnumber=" . (int)$this->account_id.")(phpgwaccounttype=u))")); 63 } 64 if(!$sri) 65 return null; 62 66 $allValues = ldap_get_entries($this->ds, $sri); 63 67 … … 607 611 { 608 612 $allValues = array(); 609 $sri = ldap_search($this->ds, $this->group_context, '(&(gidnumber=' . (int)$account_id . ')(phpgwaccounttype=g))'); 613 $sri = @ldap_search($this->ds, $this->group_context, '(&(gidnumber=' . (int)$account_id . ')(phpgwaccounttype=g))'); 614 if(!$sri) 615 return False; 610 616 $allValues = ldap_get_entries($this->ds, $sri); 611 617 … … 626 632 627 633 $allValues = array(); 628 $sri = ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(phpgwaccounttype=u))'); 634 $sri = @ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(phpgwaccounttype=u))'); 635 if(!$sri) 636 return False; 629 637 $allValues = ldap_get_entries($this->ds, $sri); 630 638 … … 639 647 { 640 648 $allValues = array(); 641 $sri = ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(phpgwaccounttype=u))'); 649 $sri = @ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(phpgwaccounttype=u))'); 650 if(!$sri) 651 return False; 642 652 $allValues = ldap_get_entries($this->ds, $sri); 643 653 … … 648 658 649 659 $allValues = array(); 650 $sri = ldap_search($this->ds, $this->group_context, '(&(gidnumber=' . (int)$account_id . ')(phpgwaccounttype=g))'); 660 $sri = @ldap_search($this->ds, $this->group_context, '(&(gidnumber=' . (int)$account_id . ')(phpgwaccounttype=g))'); 661 if(!$sri) 662 return False; 651 663 $allValues = ldap_get_entries($this->ds, $sri); 652 664 … … 695 707 if ($acct_type == 'g' && $this->group_context) 696 708 { 697 $sri = ldap_search($this->ds, $this->group_context, $ldapgroup . '=' . $account); 709 $sri = @ldap_search($this->ds, $this->group_context, $ldapgroup . '=' . $account); 710 if(!$sri) 711 return False; 698 712 $groups = ldap_get_entries($this->ds, $sri); 699 713 } 700 $sri = ldap_search($this->ds, $this->user_context, $ldapacct . '=' . $account); 714 $sri = @ldap_search($this->ds, $this->user_context, $ldapacct . '=' . $account); 715 if(!$sri) 716 return False; 701 717 $users = ldap_get_entries($this->ds, $sri); 702 718 … … 742 758 if($account_info['account_type'] == 'g') 743 759 { 744 $sri = ldap_search($this->ds, $this->group_context, 'cn=' . (string)$account_info['account_lid']); 745 } 746 else 747 { 748 $sri = ldap_search($this->ds, $this->user_context, 'uid=' . (string)$account_info['account_lid']); 749 } 760 $sri = @ldap_search($this->ds, $this->group_context, 'cn=' . (string)$account_info['account_lid']); 761 } 762 else 763 { 764 $sri = @ldap_search($this->ds, $this->user_context, 'uid=' . (string)$account_info['account_lid']); 765 } 766 if(!$sri) 767 return False; 750 768 $allValues = ldap_get_entries($this->ds, $sri); 751 769 … … 1069 1087 if(($acct_type == 'g') && $this->group_context) 1070 1088 { 1071 $sri = ldap_search($this->ds, $this->group_context, '(&(gidnumber=' . (int)$account_id . ')(phpgwAccountType=g))'); 1072 } 1073 else 1074 { 1075 $sri = ldap_search($this->ds, $this->user_context, 'uidnumber=' . (int)$account_id); 1076 } 1089 $sri = @ldap_search($this->ds, $this->group_context, '(&(gidnumber=' . (int)$account_id . ')(phpgwAccountType=g))'); 1090 } 1091 else 1092 { 1093 $sri = @ldap_search($this->ds, $this->user_context, 'uidnumber=' . (int)$account_id); 1094 } 1095 if(!$sri) 1096 return False; 1077 1097 $allValues = ldap_get_entries($this->ds, $sri); 1078 1098 … … 1096 1116 $_account_id = get_account_id($_accountid); 1097 1117 1098 $sri = ldap_search($this->ds, $this->user_context, 'uidnumber=' . (int)$_account_id); 1118 $sri = @ldap_search($this->ds, $this->user_context, 'uidnumber=' . (int)$_account_id); 1119 if(!$sri) 1120 return False; 1099 1121 $allValues = ldap_get_entries($this->ds, $sri); 1100 1122 … … 1130 1152 { 1131 1153 $allValues = array(); 1132 $sri = ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(phpgwaccounttype=u))'); 1154 $sri = @ldap_search($this->ds, $this->user_context, '(&(uidnumber=' . (int)$account_id . ')(phpgwaccounttype=u))'); 1155 if(!$sri) 1156 return False; 1133 1157 $allValues = ldap_get_entries($this->ds, $sri); 1134 1158 if (@$allValues[0]['cn'][0]) … … 1142 1166 { 1143 1167 $allValues = array(); 1144 $sri = ldap_search($this->ds, $this->user_context, '(&(mail=' . $mail . ')(phpgwaccounttype=u))'); 1168 $sri = @ldap_search($this->ds, $this->user_context, '(&(mail=' . $mail . ')(phpgwaccounttype=u))'); 1169 if(!$sri) 1170 return False; 1145 1171 $allValues = ldap_get_entries($this->ds, $sri); 1146 1172 if (@$allValues[0]['cn'][0])
Note: See TracChangeset
for help on using the changeset viewer.