extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-20 09:58:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed group filters

Browse Source
This commit is contained in:
jengo 2000-11-22 04:38:07 +00:00
parent 9d38344e92
commit 1d36311c9f
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addressbook/index.php
View File

@ -38,7 +38,7 @@
$filtermethod = " ab_access like '%,$filter,%' "; $filtermethod = " ab_access like '%,$filter,%' ";
} else { } else {
$filtermethod = " (ab_owner='" . $phpgw_info["user"]["account_id"] ."' OR ab_access='public' " $filtermethod = " (ab_owner='" . $phpgw_info["user"]["account_id"] ."' OR ab_access='public' "
. $phpgw->accounts->sql_search("ab_access") . " ) "; . $phpgw->accounts->sql_search("ab_access") . " ) ";
} }
} else { } else {
$filtermethod = " ab_owner='" . $phpgw_info["user"]["account_id"] . "' "; $filtermethod = " ab_owner='" . $phpgw_info["user"]["account_id"] . "' ";
@ -52,7 +52,7 @@
. "%$query%' OR a.ab_firstname like '%$query%' OR a.ab_email like '%$query%' OR " . "%$query%' OR a.ab_firstname like '%$query%' OR a.ab_email like '%$query%' OR "
. "a.ab_street like '%$query%' OR a.ab_city like '%$query%' OR a.ab_state " . "a.ab_street like '%$query%' OR a.ab_city like '%$query%' OR a.ab_state "
. "like '%$query%' OR a.ab_zip like '%$query%' OR a.ab_notes like " . "like '%$query%' OR a.ab_zip like '%$query%' OR a.ab_notes like "
. "'%$query%' OR c.company_name like '%$query%' OR a.ab_url like '%$query%')"); . "'%$query%' OR c.company_name like '%$query%' OR a.ab_url like '%$query%')",__LINE__,__FILE__);
// . "'%$query%' OR c.company_name like '%$query%')" // . "'%$query%' OR c.company_name like '%$query%')"
// . " $ordermethod limit $limit"); // . " $ordermethod limit $limit");
} else { } else {
@ -62,7 +62,7 @@
. "%$query%' OR ab_firstname like '%$query%' OR ab_email like '%$query%' OR " . "%$query%' OR ab_firstname like '%$query%' OR ab_email like '%$query%' OR "
. "ab_street like '%$query%' OR ab_city like '%$query%' OR ab_state " . "ab_street like '%$query%' OR ab_city like '%$query%' OR ab_state "
. "like '%$query%' OR ab_zip like '%$query%' OR ab_notes like " . "like '%$query%' OR ab_zip like '%$query%' OR ab_notes like "
. "'%$query%' OR ab_company like '%$query%' OR ab_url like '%$query$%')"); . "'%$query%' OR ab_company like '%$query%' OR ab_url like '%$query$%')",__LINE__,__FILE__);
// . "'%$query%' OR ab_company like '%$query%')" // . "'%$query%' OR ab_company like '%$query%')"
// . " $ordermethod limit $limit"); // . " $ordermethod limit $limit");
} }
@ -74,7 +74,7 @@
else else
echo "<br>" . lang("your search returned x matchs",$phpgw->db->f(0)); echo "<br>" . lang("your search returned x matchs",$phpgw->db->f(0));
} else { } else {
$phpgw->db->query("select count(*) from addressbook where $filtermethod"); $phpgw->db->query("select count(*) from addressbook where $filtermethod",__LINE__,__FILE__);
$phpgw->db->next_record(); $phpgw->db->next_record();
} }
if ($phpgw_info["apps"]["timetrack"]["enabled"]) { if ($phpgw_info["apps"]["timetrack"]["enabled"]) {
@ -144,7 +144,7 @@
. "%$query%' OR a.ab_firstname like '%$query%' OR a.ab_email like '%$query%' OR " . "%$query%' OR a.ab_firstname like '%$query%' OR a.ab_email like '%$query%' OR "
. "a.ab_street like '%$query%' OR a.ab_city like '%$query%' OR a.ab_state " . "a.ab_street like '%$query%' OR a.ab_city like '%$query%' OR a.ab_state "
. "like '%$query%' OR a.ab_zip like '%$query%' OR a.ab_notes like " . "like '%$query%' OR a.ab_zip like '%$query%' OR a.ab_notes like "
. "'%$query%' OR c.company_name like '%$query%') $ordermethod limit $limit"); . "'%$query%' OR c.company_name like '%$query%') $ordermethod limit $limit",__LINE__,__FILE__);
} else { } else {
$phpgw->db->query("SELECT ab_id,ab_owner,ab_firstname,ab_lastname," $phpgw->db->query("SELECT ab_id,ab_owner,ab_firstname,ab_lastname,"
. "ab_email,ab_wphone,ab_company " . "ab_email,ab_wphone,ab_company "
@ -153,16 +153,16 @@
. "%$query%' OR ab_firstname like '%$query%' OR ab_email like '%$query%' OR " . "%$query%' OR ab_firstname like '%$query%' OR ab_email like '%$query%' OR "
. "ab_street like '%$query%' OR ab_city like '%$query%' OR ab_state " . "ab_street like '%$query%' OR ab_city like '%$query%' OR ab_state "
. "like '%$query%' OR ab_zip like '%$query%' OR ab_notes like " . "like '%$query%' OR ab_zip like '%$query%' OR ab_notes like "
. "'%$query%' OR ab_company like '%$query%') $ordermethod limit $limit"); . "'%$query%' OR ab_company like '%$query%') $ordermethod limit $limit",__LINE__,__FILE__);
} }
} else { } else {
if ($phpgw_info["apps"]["timetrack"]["enabled"]){ if ($phpgw_info["apps"]["timetrack"]["enabled"]){
$phpgw->db->query("SELECT a.ab_id,a.ab_owner,a.ab_firstname,a.ab_lastname," $phpgw->db->query("SELECT a.ab_id,a.ab_owner,a.ab_firstname,a.ab_lastname,"
. "a.ab_email,a.ab_wphone,c.company_name " . "a.ab_email,a.ab_wphone,c.company_name "
. "from addressbook as a, customers as c where a.ab_company_id = c.company_id " . "from addressbook as a, customers as c where a.ab_company_id = c.company_id "
. "AND $filtermethod $ordermethod limit $limit"); . "AND $filtermethod $ordermethod limit $limit",__LINE__,__FILE__);
} else { } else {
$phpgw->db->query("SELECT * from addressbook WHERE $filtermethod $ordermethod limit $limit"); $phpgw->db->query("SELECT * from addressbook WHERE $filtermethod $ordermethod limit $limit",__LINE__,__FILE__);
} }
} // else $query } // else $query

1
doc/CHANGELOG
View File

@ -17,6 +17,7 @@
- Fixed nextmatchs calling link() wrong causing the next pages to not be displayed. - Fixed nextmatchs calling link() wrong causing the next pages to not be displayed.
- Removed javascript from the login template - Removed javascript from the login template
- Fixed HTML error in the application status select box for admin -> new/edit application - Fixed HTML error in the application status select box for admin -> new/edit application
- Fixed group public filters in addressbook and todo list
[0.9.3] - Fixed the new user account form not returning the users firstname or last name when an [0.9.3] - Fixed the new user account form not returning the users firstname or last name when an
error is reported. error is reported.