grommunio / grommunio-sync

lib/core/streamimporter.php

Spacing +6 added lines, -6 removed lines

@@ -26,7 +26,7 @@ 
     public function __construct(&$encoder, $class) {
         $this->encoder = &$encoder;
         $this->objclass = $class;
-        $this->classAsString = (is_object($class))?get_class($class):'';
+        $this->classAsString = (is_object($class)) ?get_class($class) : '';
         $this->seenObjects = array();
         $this->importedMsgs = 0;
         $this->checkForIgnoredMessages = true;
@@ -37,7 +37,7 @@ 
      */
     public function Config($state, $flags = 0) { return true; }
     public function ConfigContentParameters($contentparameters) { return true; }
-    public function GetState() { return false;}
+    public function GetState() { return false; }
     public function LoadConflicts($contentparameters, $state) { return true; }
 
     /**
@@ -51,7 +51,7 @@ 
      */
     public function ImportMessageChange($id, $message) {
         // ignore other SyncObjects
-        if(!($message instanceof $this->classAsString)) {
+        if (!($message instanceof $this->classAsString)) {
             return false;
         }
 
@@ -80,7 +80,7 @@ 
             $this->encoder->startTag(SYNC_ADD);
         else {
             // on update of an SyncEmail we only export the flags and categories
-            if($message instanceof SyncMail && ((isset($message->flag) && $message->flag instanceof SyncMailFlags) || isset($message->categories))) {
+            if ($message instanceof SyncMail && ((isset($message->flag) && $message->flag instanceof SyncMailFlags) || isset($message->categories))) {
                 $newmessage = new SyncMail();
                 $newmessage->read = $message->read;
                 if (isset($message->flag))              $newmessage->flag = $message->flag;
@@ -148,7 +148,7 @@ 
      * @return boolean
      */
     public function ImportMessageReadFlag($id, $flags, $categories = array()) {
-        if(!($this->objclass instanceof SyncMail))
+        if (!($this->objclass instanceof SyncMail))
             return false;
 
         $this->importedMsgs++;
@@ -163,7 +163,7 @@ 
                 $this->encoder->endTag();
                 if (!empty($categories) && is_array($categories)) {
                     $this->encoder->startTag(SYNC_POOMMAIL_CATEGORIES);
-                    foreach($categories as $category) {
+                    foreach ($categories as $category) {
                         $this->encoder->startTag(SYNC_POOMMAIL_CATEGORY);
                         $this->encoder->content($category);
                         $this->encoder->endTag();

lib/core/hierarchycache.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
      * @return string
      */
     public function GetStat() {
-        return sprintf("HierarchyCache is %s - Cached objects: %d", ((isset($this->data))?"up":"down"), ((isset($this->data))?count($this->data):"0"));
+        return sprintf("HierarchyCache is %s - Cached objects: %d", ((isset($this->data)) ? "up" : "down"), ((isset($this->data)) ?count($this->data) : "0"));
     }
 
     /**

lib/wbxml/wbxmlencoder.php

Spacing +29 added lines, -29 removed lines

@@ -33,13 +33,13 @@ 
         $this->_out = $output;
 
         // reverse-map the DTD
-        foreach($this->dtd["namespaces"] as $nsid => $nsname) {
+        foreach ($this->dtd["namespaces"] as $nsid => $nsname) {
             $this->_dtd["namespaces"][$nsname] = $nsid;
         }
 
-        foreach($this->dtd["codes"] as $cp => $value) {
+        foreach ($this->dtd["codes"] as $cp => $value) {
             $this->_dtd["codes"][$cp] = array();
-            foreach($this->dtd["codes"][$cp] as $tagid => $tagname) {
+            foreach ($this->dtd["codes"][$cp] as $tagid => $tagname) {
                 $this->_dtd["codes"][$cp][$tagname] = $tagid;
             }
         }
@@ -83,7 +83,7 @@ 
     public function startTag($tag, $attributes = false, $nocontent = false) {
         $stackelem = array();
 
-        if(!$nocontent) {
+        if (!$nocontent) {
             $stackelem['tag'] = $tag;
             $stackelem['nocontent'] = $nocontent;
             $stackelem['sent'] = false;
@@ -108,16 +108,16 @@ 
         $stackelem = array_pop($this->_stack);
 
         // Only output end tags for items that have had a start tag sent
-        if($stackelem['sent']) {
+        if ($stackelem['sent']) {
             $this->_endTag();
 
-            if(count($this->_stack) == 0)
+            if (count($this->_stack) == 0)
                 ZLog::Write(LOGLEVEL_DEBUG, "WBXMLEncoder->endTag() WBXML output completed");
 
-            if(count($this->_stack) == 0 && $this->multipart == true) {
+            if (count($this->_stack) == 0 && $this->multipart == true) {
                 $this->processMultipart();
             }
-            if(count($this->_stack) == 0)
+            if (count($this->_stack) == 0)
                 $this->writeLog();
         }
     }
@@ -133,9 +133,9 @@ 
     public function content($content) {
         // We need to filter out any \0 chars because it's the string terminator in WBXML. We currently
         // cannot send \0 characters within the XML content anywhere.
-        $content = str_replace("\0","",$content);
+        $content = str_replace("\0", "", $content);
 
-        if("x" . $content == "x")
+        if ("x".$content == "x")
             return;
         $this->_outputStack();
         $this->_content($content);
@@ -214,8 +214,8 @@ 
      * @return
      */
     private function _outputStack() {
-        for($i=0;$i<count($this->_stack);$i++) {
-            if(!$this->_stack[$i]['sent']) {
+        for ($i = 0; $i < count($this->_stack); $i++) {
+            if (!$this->_stack[$i]['sent']) {
                 $this->_startTag($this->_stack[$i]['tag'], $this->_stack[$i]['nocontent']);
                 $this->_stack[$i]['sent'] = true;
             }
@@ -234,17 +234,17 @@ 
 
         $mapping = $this->getMapping($tag);
 
-        if(!$mapping)
+        if (!$mapping)
             return false;
 
-        if($this->_tagcp != $mapping["cp"]) {
+        if ($this->_tagcp != $mapping["cp"]) {
             $this->outSwitchPage($mapping["cp"]);
             $this->_tagcp = $mapping["cp"];
         }
 
         $code = $mapping["code"];
 
-        if(!isset($nocontent) || !$nocontent)
+        if (!isset($nocontent) || !$nocontent)
             $code |= 0x40;
 
         $this->outByte($code);
@@ -296,7 +296,7 @@ 
 
         if ($this->log) {
             // data is out, do some logging
-            $this->logContent(sprintf("<<< written %d of %d bytes of %s data >>>", $written, $stat['size'], $asBase64 ? "base64 encoded":"plain"));
+            $this->logContent(sprintf("<<< written %d of %d bytes of %s data >>>", $written, $stat['size'], $asBase64 ? "base64 encoded" : "plain"));
         }
     }
 
@@ -351,10 +351,10 @@ 
             $byte = $uint & 0x7f;
             $uint = $uint >> 7;
             if ($i == 0) {
-                $out = chr($byte) . $out;
+                $out = chr($byte).$out;
             }
             else {
-                $out = chr($byte | 0x80) . $out;
+                $out = chr($byte|0x80).$out;
             }
         }
         fwrite($this->_out, $out);
@@ -399,7 +399,7 @@ 
 
         $split = $this->splitTag($tag);
 
-        if(isset($split["ns"])) {
+        if (isset($split["ns"])) {
             $cp = $this->_dtd["namespaces"][$split["ns"]];
         }
         else {
@@ -426,16 +426,16 @@ 
         $ns = false;
         $pos = strpos($fulltag, chr(58)); // chr(58) == ':'
 
-        if($pos) {
+        if ($pos) {
             $ns = substr($fulltag, 0, $pos);
-            $tag = substr($fulltag, $pos+1);
+            $tag = substr($fulltag, $pos + 1);
         }
         else {
             $tag = $fulltag;
         }
 
         $ret = array();
-        if($ns)
+        if ($ns)
             $ret["ns"] = $ns;
         $ret["tag"] = $tag;
 
@@ -453,11 +453,11 @@ 
      */
     private function logStartTag($tag, $nocontent) {
         $spaces = str_repeat(" ", count($this->logStack));
-        if($nocontent)
-            ZLog::Write(LOGLEVEL_WBXML,"O " . $spaces . " <$tag/>");
+        if ($nocontent)
+            ZLog::Write(LOGLEVEL_WBXML, "O ".$spaces." <$tag/>");
         else {
             array_push($this->logStack, $tag);
-            ZLog::Write(LOGLEVEL_WBXML,"O " . $spaces . " <$tag>");
+            ZLog::Write(LOGLEVEL_WBXML, "O ".$spaces." <$tag>");
         }
     }
 
@@ -470,7 +470,7 @@ 
     private function logEndTag() {
         $spaces = str_repeat(" ", count($this->logStack));
         $tag = array_pop($this->logStack);
-        ZLog::Write(LOGLEVEL_WBXML,"O " . $spaces . "</$tag>");
+        ZLog::Write(LOGLEVEL_WBXML, "O ".$spaces."</$tag>");
     }
 
     /**
@@ -483,7 +483,7 @@ 
      */
     private function logContent($content) {
         $spaces = str_repeat(" ", count($this->logStack));
-        ZLog::Write(LOGLEVEL_WBXML,"O " . $spaces . $content);
+        ZLog::Write(LOGLEVEL_WBXML, "O ".$spaces.$content);
     }
 
     /**
@@ -513,7 +513,7 @@ 
 
         fwrite($this->_out, $buffer);
 
-        foreach($this->bodyparts as $bp) {
+        foreach ($this->bodyparts as $bp) {
             stream_copy_to_stream($bp, $this->_out);
             fclose($bp);
         }
@@ -533,6 +533,6 @@ 
         } else {
             $data = "more than 512K of data";
         }
-        ZLog::Write(LOGLEVEL_WBXML, "WBXML-OUT: ". $data, false);
+        ZLog::Write(LOGLEVEL_WBXML, "WBXML-OUT: ".$data, false);
     }
 }

lib/wbxml/wbxmldecoder.php

Spacing +36 added lines, -36 removed lines

@@ -74,14 +74,14 @@ 
         $this->in = $input;
 
         $version = $this->getByte();
-        if($version != self::VERSION) {
+        if ($version != self::VERSION) {
             $this->inputBuffer .= chr($version);
             $this->isWBXML = false;
             return;
         }
 
         $publicid = $this->getMBUInt();
-        if($publicid !== 1)
+        if ($publicid !== 1)
             throw new WBXMLException("Wrong publicid : ".$publicid);
 
         $charsetid = $this->getMBUInt();
@@ -102,18 +102,18 @@ 
     public function getElement() {
         $element = $this->getToken();
 
-        switch($element[EN_TYPE]) {
+        switch ($element[EN_TYPE]) {
             case EN_TYPE_STARTTAG:
                 return $element;
             case EN_TYPE_ENDTAG:
                 return $element;
             case EN_TYPE_CONTENT:
                 WBXMLDecoder::ResetInWhile("decoderGetElement");
-                while(WBXMLDecoder::InWhile("decoderGetElement")) {
+                while (WBXMLDecoder::InWhile("decoderGetElement")) {
                     $next = $this->getToken();
-                    if($next == false)
+                    if ($next == false)
                         return false;
-                    else if($next[EN_TYPE] == EN_CONTENT) {
+                    else if ($next[EN_TYPE] == EN_CONTENT) {
                         $element[EN_CONTENT] .= $next[EN_CONTENT];
                     } else {
                         $this->ungetElement($next);
@@ -152,10 +152,10 @@ 
         if (!$element)
             return false;
 
-        if($element[EN_TYPE] == EN_TYPE_STARTTAG && $element[EN_TAG] == $tag)
+        if ($element[EN_TYPE] == EN_TYPE_STARTTAG && $element[EN_TAG] == $tag)
             return $element;
         else {
-            ZLog::Write(LOGLEVEL_WBXMLSTACK, sprintf("WBXMLDecoder->getElementStartTag(): unmatched WBXML tag: '%s' matching '%s' type '%s' flags '%s'", $tag, ((isset($element[EN_TAG]))?$element[EN_TAG]:""), ((isset($element[EN_TYPE]))?$element[EN_TYPE]:""), ((isset($element[EN_FLAGS]))?$element[EN_FLAGS]:"")));
+            ZLog::Write(LOGLEVEL_WBXMLSTACK, sprintf("WBXMLDecoder->getElementStartTag(): unmatched WBXML tag: '%s' matching '%s' type '%s' flags '%s'", $tag, ((isset($element[EN_TAG])) ? $element[EN_TAG] : ""), ((isset($element[EN_TYPE])) ? $element[EN_TYPE] : ""), ((isset($element[EN_FLAGS])) ? $element[EN_FLAGS] : "")));
             $this->ungetElement($element);
         }
 
@@ -171,17 +171,17 @@ 
     public function getElementEndTag() {
         $element = $this->getToken();
 
-        if($element[EN_TYPE] == EN_TYPE_ENDTAG)
+        if ($element[EN_TYPE] == EN_TYPE_ENDTAG)
             return $element;
         else {
-            ZLog::Write(LOGLEVEL_WBXMLSTACK, sprintf("WBXMLDecoder->getElementEndTag(): unmatched WBXML tag: '%s' type '%s' flags '%s'", ((isset($element[EN_TAG]))?$element[EN_TAG]:""), ((isset($element[EN_TYPE]))?$element[EN_TYPE]:""), ((isset($element[EN_FLAGS]))?$element[EN_FLAGS]:"")));
+            ZLog::Write(LOGLEVEL_WBXMLSTACK, sprintf("WBXMLDecoder->getElementEndTag(): unmatched WBXML tag: '%s' type '%s' flags '%s'", ((isset($element[EN_TAG])) ? $element[EN_TAG] : ""), ((isset($element[EN_TYPE])) ? $element[EN_TYPE] : ""), ((isset($element[EN_FLAGS])) ? $element[EN_FLAGS] : "")));
 
             $bt = debug_backtrace();
-            ZLog::Write(LOGLEVEL_ERROR, sprintf("WBXMLDecoder->getElementEndTag(): could not read end tag in '%s'. Please enable the LOGLEVEL_WBXML and send the log to the grommunio-sync dev team.", $bt[0]["file"] . ":" . $bt[0]["line"]));
+            ZLog::Write(LOGLEVEL_ERROR, sprintf("WBXMLDecoder->getElementEndTag(): could not read end tag in '%s'. Please enable the LOGLEVEL_WBXML and send the log to the grommunio-sync dev team.", $bt[0]["file"].":".$bt[0]["line"]));
 
             // log the remaining wbxml content
             $this->ungetElement($element);
-            while($el = $this->getElement());
+            while ($el = $this->getElement());
         }
 
         return false;
@@ -196,11 +196,11 @@ 
     public function getElementContent() {
         $element = $this->getToken();
 
-        if($element[EN_TYPE] == EN_TYPE_CONTENT) {
+        if ($element[EN_TYPE] == EN_TYPE_CONTENT) {
             return $element[EN_CONTENT];
         }
         else {
-            ZLog::Write(LOGLEVEL_WBXMLSTACK, sprintf("WBXMLDecoder->getElementContent(): unmatched WBXML content: '%s' type '%s' flags '%s'", ((isset($element[EN_TAG]))?$element[EN_TAG]:""), ((isset($element[EN_TYPE]))?$element[EN_TYPE]:""), ((isset($element[EN_FLAGS]))?$element[EN_FLAGS]:"")));
+            ZLog::Write(LOGLEVEL_WBXMLSTACK, sprintf("WBXMLDecoder->getElementContent(): unmatched WBXML content: '%s' type '%s' flags '%s'", ((isset($element[EN_TAG])) ? $element[EN_TAG] : ""), ((isset($element[EN_TYPE])) ? $element[EN_TYPE] : ""), ((isset($element[EN_FLAGS])) ? $element[EN_FLAGS] : "")));
             $this->ungetElement($element);
         }
 
@@ -216,8 +216,8 @@ 
      * @return
      */
     public function ungetElement($element) {
-        if($this->ungetbuffer)
-            ZLog::Write(LOGLEVEL_ERROR,sprintf("WBXMLDecoder->ungetElement(): WBXML double unget on tag: '%s' type '%s' flags '%s'", ((isset($element[EN_TAG]))?$element[EN_TAG]:""), ((isset($element[EN_TYPE]))?$element[EN_TYPE]:""), ((isset($element[EN_FLAGS]))?$element[EN_FLAGS]:"")));
+        if ($this->ungetbuffer)
+            ZLog::Write(LOGLEVEL_ERROR, sprintf("WBXMLDecoder->ungetElement(): WBXML double unget on tag: '%s' type '%s' flags '%s'", ((isset($element[EN_TAG])) ? $element[EN_TAG] : ""), ((isset($element[EN_TYPE])) ? $element[EN_TYPE] : ""), ((isset($element[EN_FLAGS])) ? $element[EN_FLAGS] : "")));
 
         $this->ungetbuffer = $element;
     }
@@ -250,7 +250,7 @@ 
      */
     public function readRemainingData() {
         ZLog::Write(LOGLEVEL_DEBUG, "WBXMLDecoder->readRemainingData() reading remaining data from input stream");
-        while($this->getElement());
+        while ($this->getElement());
     }
 
     /**----------------------------------------------------------------------------------------------------------
@@ -265,14 +265,14 @@ 
      */
     private function getToken() {
         // See if there's something in the ungetBuffer
-        if($this->ungetbuffer) {
+        if ($this->ungetbuffer) {
             $element = $this->ungetbuffer;
             $this->ungetbuffer = false;
             return $element;
         }
 
         $el = $this->_getToken();
-        if($this->log && $el)
+        if ($this->log && $el)
             $this->logToken($el);
 
         return $el;
@@ -289,18 +289,18 @@ 
     private function logToken($el) {
         $spaces = str_repeat(" ", count($this->logStack));
 
-        switch($el[EN_TYPE]) {
+        switch ($el[EN_TYPE]) {
             case EN_TYPE_STARTTAG:
-                if($el[EN_FLAGS] & EN_FLAGS_CONTENT) {
-                    ZLog::Write(LOGLEVEL_WBXML,"I " . $spaces . " <". $el[EN_TAG] . ">");
+                if ($el[EN_FLAGS] & EN_FLAGS_CONTENT) {
+                    ZLog::Write(LOGLEVEL_WBXML, "I ".$spaces." <".$el[EN_TAG].">");
                     array_push($this->logStack, $el[EN_TAG]);
                 } else
-                    ZLog::Write(LOGLEVEL_WBXML,"I " . $spaces . " <" . $el[EN_TAG] . "/>");
+                    ZLog::Write(LOGLEVEL_WBXML, "I ".$spaces." <".$el[EN_TAG]."/>");
 
                 break;
             case EN_TYPE_ENDTAG:
                 $tag = array_pop($this->logStack);
-                ZLog::Write(LOGLEVEL_WBXML,"I " . $spaces . "</" . $tag . ">");
+                ZLog::Write(LOGLEVEL_WBXML, "I ".$spaces."</".$tag.">");
                 break;
             case EN_TYPE_CONTENT:
                 // as we concatenate the string here, the entire content is copied.
@@ -308,13 +308,13 @@ 
                 // requires easily additional 20 MB of RAM. See https://jira.z-hub.io/browse/ZP-1159
                 $messagesize = strlen($el[EN_CONTENT]);
                 if ($messagesize > 10240 && !defined('WBXML_DEBUGGING')) {
-                    $content = substr($el[EN_CONTENT], 0, 10240) . sprintf(" <log message with %d bytes truncated>", $messagesize);
+                    $content = substr($el[EN_CONTENT], 0, 10240).sprintf(" <log message with %d bytes truncated>", $messagesize);
                 }
                 else {
                     $content = $el[EN_CONTENT];
                 }
                 // Log but make sure it's not truncated again (will be slightly bigger than 10KB)
-                ZLog::Write(LOGLEVEL_WBXML,"I " . $spaces . " " . $content, false);
+                ZLog::Write(LOGLEVEL_WBXML, "I ".$spaces." ".$content, false);
                 break;
         }
     }
@@ -330,13 +330,13 @@ 
         $element = array();
 
         WBXMLDecoder::ResetInWhile("decoderGetToken");
-        while(WBXMLDecoder::InWhile("decoderGetToken")) {
+        while (WBXMLDecoder::InWhile("decoderGetToken")) {
             $byte = fread($this->in, 1);
-            if($byte === "" || $byte === false)
+            if ($byte === "" || $byte === false)
                 break;
             $byte = ord($byte);
 
-            switch($byte) {
+            switch ($byte) {
                 case self::WBXML_SWITCH_PAGE:
                     $this->tagcp = $this->getByte();
                     break;
@@ -375,7 +375,7 @@ 
                     throw new WBXMLException("Invalid token :".$byte);
 
                 default:
-                    if($byte & self::WBXML_WITH_ATTRIBUTES)
+                    if ($byte & self::WBXML_WITH_ATTRIBUTES)
                         throw new WBXMLException("Attributes are not allowed :".$byte);
                     $element[EN_TYPE] = EN_TYPE_STARTTAG;
                     $element[EN_TAG] = $this->getMapping($this->tagcp, $byte & 0x3f);
@@ -441,7 +441,7 @@ 
      */
     private function getByte() {
         $ch = fread($this->in, 1);
-        if(strlen($ch) > 0)
+        if (strlen($ch) > 0)
             return ord($ch);
         else
             return;
@@ -456,12 +456,12 @@ 
     private function getMBUInt() {
         $uint = 0;
 
-        while(1) {
+        while (1) {
           $byte = $this->getByte();
 
           $uint |= $byte & 0x7f;
 
-          if($byte & 0x80)
+          if ($byte & 0x80)
               $uint = $uint << 7;
           else
               break;
@@ -480,11 +480,11 @@ 
      * @return string
      */
     private function getMapping($cp, $id) {
-        if(!isset($this->dtd["codes"][$cp]) || !isset($this->dtd["codes"][$cp][$id]))
+        if (!isset($this->dtd["codes"][$cp]) || !isset($this->dtd["codes"][$cp][$id]))
             return false;
         else {
-            if(isset($this->dtd["namespaces"][$cp])) {
-                return $this->dtd["namespaces"][$cp] . ":" . $this->dtd["codes"][$cp][$id];
+            if (isset($this->dtd["namespaces"][$cp])) {
+                return $this->dtd["namespaces"][$cp].":".$this->dtd["codes"][$cp][$id];
             } else
                 return $this->dtd["codes"][$cp][$id];
         }

lib/wbxml/wbxmldefs.php

Spacing +47 added lines, -47 removed lines

@@ -7,41 +7,41 @@ 
  * WBXML definitions
  */
 
-define('EN_TYPE',               1);
-define('EN_TAG',                2);
-define('EN_CONTENT',            3);
-define('EN_FLAGS',              4);
-define('EN_ATTRIBUTES',         5);
+define('EN_TYPE', 1);
+define('EN_TAG', 2);
+define('EN_CONTENT', 3);
+define('EN_FLAGS', 4);
+define('EN_ATTRIBUTES', 5);
 
-define('EN_TYPE_STARTTAG',      1);
-define('EN_TYPE_ENDTAG',        2);
-define('EN_TYPE_CONTENT',       3);
+define('EN_TYPE_STARTTAG', 1);
+define('EN_TYPE_ENDTAG', 2);
+define('EN_TYPE_CONTENT', 3);
 
-define('EN_FLAGS_CONTENT',      1);
-define('EN_FLAGS_ATTRIBUTES',   2);
+define('EN_FLAGS_CONTENT', 1);
+define('EN_FLAGS_ATTRIBUTES', 2);
 
 class WBXMLDefs {
 
     const WBXML_SWITCH_PAGE = 0x00;
-    const WBXML_END =         0x01;
-    const WBXML_ENTITY =      0x02; //not used in ActiveSync
-    const WBXML_STR_I =       0x03;
-    const WBXML_LITERAL =     0x04; //not used in ActiveSync
-    const WBXML_EXT_I_0 =     0x40; //not used in ActiveSync
-    const WBXML_EXT_I_1 =     0x41; //not used in ActiveSync
-    const WBXML_EXT_I_2 =     0x42; //not used in ActiveSync
-    const WBXML_PI =          0x43; //not used in ActiveSync
-    const WBXML_LITERAL_C =   0x44; //not used in ActiveSync
-    const WBXML_EXT_T_0 =     0x80; //not used in ActiveSync
-    const WBXML_EXT_T_1 =     0x81; //not used in ActiveSync
-    const WBXML_EXT_T_2 =     0x82; //not used in ActiveSync
-    const WBXML_STR_T =       0x83; //not used in ActiveSync
-    const WBXML_LITERAL_A =   0x84; //not used in ActiveSync
-    const WBXML_EXT_0 =       0xC0; //not used in ActiveSync
-    const WBXML_EXT_1 =       0xC1; //not used in ActiveSync
-    const WBXML_EXT_2 =       0xC2; //not used in ActiveSync
-    const WBXML_OPAQUE =      0xC3;
-    const WBXML_LITERAL_AC =  0xC4; //not used in ActiveSync
+    const WBXML_END = 0x01;
+    const WBXML_ENTITY = 0x02; //not used in ActiveSync
+    const WBXML_STR_I = 0x03;
+    const WBXML_LITERAL = 0x04; //not used in ActiveSync
+    const WBXML_EXT_I_0 = 0x40; //not used in ActiveSync
+    const WBXML_EXT_I_1 = 0x41; //not used in ActiveSync
+    const WBXML_EXT_I_2 = 0x42; //not used in ActiveSync
+    const WBXML_PI = 0x43; //not used in ActiveSync
+    const WBXML_LITERAL_C = 0x44; //not used in ActiveSync
+    const WBXML_EXT_T_0 = 0x80; //not used in ActiveSync
+    const WBXML_EXT_T_1 = 0x81; //not used in ActiveSync
+    const WBXML_EXT_T_2 = 0x82; //not used in ActiveSync
+    const WBXML_STR_T = 0x83; //not used in ActiveSync
+    const WBXML_LITERAL_A = 0x84; //not used in ActiveSync
+    const WBXML_EXT_0 = 0xC0; //not used in ActiveSync
+    const WBXML_EXT_1 = 0xC1; //not used in ActiveSync
+    const WBXML_EXT_2 = 0xC2; //not used in ActiveSync
+    const WBXML_OPAQUE = 0xC3;
+    const WBXML_LITERAL_AC = 0xC4; //not used in ActiveSync
 
     const WBXML_WITH_ATTRIBUTES = 0x80; //not used in ActiveSync
     const WBXML_WITH_CONTENT = 0x40;
@@ -50,8 +50,8 @@ 
      * The WBXML DTDs
      */
     protected $dtd = array(
-                "codes" => array (
-                    0 => array (
+                "codes" => array(
+                    0 => array(
                         0x05 => "Synchronize",
                         0x06 => "Replies", //Responses
                         0x07 => "Add",
@@ -90,7 +90,7 @@ 
                         0x28 => "MaxItems", // Since 14.0
                         0x29 => "HeartbeatInterval", // Since 14.0 Either this tag or the Wait tag can be present, but not both.
                     ),
-                    1 => array (
+                    1 => array(
                         0x05 => "Anniversary",
                         0x06 => "AssistantName",
                         0x07 => "AssistnamePhoneNumber", //AssistantTelephoneNumber
@@ -150,7 +150,7 @@ 
                         0x3d => "Alias", // Since 14.0
                         0x3e => "WeightedRank" // Since 14.0
                     ),
-                    2 => array (
+                    2 => array(
                         0x05 => "Attachment", // AirSyncBase Attachments is used since 12.0
                         0x06 => "Attachments", // AirSyncBase Attachments is used since 12.0
                         0x07 => "AttName", // AirSyncBase Attachments is used since 12.0
@@ -211,7 +211,7 @@ 
                         0x3e => "CompleteTime", // Since 12.0
                         0x3f => "DisallowNewTimeProposal", // Since 14.0
                     ),
-                    3 => array ( //Code page 3 is no longer in use, however, tokens 05 through 17 have been defined. 20100501
+                    3 => array( //Code page 3 is no longer in use, however, tokens 05 through 17 have been defined. 20100501
                         0x05 => "Notify",
                         0x06 => "Notification",
                         0x07 => "Version",
@@ -232,7 +232,7 @@ 
                         0x15 => "Expiry",
                         0x16 => "NotifyGUID",
                     ),
-                    4 => array (
+                    4 => array(
                         0x05 => "Timezone",
                         0x06 => "AllDayEvent",
                         0x07 => "Attendees",
@@ -289,7 +289,7 @@ 
                         0x3a => "OnlineMeetingConfLink", // Since 14.1
                         0x3b => "OnlineMeetingExternalLink", // Since 14.1
                     ),
-                    5 => array (
+                    5 => array(
                         0x05 => "Moves",
                         0x06 => "Move",
                         0x07 => "SrcMsgId",
@@ -299,7 +299,7 @@ 
                         0x0b => "Status",
                         0x0c => "DstMsgId",
                     ),
-                    6 => array (
+                    6 => array(
                         0x05 => "GetItemEstimate",
                         0x06 => "Version", // deprecated
                         0x07 => "Folders", // Collections
@@ -311,7 +311,7 @@ 
                         0x0d => "Response",
                         0x0e => "Status",
                     ),
-                    7 => array (
+                    7 => array(
                         0x05 => "Folders", // 2.5, 12.0 and 12.1
                         0x06 => "Folder", // 2.5, 12.0 and 12.1
                         0x07 => "DisplayName",
@@ -333,7 +333,7 @@ 
                         0x17 => "Count",
                         0x18 => "Version", // 2.0 - not defined in 20100501
                     ),
-                    8 => array (
+                    8 => array(
                         0x05 => "CalendarId",
                         0x06 => "FolderId", // CollectionId
                         0x07 => "MeetingResponse",
@@ -345,7 +345,7 @@ 
                         0x0d => "Version", // 2.0 - not defined in 20100501
                         0x0e => "InstanceId" // Since AS 14.1
                     ),
-                    9 => array (
+                    9 => array(
                         0x05 => "Body", // AirSyncBase Body is used since 12.0
                         0x06 => "BodySize", // AirSyncBase Body is used since 12.0
                         0x07 => "BodyTruncated", // AirSyncBase Body is used since 12.0
@@ -381,7 +381,7 @@ 
                         0x25 => "IsLeapMonth", // Since 14.0
                         0x26 => "FirstDayOfWeek", // Since 14.1
                     ),
-                    0xa => array (
+                    0xa => array(
                         0x05 => "ResolveRecipients",
                         0x06 => "Response",
                         0x07 => "Status",
@@ -408,7 +408,7 @@ 
                         0x1C => "Data", // Since 14.1
                         0x1D => "MaxPictures", // Since 14.1
                     ),
-                    0xb => array (
+                    0xb => array(
                         0x05 => "ValidateCert",
                         0x06 => "Certificates",
                         0x07 => "Certificate",
@@ -416,7 +416,7 @@ 
                         0x09 => "CheckCRL",
                         0x0a => "Status",
                     ),
-                    0xc => array (
+                    0xc => array(
                         0x05 => "CustomerId",
                         0x06 => "GovernmentId",
                         0x07 => "IMAddress",
@@ -428,7 +428,7 @@ 
                         0x0d => "NickName",
                         0x0e => "MMS",
                     ),
-                    0xd => array (
+                    0xd => array(
                         0x05 => "Ping",
                         0x06 => "AutdState", // (Not used by protocol)
                         0x07 => "Status",
@@ -440,7 +440,7 @@ 
                         0x0d => "MaxFolders",
                         0x0e => "Version" // not defined / deprecated
                     ),
-                    0xe => array (
+                    0xe => array(
                         0x05 => "Provision",
                         0x06 => "Policies",
                         0x07 => "Policy",
@@ -720,8 +720,8 @@ 
                   0xB => "ValidateCert",
                   0xC => "POOMCONTACTS2",
                   0xD => "Ping",
-                  0xE => "Provision",//
-                  0xF => "Search",//
+                  0xE => "Provision", //
+                  0xF => "Search", //
                   0x10 => "GAL",
                   0x11 => "AirSyncBase", //12.0, 12.1 and 14.0
                   0x12 => "Settings", //12.0, 12.1 and 14.0.

lib/utils/stringstreamwrapper.php

Spacing +5 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
         $this->truncateHtmlSafe = (isset($contextOptions[self::PROTOCOL]['truncatehtmlsafe'])) ? $contextOptions[self::PROTOCOL]['truncatehtmlsafe'] : false;
 
         $this->stringlength = strlen($this->stringstream);
-        ZLog::Write(LOGLEVEL_DEBUG, sprintf("StringStreamWrapper::stream_open(): initialized stream length: %d - HTML-safe-truncate: %s", $this->stringlength,  Utils::PrintAsString($this->truncateHtmlSafe)));
+        ZLog::Write(LOGLEVEL_DEBUG, sprintf("StringStreamWrapper::stream_open(): initialized stream length: %d - HTML-safe-truncate: %s", $this->stringlength, Utils::PrintAsString($this->truncateHtmlSafe)));
 
         return true;
     }
@@ -67,9 +67,9 @@ 
      * @param string $data
      * @return int
      */
-    public function stream_write($data){
+    public function stream_write($data) {
         $l = strlen($data);
-        $this->stringstream = substr($this->stringstream, 0, $this->position) . $data . substr($this->stringstream, $this->position += $l);
+        $this->stringstream = substr($this->stringstream, 0, $this->position).$data.substr($this->stringstream, $this->position += $l);
         $this->stringlength = strlen($this->stringstream);
         return $l;
     }
@@ -120,7 +120,7 @@ 
      * @param int $new_size
      * @return boolean
      */
-    public function stream_truncate ($new_size) {
+    public function stream_truncate($new_size) {
         // cut the string!
         $this->stringstream = Utils::Utf8_truncate($this->stringstream, $new_size, $this->truncateHtmlSafe);
         $this->stringlength = strlen($this->stringstream);
@@ -156,7 +156,7 @@ 
      */
      static public function Open($string, $truncatehtmlsafe = false) {
         $context = stream_context_create(array(self::PROTOCOL => array('string' => &$string, 'truncatehtmlsafe' => $truncatehtmlsafe)));
-        return fopen(self::PROTOCOL . "://",'r', false, $context);
+        return fopen(self::PROTOCOL."://", 'r', false, $context);
     }
 }
 

lib/utils/g_RFC822.php

Spacing +18 added lines, -18 removed lines

@@ -256,7 +256,7 @@ 
 
             // First check there's a colon at all:
             if (strpos($string, ':') === false) {
-                $this->error = 'Invalid address: ' . $string;
+                $this->error = 'Invalid address: '.$string;
                 return false;
             }
 
@@ -283,7 +283,7 @@ 
         // If the next char is a comma and this was a group, then
         // there are more addresses, otherwise, if there are any more
         // chars, then there is another address.
-        if ($is_group && substr($address, 0, 1) == ','){
+        if ($is_group && substr($address, 0, 1) == ',') {
             $address = trim(substr($address, 1));
             return $address;
 
@@ -339,7 +339,7 @@ 
                 || $this->_hasUnclosedBrackets($string, '()')
                 || substr($string, -1) == '\\') {
                 if (isset($parts[$i + 1])) {
-                    $string = $string . $char . $parts[$i + 1];
+                    $string = $string.$char.$parts[$i + 1];
                 } else {
                     $this->error = 'Invalid address spec. Unclosed bracket or quotes';
                     return false;
@@ -405,7 +405,7 @@ 
         $this->_hasUnclosedBracketsSub($string, $num_angle_end, $chars[1]);
 
         if ($num_angle_start < $num_angle_end) {
-            $this->error = 'Invalid address spec. Unmatched quote or bracket (' . $chars . ')';
+            $this->error = 'Invalid address spec. Unmatched quote or bracket ('.$chars.')';
             return false;
         } else {
             return ($num_angle_start > $num_angle_end);
@@ -423,11 +423,11 @@ 
     protected function _hasUnclosedBracketsSub($string, &$num, $char)
     {
         $parts = explode($char, $string);
-        for ($i = 0; $i < count($parts); $i++){
+        for ($i = 0; $i < count($parts); $i++) {
             if (substr($parts[$i], -1) == '\\' || $this->_hasUnclosedQuotes($parts[$i]))
                 $num--;
             if (isset($parts[$i + 1]))
-                $parts[$i + 1] = $parts[$i] . $char . $parts[$i + 1];
+                $parts[$i + 1] = $parts[$i].$char.$parts[$i + 1];
         }
 
         return $num;
@@ -453,7 +453,7 @@ 
             $structure = array();
 
             // And validate the group part of the name.
-            if (!$this->_validatePhrase($groupname)){
+            if (!$this->_validatePhrase($groupname)) {
                 $this->error = 'Group name did not validate.';
                 return false;
             } else {
@@ -465,7 +465,7 @@ 
                 }
             }
 
-            $address['address'] = ltrim(substr($address['address'], strlen($groupname . ':')));
+            $address['address'] = ltrim(substr($address['address'], strlen($groupname.':')));
         }
 
         // If a group then split on comma and put into an array.
@@ -474,7 +474,7 @@ 
             while (strlen($address['address']) > 0) {
                 $parts       = explode(',', $address['address']);
                 $addresses[] = $this->_splitCheck($parts, ',');
-                $address['address'] = trim(substr($address['address'], strlen(end($addresses) . ',')));
+                $address['address'] = trim(substr($address['address'], strlen(end($addresses).',')));
             }
         } else {
             $addresses[] = $address['address'];
@@ -491,7 +491,7 @@ 
         for ($i = 0; $i < count($addresses); $i++) {
             if (!$this->validateMailbox($addresses[$i])) {
                 if (empty($this->error)) {
-                    $this->error = 'Validation failed for: ' . $addresses[$i];
+                    $this->error = 'Validation failed for: '.$addresses[$i];
                 }
                 return false;
             }
@@ -529,7 +529,7 @@ 
         $parts = preg_split('/[ \\x09]+/', $phrase, -1, PREG_SPLIT_NO_EMPTY);
 
         $phrase_parts = array();
-        while (count($parts) > 0){
+        while (count($parts) > 0) {
             $phrase_parts[] = $this->_splitCheck($parts, ' ');
             for ($i = 0; $i < $this->index + 1; $i++)
                 array_shift($parts);
@@ -632,7 +632,7 @@ 
                 $comments[] = $comment;
 
                 // +2 is for the brackets
-                $_mailbox = substr($_mailbox, strpos($_mailbox, '('.$comment)+strlen($comment)+2);
+                $_mailbox = substr($_mailbox, strpos($_mailbox, '('.$comment) + strlen($comment) + 2);
             } else {
                 break;
             }
@@ -717,7 +717,7 @@ 
 
         // If $route is same as $route_addr then the colon was in
         // quotes or brackets or, of course, non existent.
-        if ($route === $route_addr){
+        if ($route === $route_addr) {
             unset($route);
             $addr_spec = $route_addr;
             if (($addr_spec = $this->_validateAddrSpec($addr_spec)) === false) {
@@ -729,7 +729,7 @@ 
                 return false;
             }
 
-            $addr_spec = substr($route_addr, strlen($route . ':'));
+            $addr_spec = substr($route_addr, strlen($route.':'));
 
             // Validate addr-spec part.
             if (($addr_spec = $this->_validateAddrSpec($addr_spec)) === false) {
@@ -805,7 +805,7 @@ 
      */
     protected function _validateSubdomain($subdomain)
     {
-        if (preg_match('|^\[(.*)]$|', $subdomain, $arr)){
+        if (preg_match('|^\[(.*)]$|', $subdomain, $arr)) {
             if (!$this->_validateDliteral($arr[1])) return false;
         } else {
             if (!$this->_validateAtom($subdomain)) return false;
@@ -824,7 +824,7 @@ 
      */
     protected function _validateDliteral($dliteral)
     {
-        return !preg_match('/(.)[][\x0D\\\\]/', $dliteral, $matches) && ((! isset($matches[1])) || $matches[1] != '\\');
+        return !preg_match('/(.)[][\x0D\\\\]/', $dliteral, $matches) && ((!isset($matches[1])) || $matches[1] != '\\');
     }
 
     /**
@@ -843,7 +843,7 @@ 
         if (strpos($addr_spec, '@') !== false) {
             $parts      = explode('@', $addr_spec);
             $local_part = $this->_splitCheck($parts, '@');
-            $domain     = substr($addr_spec, strlen($local_part . '@'));
+            $domain     = substr($addr_spec, strlen($local_part.'@'));
 
         // No @ sign so assume the default domain.
         } else {
@@ -943,7 +943,7 @@ 
      * @access private
      */
     function raiseError($message) {
-        ZLog::Write(LOGLEVEL_ERROR, "z_RFC822 error: ". $message);
+        ZLog::Write(LOGLEVEL_ERROR, "z_RFC822 error: ".$message);
         return false;
     }
 }

lib/utils/compat.php

Spacing +2 added lines, -2 removed lines

@@ -84,12 +84,12 @@
                 case 504: $text = 'Gateway Time-out'; break;
                 case 505: $text = 'HTTP Version not supported'; break;
                 default:
-                    exit('Unknown http status code "' . htmlentities($code) . '"');
+                    exit('Unknown http status code "'.htmlentities($code).'"');
                     break;
             }
 
             $protocol = (isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0');
-            header($protocol . ' ' . $code . ' ' . $text);
+            header($protocol.' '.$code.' '.$text);
 
             $GLOBALS['http_response_code'] = $code;
         } else {

lib/utils/utils.php

Spacing +36 added lines, -36 removed lines

@@ -17,7 +17,7 @@ 
      * @return string
      */
     static public function PrintAsString($var) {
-       return ($var)?(($var===true)?'true':$var):(($var===false)?'false':(($var==='')?'empty':(($var === null) ? 'null':$var)));
+       return ($var) ? (($var === true) ? 'true' : $var) : (($var === false) ? 'false' : (($var === '') ? 'empty' : (($var === null) ? 'null' : $var)));
     }
 
     /**
@@ -31,13 +31,13 @@ 
      */
     static public function SplitDomainUser($domainuser) {
         $pos = strrpos($domainuser, '\\');
-        if($pos === false){
+        if ($pos === false) {
             $user = $domainuser;
             $domain = '';
         }
-        else{
-            $domain = substr($domainuser,0,$pos);
-            $user = substr($domainuser,$pos+1);
+        else {
+            $domain = substr($domainuser, 0, $pos);
+            $user = substr($domainuser, $pos + 1);
         }
         return array($user, $domain);
     }
@@ -61,13 +61,13 @@ 
 
         $zcs = "";
         if (isset($zip) && $zip != "") $zcs = $zip;
-        if (isset($city) && $city != "") $zcs .= (($zcs)?" ":"") . $city;
-        if (isset($state) && $state != "") $zcs .= (($zcs)?" ":"") . $state;
-        if ($zcs) $out = $zcs . "\r\n" . $out;
+        if (isset($city) && $city != "") $zcs .= (($zcs) ? " " : "").$city;
+        if (isset($state) && $state != "") $zcs .= (($zcs) ? " " : "").$state;
+        if ($zcs) $out = $zcs."\r\n".$out;
 
-        if (isset($street) && $street != "") $out = $street . (($out)?"\r\n\r\n". $out: "") ;
+        if (isset($street) && $street != "") $out = $street.(($out) ? "\r\n\r\n".$out : "");
 
-        return ($out)?$out:null;
+        return ($out) ? $out : null;
     }
 
     /**
@@ -84,7 +84,7 @@ 
     static public function BuildFileAs($lastname = "", $firstname = "", $middlename = "", $company = "") {
         if (defined('FILEAS_ORDER')) {
             $fileas = $lastfirst = $firstlast = "";
-            $names = trim ($firstname . " " . $middlename);
+            $names = trim($firstname." ".$middlename);
             $lastname = trim($lastname);
             $company = trim($company);
 
@@ -92,7 +92,7 @@ 
             // firstlast is "firstname middlename lastname"
             if (strlen($lastname) > 0) {
                 $lastfirst = $lastname;
-                if (strlen($names) > 0){
+                if (strlen($names) > 0) {
                     $lastfirst .= ", $names";
                     $firstlast = "$names $lastname";
                 }
@@ -192,7 +192,7 @@ 
             $vs = preg_split('/-/', phpversion("mapi"));
             return ($version <= $vs[1]);
         }
-        if (version_compare(phpversion("mapi"), $version) == -1){
+        if (version_compare(phpversion("mapi"), $version) == -1) {
             return false;
         }
 
@@ -207,7 +207,7 @@ 
      * @access public
      * @return string   the vCal-Uid if available in the olUid, else the original olUid as HEX
      */
-    static public function GetICalUidFromOLUid($olUid){
+    static public function GetICalUidFromOLUid($olUid) {
         //check if "vCal-Uid" is somewhere in outlookid case-insensitive
         $icalUid = stristr($olUid, "vCal-Uid");
         if ($icalUid !== false) {
@@ -236,7 +236,7 @@ 
             $OLUid .= "vCal-Uid";
             $OLUid .= pack("V", 1);
             $OLUid .= $icalUid;
-            return hex2bin("040000008200E00074C5B7101A82E0080000000000000000000000000000000000000000". bin2hex($OLUid). "00");
+            return hex2bin("040000008200E00074C5B7101A82E0080000000000000000000000000000000000000000".bin2hex($OLUid)."00");
         }
         else
            return hex2bin($icalUid);
@@ -296,7 +296,7 @@ 
      */
     static public function GetFiltertypeInterval($filtertype) {
         $back = false;
-        switch($filtertype) {
+        switch ($filtertype) {
             case SYNC_FILTERTYPE_1DAY:
                 $back = 60 * 60 * 24;
                 break;
@@ -332,7 +332,7 @@ 
      * @return long
      */
     static public function GetTruncSize($truncation) {
-        switch($truncation) {
+        switch ($truncation) {
             case SYNC_TRUNCATION_HEADERS:
                 return 0;
             case SYNC_TRUNCATION_512B:
@@ -340,19 +340,19 @@ 
             case SYNC_TRUNCATION_1K:
                 return 1024;
             case SYNC_TRUNCATION_2K:
-                return 2*1024;
+                return 2 * 1024;
             case SYNC_TRUNCATION_5K:
-                return 5*1024;
+                return 5 * 1024;
             case SYNC_TRUNCATION_10K:
-                return 10*1024;
+                return 10 * 1024;
             case SYNC_TRUNCATION_20K:
-                return 20*1024;
+                return 20 * 1024;
             case SYNC_TRUNCATION_50K:
-                return 50*1024;
+                return 50 * 1024;
             case SYNC_TRUNCATION_100K:
-                return 100*1024;
+                return 100 * 1024;
             case SYNC_TRUNCATION_ALL:
-                return 1024*1024; // We'll limit to 1MB anyway
+                return 1024 * 1024; // We'll limit to 1MB anyway
             default:
                 return 1024; // Default to 1Kb
         }
@@ -388,7 +388,7 @@ 
             }
         }
 
-        while($length >= 0) {
+        while ($length >= 0) {
             if ((ord($string[$length]) < 0x80) || (ord($string[$length]) >= 0xC0)) {
                 return substr($string, 0, $length);
             }
@@ -434,7 +434,7 @@ 
      * @return boolean
      */
     static public function IsBase64String($string) {
-        return (bool) preg_match("#^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+\/]{3}=|[A-Za-z0-9+/]{4})?$#", $string);
+        return (bool)preg_match("#^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+\/]{3}=|[A-Za-z0-9+/]{4})?$#", $string);
     }
 
     /**
@@ -607,7 +607,7 @@ 
             20127 => "us-ascii"
         );
 
-        if(isset($codepages[$codepage])) {
+        if (isset($codepages[$codepage])) {
             return $codepages[$codepage];
         } else {
             // Defaulting to iso-8859-15 since it is more likely for someone to make a mistake in the codepage
@@ -709,7 +709,7 @@ 
                 throw new FatalException("FixFileOwner: $dir must be owned by the nginx/apache/php user instead of root for debian based systems and by root:grosync for RHEL-based systems");
             }
 
-            if($perm_dir['uid'] !== $perm_file['uid'] || $perm_dir['gid'] !== $perm_file['gid']) {
+            if ($perm_dir['uid'] !== $perm_file['uid'] || $perm_dir['gid'] !== $perm_file['gid']) {
                 chown($file, $perm_dir['uid']);
                 chgrp($file, $perm_dir['gid']);
                 chmod($file, 0664);
@@ -764,10 +764,10 @@ 
         if ($bytes <= 0) return '0 B';
 
         $units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB');
-        $base = log ($bytes, 1024);
+        $base = log($bytes, 1024);
         $fBase = floor($base);
         $pow = pow(1024, $base - $fBase);
-        return sprintf ("%.{$precision}f %s", $pow, $units[$fBase]);
+        return sprintf("%.{$precision}f %s", $pow, $units[$fBase]);
     }
 
     /**
@@ -866,9 +866,9 @@ 
     //if the store supports unicode return the string without converting it
     if (!$force_convert && defined('STORE_SUPPORTS_UNICODE') && STORE_SUPPORTS_UNICODE == true) return $string;
 
-    if (function_exists("iconv")){
-        return @iconv("UTF-8", "Windows-1252" . $option, $string);
-    }else{
+    if (function_exists("iconv")) {
+        return @iconv("UTF-8", "Windows-1252".$option, $string);
+    } else {
         return utf8_decode($string); // no euro support here
     }
 }
@@ -877,9 +877,9 @@ 
     //if the store supports unicode return the string without converting it
     if (!$force_convert && defined('STORE_SUPPORTS_UNICODE') && STORE_SUPPORTS_UNICODE == true) return $string;
 
-    if (function_exists("iconv")){
-        return @iconv("Windows-1252", "UTF-8" . $option, $string);
-    }else{
+    if (function_exists("iconv")) {
+        return @iconv("Windows-1252", "UTF-8".$option, $string);
+    } else {
         return utf8_encode($string); // no euro support here
     }
 }