[Phpgroupware-cvs] [19080] Fix the todo sql, as well as the use of history log

[Caeies]

Revision: 19080
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19080
Author:   Caeies
Date:     2009-02-18 18:23:40 +0000 (Wed, 18 Feb 2009)

Log Message:
-----------
Fix the todo sql, as well as the use of history log

Modified Paths:
--------------
    core/trunk/todo/inc/class.sotodo.inc.php

Modified: core/trunk/todo/inc/class.sotodo.inc.php
===================================================================
--- core/trunk/todo/inc/class.sotodo.inc.php    2009-02-18 17:12:31 UTC (rev 
19079)
+++ core/trunk/todo/inc/class.sotodo.inc.php    2009-02-18 18:23:40 UTC (rev 
19080)
@@ -260,11 +260,11 @@
 
                        $this->db->transaction_begin();
                        $this->db->query('insert into phpgw_todo 
(todo_id_main,todo_id_parent,todo_level,todo_owner,todo_access,todo_cat,'
-                               . 
'todo_des,todo_title,todo_pri,todo_status,todo_datecreated,todo_startdate,todo_enddate,todo_assigned,assigned_group)
 values ('
+                               . 
'todo_des,todo_title,todo_pri,todo_status,todo_datecreated,todo_startdate,todo_enddate,todo_assigned,assigned_group,entry_date)
 values ('
                                . (int)$values['main'] . ',' . 
(int)$values['parent'] . ',' . (int)$values['level'] . ',' . $this->account . 
",'" . (int)!!$values['access']
                                . "'," . (int)$values['cat'] . ",'" . 
$values['descr'] . "','" . $values['title'] . "'," . (int)$values['pri'] . ",'"
                                . (int)$values['status'] . "'," . time() . ',' 
. (int)$values['sdate'] . ',' . (int)$values['edate'] . ",'" . 
$values['assigned']
-                               . "','" . $values['assigned_group'] . "')", 
__LINE__, __FILE__);
+                               . "','" . $values['assigned_group'] . "',". 1 
.")", __LINE__, __FILE__);
                        $todo_id = 
$this->db->get_last_insert_id('phpgw_todo','todo_id');
 
                        if (!$values['parent'] || $values['parent'] == 0)
@@ -356,47 +356,47 @@
                        $this->db->transaction_begin();
                        if($old_values['descr'] != $values['descr'])
                        {
-                               
$this->historylog->add('D',$values['id'],$values['descr']);
+                               
$this->historylog->add('D',$values['id'],$values['descr'], 
$old_values['descr']);
                        }
 
                        if(($old_values['parent'] || $values['parent']) && 
($old_values['parent'] != $values['parent']))
                        {
-                               
$this->historylog->add('P',$values['id'],$values['parent']);
+                               
$this->historylog->add('P',$values['id'],$values['parent'], 
$old_values['parent']);
                        }
 
                        if($old_values['pri'] != $values['pri'])
                        {
-                               
$this->historylog->add('U',$values['id'],$values['pri']);
+                               
$this->historylog->add('U',$values['id'],$values['pri'],$old_values['pri']);
                        }
 
                        if($old_values['status'] != $values['status'])
                        {
-                               
$this->historylog->add('s',$values['id'],$values['status']);
+                               
$this->historylog->add('s',$values['id'],$values['status'], 
$old_values['status']);
                        }
 
                        if($old_values['access'] != $values['access'])
                        {
-                               
$this->historylog->add('a',$values['id'],$values['access']);
+                               
$this->historylog->add('a',$values['id'],$values['access'], 
$old_values['access']);
                        }
 
                        if(($old_values['sdate'] || $values['sdate']) && 
($old_values['sdate'] != $values['sdate']))
                        {
-                               
$this->historylog->add('S',$values['id'],$values['sdate']);
+                               
$this->historylog->add('S',$values['id'],$values['sdate'], 
$old_values['sdate']);
                        }
 
                        if(($old_values['edate'] || $values['edate']) && 
($old_values['edate'] != $values['edate']))
                        {
-                               
$this->historylog->add('E',$values['id'],$values['edate']);
+                               
$this->historylog->add('E',$values['id'],$values['edate'], 
$old_values['edate']);
                        }
 
                        if($old_values['title'] != $values['title'])
                        {
-                               
$this->historylog->add('T',$values['id'],$values['title']);
+                               
$this->historylog->add('T',$values['id'],$values['title'], 
$old_values['title']);
                        }
 
                        if($old_values['cat'] != $values['cat'])
                        {
-                               
$this->historylog->add('C',$values['id'],$values['cat']);
+                               
$this->historylog->add('C',$values['id'],$values['cat'], $old_values['cat']);
                        }
 
                        $values['title'] = 
$this->db->db_addslashes($values['title']);
@@ -405,7 +405,7 @@
                        $this->db->query("update phpgw_todo set todo_des='". 
$values['descr'] . "', todo_id_parent=" . $values['parent']
                                . ', todo_pri=' . intval($values['pri']) . ", 
todo_status='" . $values['status'] . "', todo_id_main=" . 
intval($values['main'])
                                . ", todo_access='" . $values['access'] . "', 
todo_level=" . intval($values['level'])
-                               . ', todo_startdate=' . 
intval($values['sdate']) . ', todo_enddate=' . intval($values['edate']) . "', 
todo_title='" . $values['title']
+                               . ', todo_startdate=' . 
intval($values['sdate']) . ', todo_enddate=' . intval($values['edate']) . ", 
todo_title='" . $values['title']
                                . "', todo_cat=" . intval($values['cat']) . ", 
todo_assigned='" . $values['assigned'] . "', assigned_group='" . 
$values['assigned_group']
                                . "' where todo_id=" . 
$values['id'],__LINE__,__FILE__);
                        $this->db->transaction_commit();