R28451 - in /branches/1.6/syncml: contacts/lib/api.php notes/lib/api.php tasks/lib/api.php

Old eGW-svn
1

Author: jlehrke
New Revision: 28451

URL: http://www.egroupware.org/viewvc/egroupware?rev=28451&view=rev
Log:
Fix missing SyncML preferences issue

Modified:
branches/1.6/syncml/contacts/lib/api.php
branches/1.6/syncml/notes/lib/api.php
branches/1.6/syncml/tasks/lib/api.php

Modified: branches/1.6/syncml/contacts/lib/api.php
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.6/syncml/contacts/lib/api.php?rev=28451&r1=28450&r2=28451&view=diff

— branches/1.6/syncml/contacts/lib/api.php (original)
+++ branches/1.6/syncml/contacts/lib/api.php Sun Nov 22 18:36:38 2009
@@ -73,17 +73,20 @@
$filter[‘account_id’] = null;
}

  • if (array_key_exists(‘filter_list’, $GLOBALS[‘egw_info’][‘user’][‘preferences’][‘syncml’]))
  • if (is_array($GLOBALS[‘egw_info’][‘user’][‘preferences’][‘syncml’]))
    {
  •   $filter['list'] = (string) (int) $GLOBALS['egw_info']['user']['preferences']['syncml']['filter_list'];

  •   // Horde::logMessage('SymcML: egwcontactssync list() list='. $filter['list'] , __FILE__, __LINE__, PEAR_LOG_DEBUG);
  • }
  • if (array_key_exists(‘filter_addressbook’, $GLOBALS[‘egw_info’][‘user’][‘preferences’][‘syncml’]))
  • {
  •   $filter['owner'] = (string) (int) $GLOBALS['egw_info']['user']['preferences']['syncml']['filter_addressbook'];

  •   // Horde::logMessage('SymcML: egwcontactssync list() owner='. $filter['owner'] , __FILE__, __LINE__, PEAR_LOG_DEBUG);
  • }
  •   if (array_key_exists('filter_list', $GLOBALS['egw_info']['user']['preferences']['syncml']))

  •   {

  •   	$filter['list'] = (string) (int) $GLOBALS['egw_info']['user']['preferences']['syncml']['filter_list'];

  •   	// Horde::logMessage('SymcML: egwcontactssync list() list='. $filter['list'] , __FILE__, __LINE__, PEAR_LOG_DEBUG);

  •   }

  •   if (array_key_exists('filter_addressbook', $GLOBALS['egw_info']['user']['preferences']['syncml']))

  •   {

  •   	$filter['owner'] = (string) (int) $GLOBALS['egw_info']['user']['preferences']['syncml']['filter_addressbook'];

  •   	// Horde::logMessage('SymcML: egwcontactssync list() owner='. $filter['owner'] , __FILE__, __LINE__, PEAR_LOG_DEBUG);

  •   }

  • }

    $allContacts = $soAddressbook->search($criteria,true,’’,’’,’’,false,‘AND’,false,$filter);

@@ -114,7 +117,6 @@

  • @return array An array of GUIDs matching the action and time criteria.
    */
    function &_egwcontactssync_listBy($action, $timestamp, $type, $filter=’’) {
  • // Horde::logMessage(“SymcML: egwcontactssync listBy action: $action timestamp: $timestamp filter: $filter”,
    // FILE, LINE, PEAR_LOG_DEBUG);
    $state =& $_SESSION[‘SyncML.state’];

Modified: branches/1.6/syncml/notes/lib/api.php
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.6/syncml/notes/lib/api.php?rev=28451&r1=28450&r2=28451&view=diff

— branches/1.6/syncml/notes/lib/api.php (original)
+++ branches/1.6/syncml/notes/lib/api.php Sun Nov 22 18:36:38 2009
@@ -63,7 +63,8 @@
$guids = array();
$boInfolog = new infolog_bo();

  • if (array_key_exists(‘note_filter’, $GLOBALS[‘egw_info’][‘user’][‘preferences’][‘syncml’]))
  • if (is_array($GLOBALS[‘egw_info’][‘user’][‘preferences’][‘syncml’]) &&
  •   array_key_exists('note_filter', $GLOBALS['egw_info']['user']['preferences']['syncml']))
    {
    $infolog_filter = $GLOBALS[‘egw_info’][‘user’][‘preferences’][‘syncml’][‘note_filter’];
    // Horde::logMessage(‘SymcML: egwtaskssync filter=’ . $filter,

Modified: branches/1.6/syncml/tasks/lib/api.php
URL: http://www.egroupware.org/viewvc/egroupware/branches/1.6/syncml/tasks/lib/api.php?rev=28451&r1=28450&r2=28451&view=diff

— branches/1.6/syncml/tasks/lib/api.php (original)
+++ branches/1.6/syncml/tasks/lib/api.php Sun Nov 22 18:36:38 2009
@@ -63,7 +63,8 @@
$guids = array();
$boInfolog = new infolog_bo();

  • if (array_key_exists(‘infolog_filter’, $GLOBALS[‘egw_info’][‘user’][‘preferences’][‘syncml’]))
  • if (is_array($GLOBALS[‘egw_info’][‘user’][‘preferences’][‘syncml’]) &&
  •   array_key_exists('infolog_filter', $GLOBALS['egw_info']['user']['preferences']['syncml']))
    {
    $infolog_filter = $GLOBALS[‘egw_info’][‘user’][‘preferences’][‘syncml’][‘infolog_filter’];
    // Horde::logMessage(‘SymcML: egwtaskssync filter=’ . $filter,

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