extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some more filtering fixes, I hope

Browse Source
This commit is contained in:
Miles Lott 2001-03-26 02:00:47 +00:00
parent 8fa2ccd754
commit 7b2ab4f697
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addressbook/inc/class.contacts_sql.inc.php
View File

@ -295,6 +295,16 @@
// turn filter's a=b,c=d OR a=b into an array
if ($filter) {
$extra_stock = array(
'id' => 'id',
'tid' => 'tid',
'lid' => 'lid',
'owner' => 'owner',
'access' => 'access',
'cat_id' => 'cat_id'
);
$check_stock = $this->stock_contact_fields + $extra_stock;
if ($DEBUG) { echo "DEBUG - Inbound filter is: #".$filter."#"; }
$filterarray = split(',',$filter);
if ($filterarray[1]) {
@ -323,7 +333,6 @@
$isstd=0;
if ($name && empty($value)) {
if ($DEBUG) { echo "<br>DEBUG - filter field '".$name."' is empty (NULL)"; }
$check_stock = $this->stock_contact_fields + array('id' => 'id', 'tid' => 'tid', 'lid' => 'lid', 'owner' => 'owner', 'cat_id' => 'cat_id');
while (list($fname,$fvalue)=each($check_stock)) {
if ($fvalue==$name) {
$filterlist .= $name.' is NULL,';
@ -332,8 +341,8 @@
}
}
} elseif($name && $value) {
reset($stock_fields);
while (list($fname,$fvalue)=each($stock_fields)) {
reset($check_stock);
while (list($fname,$fvalue)=each($check_stock)) {
if ($fvalue==$name) {
if (gettype($value) == "integer") {
$filterlist .= $name."=".$value.",";

2
addressbook/inc/functions.inc.php
View File

@ -170,7 +170,7 @@
}
}
function addressbook_add_entry($userid,$fields,$access,$cat_id) {
function addressbook_add_entry($userid,$fields,$access='',$cat_id='') {
global $this,$rights;
if ($rights & PHPGW_ACL_ADD) {
$this->add($userid,$fields,$access,$cat_id);