Passed
Branch master (ff9d34)
by Mike
09:14
created
lib/request/settings.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
         // - UserInformation
32 32
         // Each of them should only be once per request. Each property must be processed in order.
33 33
         WBXMLDecoder::ResetInWhile("settingsMain");
34
-        while(WBXMLDecoder::InWhile("settingsMain")) {
34
+        while (WBXMLDecoder::InWhile("settingsMain")) {
35 35
             $propertyName = "";
36 36
             if (self::$decoder->getElementStartTag(SYNC_SETTINGS_OOF)) {
37 37
                 $propertyName = SYNC_SETTINGS_OOF;
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
                     case SYNC_SETTINGS_OOF:
61 61
                         $oofGet = new SyncOOF();
62 62
                         $oofGet->Decode(self::$decoder);
63
-                        if(!self::$decoder->getElementEndTag())
63
+                        if (!self::$decoder->getElementEndTag())
64 64
                             return false; // SYNC_SETTINGS_GET
65 65
                         break;
66 66
 
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 
75 75
                     default:
76 76
                         //TODO: a special status code needed?
77
-                        ZLog::Write(LOGLEVEL_WARN, sprintf ("This property ('%s') is not allowed to use get in request", $propertyName));
77
+                        ZLog::Write(LOGLEVEL_WARN, sprintf("This property ('%s') is not allowed to use get in request", $propertyName));
78 78
                 }
79 79
             }
80 80
             elseif (self::$decoder->getElementStartTag(SYNC_SETTINGS_SET)) {
@@ -101,10 +101,10 @@  discard block
 block discarded – undo
101 101
 
102 102
                     default:
103 103
                         //TODO: a special status code needed?
104
-                        ZLog::Write(LOGLEVEL_WARN, sprintf ("This property ('%s') is not allowed to use set in request", $propertyName));
104
+                        ZLog::Write(LOGLEVEL_WARN, sprintf("This property ('%s') is not allowed to use set in request", $propertyName));
105 105
                 }
106 106
 
107
-                if(!self::$decoder->getElementEndTag())
107
+                if (!self::$decoder->getElementEndTag())
108 108
                     return false; // SYNC_SETTINGS_SET
109 109
             }
110 110
             else {
@@ -112,12 +112,12 @@  discard block
 block discarded – undo
112 112
                 return false;
113 113
             }
114 114
 
115
-            if(!self::$decoder->getElementEndTag())
115
+            if (!self::$decoder->getElementEndTag())
116 116
                 return false; // SYNC_SETTINGS_OOF or SYNC_SETTINGS_DEVICEPW or SYNC_SETTINGS_DEVICEINFORMATION or SYNC_SETTINGS_USERINFORMATION
117 117
 
118 118
             //break if it reached the endtag
119 119
             $e = self::$decoder->peek();
