holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reworked infolog so-layer to use new db-functions to allow updates under MaxDB

Browse Source
This commit is contained in:
Ralf Becker 2004-09-19 16:15:53 +00:00
parent 35ef5df8a3
commit bd15c88efb
2 changed files with 123 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
infolog/inc/class.soinfolog.inc.php
View File

@ -27,6 +27,8 @@
var $grants;
var $data = array( );
var $user;
var $info_table = 'phpgw_infolog';
var $extra_table = 'phpgw_infolog_extra';
/*!
@function soinfolog
@ -35,6 +37,7 @@
function soinfolog( $info_id = 0)
{
$this->db = $GLOBALS['phpgw']->db;
$this->db->set_app('infolog');
$this->grants = $GLOBALS['phpgw']->acl->get_grants('infolog');
$this->user = $GLOBALS['phpgw_info']['user']['account_id'];
@ -265,7 +268,7 @@
$info_id = intval($info_id);
if ($info_id <= 0 || $info_id != $this->data['info_id'] &&
(!$this->db->query("select * FROM phpgw_infolog WHERE info_id=$info_id",__LINE__,__FILE__) ||
(!$this->db->select($this->info_table,'*',array('info_id'=>$info_id),__LINE__,__FILE__) ||
!$this->db->next_record()))
{
$this->init( );
@ -275,7 +278,7 @@
{
$this->db2data($this->data);
$this->db->query("SELECT info_extra_name,info_extra_value FROM phpgw_infolog_extra WHERE info_id=$info_id",__LINE__,__FILE__);
$this->db->select($this->extra_table,'info_extra_name,info_extra_value',array('info_id'=>$info_id),__LINE__,__FILE__);
while ($this->db->next_record())
{
$this->data['#'.$this->db->f(0)] = $this->db->f(1);
@ -295,12 +298,12 @@
function delete($info_id,$delete_children=True,$new_parent=0) // did _not_ ensure ACL
{
//echo "<p>soinfolog::delete($info_id,'$delete_children',$new_parent)</p>\n";
if (($info_id = intval($info_id)) <= 0)
if ((int) $info_id <= 0)
{
return;
}
$this->db->query("DELETE FROM phpgw_infolog WHERE info_id=$info_id",__LINE__,__FILE__);
$this->db->query("DELETE FROM phpgw_infolog_extra WHERE info_id=$info_id");
$this->db->delete($this->info_table,array('info_id'=>$info_id),__LINE__,__FILE__);
$this->db->delete($this->extra_table,array('info_id'=>$info_id),__LINE__,__FILE__);
$this->links->unlink(0,'infolog',$info_id);
if ($this->data['info_id'] == $info_id)
@ -311,15 +314,17 @@
if ($delete_children)
{
$db2 = $this->db; // we need an extra result-set
$db2->query("SELECT info_id FROM phpgw_infolog WHERE info_id_parent=$info_id AND info_owner=$this->user",__LINE__,__FILE__);
$db2->select($this->info_table,'info_id',array(
'info_id_parent' => $info_id,
'info_owner' => $this->user,
),__LINE__,__FILE__);
while ($db2->next_record())
{
$this->delete($db2->f(0),$delete_children);
}
}
// set parent_id to $new_parent for all not deleted children
$new_parent = intval($new_parent);
$this->db->query("UPDATE phpgw_infolog SET info_id_parent=$new_parent WHERE info_id_parent=$info_id",__LINE__,__FILE__);
// set parent_id to $new_parent or 0 for all not deleted children
$this->db->update($this->info_table,array('info_id_parent'=>$new_parent),array('info_id_parent'=>$info_id),__LINE__,__FILE__);
}
/*!
@ -331,11 +336,10 @@
*/
function change_delete_owner($owner,$new_owner=0) // new_owner=0 means delete
{
$owner = intval($owner);
if (!($new_owner = intval($new_owner)))
if (!(int) $new_owner)
{
$db2 = $this->db; // we need an extra result-set
$db2->query("SELECT info_id FROM phpgw_infolog WHERE info_owner=$owner",__LINE__,__FILE__);
$db2->select($this->info_table,'info_id',array('info_owner'=>$owner),__LINE__,__FILE__);
while($db2->next_record())
{
$this->delete($this->db->f(0),False);
@ -343,9 +347,9 @@
}
else
{
$this->db->query("UPDATE phpgw_infolog SET info_owner=$new_owner WHERE info_owner=$owner",__LINE__,__FILE__);
$this->db->update($this->info_table,array('info_owner'=>$new_owner),array('info_owner'=>$owner),__LINE__,__FILE__);
}
$this->db->query("UPDATE phpgw_infolog SET info_responsible=$new_owner WHERE info_responsible=$owner",__LINE__,__FILE__);
$this->db->update($this->info_table,array('info_responsible'=>$new_owner),array('info_responsible'=>$owner),__LINE__,__FILE__);
}
/*!
@ -357,59 +361,29 @@
*/
function write($values) // did _not_ ensure ACL
{
include(PHPGW_SERVER_ROOT.'/infolog/setup/tables_current.inc.php');
$db_cols = $phpgw_baseline['phpgw_infolog']['fd'];
unset($phpgw_baseline);
$info_id = intval($values['info_id']) > 0 ? intval($values['info_id']) : 0;
$info_id = (int) $values['info_id'];
$table_def = $this->db->get_table_definitions('infolog',$this->info_table);
$to_write = array();
foreach($values as $key => $val)
{
if ($key != 'info_id')
if ($key != 'info_id' && isset($table_def['fd'][$key]))
{
if (!isset($db_cols[$key]))
{
continue; // not in infolog-table
}
$this->data[$key] = $val; // update internal data
switch($db_cols[$key]['type']) // protection against query-insertion
{
case 'int': case 'auto':
$val = intval($val);
break;
default:
$val = "'".$this->db->db_addslashes($val)."'";
break;
}
$cols .= (strlen($cols) ? ',' : '').$key;
$vals .= (strlen($vals) ? ',' : '').$val;
$query .= (strlen($query) ? ',' : '')."$key=$val";
$to_write[$key] = $this->data[$key] = $val; // update internal data
}
}
if (($this->data['info_id'] = $info_id))
{
$query = "UPDATE phpgw_infolog SET $query WHERE info_id=$info_id";
$this->db->query($query,__LINE__,__FILE__);
$this->db->update($this->info_table,$to_write,array('info_id'=>$info_id),__LINE__,__FILE__);
}
else
{
$query = "INSERT INTO phpgw_infolog ($cols) VALUES ($vals)";
$this->db->query($query,__LINE__,__FILE__);
$this->data['info_id']=$this->db->get_last_insert_id('phpgw_infolog','info_id');
$this->db->insert($this->info_table,$to_write,false,__LINE__,__FILE__);
$this->data['info_id']=$this->db->get_last_insert_id($this->info_table,'info_id');
}
//echo "<p>soinfolog.write values= "; _debug_array($values);
// write customfields now
$existing = array();
if ($info_id) // existing entry
{
$this->db->query("SELECT info_extra_name FROM phpgw_infolog_extra WHERE info_id=$info_id",__LINE__,__FILE__);
while($this->db->next_record())
{
$existing[strtolower($this->db->f(0))] = True;
}
}
foreach($values as $key => $val)
{
if ($key[0] != '#')
@ -418,17 +392,12 @@
}
$this->data[$key] = $val; // update internal data
$val = $this->db->db_addslashes($val);
$name = $this->db->db_addslashes($key = substr($key,1));
if ($existing[strtolower($key)])
{
$query = "UPDATE phpgw_infolog_extra SET info_extra_value='$val' WHERE info_id=$info_id AND info_extra_name='$name'";
}
else
{
$query = "INSERT INTO phpgw_infolog_extra (info_id,info_extra_name,info_extra_value) VALUES (".$this->data['info_id'].",'$name','$val')";
}
$this->db->query($query,__LINE__,__FILE__);
$this->db->insert($this->extra_table,array(
'info_extra_value'=>$val
),array(
'info_id' => $info_id,
'info_extra_name' => substr($key,1),
),__LINE__,__FILE__);
}
// echo "<p>soinfolog.write this->data= "; _debug_array($this->data);
@ -448,7 +417,10 @@
{
return 0;
}
$this->db->query($sql="select count(*) FROM phpgw_infolog WHERE info_id_parent=$info_id AND ".$this->aclFilter(),__LINE__,__FILE__);
$this->db->select($this->info_table,'count(*)',array(
'info_id_parent' => $info_id,
$this->aclFilter()
),__LINE__,__FILE__);
$this->db->next_record();
//echo "<p>anzSubs($info_id) = ".$this->db->f(0)." ($sql)</p>\n";
@ -486,7 +458,7 @@
if (count($links))
{
$link_extra = ($action == 'sp' ? 'OR' : 'AND').' phpgw_infolog.info_id IN ('.implode(',',$links).')';
$link_extra = ($action == 'sp' ? 'OR' : 'AND')." $this->info_table.info_id IN (".implode(',',$links).')';
}
}
if (!empty($query['order']) && eregi('^[a-z_0-9, ]+$',$query['order']) && (empty($query['sort']) || eregi('^(DESC|ASC)$',$query['sort'])))
@ -540,9 +512,23 @@
if ($query['query']) $query['search'] = $query['query']; // allow both names
if ($query['search']) // we search in _from, _subject, _des and _extra_value for $query
{
$pattern = "'%".$this->db->db_addslashes($query['search'])."%'";
$sql_query = "AND (info_from like $pattern OR info_subject LIKE $pattern OR info_des LIKE $pattern OR info_extra_value LIKE $pattern) ";
$join = 'LEFT JOIN phpgw_infolog_extra ON phpgw_infolog.info_id=phpgw_infolog_extra.info_id';
$pattern = $this->db->quote('%'.$query['search'].'%');
$columns = array('info_from','info_subject','info_extra_value');
switch($this->db->Type)
{
case 'mssql':
$columns[] = 'CAST(info_des AS varchar)';
break;
case 'sapdb':
case 'maxdb':
// at the moment MaxDB 7.5 cant cast nor search text columns, it's suppost to change in 7.6
break;
default:
$columns[] = 'info_des';
}
$sql_query = 'AND ('.implode(" LIKE $pattern OR ",$columns)." LIKE $pattern) ";
$join = "LEFT JOIN $this->extra_table ON $this->info_table.info_id=$this->extra_table.info_id";
}
$pid = 'AND info_id_parent='.($action == 'sp' ? $query['action_id'] : 0);
@ -554,10 +540,10 @@
$ids = array( );
if ($action == '' || $action == 'sp' || count($links))
{
$sql_query = "FROM phpgw_infolog $join WHERE ($filtermethod $pid $sql_query) $link_extra";
$sql_query = "FROM $this->info_table $join WHERE ($filtermethod $pid $sql_query) $link_extra";
switch($this->db->Type)
{
// mssql and others cant use DISTICT of text columns (info_des) are involved
// mssql and others cant use DISTICT if text columns (info_des) are involved
case 'mssql':
case 'sapdb':
case 'maxdb':
@ -566,14 +552,14 @@
default:
$distinct = 'DISTINCT';
}
$this->db->query($sql="SELECT $distinct phpgw_infolog.info_id ".$sql_query,__LINE__,__FILE__);
$this->db->query($sql="SELECT $distinct $this->info_table.info_id ".$sql_query,__LINE__,__FILE__);
$query['total'] = $this->db->num_rows();
if (!$query['start'] || $query['start'] > $query['total'])
{
$query['start'] = 0;
}
$this->db->limit_query($sql="SELECT $distinct phpgw_infolog.* $sql_query $ordermethod",$query['start'],__LINE__,__FILE__);
$this->db->limit_query($sql="SELECT $distinct $this->info_table.* $sql_query $ordermethod",$query['start'],__LINE__,__FILE__);
//echo "<p>sql='$sql'</p>\n";
while ($this->db->next_record())
{

127
infolog/inc/class.solink.inc.php
View File

@ -37,7 +37,7 @@
);
var $db;
var $user;
var $db_name = 'phpgw_links';
var $link_table = 'phpgw_links';
var $debug;
/*!
@ -49,6 +49,7 @@
function solink( )
{
$this->db = $GLOBALS['phpgw']->db;
$this->db->set_app('infolog');
$this->user = $GLOBALS['phpgw_info']['user']['account_id'];
}
@ -81,25 +82,15 @@
{
$owner = $this->user;
}
$vars2addslashes = array('app1','id1','app2','id2','remark');
foreach ($vars2addslashes as $var)
{
$$var = $this->db->db_addslashes($$var);
}
if (!$lastmod)
{
$lastmod = time();
}
$sql = "INSERT INTO $this->db_name (link_app1,link_id1,link_app2,link_id2,link_remark,link_lastmod,link_owner) ".
" VALUES ('$app1','$id1','$app2','$id2','$remark',".intval($lastmod).','.intval($owner).')';
if ($this->debug)
{
echo "<p>solink.link($app1,$id1,$app2,$id2,'$remark',$owner) sql='$sql'</p>\n";
}
$this->db->query($sql,__LINE__,__FILE__);
return $this->db->errno ? False : $this->db->get_last_insert_id($this->db_name,'link_id');
return $this->db->insert($this->link_table,array(
'link_app1' => $app1,
'link_id1' => $id1,
'link_app2' => $app2,
'link_id2' => $id2,
'link_remark' => $remark,
'link_lastmod' => $lastmod ? $lastmod : time(),
'link_owner' => $owner,
),False,__LINE__,__FILE__) ? $this->db->get_last_insert_id($this->link_table,'link_id') : false;
}
/*!
@ -113,22 +104,21 @@
*/
function get_links( $app,$id,$only_app='',$order='link_lastmod DESC' )
{
$links = array();
$vars2addslashes = array('app','id','only_app','order');
foreach ($vars2addslashes as $var)
{
$$var = $this->db->db_addslashes($$var);
}
$sql = "SELECT * FROM $this->db_name".
" WHERE (link_app1 = '$app' AND link_id1 = '$id')".
" OR (link_app2 = '$app' AND link_id2 = '$id')".
($order != '' ? " ORDER BY $order" : '');
if ($this->debug)
{
echo "<p>solink.get_links($app,$id,$only_app,$order) sql='$sql'</p>\n";
echo "<p>solink.get_links($app,$id,$only_app,$order)</p>\n";
}
$links = array();
$this->db->select($this->link_table,'*',$this->db->expression($this->link_table,'(',array(
'link_app1' => $app,
'link_id1' => $id,
),') OR (',array(
'link_app2' => $app,
'link_id2' => $id,
),')'
),__LINE__,__FILE__,False,$order ? " ORDER BY $order" : '');
$this->db->query($sql,__LINE__,__FILE__);
if ($not_only = $only_app[0] == '!')
@ -183,10 +173,9 @@
{
echo "<p>solink.get_link('$app_link_id',$id,'$app2','$id2')</p>\n";
}
$sql = "SELECT * FROM $this->db_name WHERE ";
if (intval($app_link_id) > 0)
if ((int) $app_link_id > 0)
{
$sql .= 'link_id='.intval($app_link_id);
$where = array('link_id' => $app_link_id);
}
else
{
@ -199,10 +188,19 @@
{
$$var = $this->db->db_addslashes($$var);
}
$sql .= "(link_app1='$app_link_id' AND link_id1='$id' AND link_app2='$app2' AND link_id2='$id2') OR".
"(link_app2='$app_link_id' AND link_id2='$id' AND link_app1='$app2' AND link_id1='$id2')";
$where = $this->db->expression($this->link_table,'(',array(
'link_app1' => $app_link_id,
'link_id1' => $id,
'link_app2' => $app2,
'link_id2' => $id2,
),') OR (',array(
'link_app2' => $app_link_id,
'link_id2' => $id,
'link_app1' => $app2,
'link_id1' => $id2,
),')');
}
$this->db->query($sql,__LINE__,__FILE__);
$this->db->select($this->link_table,'*',$where,__LINE__,__FILE__);
if ($this->db->next_record())
{
@ -226,10 +224,14 @@
*/
function unlink($link_id,$app='',$id='',$owner='',$app2='',$id2='')
{
$sql = "DELETE FROM $this->db_name WHERE ";
if (intval($link_id) > 0)
if ($this->debug)
{
$sql .= 'link_id='.intval($link_id);
echo "<p>solink.unlink($link_id,$app,$id,$owner,$app2,$id2)</p>\n";
}
$sql = "DELETE FROM $this->link_table WHERE ";
if ((int)$link_id > 0)
{
$where = array('link_id' => $link_id);
}
elseif ($app == '' AND $owner == '')
{
@ -237,37 +239,38 @@
}
else
{
$vars2addslashes = array('app','id','app2','id2');
foreach ($vars2addslashes as $var)
{
$$var = $this->db->db_addslashes($$var);
}
if ($app != '' && $app2 == '')
{
$sql .= "((link_app1='$app'";
$sql2 = '';
$check1 = array('link_app1' => $app);
$check2 = array('link_app2' => $app);
if ($id != '')
{
$sql .= " AND link_id1='$id'";
$sql2 .= " AND link_id2='$id'";
$check1['link_id1'] = $id;
$check2['link_id2'] = $id;
}
$sql .= ") OR (link_app2='$app'$sql2))";
$where = $this->db->expression($this->link_table,'((',$check1,') OR (',$check2,'))');
}
elseif ($app != '' && $app2 != '')
{
$sql .= "((link_app1='$app' AND link_id1='$id' AND link_app2='$app2' AND link_id2='$id2') OR";
$sql .= " (link_app1='$app2' AND link_id1='$id2' AND link_app2='$app' AND link_id2='$id'))";
$where = $this->db->expression($this->link_table,'((',array(
'link_app1' => $app,
'link_id1' => $id,
'link_app2' => $app2,
'link_id2' => $id2,
),') OR (',array(
'link_app1' => $app2,
'link_id1' => $id2,
'link_app2' => $app,
'link_id2' => $id,
),')');
}
if ($owner != '')
{
$sql .= ($app != '' ? ' AND ' : '') . 'link_owner='.intval($owner);
if ($app) $where = array($where);
$where['link_owner'] = $owner;
}
}
if ($this->debug)
{
echo "<p>solink.unlink($link_id,$app,$id,$owner,$app2,$id2) sql='$sql'</p>\n";
}
$this->db->query($sql,__LINE__,__FILE__);
$this->db->delete($this->link_table,$where,__LINE__,__FILE__);
return $this->db->affected_rows();
}
@ -283,11 +286,11 @@
*/
function chown($owner,$new_owner)
{
if (intval($owner) <= 0 || intval($new_owner) <= 0)
if ((int)$owner <= 0 || (int) $new_owner)
{
return 0;
}
$this->db->query("UPDATE $this->db_name SET owner=".intval($new_owner).' WHERE owner='.intval($owner),__LINE__,__FILE__);
$this->db->update($this->link_table,array('owner'=>$new_owner),array('owner'=>$owner),__LINE__,__FILE__);
return $this->db->affected_rows();
}