ZP-168 #comment SMS sync causes WBXMLException #time 30m

git-svn-id: https://z-push.org/svn/z-push/trunk@1488 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

src/lib/request/getitemestimate.php

@@ -97,16 +97,49 @@ class GetItemEstimate extends RequestProcessor {
                     }
                 }
 
-                elseif(self::$decoder->getElementStartTag(SYNC_OPTIONS)) {
-                    while(1) {
-                        if(self::$decoder->getElementStartTag(SYNC_FILTERTYPE)) {
+                // get items estimate does not necessarily send the folder type
+                elseif(self::$decoder->getElementStartTag(SYNC_GETITEMESTIMATE_FOLDERTYPE)) {
+                    $spa->SetContentClass(self::$decoder->getElementContent());
+
+                    if(!self::$decoder->getElementEndTag())
+                        return false;
+                }
+
+                //TODO AS 2.5 and filtertype not set
+                elseif(self::$decoder->getElementStartTag(SYNC_FILTERTYPE)) {
                     $spa->SetFilterType(self::$decoder->getElementContent());
+
                     if(!self::$decoder->getElementEndTag())
                         return false;
                 }
 
+                while(self::$decoder->getElementStartTag(SYNC_OPTIONS)) {
+                    while(1) {
+                        $firstOption = true;
+                        // foldertype definition
                         if(self::$decoder->getElementStartTag(SYNC_FOLDERTYPE)) {
-                            $spa->SetContentClass(self::$decoder->getElementContent());
+                            $foldertype = self::$decoder->getElementContent();
+                            ZLog::Write(LOGLEVEL_DEBUG, sprintf("HandleGetItemEstimate(): specified options block with foldertype '%s'", $foldertype));
+
+                            // switch the foldertype for the next options
+                            $spa->UseCPO($foldertype);
+
+                            // set to synchronize all changes. The mobile could overwrite this value
+                            $spa->SetFilterType(SYNC_FILTERTYPE_ALL);
+
+                            if(!self::$decoder->getElementEndTag())
+                                return false;
+                        }
+                        // if no foldertype is defined, use default cpo
+                        else if ($firstOption){
+                            $spa->UseCPO();
+                            // set to synchronize all changes. The mobile could overwrite this value
+                            $spa->SetFilterType(SYNC_FILTERTYPE_ALL);
+                        }
+                        $firstOption = false;
+
+                        if(self::$decoder->getElementStartTag(SYNC_FILTERTYPE)) {
+                            $spa->SetFilterType(self::$decoder->getElementContent());
                             if(!self::$decoder->getElementEndTag())
                                 return false;
                         }
@@ -125,22 +158,6 @@ class GetItemEstimate extends RequestProcessor {
                     }
                 }
 
-                // get items estimate does not necessarily send the folder type
-                elseif(self::$decoder->getElementStartTag(SYNC_GETITEMESTIMATE_FOLDERTYPE)) {
-                    $spa->SetContentClass(self::$decoder->getElementContent());
-
-                    if(!self::$decoder->getElementEndTag())
-                        return false;
-                }
-
-                //TODO AS 2.5 and filtertype not set
-                elseif(self::$decoder->getElementStartTag(SYNC_FILTERTYPE)) {
-                    $spa->SetFilterType(self::$decoder->getElementContent());
-
-                    if(!self::$decoder->getElementEndTag())
-                        return false;
-                }
-
                 $e = self::$decoder->peek();
                 if($e[EN_TYPE] == EN_TYPE_ENDTAG) {
                     self::$decoder->getElementEndTag(); //SYNC_GETITEMESTIMATE_FOLDER