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

cosmetic changes due to funny if syntax..cosmetic changes due to funny if syntax....

Browse Source
This commit is contained in:
jerrywestrick 2001-08-06 16:50:20 +00:00
parent 095bc09403
commit 532726692c
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
admin/inc/class.solog.inc.php
View File

@ -79,7 +79,7 @@
function get_error_e($parms) function get_error_e($parms)
{ {
// Fixed From // Fixed From
if ($parms['from'] == '') if (!isset($parms['from']))
{ {
$parms['from'] = array('phpgw_accounts'); $parms['from'] = array('phpgw_accounts');
} }
@ -89,7 +89,7 @@
} }
// Fix Where // Fix Where
if ($parms['where'] == '') if (!isset($parms['where']))
{ {
$parms['where'] = array('phpgw_log.log_user = phpgw_accounts.account_id'); $parms['where'] = array('phpgw_log.log_user = phpgw_accounts.account_id');
} }
@ -99,7 +99,7 @@
} }
// Fix Default Fields // Fix Default Fields
if ($parms['fields'] == '') if (!isset($parms['fields']))
{ {
$parms['fields'] = $this->get_error_cols_e(); $parms['fields'] = $this->get_error_cols_e();
} }
@ -116,7 +116,7 @@
// Build From_Clause // Build From_Clause
$from_clause = 'FROM phpgw_log, phpgw_log_msg '; $from_clause = 'FROM phpgw_log, phpgw_log_msg ';
if ($from != '') if (isset($from))
{ {
$from[] = 'phpgw_log'; $from[] = 'phpgw_log';
$from[] = 'phpgw_log_msg'; $from[] = 'phpgw_log_msg';
@ -125,7 +125,7 @@
// Build Where_Clause // Build Where_Clause
$where_clause = 'WHERE phpgw_log.log_id = phpgw_log_msg.log_msg_log_id '; $where_clause = 'WHERE phpgw_log.log_id = phpgw_log_msg.log_msg_log_id ';
if ($where != '') if (isset($where))
{ {
$where[] = 'phpgw_log.log_id = phpgw_log_msg.log_msg_log_id'; $where[] = 'phpgw_log.log_id = phpgw_log_msg.log_msg_log_id';
$where_clause = 'WHERE ' . implode(' AND ',$where) . ' '; $where_clause = 'WHERE ' . implode(' AND ',$where) . ' ';
@ -133,22 +133,22 @@
// Build Order_By_Clause // Build Order_By_Clause
$orderby_clause = 'Order By phpgw_log.log_id, phpgw_log_msg.log_msg_seq_no '; $orderby_clause = 'Order By phpgw_log.log_id, phpgw_log_msg.log_msg_seq_no ';
if ($orderby != '') if (isset($orderby))
{ {
$orderby_clause = 'Order By ' . implode(', ',$orderby); $orderby_clause = 'Order By ' . implode(', ',$orderby);
} }
// If no Fields specified default to * // If no Fields specified default to *
if ($fields == '') if (!isset($fields))
{ {
$fields = $this->error_cols; $fields = $this->error_cols();
} }
$rows = array(); $rows = array();
$rowno = 0;
// Do Select // Do Select
$this->db->query("select ". implode(', ',array_keys($fields)).' '.$from_clause.$where_clause.$orderby_clause,__LINE__,__FILE__); $select = "select ". implode(', ',array_keys($fields)).' '.$from_clause.$where_clause.$orderby_clause;
$this->db->query($select,__LINE__,__FILE__);
while($this->db->next_record()) while($this->db->next_record())
{ {
reset($fields); reset($fields);
@ -156,8 +156,7 @@
{ {
$this_row[$fname] = $this->db->f($fname); $this_row[$fname] = $this->db->f($fname);
}; };
$rows[$rowno] = $this_row; $rows[] = $this_row;
$rowno++;
}; };
return $rows; return $rows;
} }