[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] sync/inc/class.ui_sync.inc.php, 1.31
From: |
nomail |
Subject: |
[Phpgroupware-cvs] sync/inc/class.ui_sync.inc.php, 1.31 |
Date: |
Mon, 12 Jul 2004 21:35:27 +0200 |
Update of /sync/inc
Modified Files:
Branch:
class.ui_sync.inc.php
date: 2004/07/12 19:35:27; author: mleonhardt; state: Exp; lines: +21 -6
Log Message:
- documentation fixes
- code review + cleaning up
=====================================================================
Index: sync/inc/class.ui_sync.inc.php
diff -u sync/inc/class.ui_sync.inc.php:1.30 sync/inc/class.ui_sync.inc.php:1.31
--- sync/inc/class.ui_sync.inc.php:1.30 Tue Jul 6 10:11:40 2004
+++ sync/inc/class.ui_sync.inc.php Mon Jul 12 19:35:27 2004
@@ -155,6 +155,7 @@
// parse
$this->template->set_var('sync', lang('sync'));
$body = $this->template->fp('sync_template','page_header');
+
// parse status
$this->template->set_var('last_operation_status',
$this->last_operation_status);
$body .= $this->template->fp('sync_template','status');
@@ -182,6 +183,7 @@
// table header
$this->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$this->template->set_var('last_sync_status',lang('last_sync_status'));
+
// account, uri, description, username, edit, delete
$this->template->set_var('head_source', lang('head_source'));
$this->template->set_var('head_lastsync', lang('head_lastsync'));
@@ -403,7 +405,7 @@
* call and output testcase
*
* this public function
- * calls the Testcase-routine from testcase.inc.php and
+ * calls the Testcase-function from testcase.inc.php and
* displays the unfiltered output
*
* @access public
@@ -428,6 +430,7 @@
* this public function
* loads the listdevices.tpl Template
* and lists all registered devices of the actual logged in user
+ *
* @access public
*/
@@ -560,6 +563,7 @@
* loads the sync.tpl Template and shows the default init site of the sync
module
* and lists all registered devices of the actual logged in user after
deleting
* the requested device given in URL-var 'del_device_id'
+ *
* @access public
*/
@@ -587,6 +591,7 @@
* this public function
* loads the listconflicts.tpl Template
* and lists all appeared conflicts of the actual logged in user
+ *
* @access public
*/
@@ -619,6 +624,7 @@
$IndexLink =
$GLOBALS['phpgw']->link('/index.php','menuaction=sync.ui_sync.init');
$this->template->set_var('GoBackLink',$IndexLink);
$this->template->set_var('link_back', lang('link_back'));
+
// parse header
$this->template->set_var('sync', lang('sync'));
$appname = $this->so->GetSourceModule($source);
@@ -643,7 +649,7 @@
}
/**
- * insert the list of all appeared conflicts of actual user
+ * insert the list of all appeared conflicts of actual user and the given
source
*
* @access private
*/
@@ -656,7 +662,7 @@
// table header
$this->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
- // account, uri, description, username, edit, delete
+ // fieldname, server wins, client wins, result (not used yet)
$this->template->set_var('head_fieldname', lang('head_fieldname'));
$this->template->set_var('head_fieldserver', lang('head_fieldserver'));
$this->template->set_var('head_fieldclient', lang('head_fieldclient'));
@@ -723,6 +729,7 @@
* loads the listsources.tpl Template
* and lists all registered sources of the sync module and the
* assigned phpGroupware applications
+ *
* @access public
*/
@@ -873,6 +880,7 @@
* this public function
* loads the listsources.tpl
* and saves the new settings
+ *
* @access public
*/
@@ -914,6 +922,7 @@
* loads the sync.tpl Template and shows the default init site of the sync
module
* and lists all registered sources of the actual logged in user after
deleting
* the requested source given in URL-var 'del_source_id'
+ *
* @access public
*/
@@ -941,7 +950,8 @@
* show syncmodul preferences
*
* this public function
- * loads the preferences.tpl Template and shows the conflict-handling
settings of the user
+ * loads the preferences.tpl Template and shows the conflict-handling
settings of the user
+ *
* @access public
*/
@@ -1048,6 +1058,7 @@
$sources = $this->so->getUsedSources($deviceid);
+ // source
foreach($sources as $source) {
$sourcecount++;
$tr_color = $this->nextmatchs->alternate_row_color($tr_color);
@@ -1061,7 +1072,7 @@
$selectedid = $this->so->GetConflictHandleSetting($deviceid,
$source);
// in case of readerror we use the default (3 = duplicate)
if ($selectedid < 0) $selectedid = 3;
- // convert to
+ // convert to string
$selected = $this->bo->conflictsolutions[$selectedid];
$selectoptions = '';
reset($this->bo->conflictsolutions);
@@ -1148,6 +1159,7 @@
* this public function
* loads the listdevices.tpl Template and shows devicelist of the current
user
* and saves the new description
+ *
* @access public
*/
@@ -1182,6 +1194,7 @@
* this public function
* loads the devicesettings.tpl
* and saves the new settings
+ *
* @access public
*/
@@ -1277,6 +1290,7 @@
}
$this->last_operation_status = sprintf(lang('status_devicesettingssaved'),
$status1, $this->bo->getDeviceName($deviceid), $status2);
+
// show devicelist
$this->listdevices();
}
@@ -1336,6 +1350,7 @@
* in case of error return value is boolean
false
* @access private
*/
+
function convertIsotoUnixTime($isostring)
{
// split
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] sync/inc/class.ui_sync.inc.php, 1.31,
nomail <=