Merge branch 'master' into newprefs

Conflicts:
	framework/ActiveSync/lib/Horde/ActiveSync/Driver/Horde.php
	framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
	framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
	framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
	framework/ActiveSync/lib/Horde/ActiveSync/State/File.php
	kronolith/lib/Event.php

diff --cc framework/ActiveSync/lib/Horde/ActiveSync.php
index 67999c2,929e48f..a53442d
--- 1/framework/ActiveSync/lib/Horde/ActiveSync.php
--- 2/framework/ActiveSync/lib/Horde/ActiveSync.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync.php
@@@ -456,14 -198,115 +198,122 @@@ class Horde_ActiveSyn
      const CONFLICT_OVERWRITE_SERVER = 0;
      const CONFLICT_OVERWRITE_PIM = 1;
  
+     /* TRUNCATION Constants */
+     const TRUNCATION_HEADERS = 0;
+     const TRUNCATION_512B = 1;
+     const TRUNCATION_1K = 2;
+     const TRUNCATION_5K = 4;
+     const TRUNCATION_SEVEN = 7;
+     const TRUNCATION_ALL = 9;
+ 
+     /* Request related constants that are used in multiple places */
+     /* FOLDERHIERARCHY */ 
+     const FOLDERHIERARCHY_FOLDERS = 'FolderHierarchy:Folders';
+     const FOLDERHIERARCHY_FOLDER = 'FolderHierarchy:Folder';
+     const FOLDERHIERARCHY_DISPLAYNAME = 'FolderHierarchy:DisplayName';
+     const FOLDERHIERARCHY_SERVERENTRYID = 'FolderHierarchy:ServerEntryId';
+     const FOLDERHIERARCHY_PARENTID = 'FolderHierarchy:ParentId';
+     const FOLDERHIERARCHY_TYPE = 'FolderHierarchy:Type';
+     const FOLDERHIERARCHY_RESPONSE = 'FolderHierarchy:Response';
+     const FOLDERHIERARCHY_STATUS = 'FolderHierarchy:Status';
+     const FOLDERHIERARCHY_CONTENTCLASS = 'FolderHierarchy:ContentClass';
+     const FOLDERHIERARCHY_CHANGES = 'FolderHierarchy:Changes';
+     const FOLDERHIERARCHY_ADD = 'FolderHierarchy:Add';
+     const FOLDERHIERARCHY_REMOVE = 'FolderHierarchy:Remove';
+     const FOLDERHIERARCHY_UPDATE = 'FolderHierarchy:Update';
+     const FOLDERHIERARCHY_SYNCKEY = 'FolderHierarchy:SyncKey';
+     const FOLDERHIERARCHY_FOLDERCREATE = 'FolderHierarchy:FolderCreate';
+     const FOLDERHIERARCHY_FOLDERDELETE = 'FolderHierarchy:FolderDelete';
+     const FOLDERHIERARCHY_FOLDERUPDATE = 'FolderHierarchy:FolderUpdate';
+     const FOLDERHIERARCHY_FOLDERSYNC = 'FolderHierarchy:FolderSync';
+     const FOLDERHIERARCHY_COUNT = 'FolderHierarchy:Count';
+     const FOLDERHIERARCHY_VERSION = 'FolderHierarchy:Version';
+     
+     /* SYNC */
+     const SYNC_SYNCHRONIZE = 'Synchronize';
+     const SYNC_REPLIES = 'Replies';
+     const SYNC_ADD = 'Add';
+     const SYNC_MODIFY = 'Modify';
+     const SYNC_REMOVE = 'Remove';
+     const SYNC_FETCH = 'Fetch';
+     const SYNC_SYNCKEY = 'SyncKey';
+     const SYNC_CLIENTENTRYID = 'ClientEntryId';
+     const SYNC_SERVERENTRYID = 'ServerEntryId';
+     const SYNC_STATUS = 'Status';
+     const SYNC_FOLDER = 'Folder';
+     const SYNC_FOLDERTYPE = 'FolderType';
+     const SYNC_VERSION = 'Version';
+     const SYNC_FOLDERID = 'FolderId';
+     const SYNC_GETCHANGES = 'GetChanges';
+     const SYNC_MOREAVAILABLE = 'MoreAvailable';
+     const SYNC_WINDOWSIZE = 'WindowSize';
+     const SYNC_COMMANDS = 'Commands';
+     const SYNC_OPTIONS = 'Options';
+     const SYNC_FILTERTYPE = 'FilterType';
+     const SYNC_TRUNCATION = 'Truncation';
+     const SYNC_RTFTRUNCATION = 'RtfTruncation';
+     const SYNC_CONFLICT = 'Conflict';
+     const SYNC_FOLDERS = 'Folders';
+     const SYNC_DATA = 'Data';
+     const SYNC_DELETESASMOVES = 'DeletesAsMoves';
+     const SYNC_NOTIFYGUID = 'NotifyGUID';
+     const SYNC_SUPPORTED = 'Supported';
+     const SYNC_SOFTDELETE = 'SoftDelete';
+     const SYNC_MIMESUPPORT = 'MIMESupport';
+     const SYNC_MIMETRUNCATION = 'MIMETruncation';
+ 
+     /* PROVISION */
+     const PROVISION_PROVISION =  'Provision:Provision';
+     const PROVISION_POLICIES =  'Provision:Policies';
+     const PROVISION_POLICY =  'Provision:Policy';
+     const PROVISION_POLICYTYPE =  'Provision:PolicyType';
+     const PROVISION_POLICYKEY =  'Provision:PolicyKey';
+     const PROVISION_DATA =  'Provision:Data';
+     const PROVISION_STATUS =  'Provision:Status';
+     const PROVISION_REMOTEWIPE =  'Provision:RemoteWipe';
+     const PROVISION_EASPROVISIONDOC =  'Provision:EASProvisionDoc';
+ 
+     /* Flags */
+     const FLAG_NEWMESSAGE = 'NewMessage';
+ 
+     /* Folder types */
+     // Other constants
+     const FOLDER_TYPE_OTHER =  1;
+     const FOLDER_TYPE_INBOX =  2;
+     const FOLDER_TYPE_DRAFTS =  3;
+     const FOLDER_TYPE_WASTEBASKET =  4;
+     const FOLDER_TYPE_SENTMAIL =  5;
+     const FOLDER_TYPE_OUTBOX =  6;
+     const FOLDER_TYPE_TASK =  7;
+     const FOLDER_TYPE_APPOINTMENT =  8;
+     const FOLDER_TYPE_CONTACT =  9;
+     const FOLDER_TYPE_NOTE =  10;
+     const FOLDER_TYPE_JOURNAL =  11;
+     const FOLDER_TYPE_USER_MAIL =  12;
+     const FOLDER_TYPE_USER_APPOINTMENT =  13;
+     const FOLDER_TYPE_USER_CONTACT =  14;
+     const FOLDER_TYPE_USER_TASK =  15;
+     const FOLDER_TYPE_USER_JOURNAL =  16;
+     const FOLDER_TYPE_USER_NOTE =  17;
+     const FOLDER_TYPE_UNKNOWN =  18;
+     const FOLDER_TYPE_RECIPIENT_CACHE =  19;
+     const FOLDER_TYPE_DUMMY =  '__dummy.Folder.Id__';
+  
+     /**
+      * Logger
+      *
+      * @var Horde_Log_Logger
+      */
+     protected $_logger;
+ 
      /**
 +     * Logger
 +     *
 +     * @var Horde_Log_Logger
 +     */
 +    protected $_logger;
 +
 +    /**
       * Provisioning support
       *
       * @var string (TODO _constant this)

diff --cc framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
index 4f195b9,b12e7a7..bc4d34b
--- 1/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
--- 2/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
@@@ -714,12 -720,4 +720,4 @@@ class Horde_ActiveSync_Message_Appointm
          return 'Calendar';
      }
  
-     protected function _getAttribute($name, $default = null)
-     {
-         if (!empty($this->_properties[$name])) {
-             return $this->_properties[$name];
-         } else {
-             return $default;
-         }
-     }
--}
++}

diff --cc framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
index 1a1d045,2ec96b9..96c3b10
--- 1/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
--- 2/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
@@@ -181,4 -190,4 +190,4 @@@ class Horde_ActiveSync_Request_Ping ext
  
          return true;
      }
--}
++}

diff --cc framework/ActiveSync/lib/Horde/ActiveSync/State/File.php
index f813b71,d4d437b..431deee
--- 1/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php
--- 2/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/State/File.php
@@@ -778,4 -790,4 +790,4 @@@ class Horde_ActiveSync_State_File exten
          return $a['id'] < $b['id'] ? 1 : -1;
      }
  
--}
++}

diff --cc kronolith/lib/Kronolith.php
Simple merge

diff --cc kronolith/themes/screen.css
Simple merge