R28337 - in /trunk: phpgwapi/inc/horde/Horde/SyncML/ phpgwapi/inc/horde/Horde/SyncML/Command/ syncml/inc/

Old eGW-svn
1

Author: jlehrke
New Revision: 28337

URL: http://www.egroupware.org/viewvc/egroupware?rev=28337&view=rev
Log:
Add additional datastores

Modified:
trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
trunk/phpgwapi/inc/horde/Horde/SyncML/State.php
trunk/syncml/inc/class.syncml_hooks.inc.php

Modified: trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php?rev=28337&r1=28336&r2=28337&view=diff

— trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php (original)
+++ trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Get.php Tue Nov 17 08:13:21 2009
@@ -106,7 +106,11 @@
array(‘text/plain’ => ‘1.0’));
$this->_writeDataStore(’./contacts’, ‘text/vcard’, ‘3.0’, $output,
array(‘text/x-vcard’ => ‘2.1’));

  •        $this->_writeDataStore('./card', 'text/vcard', '3.0', $output,

  •                               array('text/x-vcard' => '2.1'));
       $this->_writeDataStore('./tasks', 'text/calendar', '2.0', $output,

  •                               array('text/x-vcalendar' => '1.0'));

  •        $this->_writeDataStore('./jobs', 'text/calendar', '2.0', $output,
                              array('text/x-vcalendar' => '1.0'));
       $this->_writeDataStore('./calendar', 'text/calendar', '2.0', $output,
                              array('text/x-vcalendar' => '1.0'));

Modified: trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php?rev=28337&r1=28336&r2=28337&view=diff

— trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php (original)
+++ trunk/phpgwapi/inc/horde/Horde/SyncML/Command/Put.php Tue Nov 17 08:13:21 2009
@@ -159,6 +159,7 @@
switch ($this->_sourceReference)
{
case ‘contact’:

  •   						case 'card':
  							if ($this->_contentType != "text/x-s4j-sifc")
  							{
  								error_log("forcing 'contact' content type to 'text/x-s4j-sifc' instead of '".$this->_contentType."'");

Modified: trunk/phpgwapi/inc/horde/Horde/SyncML/State.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/phpgwapi/inc/horde/Horde/SyncML/State.php?rev=28337&r1=28336&r2=28337&view=diff

— trunk/phpgwapi/inc/horde/Horde/SyncML/State.php (original)
+++ trunk/phpgwapi/inc/horde/Horde/SyncML/State.php Tue Nov 17 08:13:21 2009
@@ -153,17 +153,17 @@
define(‘SERVER_SYNC_ACKNOWLEDGED’, 6);

// conflict management
-define(‘CONFLICT_CLIENT_WINNING’, 0);
-define(‘CONFLICT_SERVER_WINNING’, 1);
-define(‘CONFLICT_MERGE_DATA’, 2);
+define(‘CONFLICT_CLIENT_WINNING’, 0);
+define(‘CONFLICT_SERVER_WINNING’, 1);
+define(‘CONFLICT_MERGE_DATA’, 2);
define(‘CONFLICT_RESOLVED_WITH_DUPLICATE’, 3);
define(‘CONFLICT_CLIENT_CHANGES_IGNORED’, 4);
define(‘CONFLICT_CLIENT_REFRESH_ENFORCED’, 5);

define(‘MAX_DATA’, 19);
-define(‘MAX_ENTRIES’, 10); // default
-define(‘MAX_GUID_SIZE’, 64);
-define(‘MIN_MSG_LEFT’, 200); // Overhead
+define(‘MAX_ENTRIES’, 10); // default
+define(‘MAX_GUID_SIZE’, 64);
+define(‘MIN_MSG_LEFT’, 200); // Overhead

/**

  • The Horde_SyncML_State class provides a SyncML state object.
    @@ -846,6 +846,7 @@
    $_type = str_replace(’./’,’’,$type);
    switch (strtolower($_type)) {
    case ‘contacts’:
  •   	case 'card':
  		return 'text/vcard';
  		break;

@@ -856,6 +857,7 @@
case ‘calendar’:
case ‘events’:
case ‘tasks’:

  •   	case 'jobs':
  	case 'caltasks':
  		return 'text/calendar';
  		break;

@@ -892,6 +894,7 @@
switch(strtolower($_type))
{
case ‘contacts’:

  •   	case 'card':
  		return 'contacts';
  		break;

@@ -900,6 +903,7 @@
break;

		case 'tasks':

  •   	case 'jobs':
  		return 'tasks';
  		break;

Modified: trunk/syncml/inc/class.syncml_hooks.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/syncml/inc/class.syncml_hooks.inc.php?rev=28337&r1=28336&r2=28337&view=diff

— trunk/syncml/inc/class.syncml_hooks.inc.php (original)
+++ trunk/syncml/inc/class.syncml_hooks.inc.php Tue Nov 17 08:13:21 2009
@@ -205,6 +205,24 @@
‘admin’ => False,
‘default’ => 1
),

  •   	'./card' => array(

  •   		'type'   => 'select',

  •   		'label'  => './card',

  •   		'name'   => './card',

  •   		'values' => $show_entries,

  •   		'xmlrpc' => True,

  •   		'admin'  => False,

  •   		'default' => 1

  •   	),

  •   	'card' => array(

  •   		'type'   => 'select',

  •   		'label'  => 'card',

  •   		'name'   => 'card',

  •   		'values' => $show_entries,

  •   		'xmlrpc' => True,

  •   		'admin'  => False,

  •   		'default' => 1

  •   	),
  	'./tasks' => array(
  		'type'   => 'select',
  		'label'  => './tasks',

@@ -223,6 +241,24 @@
‘admin’ => False,
‘default’ => 1
),

  •   	'./jobs' => array(

  •   		'type'   => 'select',

  •   		'label'  => './jobs',

  •   		'name'   => './jobs',

  •   		'values' => $show_entries,

  •   		'xmlrpc' => True,

  •   		'admin'  => False,

  •   		'default' => 1

  •   	),

  •   	'jobs' => array(

  •   		'type'   => 'select',

  •   		'label'  => 'jobs',

  •   		'name'   => 'jobs',

  •   		'values' => $show_entries,

  •   		'xmlrpc' => True,

  •   		'admin'  => False,

  •   		'default' => 1

  •   	),
  	'./caltasks' => array(
  		'type'   => 'select',
  		'label'  => './caltasks',

@@ -344,6 +380,24 @@
‘type’ => ‘select’,
‘label’ => ‘siftasks’,
‘name’ => ‘siftasks’,

  •   		'values' => $show_entries,

  •   		'xmlrpc' => True,

  •   		'admin'  => False,

  •   		'default' => 1

  •   	),

  •   	'./stask' => array(

  •   		'type'   => 'select',

  •   		'label'  => './stask',

  •   		'name'   => './stask',

  •   		'values' => $show_entries,

  •   		'xmlrpc' => True,

  •   		'admin'  => False,

  •   		'default' => 1

  •   	),

  •   	'stask' => array(

  •   		'type'   => 'select',

  •   		'label'  => 'stask',

  •   		'name'   => 'stask',
  		'values' => $show_entries,
  		'xmlrpc' => True,
  		'admin'  => False,

Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what’s new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs