[Phpgroupware-cvs] sync/inc/class.ui_sync.inc.php, 1.33

[nomail]

Update of /sync/inc
Modified Files:
        Branch: 
          class.ui_sync.inc.php

date: 2004/11/26 12:34:57;  author: fipsfuchs;  state: Exp;  lines: +5 -5

Log Message:
new version from internal CVS moved to original project
=====================================================================
Index: sync/inc/class.ui_sync.inc.php
diff -u sync/inc/class.ui_sync.inc.php:1.32 sync/inc/class.ui_sync.inc.php:1.33
--- sync/inc/class.ui_sync.inc.php:1.32 Mon Jul 12 21:13:12 2004
+++ sync/inc/class.ui_sync.inc.php      Fri Nov 26 12:34:57 2004
@@ -306,7 +306,7 @@
    */
   function insert_outlook_import()
   {
-    $RunOutlookLink = 
$GLOBALS['phpgw']->link('/index.php','menuaction=sync.outlook_import.sync');
+    $RunOutlookLink = 
$GLOBALS['phpgw']->link('/index.php','menuaction=sync.ui_outlook_import.import');
 
     $this->template->set_var('RunOutlookLink',$RunOutlookLink);
     $this->template->set_var('link_outlook_import', lang('link_outlook'));
@@ -361,7 +361,7 @@
 
   function cleartables()
   {
-    $id = $GLOBALS['phpgw_info']['user']['account_id'];
+    $user_id = $GLOBALS['phpgw_info']['user']['account_id'];
     
     // contacts 
     $this->ipc = $this->ipcManager->getIPC('addressbook');
@@ -386,7 +386,7 @@
 
 
     // notes 
-    $GLOBALS['phpgw']->db->query("DELETE FROM phpgw_notes WHERE note_owner = 
'$id';",__LINE__,__FILE__);
+    $GLOBALS['phpgw']->db->query("DELETE FROM phpgw_notes WHERE note_owner = 
'$user_id';",__LINE__,__FILE__);
     
     // sync 
     $GLOBALS['phpgw']->db->query("TRUNCATE TABLE 
phpgw_syncmapping;",__LINE__,__FILE__);
@@ -394,7 +394,7 @@
     $GLOBALS['phpgw']->db->query("TRUNCATE TABLE 
phpgw_syncconflicts;",__LINE__,__FILE__);
     
     // todo
-    $GLOBALS['phpgw']->db->query("DELETE FROM phpgw_todo WHERE todo_owner = 
'$id';",__LINE__,__FILE__);
+    $GLOBALS['phpgw']->db->query("DELETE FROM phpgw_todo WHERE todo_owner = 
'$user_id';",__LINE__,__FILE__);
     
     // calendar
     // contacts