extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-22 13:58:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better ldap filtering (GNU Bug# 100340)

Browse Source
This commit is contained in:
Miles Lott 2002-04-24 12:15:31 +00:00
parent b5daa8dadd
commit 30e832e992
2 changed files with 129 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
phpgwapi/inc/class.contacts_ldap.inc.php
View File

@ -371,10 +371,12 @@
/* this was not listing private entries when show all was selected */ /* this was not listing private entries when show all was selected */
/* $filterfields += array('phpgwcontactaccess' => 'public'); */ /* $filterfields += array('phpgwcontactaccess' => 'public'); */
$grants = $this->grants; $grants = $this->grants;
while(list($user) = each($grants)) if ($DEBUG) { echo '<br>DEBUG - My user id is: ' . $this->account_id; }
while (list($user) = each($grants))
{ {
if($DEBUG) { echo '<br>DEBUG - Grant from owner: '.$user; } if ($DEBUG) { echo '<br>DEBUG - Grant from owner: '.$user; }
$filterfields += array('phpgwcontactowner' => $user); /* I know this looks silly... */
@$filterfields['phpgwcontactowner'][] = array('phpgwcontactowner' => $user);
} }
} }
/* /*
@ -401,49 +403,28 @@
echo "<br>DEBUG - ORDER by $order"; echo "<br>DEBUG - ORDER by $order";
} }
$ldap_fields = array();
$myfilter = '';
if($query) if($query)
{ {
$ldap_fields = array();
$total = 0;
reset($this->stock_contact_fields); reset($this->stock_contact_fields);
$lquery = '(&(|'; /* $lquery = '(|'; */ $myfilter = $this->makefilter($filterfields,$this->stock_contact_fields,$query,$DEBUG);
while(list($name,$value) = each($this->stock_contact_fields) )
{
$lquery .= '(' . $value . '=*' . $query . '*)';
}
$lquery .= ')(phpgwcontactowner=*))'; /* $lquery .= ')'; */
/* echo $lquery; exit; */
$sri = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_contact_context'], "$lquery");
/* append the results */
$ldap_fields += ldap_get_entries($this->ldap, $sri);
/* add the # rows to our total */
$total = $total + ldap_count_entries($this->ldap, $sri);
/* _debug_array($ldap_fields);exit; */
if($filterfields)
{
$ldap_fields = $this->filter_ldap($ldap_fields,$filterfields,$DEBUG);
}
$this->total_records = count($ldap_fields);
/* echo '<br>total="'.$this->total_records.'"'; */
} }
else else
{ {
$sri = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_contact_context'], 'phpgwcontactowner=*'); $myfilter = $this->makefilter($filterfields,'','',$DEBUG);
$ldap_fields = ldap_get_entries($this->ldap, $sri);
$this->total_records = ldap_count_entries($this->ldap, $sri);
if($filterfields)
{
$ldap_fields = $this->filter_ldap($ldap_fields,$filterfields,$DEBUG);
}
} }
$sri = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_contact_context'], $myfilter);
$ldap_fields = ldap_get_entries($this->ldap, $sri);
/* _debug_array($ldap_fields);exit; */
$this->total_records = ldap_count_entries($this->ldap, $sri);
/* echo '<br>total="'.$this->total_records.'"'; */
if($DEBUG) { echo '<br>Query returned "'.$this->total_records.'" records.'; }
/* Use shared sorting routines, based on sort and order */ /* Use shared sorting routines, based on sort and order */
if($sort == 'ASC') if($sort == 'ASC')
{ {
@ -515,6 +496,116 @@
return $return_fields; return $return_fields;
} }
/* Used by read() above to build the ldap filter string */
function makefilter($qarray,$extra='',$query='', $DEBUG=False)
{
if(!is_array($qarray))
{
return $qarray;
}
if(is_array($extra))
{
if($DEBUG) { echo '<br>Searching...'; }
reset($extra);
while(list($name,$value) = each($extra))
{
$qarray[] = array($value => $query);
}
}
elseif($extra)
{
$tmp = split('=',$extra);
$qarray[] = array($tmp[0] => $tmp[1]);
}
@ksort($qarray);
$aquery = '(&';
$oquery = '(|';
$hasor = False;
while(list($name,$value) = @each($qarray))
{
if(is_array($value))
{
while(list($x,$y) = each($value))
{
if($y == '*')
{
$oquery .= '(' . $x . '=*)';
$hasor = True;
}
elseif(is_array($y))
{
/* This was most likely created from acl grants in read() above */
while(list($a,$b) = each($y))
{
$tmp .= '(' . $a . '=' . $b . ')';
}
}
else
{
$oquery .= '(' . $x . '=*' . $y . '*)';
$hasor = True;
}
}
}
elseif($value == $query)
{
/* searching */
$oquery .= '(' . $name . '=*' . $value . '*)';
$hasor = True;
}
else
{
/* exact value (filtering based on tid, etc...) */
if($name == $lastname)
{
$aquery .= '(' . $name . '=' . $value . ')';
}
else
{
$aquery .= '(' . $name . '=' . $value . ')';
}
}
if($tmp)
{
if(strstr($tmp,')('))
{
$aquery .= '(|' . $tmp . ')';
}
else
{
$aquery .= $tmp;
}
unset($tmp);
}
}
$aquery .= ')';
$oquery .= ')';
if(!$hasor)
{
$oquery = '';
$fquery = $aquery;
}
else
{
$fquery = '(&' . $aquery . $oquery . ')';
}
if($DEBUG)
{
echo '<br>AND query: "' . $aquery . '"';
echo '<br>OR query: "' . $oquery . '"';
echo '<br>Full query: "' . $fquery . '"';
echo '<br>Will search in "' . $GLOBALS['phpgw_info']['server']['ldap_contact_context'] . '"';
}
return $fquery;
}
function add($owner,$fields,$access='private',$cat_id='0',$tid='n') function add($owner,$fields,$access='private',$cat_id='0',$tid='n')
{ {
$tid = $fields['tid'] ? trim($fields['tid']) : $tid; $tid = $fields['tid'] ? trim($fields['tid']) : $tid;

92
phpgwapi/inc/class.contacts_shared.inc.php
View File

@ -197,98 +197,6 @@
return ($sortarray); return ($sortarray);
} }
function filter_ldap($ldap_fields,$filterfields,$DEBUG=0)
{
$match = 0;
if($DEBUG) { echo '<br>'; }
for($i=0;$i<count($ldap_fields);$i++)
{
$yes = True;
if($ldap_fields[$i]['uidnumber'][0])
{
reset($filterfields);
while(list($col,$filt) = each($filterfields))
{
if($col == 'phpgwcontactcatid')
{
$colarray = explode(',',$ldap_fields[$i][$col][0]);
if($colarray[1])
{
while(list($key,$val) = each ($colarray))
{
if($DEBUG) { echo '&nbsp;&nbsp;Testing "'.$col.'" for "'.$val.'"'; }
if($val == $filt)
{
if($DEBUG) { echo ', and number '.$ldap_fields[$i]['uidnumber'][0].' matched.'.'&nbsp;&nbsp;'; }
$yes &= True;
$match++;
break;
}
}
}
else
{
if($DEBUG) { echo '&nbsp;&nbsp;Testing "'.$col.'" for "'.$filt.'"'; }
if($ldap_fields[$i][$col][0] == $filt)
{
if($DEBUG) { echo ', and number '.$ldap_fields[$i]['uidnumber'][0].' matched.'.'&nbsp;&nbsp;'; }
$yes &= True;
$match++;
}
else
{
if($DEBUG) { echo ', but number '.$ldap_fields[$i]['uidnumber'][0].' did not match.'.'&nbsp;&nbsp;'; }
$yes &= False;
$match--;
}
}
}
else
{
if($DEBUG) { echo '&nbsp;&nbsp;Testing "'.$col.'" for "'.$filt.'"'; }
if($ldap_fields[$i][$col][0] == $filt)
{
if($DEBUG) { echo ', and number '.$ldap_fields[$i]['uidnumber'][0].' matched.'.'&nbsp;&nbsp;'; }
$yes &= True;
$match++;
}
else
{
if($DEBUG) { echo ', but number '.$ldap_fields[$i]['uidnumber'][0].' did not match.'.'&nbsp;&nbsp;'; }
$yes &= False;
$match--;
}
}
}
if($yes)
{
if($DEBUG) { echo $ldap_fields[$i]['uidnumber'][0].' matched all!'.'<br>'; }
$new_ldap[] = $ldap_fields[$i];
}
else
{
if($DEBUG) { echo $ldap_fields[$i]['uidnumber'][0].' did not match all.'.'<br>'; }
}
}
}
if($DEBUG)
{
if($match)
{
echo '<br>'.$match.' total matches.'."\n";
}
else
{
echo '<br>No matches :('."\n";
}
}
$this->total_records = count($new_ldap);
return $new_ldap;
}
function formatted_address($id, $business = True, $afont = '', $asize = '2') function formatted_address($id, $business = True, $afont = '', $asize = '2')
{ {
$t = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook')); $t = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('addressbook'));