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

[nomail]

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

date: 2004/07/06 10:11:40;  author: mleonhardt;  state: Exp;  lines: +18 -7

Log Message:
- removed unused deleteClientMappings function
- documentation
- extended conflicthandling-ui
=====================================================================
Index: sync/inc/class.ui_sync.inc.php
diff -u sync/inc/class.ui_sync.inc.php:1.29 sync/inc/class.ui_sync.inc.php:1.30
--- sync/inc/class.ui_sync.inc.php:1.29 Thu Jul  1 08:46:44 2004
+++ sync/inc/class.ui_sync.inc.php      Tue Jul  6 10:11:40 2004
@@ -702,6 +702,8 @@
                                // conflictfooter (controls)
                                $this->template->set_var('conflictformaction', 
                                                
$GLOBALS['phpgw']->link('/index.php','menuaction=sync.ui_sync.saveconflictsolution'));
+                               $this->template->set_var('deviceid', $deviceid);
+                               $this->template->set_var('source', $source);
                                $this->template->set_var('conflictid', 
$conflictid);
                                $this->template->set_var('link_apply', 
lang('link_apply'));
                        $conflictlisttable .= 
$this->template->fp('sync_template','conflict_footer');
@@ -1297,8 +1299,8 @@
     $deviceid = get_var('deviceid');
     $source = get_var('source');
 
-    // set the Settings
-    if ($this->so->SetDeviceSettings($deviceid, $username, $password) >= 0)
+    // solve the conflict and save the entry
+    if ($this->bo->SaveSolvedConflict($deviceid, $source, $conflictid, 
$action) >= 0)
     {
       $status1 = lang('status_ok');
       $status2 = '';
@@ -1308,10 +1310,19 @@
       $status1 = lang('status_error');
       $status2 = lang('status_not');
     }   
-    $this->last_operation_status = sprintf(lang('status_devicesettingssaved'), 
-             $status1, $this->bo->getDeviceName($deviceid), $status2);
-    // show devicelist
-    $this->listdevices();
+    $this->last_operation_status = 
sprintf(lang('status_conflictsolutionsaved'), 
+             $status1, $action, $status2);
+    
+    if ($this->so->hasconflicts($deviceid, $source))
+    {
+       // show conflictlist
+       $this->listconflicts();
+    }
+    else
+    {
+       // show lastsync
+       $this->init();
+    }
        }
 
     /**