extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed db selection to work with ttracker

Browse Source
This commit is contained in:
bettina 2000-12-08 17:25:51 +00:00
parent 447abe485b
commit 7647221d96
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addressbook/index.php
View File

@ -137,7 +137,7 @@
if (isset($query) && $query) { if (isset($query) && $query) {
if (isset($phpgw_info["apps"]["timetrack"]["enabled"]) && if (isset($phpgw_info["apps"]["timetrack"]["enabled"]) &&
$phpgw_info["apps"]["timetrack"]["enabled"]) { $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_company_id,"
. "a.ab_email,a.ab_wphone,c.company_name,a.ab_hphone,a.ab_fax,a.ab_mphone " . "a.ab_email,a.ab_wphone,c.company_name,a.ab_hphone,a.ab_fax,a.ab_mphone "
. "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 AND (a.ab_lastname like '" . "AND $filtermethod AND (a.ab_lastname like '"
@ -170,8 +170,8 @@
$ab_id = $phpgw->db->f("ab_id"); $ab_id = $phpgw->db->f("ab_id");
while ($column = each($columns_to_display)) { while ($column = each($columns_to_display)) {
if ($phpgw_info["apps"]["timetrack"]["enabled"]) {
if ($column[0] == "company") { if ($column[0] == "company") {
if ($phpgw_info["apps"]["timetrack"]["enabled"]) {
$field = $phpgw->db->f("company_name"); $field = $phpgw->db->f("company_name");
} else { } else {
$field = $phpgw->db->f("ab_company"); $field = $phpgw->db->f("ab_company");
@ -180,7 +180,19 @@
$field = $phpgw->db->f("ab_" . $column[0]); $field = $phpgw->db->f("ab_" . $column[0]);
} }
$field = $phpgw->strip_html($field); /*
while ($column = each($columns_to_display)) {
if ($phpgw_info["apps"]["timetrack"]["enabled"]) {
if ($column[0] == "company") {
$field = $phpgw->db->f("company_name");
} else {
$field = $phpgw->db->f("ab_company");
}
} else {
$field = $phpgw->db->f("ab_" . $column[0]);
} */
$field = htmlentities($field);
// Some fields require special formating. // Some fields require special formating.
if ($column[0] == "url") { if ($column[0] == "url") {