TRUNCATION constants

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync.php b/framework/ActiveSync/lib/Horde/ActiveSync.php
index 7bef4d2..6911655 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync.php
@@ -336,13 +336,6 @@ define("SYNC_FOLDER_TYPE_UNKNOWN", 18);
 define("SYNC_FOLDER_TYPE_RECIPIENT_CACHE", 19);
 define("SYNC_FOLDER_TYPE_DUMMY", "__dummy.Folder.Id__");
 
-define("SYNC_TRUNCATION_HEADERS", 0);
-define("SYNC_TRUNCATION_512B", 1);
-define("SYNC_TRUNCATION_1K", 2);
-define("SYNC_TRUNCATION_5K", 4);
-define("SYNC_TRUNCATION_SEVEN", 7);
-define("SYNC_TRUNCATION_ALL", 9);
-
 /**
  * Main ActiveSync class. Entry point for performing all ActiveSync operations
  *
@@ -353,6 +346,13 @@ class Horde_ActiveSync
     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;
     /**
      * Logger
      *

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
index 81d9626..a6a8aa1 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php
@@ -91,7 +91,7 @@ class Horde_ActiveSync_Request_Sync extends Horde_ActiveSync_Request_Base
                $this->_decoder->getElementStartTag(self::FOLDER)) {
 
             $collection = array();
-            $collection['truncation'] = SYNC_TRUNCATION_ALL;
+            $collection['truncation'] = Horde_ActiveSync::TRUNCATION_ALL;
             $collection['clientids'] = array();
             $collection['fetchids'] = array();
 

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Sync.php b/framework/ActiveSync/lib/Horde/ActiveSync/Sync.php
index 435584e..cf5bfee 100644 (file)
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Sync.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Sync.php
@@ -248,16 +248,16 @@ class Horde_ActiveSync_Sync
     private static function _getTruncSize($truncation)
     {
         switch($truncation) {
-        case SYNC_TRUNCATION_HEADERS:
+        case Horde_ActiveSync::TRUNCATION_HEADERS:
             return 0;
-        case SYNC_TRUNCATION_512B:
+        case Horde_ActiveSync::TRUNCATION_512B:
             return 512;
-        case SYNC_TRUNCATION_1K:
+        case Horde_ActiveSync::TRUNCATION_1K:
             return 1024;
-        case SYNC_TRUNCATION_5K:
+        case Horde_ActiveSync::TRUNCATION_5K:
             return 5 * 1024;
-        case SYNC_TRUNCATION_SEVEN:
-        case SYNC_TRUNCATION_ALL:
+        case Horde_ActiveSync::TRUNCATION_SEVEN:
+        case Horde_ActiveSync::TRUNCATION_ALL:
             return 1024 * 1024; // We'll limit to 1MB anyway
         default:
             return 1024; // Default to 1Kb