120
-            if($e[EN_TYPE] == EN_TYPE_ENDTAG) {
120
+            if ($e[EN_TYPE] == EN_TYPE_ENDTAG) {
121 121
                 self::$decoder->getElementEndTag(); //SYNC_SETTINGS_SETTINGS
122 122
                 break;
123 123
             }
Please login to merge, or discard this patch.
lib/syncobjects/syncitemoperationsattachment.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@
 block discarded – undo
15 15
 
16 16
     function __construct() {
17 17
         $mapping = array(
18
-            SYNC_AIRSYNCBASE_CONTENTTYPE                        => array (  self::STREAMER_VAR      => "contenttype"),
19
-            SYNC_ITEMOPERATIONS_DATA                            => array (  self::STREAMER_VAR      => "data",
18
+            SYNC_AIRSYNCBASE_CONTENTTYPE                        => array(self::STREAMER_VAR      => "contenttype"),
19
+            SYNC_ITEMOPERATIONS_DATA                            => array(self::STREAMER_VAR      => "data",
20 20
                                                                             self::STREAMER_TYPE     => self::STREAMER_TYPE_STREAM_ASBASE64,
21 21
                                                                             self::STREAMER_PROP     => self::STREAMER_TYPE_MULTIPART),
22 22
         );
Please login to merge, or discard this patch.
lib/syncobjects/syncfolder.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -21,34 +21,34 @@
 block discarded – undo
21 21
     public $TypeReal;
22 22
 
23 23
     function __construct() {
24
-        $mapping = array (
25
-                    SYNC_FOLDERHIERARCHY_SERVERENTRYID                  => array (  self::STREAMER_VAR      => "serverid",
26
-                                                                                    self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_REQUIRED   => false)),
24
+        $mapping = array(
25
+                    SYNC_FOLDERHIERARCHY_SERVERENTRYID                  => array(self::STREAMER_VAR      => "serverid",
26
+                                                                                    self::STREAMER_CHECKS   => array(self::STREAMER_CHECK_REQUIRED   => false)),
27 27
 
28
-                    SYNC_FOLDERHIERARCHY_PARENTID                       => array (  self::STREAMER_VAR      => "parentid",
29
-                                                                                    self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_REQUIRED   => self::STREAMER_CHECK_SETZERO)),
28
+                    SYNC_FOLDERHIERARCHY_PARENTID                       => array(self::STREAMER_VAR      => "parentid",
29
+                                                                                    self::STREAMER_CHECKS   => array(self::STREAMER_CHECK_REQUIRED   => self::STREAMER_CHECK_SETZERO)),
30 30
 
31
-                    SYNC_FOLDERHIERARCHY_DISPLAYNAME                    => array (  self::STREAMER_VAR      => "displayname",
32
-                                                                                    self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_REQUIRED   => "Unknown")),
31
+                    SYNC_FOLDERHIERARCHY_DISPLAYNAME                    => array(self::STREAMER_VAR      => "displayname",
32
+                                                                                    self::STREAMER_CHECKS   => array(self::STREAMER_CHECK_REQUIRED   => "Unknown")),
33 33
 
34
-                    SYNC_FOLDERHIERARCHY_TYPE                           => array (  self::STREAMER_VAR      => "type",
35
-                                                                                    self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_REQUIRED   => 18,
34
+                    SYNC_FOLDERHIERARCHY_TYPE                           => array(self::STREAMER_VAR      => "type",
35
+                                                                                    self::STREAMER_CHECKS   => array(self::STREAMER_CHECK_REQUIRED   => 18,
36 36
                                                                                                                         self::STREAMER_CHECK_CMPHIGHER  => 0,
37
-                                                                                                                        self::STREAMER_CHECK_CMPLOWER   => 20  )),
37
+                                                                                                                        self::STREAMER_CHECK_CMPLOWER   => 20)),
38 38
 
39
-                    SYNC_FOLDERHIERARCHY_IGNORE_STORE                   => array (  self::STREAMER_VAR      => "Store",
39
+                    SYNC_FOLDERHIERARCHY_IGNORE_STORE                   => array(self::STREAMER_VAR      => "Store",
40 40
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_IGNORE),
41 41
 
42
-                    SYNC_FOLDERHIERARCHY_IGNORE_NOBCKENDFLD             => array (  self::STREAMER_VAR      => "NoBackendFolder",
42
+                    SYNC_FOLDERHIERARCHY_IGNORE_NOBCKENDFLD             => array(self::STREAMER_VAR      => "NoBackendFolder",
43 43
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_IGNORE),
44 44
 
45
-                    SYNC_FOLDERHIERARCHY_IGNORE_BACKENDID               => array (  self::STREAMER_VAR      => "BackendId",
45
+                    SYNC_FOLDERHIERARCHY_IGNORE_BACKENDID               => array(self::STREAMER_VAR      => "BackendId",
46 46
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_IGNORE),
47 47
 
48
-                    SYNC_FOLDERHIERARCHY_IGNORE_FLAGS                   => array (  self::STREAMER_VAR      => "Flags",
48
+                    SYNC_FOLDERHIERARCHY_IGNORE_FLAGS                   => array(self::STREAMER_VAR      => "Flags",
49 49
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_IGNORE),
50 50
 
51
-                    SYNC_FOLDERHIERARCHY_IGNORE_TYPEREAL                => array (  self::STREAMER_VAR      => "TypeReal",
51
+                    SYNC_FOLDERHIERARCHY_IGNORE_TYPEREAL                => array(self::STREAMER_VAR      => "TypeReal",
52 52
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_IGNORE),
53 53
         );
54 54
 
Please login to merge, or discard this patch.
lib/syncobjects/synctask.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -29,23 +29,23 @@  discard block
 block discarded – undo
29 29
     public $categories;
30 30
 
31 31
     function __construct() {
32
-        $mapping = array (
33
-                    SYNC_POOMTASKS_BODY                                 => array (  self::STREAMER_VAR      => "body",
32
+        $mapping = array(
33
+                    SYNC_POOMTASKS_BODY                                 => array(self::STREAMER_VAR      => "body",
34 34
                                                                                     self::STREAMER_RONOTIFY => true),
35
-                    SYNC_POOMTASKS_COMPLETE                             => array (  self::STREAMER_VAR      => "complete",
36
-                                                                                    self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_REQUIRED       => self::STREAMER_CHECK_SETZERO,
37
-                                                                                                                        self::STREAMER_CHECK_ZEROORONE      => self::STREAMER_CHECK_SETZERO ),
35
+                    SYNC_POOMTASKS_COMPLETE                             => array(self::STREAMER_VAR      => "complete",
36
+                                                                                    self::STREAMER_CHECKS   => array(self::STREAMER_CHECK_REQUIRED       => self::STREAMER_CHECK_SETZERO,
37
+                                                                                                                        self::STREAMER_CHECK_ZEROORONE      => self::STREAMER_CHECK_SETZERO),
38 38
                                                                                     self::STREAMER_RONOTIFY => true),
39 39
 
40
-                    SYNC_POOMTASKS_DATECOMPLETED                        => array (  self::STREAMER_VAR      => "datecompleted",
40
+                    SYNC_POOMTASKS_DATECOMPLETED                        => array(self::STREAMER_VAR      => "datecompleted",
41 41
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
42 42
                                                                                     self::STREAMER_RONOTIFY => true),
43 43
 
44
-                    SYNC_POOMTASKS_DUEDATE                              => array (  self::STREAMER_VAR      => "duedate",
44
+                    SYNC_POOMTASKS_DUEDATE                              => array(self::STREAMER_VAR      => "duedate",
45 45
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
46 46
                                                                                     self::STREAMER_RONOTIFY => true),
47 47
 
48
-                    SYNC_POOMTASKS_UTCDUEDATE                           => array (  self::STREAMER_VAR      => "utcduedate",
48
+                    SYNC_POOMTASKS_UTCDUEDATE                           => array(self::STREAMER_VAR      => "utcduedate",
49 49
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
50 50
                                                                                     self::STREAMER_RONOTIFY => true),
51 51
 
@@ -54,25 +54,25 @@  discard block
 block discarded – undo
54 54
                     // 1 = Normal
55 55
                     // 2 = High
56 56
                     // even the default value 1 is optional, the native android client 2.2 interprets a non-existing value as 0 (low)
57
-                    SYNC_POOMTASKS_IMPORTANCE                           => array (  self::STREAMER_VAR      => "importance",
58
-                                                                                    self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_REQUIRED       => self::STREAMER_CHECK_SETONE,
59
-                                                                                                                        self::STREAMER_CHECK_ONEVALUEOF     => array(0,1,2) ),
57
+                    SYNC_POOMTASKS_IMPORTANCE                           => array(self::STREAMER_VAR      => "importance",
58
+                                                                                    self::STREAMER_CHECKS   => array(self::STREAMER_CHECK_REQUIRED       => self::STREAMER_CHECK_SETONE,
59
+                                                                                                                        self::STREAMER_CHECK_ONEVALUEOF     => array(0, 1, 2)),
60 60
                                                                                     self::STREAMER_RONOTIFY => true),
61 61
 
62
-                    SYNC_POOMTASKS_RECURRENCE                           => array (  self::STREAMER_VAR      => "recurrence",
62
+                    SYNC_POOMTASKS_RECURRENCE                           => array(self::STREAMER_VAR      => "recurrence",
63 63
                                                                                     self::STREAMER_TYPE     => "SyncTaskRecurrence",
64 64
                                                                                     self::STREAMER_RONOTIFY => true),
65 65
 
66
-                    SYNC_POOMTASKS_REGENERATE                           => array (  self::STREAMER_VAR      => "regenerate",
66
+                    SYNC_POOMTASKS_REGENERATE                           => array(self::STREAMER_VAR      => "regenerate",
67 67
                                                                                     self::STREAMER_RONOTIFY => true),
68
-                    SYNC_POOMTASKS_DEADOCCUR                            => array (  self::STREAMER_VAR      => "deadoccur",
68
+                    SYNC_POOMTASKS_DEADOCCUR                            => array(self::STREAMER_VAR      => "deadoccur",
69 69
                                                                                     self::STREAMER_RONOTIFY => true),
70
-                    SYNC_POOMTASKS_REMINDERSET                          => array (  self::STREAMER_VAR      => "reminderset",
71
-                                                                                    self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_REQUIRED       => self::STREAMER_CHECK_SETZERO,
72
-                                                                                                                        self::STREAMER_CHECK_ZEROORONE      => self::STREAMER_CHECK_SETZERO ),
70
+                    SYNC_POOMTASKS_REMINDERSET                          => array(self::STREAMER_VAR      => "reminderset",
71
+                                                                                    self::STREAMER_CHECKS   => array(self::STREAMER_CHECK_REQUIRED       => self::STREAMER_CHECK_SETZERO,
72
+                                                                                                                        self::STREAMER_CHECK_ZEROORONE      => self::STREAMER_CHECK_SETZERO),
73 73
                                                                                     self::STREAMER_RONOTIFY => true),
74 74
 
75
-                    SYNC_POOMTASKS_REMINDERTIME                         => array (  self::STREAMER_VAR      => "remindertime",
75
+                    SYNC_POOMTASKS_REMINDERTIME                         => array(self::STREAMER_VAR      => "remindertime",
76 76
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
77 77
                                                                                     self::STREAMER_RONOTIFY => true),
78 78
 
@@ -81,28 +81,28 @@  discard block
 block discarded – undo
81 81
                     // 1 = Personal
82 82
                     // 2 = Private
83 83
                     // 3 = Confident
84
-                    SYNC_POOMTASKS_SENSITIVITY                          => array (  self::STREAMER_VAR      => "sensitivity",
85
-                                                                                    self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_ONEVALUEOF => array(0,1,2,3) ),
84
+                    SYNC_POOMTASKS_SENSITIVITY                          => array(self::STREAMER_VAR      => "sensitivity",
85
+                                                                                    self::STREAMER_CHECKS   => array(self::STREAMER_CHECK_ONEVALUEOF => array(0, 1, 2, 3)),
86 86
                                                                                     self::STREAMER_RONOTIFY => true),
87 87
 
88
-                    SYNC_POOMTASKS_STARTDATE                            => array (  self::STREAMER_VAR      => "startdate",
88
+                    SYNC_POOMTASKS_STARTDATE                            => array(self::STREAMER_VAR      => "startdate",
89 89
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
90 90
                                                                                     self::STREAMER_RONOTIFY => true),
91 91
 
92
-                    SYNC_POOMTASKS_UTCSTARTDATE                         => array (  self::STREAMER_VAR      => "utcstartdate",
92
+                    SYNC_POOMTASKS_UTCSTARTDATE                         => array(self::STREAMER_VAR      => "utcstartdate",
93 93
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
94 94
                                                                                     self::STREAMER_RONOTIFY => true),
95 95
 
96
-                    SYNC_POOMTASKS_SUBJECT                              => array (  self::STREAMER_VAR      => "subject",
96
+                    SYNC_POOMTASKS_SUBJECT                              => array(self::STREAMER_VAR      => "subject",
97 97
                                                                                     self::STREAMER_RONOTIFY => true),
98
-                    SYNC_POOMTASKS_RTF                                  => array (  self::STREAMER_VAR      => "rtf"),
99
-                    SYNC_POOMTASKS_CATEGORIES                           => array (  self::STREAMER_VAR      => "categories",
98
+                    SYNC_POOMTASKS_RTF                                  => array(self::STREAMER_VAR      => "rtf"),
99
+                    SYNC_POOMTASKS_CATEGORIES                           => array(self::STREAMER_VAR      => "categories",
100 100
                                                                                     self::STREAMER_ARRAY    => SYNC_POOMTASKS_CATEGORY,
101 101
                                                                                     self::STREAMER_RONOTIFY => true),
102 102
                 );
103 103
 
104 104
             if (Request::GetProtocolVersion() >= 12.0) {
105
-            $mapping[SYNC_AIRSYNCBASE_BODY]                             = array (   self::STREAMER_VAR      => "asbody",
105
+            $mapping[SYNC_AIRSYNCBASE_BODY] = array(self::STREAMER_VAR      => "asbody",
106 106
                                                                                     self::STREAMER_TYPE     => "SyncBaseBody",
107 107
                                                                                     self::STREAMER_RONOTIFY => true);
108 108
 
@@ -135,12 +135,12 @@  discard block
 block discarded – undo
135 135
             return false;
136 136
 
137 137
         if (isset($this->startdate) && isset($this->duedate) && $this->duedate < $this->startdate) {
138
-            ZLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter 'startdate' is HIGHER than 'duedate'. Check failed!", get_class($this) ));
138
+            ZLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter 'startdate' is HIGHER than 'duedate'. Check failed!", get_class($this)));
139 139
             return false;
140 140
         }
141 141
 
142 142
         if (isset($this->utcstartdate) && isset($this->utcduedate) && $this->utcduedate < $this->utcstartdate) {
143
-            ZLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter 'utcstartdate' is HIGHER than 'utcduedate'. Check failed!", get_class($this) ));
143
+            ZLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter 'utcstartdate' is HIGHER than 'utcduedate'. Check failed!", get_class($this)));
144 144
             return false;
145 145
         }
146 146
 
Please login to merge, or discard this patch.
lib/syncobjects/syncresolverecipient.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,22 +19,22 @@
 block discarded – undo
19 19
     public $id;
20 20
 
21 21
     public function __construct() {
22
-        $mapping = array (
23
-            SYNC_RESOLVERECIPIENTS_TYPE                     => array (  self::STREAMER_VAR      => "type"),
24
-            SYNC_RESOLVERECIPIENTS_DISPLAYNAME              => array (  self::STREAMER_VAR      => "displayname"),
25
-            SYNC_RESOLVERECIPIENTS_EMAILADDRESS             => array (  self::STREAMER_VAR      => "emailaddress"),
22
+        $mapping = array(
23
+            SYNC_RESOLVERECIPIENTS_TYPE                     => array(self::STREAMER_VAR      => "type"),
24
+            SYNC_RESOLVERECIPIENTS_DISPLAYNAME              => array(self::STREAMER_VAR      => "displayname"),
25
+            SYNC_RESOLVERECIPIENTS_EMAILADDRESS             => array(self::STREAMER_VAR      => "emailaddress"),
26 26
 
27
-            SYNC_RESOLVERECIPIENTS_CERTIFICATES             => array (  self::STREAMER_VAR      => "certificates",
27
+            SYNC_RESOLVERECIPIENTS_CERTIFICATES             => array(self::STREAMER_VAR      => "certificates",
28 28
                                                                         self::STREAMER_TYPE     => "SyncResolveRecipientsCertificates")
29 29
         );
30 30
 
31 31
         if (Request::GetProtocolVersion() >= 14.0) {
32
-            $mapping[SYNC_RESOLVERECIPIENTS_AVAILABILITY]   = array (  self::STREAMER_VAR      => "availability",
32
+            $mapping[SYNC_RESOLVERECIPIENTS_AVAILABILITY] = array(self::STREAMER_VAR      => "availability",
33 33
                                                                        self::STREAMER_TYPE     => "SyncResolveRecipientsAvailability");
34 34
         }
35 35
 
36 36
         if (Request::GetProtocolVersion() >= 14.1) {
37
-            $mapping[SYNC_RESOLVERECIPIENTS_PICTURE]        = array (  self::STREAMER_VAR      => "picture",
37
+            $mapping[SYNC_RESOLVERECIPIENTS_PICTURE] = array(self::STREAMER_VAR      => "picture",
38 38
                                                                        self::STREAMER_TYPE     => "SyncResolveRecipientsPicture");
39 39
         }
40 40
 
Please login to merge, or discard this patch.
lib/syncobjects/syncmailflags.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -27,47 +27,47 @@
 block discarded – undo
27 27
 
28 28
     function __construct() {
29 29
         $mapping = array(
30
-                    SYNC_POOMTASKS_SUBJECT                              => array (  self::STREAMER_VAR      => "subject",
30
+                    SYNC_POOMTASKS_SUBJECT                              => array(self::STREAMER_VAR      => "subject",
31 31
                                                                                     self::STREAMER_RONOTIFY => true),
32
-                    SYNC_POOMMAIL_FLAGSTATUS                            => array (  self::STREAMER_VAR      => "flagstatus",
32
+                    SYNC_POOMMAIL_FLAGSTATUS                            => array(self::STREAMER_VAR      => "flagstatus",
33 33
                                                                                     self::STREAMER_RONOTIFY => true),
34
-                    SYNC_POOMMAIL_FLAGTYPE                              => array (  self::STREAMER_VAR      => "flagtype",
34
+                    SYNC_POOMMAIL_FLAGTYPE                              => array(self::STREAMER_VAR      => "flagtype",
35 35
                                                                                     self::STREAMER_RONOTIFY => true),
36
-                    SYNC_POOMTASKS_DATECOMPLETED                        => array (  self::STREAMER_VAR      => "datecompleted",
36
+                    SYNC_POOMTASKS_DATECOMPLETED                        => array(self::STREAMER_VAR      => "datecompleted",
37 37
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
38 38
                                                                                     self::STREAMER_RONOTIFY => true),
39 39
 
40
-                    SYNC_POOMMAIL_COMPLETETIME                          => array (  self::STREAMER_VAR      => "completetime",
40
+                    SYNC_POOMMAIL_COMPLETETIME                          => array(self::STREAMER_VAR      => "completetime",
41 41
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
42 42
                                                                                     self::STREAMER_RONOTIFY => true),
43 43
 
44
-                    SYNC_POOMTASKS_STARTDATE                            => array (  self::STREAMER_VAR      => "startdate",
44
+                    SYNC_POOMTASKS_STARTDATE                            => array(self::STREAMER_VAR      => "startdate",
45 45
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
46 46
                                                                                     self::STREAMER_RONOTIFY => true),
47 47
 
48
-                    SYNC_POOMTASKS_DUEDATE                              => array (  self::STREAMER_VAR      => "duedate",
48
+                    SYNC_POOMTASKS_DUEDATE                              => array(self::STREAMER_VAR      => "duedate",
49 49
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
50 50
                                                                                     self::STREAMER_RONOTIFY => true),
51 51
 
52
-                    SYNC_POOMTASKS_UTCSTARTDATE                         => array (  self::STREAMER_VAR      => "utcstartdate",
52
+                    SYNC_POOMTASKS_UTCSTARTDATE                         => array(self::STREAMER_VAR      => "utcstartdate",
53 53
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
54 54
                                                                                     self::STREAMER_RONOTIFY => true),
55 55
 
56
-                    SYNC_POOMTASKS_UTCDUEDATE                           => array (  self::STREAMER_VAR      => "utcduedate",
56
+                    SYNC_POOMTASKS_UTCDUEDATE                           => array(self::STREAMER_VAR      => "utcduedate",
57 57
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
58 58
                                                                                     self::STREAMER_RONOTIFY => true),
59 59
 
60
-                    SYNC_POOMTASKS_REMINDERSET                          => array (  self::STREAMER_VAR      => "reminderset",
60
+                    SYNC_POOMTASKS_REMINDERSET                          => array(self::STREAMER_VAR      => "reminderset",
61 61
                                                                                     self::STREAMER_RONOTIFY => true),
62
-                    SYNC_POOMTASKS_REMINDERTIME                         => array (  self::STREAMER_VAR      => "remindertime",
62
+                    SYNC_POOMTASKS_REMINDERTIME                         => array(self::STREAMER_VAR      => "remindertime",
63 63
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
64 64
                                                                                     self::STREAMER_RONOTIFY => true),
65 65
 
66
-                    SYNC_POOMTASKS_ORDINALDATE                          => array (  self::STREAMER_VAR      => "ordinaldate",
66
+                    SYNC_POOMTASKS_ORDINALDATE                          => array(self::STREAMER_VAR      => "ordinaldate",
67 67
                                                                                     self::STREAMER_TYPE     => self::STREAMER_TYPE_DATE_DASHES,
68 68
                                                                                     self::STREAMER_RONOTIFY => true),
69 69
 
70
-                    SYNC_POOMTASKS_SUBORDINALDATE                       => array (  self::STREAMER_VAR      => "subordinaldate",
70
+                    SYNC_POOMTASKS_SUBORDINALDATE                       => array(self::STREAMER_VAR      => "subordinaldate",
71 71
                                                                                     self::STREAMER_RONOTIFY => true),
72 72
         );
73 73
 
Please login to merge, or discard this patch.
lib/syncobjects/syncobject.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
     const STREAMER_CHECK_CMPLOWER = 13;
23 23
     const STREAMER_CHECK_CMPHIGHER = 14;
24 24
     const STREAMER_CHECK_LENGTHMAX = 15;
25
-    const STREAMER_CHECK_EMAIL   = 16;
25
+    const STREAMER_CHECK_EMAIL = 16;
26 26
 
27 27
     protected $unsetVars;
28 28
     protected $supportsPrivateStripping;
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
             return false;
86 86
 
87 87
         // check objecttype
88
-        if (! ($odo instanceof SyncObject)) {
88
+        if (!($odo instanceof SyncObject)) {
89 89
             ZLog::Write(LOGLEVEL_DEBUG, "SyncObject->equals() the target object is not a SyncObject");
90 90
             return false;
91 91
         }
@@ -114,13 +114,13 @@  discard block
 block discarded – undo
114 114
             }
115 115
             else {
116 116
                 if (isset($this->$val) && isset($odo->$val)) {
117
-                    if ($strictTypeCompare){
118
-                        if ($this->$val !== $odo->$val){
117
+                    if ($strictTypeCompare) {
118
+                        if ($this->$val !== $odo->$val) {
119 119
                             ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false on field '%s': '%s' != '%s' using strictTypeCompare", $val, Utils::PrintAsString($this->$val), Utils::PrintAsString($odo->$val)));
120 120
                             return false;
121 121
                         }
122 122
                     } else {
123
-                        if ($this->$val != $odo->$val){
123
+                        if ($this->$val != $odo->$val) {
124 124
                             ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false on field '%s': '%s' != '%s'", $val, Utils::PrintAsString($this->$val), Utils::PrintAsString($odo->$val)));
125 125
                             return false;
126 126
                         }
@@ -145,11 +145,11 @@  discard block
 block discarded – undo
145 145
      * @return String
146 146
      */
147 147
     public function __toString() {
148
-        $str = get_class($this) . " (\n";
148
+        $str = get_class($this)." (\n";
149 149
 
150 150
         $streamerVars = array();
151 151
         foreach ($this->mapping as $k=>$v)
152
-            $streamerVars[$v[self::STREAMER_VAR]] = (isset($v[self::STREAMER_TYPE]))?$v[self::STREAMER_TYPE]:false;
152
+            $streamerVars[$v[self::STREAMER_VAR]] = (isset($v[self::STREAMER_TYPE])) ? $v[self::STREAMER_TYPE] : false;
153 153
 
154 154
         foreach (get_object_vars($this) as $k=>$v) {
155 155
             if ($k == "mapping") continue;
@@ -161,14 +161,14 @@  discard block
 block discarded – undo
161 161
 
162 162
             // self::STREAMER_ARRAY ?
163 163
             if (is_array($v)) {
164
-                $str .= "\t". $strV . $k ."(Array) size: " . count($v) ."\n";
165
-                foreach ($v as $value) $str .= "\t\t". Utils::PrintAsString($value) ."\n";
164
+                $str .= "\t".$strV.$k."(Array) size: ".count($v)."\n";
165
+                foreach ($v as $value) $str .= "\t\t".Utils::PrintAsString($value)."\n";
166 166
             }
167 167
             else if ($v instanceof SyncObject) {
168
-                $str .= "\t". $strV .$k ." => ". str_replace("\n", "\n\t\t\t", $v->__toString()) . "\n";
168
+                $str .= "\t".$strV.$k." => ".str_replace("\n", "\n\t\t\t", $v->__toString())."\n";
169 169
             }
170 170
             else
171
-                $str .= "\t". $strV .$k ." => " . (isset($this->$k)? Utils::PrintAsString($this->$k) :"null") . "\n";
171
+                $str .= "\t".$strV.$k." => ".(isset($this->$k) ? Utils::PrintAsString($this->$k) : "null")."\n";
172 172
         }
173 173
         $str .= ")";
174 174
 
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
             // check sub-objects recursively
248 248
             if (isset($v[self::STREAMER_TYPE]) && isset($this->{$v[self::STREAMER_VAR]})) {
249 249
                 if ($this->{$v[self::STREAMER_VAR]} instanceof SyncObject) {
250
-                    if (! $this->{$v[self::STREAMER_VAR]}->Check($logAsDebug))
250
+                    if (!$this->{$v[self::STREAMER_VAR]}->Check($logAsDebug))
251 251
                         return false;
252 252
                 }
253 253
                 else if (is_array($this->{$v[self::STREAMER_VAR]})) {
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
             if (isset($v[self::STREAMER_CHECKS])) {
261 261
                 foreach ($v[self::STREAMER_CHECKS] as $rule => $condition) {
262 262
                     // check REQUIRED settings
263
-                    if ($rule === self::STREAMER_CHECK_REQUIRED && (!isset($this->{$v[self::STREAMER_VAR]}) || $this->{$v[self::STREAMER_VAR]} === '' ) ) {
263
+                    if ($rule === self::STREAMER_CHECK_REQUIRED && (!isset($this->{$v[self::STREAMER_VAR]}) || $this->{$v[self::STREAMER_VAR]} === '')) {
264 264
                         // parameter is not set but ..
265 265
                         // requested to set to 0
266 266
                         if ($condition === self::STREAMER_CHECK_SETZERO) {
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
                     // check STREAMER_CHECK_ZEROORONE
302 302
                     if ($rule === self::STREAMER_CHECK_ZEROORONE && isset($this->{$v[self::STREAMER_VAR]})) {
303 303
                         if ($this->{$v[self::STREAMER_VAR]} != 0 && $this->{$v[self::STREAMER_VAR]} != 1) {
304
-                            $newval = $condition === self::STREAMER_CHECK_SETZERO ? 0:1;
304
+                            $newval = $condition === self::STREAMER_CHECK_SETZERO ? 0 : 1;
305 305
                             $this->{$v[self::STREAMER_VAR]} = $newval;
306 306
                             ZLog::Write($defaultLogLevel, sprintf("SyncObject->Check(): Fixed object from type %s: parameter '%s' is set to '%s' as it was not 0 or 1", $objClass, $v[self::STREAMER_VAR], $newval));
307 307
                         }
@@ -340,15 +340,15 @@  discard block
 block discarded – undo
340 340
                                 ZLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter '%s' can not be compared, as the comparable is not set. Check failed!", $objClass, $v[self::STREAMER_VAR]));
341 341
                                 return false;
342 342
                             }
343
-                            if ( ($rule == self::STREAMER_CHECK_CMPHIGHER && $this->{$v[self::STREAMER_VAR]} < $cmp) ||
344
-                                 ($rule == self::STREAMER_CHECK_CMPLOWER  && $this->{$v[self::STREAMER_VAR]} > $cmp)
343
+                            if (($rule == self::STREAMER_CHECK_CMPHIGHER && $this->{$v[self::STREAMER_VAR]} < $cmp) ||
344
+                                 ($rule == self::STREAMER_CHECK_CMPLOWER && $this->{$v[self::STREAMER_VAR]} > $cmp)
345 345
                                 ) {
346 346
 
347 347
                                 ZLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter '%s' is %s than '%s'. Check failed!",
348 348
                                                                     $objClass,
349 349
                                                                     $v[self::STREAMER_VAR],
350
-                                                                    (($rule === self::STREAMER_CHECK_CMPHIGHER)?'LOWER':'HIGHER'),
351
-                                                                    ((isset($cmpPar)?$cmpPar:$condition))  ));
350
+                                                                    (($rule === self::STREAMER_CHECK_CMPHIGHER) ? 'LOWER' : 'HIGHER'),
351
+                                                                    ((isset($cmpPar) ? $cmpPar : $condition))));
352 352
                                 return false;
353 353
                             }
354 354
                         }
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
                     // if $condition is false then the check really fails. Otherwise invalid emails are removed.
377 377
                     // if nothing is left (all emails were false), the parameter is set to condition
378 378
                     if ($rule === self::STREAMER_CHECK_EMAIL && isset($this->{$v[self::STREAMER_VAR]})) {
379
-                        if ($condition === false && ( (is_array($this->{$v[self::STREAMER_VAR]}) && empty($this->{$v[self::STREAMER_VAR]})) || strlen($this->{$v[self::STREAMER_VAR]}) == 0) )
379
+                        if ($condition === false && ((is_array($this->{$v[self::STREAMER_VAR]}) && empty($this->{$v[self::STREAMER_VAR]})) || strlen($this->{$v[self::STREAMER_VAR]}) == 0))
380 380
                             continue;
381 381
 
382 382
                         $as_array = false;
@@ -386,12 +386,12 @@  discard block
 block discarded – undo
386 386
                             $as_array = true;
387 387
                         }
388 388
                         else {
389
-                            $mails = array( $this->{$v[self::STREAMER_VAR]} );
389
+                            $mails = array($this->{$v[self::STREAMER_VAR]} );
390 390
                         }
391 391
 
392 392
                         $output = array();
393 393
                         foreach ($mails as $mail) {
394
-                            if (! Utils::CheckEmail($mail)) {
394
+                            if (!Utils::CheckEmail($mail)) {
395 395
                                 ZLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): object from type %s: parameter '%s' contains an invalid email address '%s'. Address is removed.", $objClass, $v[self::STREAMER_VAR], $mail));
396 396
                             }
397 397
                             else
Please login to merge, or discard this patch.
lib/syncobjects/syncresolverecipientspicture.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -16,13 +16,13 @@
 block discarded – undo
16 16
     public $data;
17 17
 
18 18
     public function __construct() {
19
-        $mapping = array ();
19
+        $mapping = array();
20 20
 
21 21
         if (Request::GetProtocolVersion() >= 14.1) {
22
-            $mapping[SYNC_RESOLVERECIPIENTS_MAXSIZE]        = array (  self::STREAMER_VAR      => "maxsize");
23
-            $mapping[SYNC_RESOLVERECIPIENTS_MAXPICTURES]    = array (  self::STREAMER_VAR      => "maxpictures");
24
-            $mapping[SYNC_RESOLVERECIPIENTS_STATUS]         = array (  self::STREAMER_VAR      => "status");
25
-            $mapping[SYNC_RESOLVERECIPIENTS_DATA]           = array (  self::STREAMER_VAR      => "data",
22
+            $mapping[SYNC_RESOLVERECIPIENTS_MAXSIZE]        = array(self::STREAMER_VAR      => "maxsize");
23
+            $mapping[SYNC_RESOLVERECIPIENTS_MAXPICTURES]    = array(self::STREAMER_VAR      => "maxpictures");
24
+            $mapping[SYNC_RESOLVERECIPIENTS_STATUS]         = array(self::STREAMER_VAR      => "status");
25
+            $mapping[SYNC_RESOLVERECIPIENTS_DATA]           = array(self::STREAMER_VAR      => "data",
26 26
                                                                        self::STREAMER_TYPE     => self::STREAMER_TYPE_STREAM_ASBASE64,
27 27
                                                                      );
28 28
         }
Please login to merge, or discard this patch.
lib/syncobjects/syncresolverecipientsoptions.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -17,15 +17,15 @@
 block discarded – undo
17 17
     public $picture;
18 18
 
19 19
     public function __construct() {
20
-        $mapping = array (
21
-            SYNC_RESOLVERECIPIENTS_CERTIFICATERETRIEVAL     => array (  self::STREAMER_VAR      => "certificateretrieval"),
22
-            SYNC_RESOLVERECIPIENTS_MAXCERTIFICATES          => array (  self::STREAMER_VAR      => "maxcertificates"),
23
-            SYNC_RESOLVERECIPIENTS_MAXAMBIGUOUSRECIPIENTS   => array (  self::STREAMER_VAR      => "maxambiguousrecipients"),
20
+        $mapping = array(
21
+            SYNC_RESOLVERECIPIENTS_CERTIFICATERETRIEVAL     => array(self::STREAMER_VAR      => "certificateretrieval"),
22
+            SYNC_RESOLVERECIPIENTS_MAXCERTIFICATES          => array(self::STREAMER_VAR      => "maxcertificates"),
23
+            SYNC_RESOLVERECIPIENTS_MAXAMBIGUOUSRECIPIENTS   => array(self::STREAMER_VAR      => "maxambiguousrecipients"),
24 24
 
25
-            SYNC_RESOLVERECIPIENTS_AVAILABILITY             => array (  self::STREAMER_VAR      => "availability",
25
+            SYNC_RESOLVERECIPIENTS_AVAILABILITY             => array(self::STREAMER_VAR      => "availability",
26 26
                                                                         self::STREAMER_TYPE     => "SyncResolveRecipientsAvailability"),
27 27
 
28
-            SYNC_RESOLVERECIPIENTS_PICTURE                  => array (  self::STREAMER_VAR      => "picture",
28
+            SYNC_RESOLVERECIPIENTS_PICTURE                  => array(self::STREAMER_VAR      => "picture",
29 29
                                                                         self::STREAMER_TYPE     => "SyncResolveRecipientsPicture"),
30 30
         );
31 31
 
Please login to merge, or discard this patch.