@@ -138,7 +138,7 @@ |
||
| 138 | 138 | |
| 139 | 139 | //In AS 14 request only collectionid is sent, without class |
| 140 | 140 | if (! $spa->HasContentClass() && $spa->HasFolderId()) { |
| 141 | - try { |
|
| 141 | + try { |
|
| 142 | 142 | $spa->SetContentClass(self::$deviceManager->GetFolderClassFromCacheByID($spa->GetFolderId())); |
| 143 | 143 | } |
| 144 | 144 | catch (NoHierarchyCacheAvailableException $nhca) { |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | $sc->AddParameter($spa, "state", $this->importer->GetState()); |
| 524 | 524 | } |
| 525 | 525 | catch (StatusException $stex) { |
| 526 | - $status = $stex->getCode(); |
|
| 526 | + $status = $stex->getCode(); |
|
| 527 | 527 | } |
| 528 | 528 | } |
| 529 | 529 | |
@@ -612,9 +612,9 @@ discard block |
||
| 612 | 612 | $this->saveMultiFolderInfo("exception", "StateNotFoundException"); |
| 613 | 613 | } |
| 614 | 614 | catch (StatusException $stex) { |
| 615 | - $status = SYNC_STATUS_FOLDERHIERARCHYCHANGED; |
|
| 616 | - self::$topCollector->AnnounceInformation(sprintf("StatusException code: %d", $status), $this->singleFolder); |
|
| 617 | - $this->saveMultiFolderInfo("exception", "StatusException"); |
|
| 615 | + $status = SYNC_STATUS_FOLDERHIERARCHYCHANGED; |
|
| 616 | + self::$topCollector->AnnounceInformation(sprintf("StatusException code: %d", $status), $this->singleFolder); |
|
| 617 | + $this->saveMultiFolderInfo("exception", "StatusException"); |
|
| 618 | 618 | } |
| 619 | 619 | |
| 620 | 620 | // update a few values |
@@ -816,7 +816,7 @@ discard block |
||
| 816 | 816 | throw new StatusException(sprintf("HandleSync() could not get an exporter for folder id %s/%s", $spa->GetFolderId(), $spa->GetBackendFolderId()), SYNC_STATUS_FOLDERHIERARCHYCHANGED); |
| 817 | 817 | } |
| 818 | 818 | catch (StatusException $stex) { |
| 819 | - $status = $stex->getCode(); |
|
| 819 | + $status = $stex->getCode(); |
|
| 820 | 820 | } |
| 821 | 821 | try { |
| 822 | 822 | // Stream the messages directly to the PDA |
@@ -1294,9 +1294,9 @@ discard block |
||
| 1294 | 1294 | $this->saveMultiFolderInfo("exception", "StateNotFoundException"); |
| 1295 | 1295 | } |
| 1296 | 1296 | catch (StatusException $stex) { |
| 1297 | - $status = $stex->getCode(); |
|
| 1298 | - self::$topCollector->AnnounceInformation(sprintf("StatusException code: %d", $status), $this->singleFolder); |
|
| 1299 | - $this->saveMultiFolderInfo("exception", "StateNotFoundException"); |
|
| 1297 | + $status = $stex->getCode(); |
|
| 1298 | + self::$topCollector->AnnounceInformation(sprintf("StatusException code: %d", $status), $this->singleFolder); |
|
| 1299 | + $this->saveMultiFolderInfo("exception", "StateNotFoundException"); |
|
| 1300 | 1300 | |
| 1301 | 1301 | } |
| 1302 | 1302 | } |
@@ -1344,7 +1344,7 @@ discard block |
||
| 1344 | 1344 | } |
| 1345 | 1345 | } |
| 1346 | 1346 | catch (StatusException $stex) { |
| 1347 | - $status = $stex->getCode(); |
|
| 1347 | + $status = $stex->getCode(); |
|
| 1348 | 1348 | } |
| 1349 | 1349 | |
| 1350 | 1350 | return $status; |
@@ -1473,7 +1473,7 @@ discard block |
||
| 1473 | 1473 | } |
| 1474 | 1474 | } |
| 1475 | 1475 | catch (StatusException $stex) { |
| 1476 | - $actiondata["statusids"][$clientid] = $stex->getCode(); |
|
| 1476 | + $actiondata["statusids"][$clientid] = $stex->getCode(); |
|
| 1477 | 1477 | } |
| 1478 | 1478 | break; |
| 1479 | 1479 | case SYNC_REMOVE: |
@@ -116,7 +116,7 @@ |
||
| 116 | 116 | $searchvalue = self::$decoder->getElementContent(); |
| 117 | 117 | $cpo->SetSearchValueLess($searchvalue); |
| 118 | 118 | if(!self::$decoder->getElementEndTag()) // SYNC_SEARCH_VALUE |
| 119 | - return false; |
|
| 119 | + return false; |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | if(!self::$decoder->getElementEndTag()) // SYNC_SEARCH_LESSTHAN |
@@ -350,11 +350,11 @@ discard block |
||
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | /** |
| 353 | - * Returns if the AcceptMultipart parameter of the querystring is set |
|
| 354 | - * |
|
| 355 | - * @access public |
|
| 356 | - * @return boolean |
|
| 357 | - */ |
|
| 353 | + * Returns if the AcceptMultipart parameter of the querystring is set |
|
| 354 | + * |
|
| 355 | + * @access public |
|
| 356 | + * @return boolean |
|
| 357 | + */ |
|
| 358 | 358 | static public function GetGETAcceptMultipart() { |
| 359 | 359 | if (isset(self::$acceptMultipart)) |
| 360 | 360 | return self::$acceptMultipart; |
@@ -718,11 +718,11 @@ discard block |
||
| 718 | 718 | * @return string |
| 719 | 719 | */ |
| 720 | 720 | static private function filterIP($input) { |
| 721 | - $in_addr = @inet_pton($input); |
|
| 722 | - if ($in_addr === false) { |
|
| 721 | + $in_addr = @inet_pton($input); |
|
| 722 | + if ($in_addr === false) { |
|
| 723 | 723 | return 'badip-' . self::filterEvilInput($input, self::HEX_EXTENDED); |
| 724 | - } |
|
| 725 | - return inet_ntop($in_addr); |
|
| 724 | + } |
|
| 725 | + return inet_ntop($in_addr); |
|
| 726 | 726 | } |
| 727 | 727 | |
| 728 | 728 | /** |
@@ -30,12 +30,12 @@ |
||
| 30 | 30 | |
| 31 | 31 | if (Request::GetProtocolVersion() >= 14.0) { |
| 32 | 32 | $mapping[SYNC_RESOLVERECIPIENTS_AVAILABILITY] = array ( self::STREAMER_VAR => "availability", |
| 33 | - self::STREAMER_TYPE => "SyncResolveRecipientsAvailability"); |
|
| 33 | + self::STREAMER_TYPE => "SyncResolveRecipientsAvailability"); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | if (Request::GetProtocolVersion() >= 14.1) { |
| 37 | 37 | $mapping[SYNC_RESOLVERECIPIENTS_PICTURE] = array ( self::STREAMER_VAR => "picture", |
| 38 | - self::STREAMER_TYPE => "SyncResolveRecipientsPicture"); |
|
| 38 | + self::STREAMER_TYPE => "SyncResolveRecipientsPicture"); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | parent::__construct($mapping); |
@@ -23,8 +23,8 @@ |
||
| 23 | 23 | $mapping[SYNC_RESOLVERECIPIENTS_MAXPICTURES] = array ( self::STREAMER_VAR => "maxpictures"); |
| 24 | 24 | $mapping[SYNC_RESOLVERECIPIENTS_STATUS] = array ( self::STREAMER_VAR => "status"); |
| 25 | 25 | $mapping[SYNC_RESOLVERECIPIENTS_DATA] = array ( self::STREAMER_VAR => "data", |
| 26 | - self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASBASE64, |
|
| 27 | - ); |
|
| 26 | + self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASBASE64, |
|
| 27 | + ); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | parent::__construct($mapping); |
@@ -20,17 +20,17 @@ |
||
| 20 | 20 | $mapping = array( |
| 21 | 21 | SYNC_AIRSYNCBASE_TYPE => array (self::STREAMER_VAR => "type"), |
| 22 | 22 | SYNC_AIRSYNCBASE_ESTIMATEDDATASIZE => array (self::STREAMER_VAR => "estimatedDataSize", |
| 23 | - self::STREAMER_PRIVATE => strlen(self::STRIP_PRIVATE_SUBSTITUTE)), // when stripping private we set the body to self::STRIP_PRIVATE_SUBSTITUTE, so the size needs to be its length |
|
| 23 | + self::STREAMER_PRIVATE => strlen(self::STRIP_PRIVATE_SUBSTITUTE)), // when stripping private we set the body to self::STRIP_PRIVATE_SUBSTITUTE, so the size needs to be its length |
|
| 24 | 24 | SYNC_AIRSYNCBASE_TRUNCATED => array (self::STREAMER_VAR => "truncated"), |
| 25 | 25 | SYNC_AIRSYNCBASE_DATA => array (self::STREAMER_VAR => "data", |
| 26 | - self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASPLAIN, |
|
| 27 | - self::STREAMER_PROP => self::STREAMER_TYPE_MULTIPART, |
|
| 28 | - self::STREAMER_RONOTIFY => true, |
|
| 29 | - self::STREAMER_PRIVATE => StringStreamWrapper::Open(self::STRIP_PRIVATE_SUBSTITUTE)), // replace the body with self::STRIP_PRIVATE_SUBSTITUTE when stripping private |
|
| 26 | + self::STREAMER_TYPE => self::STREAMER_TYPE_STREAM_ASPLAIN, |
|
| 27 | + self::STREAMER_PROP => self::STREAMER_TYPE_MULTIPART, |
|
| 28 | + self::STREAMER_RONOTIFY => true, |
|
| 29 | + self::STREAMER_PRIVATE => StringStreamWrapper::Open(self::STRIP_PRIVATE_SUBSTITUTE)), // replace the body with self::STRIP_PRIVATE_SUBSTITUTE when stripping private |
|
| 30 | 30 | ); |
| 31 | 31 | if(Request::GetProtocolVersion() >= 14.0) { |
| 32 | 32 | $mapping[SYNC_AIRSYNCBASE_PREVIEW] = array (self::STREAMER_VAR => "preview", |
| 33 | - self::STREAMER_PRIVATE => self::STRIP_PRIVATE_SUBSTITUTE |
|
| 33 | + self::STREAMER_PRIVATE => self::STRIP_PRIVATE_SUBSTITUTE |
|
| 34 | 34 | ); |
| 35 | 35 | } |
| 36 | 36 | |
@@ -15,10 +15,10 @@ |
||
| 15 | 15 | |
| 16 | 16 | public function __construct() { |
| 17 | 17 | $mapping = array ( |
| 18 | - SYNC_SETTINGS_SMPTADDRESS => array ( self::STREAMER_VAR => "smtpaddress", |
|
| 18 | + SYNC_SETTINGS_SMPTADDRESS => array ( self::STREAMER_VAR => "smtpaddress", |
|
| 19 | 19 | self::STREAMER_PROP => self::STREAMER_TYPE_NO_CONTAINER, |
| 20 | 20 | self::STREAMER_ARRAY => SYNC_SETTINGS_SMPTADDRESS), |
| 21 | - SYNC_SETTINGS_PRIMARYSMTPADDRESS => array ( self::STREAMER_VAR => "primarysmtpaddress")); |
|
| 21 | + SYNC_SETTINGS_PRIMARYSMTPADDRESS => array ( self::STREAMER_VAR => "primarysmtpaddress")); |
|
| 22 | 22 | |
| 23 | 23 | parent::__construct($mapping); |
| 24 | 24 | } |
@@ -24,23 +24,23 @@ |
||
| 24 | 24 | SYNC_COMPOSEMAIL_CLIENTID => array ( self::STREAMER_VAR => "clientid"), |
| 25 | 25 | |
| 26 | 26 | SYNC_COMPOSEMAIL_SAVEINSENTITEMS => array ( self::STREAMER_VAR => "saveinsent", |
| 27 | - self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY), |
|
| 27 | + self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY), |
|
| 28 | 28 | |
| 29 | 29 | SYNC_COMPOSEMAIL_REPLACEMIME => array ( self::STREAMER_VAR => "replacemime", |
| 30 | - self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY), |
|
| 30 | + self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY), |
|
| 31 | 31 | |
| 32 | 32 | SYNC_COMPOSEMAIL_ACCOUNTID => array ( self::STREAMER_VAR => "accountid"), |
| 33 | 33 | |
| 34 | 34 | SYNC_COMPOSEMAIL_SOURCE => array ( self::STREAMER_VAR => "source", |
| 35 | - self::STREAMER_TYPE => "SyncSendMailSource"), |
|
| 35 | + self::STREAMER_TYPE => "SyncSendMailSource"), |
|
| 36 | 36 | |
| 37 | 37 | SYNC_COMPOSEMAIL_MIME => array ( self::STREAMER_VAR => "mime"), |
| 38 | 38 | |
| 39 | 39 | SYNC_COMPOSEMAIL_REPLYFLAG => array ( self::STREAMER_VAR => "replyflag", |
| 40 | - self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE), |
|
| 40 | + self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE), |
|
| 41 | 41 | |
| 42 | 42 | SYNC_COMPOSEMAIL_FORWARDFLAG => array ( self::STREAMER_VAR => "forwardflag", |
| 43 | - self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE), |
|
| 43 | + self::STREAMER_TYPE => self::STREAMER_TYPE_IGNORE), |
|
| 44 | 44 | ); |
| 45 | 45 | |
| 46 | 46 | parent::__construct($mapping); |