XOOPS / XoopsCore

htdocs/class/xml/rpc/metaweblogapi.php

Switch Indentation +17 added lines, -17 removed lines

@@ -207,23 +207,23 @@
                         foreach ($ret[$i] as $key => $value) {
                             $maptag = $this->_getXoopsTagMap($key);
                             switch($maptag) {
-                            case 'userid':
-                                $struct->add('userid', new XoopsXmlRpcString($value));
-                                break;
-                            case 'dateCreated':
-                                $struct->add('dateCreated', new XoopsXmlRpcDatetime($value));
-                                break;
-                            case 'postid':
-                                $struct->add('postid', new XoopsXmlRpcString($value));
-                                $struct->add('link', new XoopsXmlRpcString($xoops_url.'/modules/news/article.php?item_id='.$value));
-                                $struct->add('permaLink', new XoopsXmlRpcString($xoops_url.'/modules/news/article.php?item_id='.$value));
-                                break;
-                            case 'title':
-                                $struct->add('title', new XoopsXmlRpcString($value));
-                                break;
-                            default :
-                                $content .= '<'.$key.'>'.trim($value).'</'.$key.'>';
-                                break;
+                                case 'userid':
+                                    $struct->add('userid', new XoopsXmlRpcString($value));
+                                    break;
+                                case 'dateCreated':
+                                    $struct->add('dateCreated', new XoopsXmlRpcDatetime($value));
+                                    break;
+                                case 'postid':
+                                    $struct->add('postid', new XoopsXmlRpcString($value));
+                                    $struct->add('link', new XoopsXmlRpcString($xoops_url.'/modules/news/article.php?item_id='.$value));
+                                    $struct->add('permaLink', new XoopsXmlRpcString($xoops_url.'/modules/news/article.php?item_id='.$value));
+                                    break;
+                                case 'title':
+                                    $struct->add('title', new XoopsXmlRpcString($value));
+                                    break;
+                                default :
+                                    $content .= '<'.$key.'>'.trim($value).'</'.$key.'>';
+                                    break;
                             }
                         }
                         $struct->add('description', new XoopsXmlRpcString($content));

Spacing +7 added lines, -7 removed lines

@@ -62,7 +62,7 @@ 
                 if (count($missing) > 0) {
                     $msg = '';
                     foreach ($missing as $m) {
-                        $msg .= '<' . $m . '> ';
+                        $msg .= '<'.$m.'> ';
                         echo $m;
                     }
                     $this->response->add(new XoopsXmlRpcFault(109, $msg));
@@ -103,7 +103,7 @@ 
                     $maptag = $this->_getXoopsTagMap($tag);
                     if (!isset($this->params[3][$maptag])) {
                         $data = $this->_getTagCdata($this->params[3]['description'], $maptag, true);
-                        if (trim($data) == ''){
+                        if (trim($data) == '') {
                             if ($detail['required']) {
                                 $missing[] = $tag;
                             }
@@ -117,7 +117,7 @@ 
                 if (count($missing) > 0) {
                     $msg = '';
                     foreach ($missing as $m) {
-                        $msg .= '<' . $m . '> ';
+                        $msg .= '<'.$m.'> ';
                     }
                     $this->response->add(new XoopsXmlRpcFault(109, $msg));
                 } else {
@@ -167,14 +167,14 @@ 
                             break;
                         case 'postid':
                             $struct->add('postid', new XoopsXmlRpcString($value));
-                            $struct->add('link', new XoopsXmlRpcString($xoops_url . '/modules/xoopssections/item.php?item=' . $value));
-                            $struct->add('permaLink', new XoopsXmlRpcString($xoops_url . '/modules/xoopssections/item.php?item=' . $value));
+                            $struct->add('link', new XoopsXmlRpcString($xoops_url.'/modules/xoopssections/item.php?item='.$value));
+                            $struct->add('permaLink', new XoopsXmlRpcString($xoops_url.'/modules/xoopssections/item.php?item='.$value));
                             break;
                         case 'title':
                             $struct->add('title', new XoopsXmlRpcString($value));
                             break;
                         default :
-                            $content .= '<' . $key . '>' . trim($value) . '</' . $key . '>';
+                            $content .= '<'.$key.'>'.trim($value).'</'.$key.'>';
                             break;
                     }
                 }
@@ -206,7 +206,7 @@ 
                         $content = '';
                         foreach ($ret[$i] as $key => $value) {
                             $maptag = $this->_getXoopsTagMap($key);
-                            switch($maptag) {
+                            switch ($maptag) {
                             case 'userid':
                                 $struct->add('userid', new XoopsXmlRpcString($value));
                                 break;

htdocs/class/xml/rpc/bloggerapi.php

Indentation +1 added lines, -1 removed lines

@@ -231,7 +231,7 @@
         } else {
             $arr = new XoopsXmlRpcArray();
             $struct = new XoopsXmlRpcStruct();
-			$xoops_url = \XoopsBaseConfig::get('url');
+            $xoops_url = \XoopsBaseConfig::get('url');
             $struct->add('url', new XoopsXmlRpcString($xoops_url.'/modules/'.$this->module->getVar('dirname').'/'));
             $struct->add('blogid', new XoopsXmlRpcString($this->module->getVar('mid')));
             $struct->add('blogName', new XoopsXmlRpcString('XOOPS Blog'));

Switch Indentation +33 added lines, -33 removed lines

@@ -154,18 +154,18 @@ 
                 foreach ($ret as $key => $value) {
                     $maptag = $this->_getXoopsTagMap($key);
                     switch($maptag) {
-                    case 'userid':
-                        $struct->add('userid', new XoopsXmlRpcString($value));
-                        break;
-                    case 'dateCreated':
-                        $struct->add('dateCreated', new XoopsXmlRpcDatetime($value));
-                        break;
-                    case 'postid':
-                        $struct->add('postid', new XoopsXmlRpcString($value));
-                        break;
-                    default :
-                        $content .= '<'.$key.'>'.trim($value).'</'.$key.'>';
-                        break;
+                        case 'userid':
+                            $struct->add('userid', new XoopsXmlRpcString($value));
+                            break;
+                        case 'dateCreated':
+                            $struct->add('dateCreated', new XoopsXmlRpcDatetime($value));
+                            break;
+                        case 'postid':
+                            $struct->add('postid', new XoopsXmlRpcString($value));
+                            break;
+                        default :
+                            $content .= '<'.$key.'>'.trim($value).'</'.$key.'>';
+                            break;
                     }
                 }
                 $struct->add('content', new XoopsXmlRpcString($content));
@@ -198,18 +198,18 @@ 
                         foreach($ret[$i] as $key => $value) {
                             $maptag = $this->_getXoopsTagMap($key);
                             switch($maptag) {
-                            case 'userid':
-                                $struct->add('userid', new XoopsXmlRpcString($value));
-                                break;
-                            case 'dateCreated':
-                                $struct->add('dateCreated', new XoopsXmlRpcDatetime($value));
-                                break;
-                            case 'postid':
-                                $struct->add('postid', new XoopsXmlRpcString($value));
-                                break;
-                            default :
-                                $content .= '<'.$key.'>'.trim($value).'</'.$key.'>';
-                                break;
+                                case 'userid':
+                                    $struct->add('userid', new XoopsXmlRpcString($value));
+                                    break;
+                                case 'dateCreated':
+                                    $struct->add('dateCreated', new XoopsXmlRpcDatetime($value));
+                                    break;
+                                case 'postid':
+                                    $struct->add('postid', new XoopsXmlRpcString($value));
+                                    break;
+                                default :
+                                    $content .= '<'.$key.'>'.trim($value).'</'.$key.'>';
+                                    break;
                             }
                         }
                         $struct->add('content', new XoopsXmlRpcString($content));
@@ -262,15 +262,15 @@ 
             $this->response->add(new XoopsXmlRpcFault(104));
         } else {
             switch ($this->params[5]) {
-            case 'main':
-                $this->response->add(new XoopsXmlRpcFault(107));
-                break;
-            case 'archiveIndex':
-                $this->response->add(new XoopsXmlRpcFault(107));
-                break;
-            default:
-                $this->response->add(new XoopsXmlRpcFault(107));
-                break;
+                case 'main':
+                    $this->response->add(new XoopsXmlRpcFault(107));
+                    break;
+                case 'archiveIndex':
+                    $this->response->add(new XoopsXmlRpcFault(107));
+                    break;
+                default:
+                    $this->response->add(new XoopsXmlRpcFault(107));
+                    break;
             }
         }
     }

Spacing +8 added lines, -8 removed lines

@@ -38,7 +38,7 @@ 
         if (!$this->_checkUser($this->params[2], $this->params[3])) {
             $this->response->add(new XoopsXmlRpcFault(104));
         } else {
-            if (!$fields =& $this->_getPostFields(null, $this->params[1])) {
+            if (!$fields = & $this->_getPostFields(null, $this->params[1])) {
                 $this->response->add(new XoopsXmlRpcFault(106));
             } else {
                 $missing = array();
@@ -46,7 +46,7 @@ 
                 foreach ($fields as $tag => $detail) {
                     $maptag = $this->_getXoopsTagMap($tag);
                     $data = $this->_getTagCdata($this->params[4], $maptag, true);
-                    if (trim($data) == ''){
+                    if (trim($data) == '') {
                         if ($detail['required']) {
                             $missing[] = $maptag;
                         }
@@ -57,7 +57,7 @@ 
                 if (count($missing) > 0) {
                     $msg = '';
                     foreach ($missing as $m) {
-                        $msg .= '<' . $m . '> ';
+                        $msg .= '<'.$m.'> ';
                     }
                     $this->response->add(new XoopsXmlRpcFault(109, $msg));
                 } else {
@@ -91,7 +91,7 @@ 
                 $post = array();
                 foreach ($fields as $tag => $detail) {
                     $data = $this->_getTagCdata($this->params[4], $tag, true);
-                    if (trim($data) == ''){
+                    if (trim($data) == '') {
                         if ($detail['required']) {
                             $missing[] = $tag;
                         }
@@ -102,7 +102,7 @@ 
                 if (count($missing) > 0) {
                     $msg = '';
                     foreach ($missing as $m) {
-                        $msg .= '<' . $m . '> ';
+                        $msg .= '<'.$m.'> ';
                     }
                     $this->response->add(new XoopsXmlRpcFault(109, $msg));
                 } else {
@@ -153,7 +153,7 @@ 
                 $content = '';
                 foreach ($ret as $key => $value) {
                     $maptag = $this->_getXoopsTagMap($key);
-                    switch($maptag) {
+                    switch ($maptag) {
                     case 'userid':
                         $struct->add('userid', new XoopsXmlRpcString($value));
                         break;
@@ -195,9 +195,9 @@ 
                     for ($i = 0; $i < $count; ++$i) {
                         $struct = new XoopsXmlRpcStruct();
                         $content = '';
-                        foreach($ret[$i] as $key => $value) {
+                        foreach ($ret[$i] as $key => $value) {
                             $maptag = $this->_getXoopsTagMap($key);
-                            switch($maptag) {
+                            switch ($maptag) {
                             case 'userid':
                                 $struct->add('userid', new XoopsXmlRpcString($value));
                                 break;

htdocs/class/xml/rpc/xmlrpctag.php

Spacing +13 added lines, -13 removed lines

@@ -54,10 +54,10 @@ 
             if (!$tag->isFault()) {
                 $payload .= $tag->render();
             } else {
-                return '<?xml version="1.0"?><methodResponse>' . $tag->render() . '</methodResponse>';
+                return '<?xml version="1.0"?><methodResponse>'.$tag->render().'</methodResponse>';
             }
         }
-        return '<?xml version="1.0"?><methodResponse><params><param>' . $payload . '</param></params></methodResponse>';
+        return '<?xml version="1.0"?><methodResponse><params><param>'.$payload.'</param></params></methodResponse>';
     }
 }
 
@@ -88,9 +88,9 @@ 
         $payload = '';
         foreach ($this->_tags as $tag) {
             /* @var $tag XoopsXmlRpcTag */
-            $payload .= '<param>' . $tag->render() . '</param>';
+            $payload .= '<param>'.$tag->render().'</param>';
         }
-        return '<?xml version="1.0"?><methodCall><methodName>' . $this->methodName . '</methodName><params>' . $payload . '</params></methodCall>';
+        return '<?xml version="1.0"?><methodCall><methodName>'.$this->methodName.'</methodName><params>'.$payload.'</params></methodCall>';
     }
 }
 
@@ -209,9 +209,9 @@ 
                 $string = 'Method response error';
                 break;
         }
-        $string .= "\n" . $this->_extra;
+        $string .= "\n".$this->_extra;
 
-        return '<fault><value><struct><member><name>faultCode</name><value>' . $this->_code . '</value></member><member><name>faultString</name><value>' . $this->encode($string) . '</value></member></struct></value></fault>';
+        return '<fault><value><struct><member><name>faultCode</name><value>'.$this->_code.'</value></member><member><name>faultString</name><value>'.$this->encode($string).'</value></member></struct></value></fault>';
     }
 }
 
@@ -238,7 +238,7 @@ 
      */
     public function render()
     {
-        return '<value><int>' . $this->_value . '</int></value>';
+        return '<value><int>'.$this->_value.'</int></value>';
     }
 }
 
@@ -265,7 +265,7 @@ 
      */
     public function render()
     {
-        return '<value><double>' . $this->_value . '</double></value>';
+        return '<value><double>'.$this->_value.'</double></value>';
     }
 }
 
@@ -292,7 +292,7 @@ 
      */
     public function render()
     {
-        return '<value><boolean>' . $this->_value . '</boolean></value>';
+        return '<value><boolean>'.$this->_value.'</boolean></value>';
     }
 }
 
@@ -319,7 +319,7 @@ 
      */
     public function render()
     {
-        return '<value><string>' . $this->encode($this->_value) . '</string></value>';
+        return '<value><string>'.$this->encode($this->_value).'</string></value>';
     }
 }
 
@@ -350,7 +350,7 @@ 
      */
     public function render()
     {
-        return '<value><dateTime.iso8601>' . gmstrftime("%Y%m%dT%H:%M:%S", $this->_value) . '</dateTime.iso8601></value>';
+        return '<value><dateTime.iso8601>'.gmstrftime("%Y%m%dT%H:%M:%S", $this->_value).'</dateTime.iso8601></value>';
     }
 }
 
@@ -377,7 +377,7 @@ 
      */
     public function render()
     {
-        return '<value><base64>' . $this->_value . '</base64></value>';
+        return '<value><base64>'.$this->_value.'</base64></value>';
     }
 }
 
@@ -443,7 +443,7 @@ 
         $ret = '<value><struct>';
         foreach ($this->_tags as $tag) {
             /* @var $tag['value'] XoopsXmlRplTag */
-            $ret .= '<member><name>' . $this->encode($tag['name']) . '</name>' . $tag['value']->render() . '</member>';
+            $ret .= '<member><name>'.$this->encode($tag['name']).'</name>'.$tag['value']->render().'</member>';
         }
         $ret .= '</struct></value>';
         return $ret;

htdocs/class/xml/rpc/xmlrpcapi.php

Spacing +2 added lines, -2 removed lines

@@ -180,7 +180,7 @@ 
     {
         $ret = '';
         $match = array();
-        if (preg_match("/\<" . $tag . "\>(.*)\<\/" . $tag . "\>/is", $text, $match)) {
+        if (preg_match("/\<".$tag."\>(.*)\<\/".$tag."\>/is", $text, $match)) {
             if ($remove) {
                 $text = str_replace($match[0], '', $text);
             }
@@ -201,7 +201,7 @@ 
     {
         if (strtolower(get_class($this)) !== 'xoopsapi') {
             $xoops_root_path = \XoopsBaseConfig::get('root-path');
-            require_once($xoops_root_path . '/class/xml/rpc/xoopsapi.php');
+            require_once($xoops_root_path.'/class/xml/rpc/xoopsapi.php');
             return new XoopsApi($params, $this->response, $this->module);
         } else {
             return $this;

htdocs/class/xml/rpc/xmlrpcparser.php

Indentation +6 added lines, -6 removed lines

@@ -336,8 +336,8 @@ 
 {
 
     /**
-    * @return string[]
-    */
+     * @return string[]
+     */
     public function getName()
     {
         return array('int', 'i4');
@@ -647,10 +647,10 @@ 
     }
 
     /**
-    * @param SaxParser $parser
-    * @param array $attributes
-    * @return void
-    */
+     * @param SaxParser $parser
+     * @param array $attributes
+     * @return void
+     */
     public function handleBeginElement(SaxParser $parser, &$attributes)
     {
         if (!is_a($parser,'XoopsXmlRpcParser')) return;

Spacing +17 added lines, -17 removed lines

@@ -324,7 +324,7 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $parser->setMethodName($data);
     }
 }
@@ -350,7 +350,7 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $parser->setTempValue((int)($data));
     }
 }
@@ -376,7 +376,7 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $data = (float)$data;
         $parser->setTempValue($data);
     }
@@ -403,7 +403,7 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $data = (boolean)$data;
         $parser->setTempValue($data);
     }
@@ -430,7 +430,7 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $parser->setTempValue((string)($data));
     }
 }
@@ -456,7 +456,7 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $matches = array();
         if (!preg_match("/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})$/", $data, $matches)) {
             $parser->setTempValue(time());
@@ -487,7 +487,7 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $parser->setTempValue(base64_decode($data));
     }
 }
@@ -513,7 +513,7 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         switch ($parser->getParentTag()) {
             case 'member':
                 $parser->setTempName($data);
@@ -545,7 +545,7 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         switch ($parser->getParentTag()) {
             case 'member':
                 $parser->setTempValue($data);
@@ -566,7 +566,7 @@ 
      */
     public function handleBeginElement(SaxParser $parser, &$attributes)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         //$parser->resetTempValue();
     }
 
@@ -576,7 +576,7 @@ 
      */
     public function handleEndElement(SaxParser $parser)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         switch ($parser->getCurrentTag()) {
             case 'member':
                 $parser->setTempMember($parser->getTempName(), $parser->getTempValue());
@@ -614,7 +614,7 @@ 
      */
     public function handleBeginElement(SaxParser $parser, &$attributes)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $parser->setWorkingLevel();
         $parser->resetTempMember();
     }
@@ -625,7 +625,7 @@ 
      */
     public function handleEndElement(SaxParser $parser)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $member = $parser->getTempMember();
         $parser->releaseWorkingLevel();
         $parser->setTempStruct($member);
@@ -653,7 +653,7 @@ 
     */
     public function handleBeginElement(SaxParser $parser, &$attributes)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $parser->setWorkingLevel();
         $parser->resetTempArray();
     }
@@ -664,7 +664,7 @@ 
      */
     public function handleEndElement(SaxParser $parser)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $parser->setTempValue($parser->getTempArray());
         $parser->releaseWorkingLevel();
     }
@@ -691,7 +691,7 @@ 
      */
     public function handleBeginElement(SaxParser $parser, &$attributes)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $parser->setWorkingLevel();
         $parser->resetTempStruct();
     }
@@ -702,7 +702,7 @@ 
      */
     public function handleEndElement(SaxParser $parser)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser, 'XoopsXmlRpcParser')) return;
         $parser->setTempValue($parser->getTempStruct());
         $parser->releaseWorkingLevel();
     }

Braces +51 added lines, -17 removed lines

@@ -324,7 +324,9 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $parser->setMethodName($data);
     }
 }
@@ -350,7 +352,9 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $parser->setTempValue((int)($data));
     }
 }
@@ -376,7 +380,9 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $data = (float)$data;
         $parser->setTempValue($data);
     }
@@ -403,7 +409,9 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $data = (boolean)$data;
         $parser->setTempValue($data);
     }
@@ -430,7 +438,9 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $parser->setTempValue((string)($data));
     }
 }
@@ -456,7 +466,9 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $matches = array();
         if (!preg_match("/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})$/", $data, $matches)) {
             $parser->setTempValue(time());
@@ -487,7 +499,9 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $parser->setTempValue(base64_decode($data));
     }
 }
@@ -513,7 +527,9 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         switch ($parser->getParentTag()) {
             case 'member':
                 $parser->setTempName($data);
@@ -545,7 +561,9 @@ 
      */
     public function handleCharacterData(SaxParser $parser, &$data)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         switch ($parser->getParentTag()) {
             case 'member':
                 $parser->setTempValue($data);
@@ -566,7 +584,9 @@ 
      */
     public function handleBeginElement(SaxParser $parser, &$attributes)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         //$parser->resetTempValue();
     }
 
@@ -576,7 +596,9 @@ 
      */
     public function handleEndElement(SaxParser $parser)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         switch ($parser->getCurrentTag()) {
             case 'member':
                 $parser->setTempMember($parser->getTempName(), $parser->getTempValue());
@@ -614,7 +636,9 @@ 
      */
     public function handleBeginElement(SaxParser $parser, &$attributes)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $parser->setWorkingLevel();
         $parser->resetTempMember();
     }
@@ -625,7 +649,9 @@ 
      */
     public function handleEndElement(SaxParser $parser)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $member = $parser->getTempMember();
         $parser->releaseWorkingLevel();
         $parser->setTempStruct($member);
@@ -653,7 +679,9 @@ 
     */
     public function handleBeginElement(SaxParser $parser, &$attributes)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $parser->setWorkingLevel();
         $parser->resetTempArray();
     }
@@ -664,7 +692,9 @@ 
      */
     public function handleEndElement(SaxParser $parser)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $parser->setTempValue($parser->getTempArray());
         $parser->releaseWorkingLevel();
     }
@@ -691,7 +721,9 @@ 
      */
     public function handleBeginElement(SaxParser $parser, &$attributes)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $parser->setWorkingLevel();
         $parser->resetTempStruct();
     }
@@ -702,7 +734,9 @@ 
      */
     public function handleEndElement(SaxParser $parser)
     {
-        if (!is_a($parser,'XoopsXmlRpcParser')) return;
+        if (!is_a($parser,'XoopsXmlRpcParser')) {
+            return;
+        }
         $parser->setTempValue($parser->getTempStruct());
         $parser->releaseWorkingLevel();
     }

htdocs/class/xml/rpc/xoopsapi.php

Spacing +12 added lines, -12 removed lines

@@ -61,7 +61,7 @@ 
                 if (count($missing) > 0) {
                     $msg = '';
                     foreach ($missing as $m) {
-                        $msg .= '<' . $m . '> ';
+                        $msg .= '<'.$m.'> ';
                     }
                     $this->response->add(new XoopsXmlRpcFault(109, $msg));
                 } else {
@@ -151,7 +151,7 @@ 
                 if (count($missing) > 0) {
                     $msg = '';
                     foreach ($missing as $m) {
-                        $msg .= '<' . $m . '> ';
+                        $msg .= '<'.$m.'> ';
                     }
                     $this->response->add(new XoopsXmlRpcFault(109, $msg));
                 } else {
@@ -249,7 +249,7 @@ 
                     $struct = new XoopsXmlRpcStruct();
                     $content = '';
                     foreach ($ret as $key => $value) {
-                        switch($key) {
+                        switch ($key) {
                             case 'uid':
                                 $struct->add('userid', new XoopsXmlRpcString($value));
                                 break;
@@ -258,14 +258,14 @@ 
                                 break;
                             case 'storyid':
                                 $struct->add('postid', new XoopsXmlRpcString($value));
-                                $struct->add('link', new XoopsXmlRpcString(\XoopsBaseConfig::get('url') . '/modules/news/article.php?item_id=' . $value));
-                                $struct->add('permaLink', new XoopsXmlRpcString(\XoopsBaseConfig::get('url') . '/modules/news/article.php?item_id=' . $value));
+                                $struct->add('link', new XoopsXmlRpcString(\XoopsBaseConfig::get('url').'/modules/news/article.php?item_id='.$value));
+                                $struct->add('permaLink', new XoopsXmlRpcString(\XoopsBaseConfig::get('url').'/modules/news/article.php?item_id='.$value));
                                 break;
                             case 'title':
                                 $struct->add('title', new XoopsXmlRpcString($value));
                                 break;
                             default :
-                                $content .= '<' . $key . '>' . trim($value) . '</' . $key . '>';
+                                $content .= '<'.$key.'>'.trim($value).'</'.$key.'>';
                                 break;
                         }
                     }
@@ -319,8 +319,8 @@ 
                     for ($i = 0; $i < $count; ++$i) {
                         $struct = new XoopsXmlRpcStruct();
                         $content = '';
-                        foreach($ret[$i] as $key => $value) {
-                            switch($key) {
+                        foreach ($ret[$i] as $key => $value) {
+                            switch ($key) {
                                 case 'uid':
                                     $struct->add('userid', new XoopsXmlRpcString($value));
                                     break;
@@ -329,14 +329,14 @@ 
                                     break;
                                 case 'storyid':
                                     $struct->add('postid', new XoopsXmlRpcString($value));
-                                    $struct->add('link', new XoopsXmlRpcString(\XoopsBaseConfig::get('url') . '/modules/news/article.php?item_id=' . $value));
-                                    $struct->add('permaLink', new XoopsXmlRpcString(\XoopsBaseConfig::get('url') . '/modules/news/article.php?item_id=' . $value));
+                                    $struct->add('link', new XoopsXmlRpcString(\XoopsBaseConfig::get('url').'/modules/news/article.php?item_id='.$value));
+                                    $struct->add('permaLink', new XoopsXmlRpcString(\XoopsBaseConfig::get('url').'/modules/news/article.php?item_id='.$value));
                                     break;
                                 case 'title':
                                     $struct->add('title', new XoopsXmlRpcString($value));
                                     break;
                                 default :
-                                    $content .= '<' . $key . '>' . trim($value) . '</' . $key . '>';
+                                    $content .= '<'.$key.'>'.trim($value).'</'.$key.'>';
                                     break;
                             }
                         }
@@ -351,7 +351,7 @@ 
         return null;
     }
 
-    function getCategories($respond=true)
+    function getCategories($respond = true)
     {
         global $xoopsDB;
         if (!$this->_checkUser($this->params[1], $this->params[2])) {

htdocs/class/xml/saxparser.php

Spacing +1 added lines, -1 removed lines

@@ -380,7 +380,7 @@
             $ret = '';
             if (count($this->errors) > 0) {
                 foreach ($this->errors as $error) {
-                    $ret .= $error . '<br />';
+                    $ret .= $error.'<br />';
                 }
             }
             return $ret;

htdocs/class/tree.php

Spacing +6 added lines, -6 removed lines

@@ -189,11 +189,11 @@ 
     {
         if ($key > 0) {
             $value = $this->tree[$key]['obj']->getVar($this->myId);
-            $ret .= '<option value="' . $value . '"';
+            $ret .= '<option value="'.$value.'"';
             if ($value == $selected) {
                 $ret .= ' selected';
             }
-            $ret .= '>' . $prefix_curr . $this->tree[$key]['obj']->getVar($fieldName) . '</option>';
+            $ret .= '>'.$prefix_curr.$this->tree[$key]['obj']->getVar($fieldName).'</option>';
             $prefix_curr .= $prefix_orig;
         }
         if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
@@ -229,13 +229,13 @@ 
     ) {
         $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
         trigger_error("makeSelBox() is deprecated since 2.5.9, please use makeSelectElement(), accessed from {$trace[0]['file']} line {$trace[0]['line']},");
-        $ret = '<select name="' . $name . '" id="' . $name . '" ' . $extra . '>';
+        $ret = '<select name="'.$name.'" id="'.$name.'" '.$extra.'>';
         if (false !== (bool)$addEmptyOption) {
             $ret .= '<option value="0"></option>';
         }
         $this->makeSelBoxOptions($fieldName, $selected, $key, $ret, $prefix);
 
-        return $ret . '</select>';
+        return $ret.'</select>';
     }
 
     /**
@@ -290,7 +290,7 @@ 
     {
         if ($key > 0) {
             $value = $this->tree[$key]['obj']->getVar($this->myId);
-            $name = $prefix_curr . $this->tree[$key]['obj']->getVar($fieldName);
+            $name = $prefix_curr.$this->tree[$key]['obj']->getVar($fieldName);
             $element->addOption($value, $name);
             $prefix_curr .= $prefix_orig;
         }
@@ -320,7 +320,7 @@ 
             return $this->tree;
         }
         trigger_error(
-            'Undefined property: XoopsObjectTree::$' . $name .
+            'Undefined property: XoopsObjectTree::$'.$name.
             " in {$trace[0]['file']} line {$trace[0]['line']}, ",
             E_USER_NOTICE);
         return null;

htdocs/class/vendor/snoopy.php

Spacing +41 added lines, -41 removed lines

@@ -149,7 +149,7 @@ 
                         // using proxy, send entire URI
                         $this->_httprequest($URI, $fp, $URI, $this->_httpmethod);
                     } else {
-                        $path = $URI_PARTS["path"] . ($URI_PARTS["query"] ? "?" . $URI_PARTS["query"] : "");
+                        $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
                         // no proxy, send only the path
                         $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
                     }
@@ -160,7 +160,7 @@ 
                         /* url was redirected, check if we've hit the max depth */
                         if ($this->maxredirs > $this->_redirectdepth) {
                             // only follow redirect if it's on this site, or offsiteok is true
-                            if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                            if (preg_match("|^https?://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
@@ -188,7 +188,7 @@ 
                 break;
             default:
                 // not a valid protocol
-                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
                 return false;
                 break;
         }
@@ -239,7 +239,7 @@ 
                         // using proxy, send entire URI
                         $this->_httprequest($URI, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
                     } else {
-                        $path = $URI_PARTS["path"] . ($URI_PARTS["query"] ? "?" . $URI_PARTS["query"] : "");
+                        $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
                         // no proxy, send only the path
                         $this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
                     }
@@ -249,11 +249,11 @@ 
                     if ($this->_redirectaddr) {
                         /* url was redirected, check if we've hit the max depth */
                         if ($this->maxredirs > $this->_redirectdepth) {
-                            if (!preg_match("|^" . $URI_PARTS["scheme"] . "://|", $this->_redirectaddr))
-                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"] . "://" . $URI_PARTS["host"]);
+                            if (!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
 
                             // only follow redirect if it's on this site, or offsiteok is true
-                            if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                            if (preg_match("|^https?://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
@@ -285,7 +285,7 @@ 
                 break;
             default:
                 // not a valid protocol
-                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
                 return false;
                 break;
         }
@@ -585,9 +585,9 @@ 
         $match = preg_replace("|/$|", "", $match);
         $match_part = parse_url($match);
         $match_root =
-            $match_part["scheme"] . "://" . $match_part["host"];
+            $match_part["scheme"]."://".$match_part["host"];
 
-        $search = array("|^http://" . preg_quote($this->host) . "|i",
+        $search = array("|^http://".preg_quote($this->host)."|i",
             "|^(\/)|i",
             "|^(?!http://)(?!mailto:)|i",
             "|/\./|",
@@ -595,8 +595,8 @@ 
         );
 
         $replace = array("",
-            $match_root . "/",
-            $match . "/",
+            $match_root."/",
+            $match."/",
             "/",
             "/"
         );
@@ -625,17 +625,17 @@ 
         $URI_PARTS = parse_url($URI);
         if (empty($url))
             $url = "/";
-        $headers = $http_method . " " . $url . " " . $this->_httpversion . "\r\n";
+        $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
         if (!empty($this->host) && !isset($this->rawheaders['Host'])) {
-            $headers .= "Host: " . $this->host;
+            $headers .= "Host: ".$this->host;
             if (!empty($this->port) && $this->port != '80')
-                $headers .= ":" . $this->port;
+                $headers .= ":".$this->port;
             $headers .= "\r\n";
         }
         if (!empty($this->agent))
-            $headers .= "User-Agent: " . $this->agent . "\r\n";
+            $headers .= "User-Agent: ".$this->agent."\r\n";
         if (!empty($this->accept))
-            $headers .= "Accept: " . $this->accept . "\r\n";
+            $headers .= "Accept: ".$this->accept."\r\n";
         if ($this->use_gzip) {
             // make sure PHP was built with --with-zlib
             // and we can handle gzipp'ed data
@@ -643,13 +643,13 @@ 
                 $headers .= "Accept-encoding: gzip\r\n";
             } else {
                 trigger_error(
-                    "use_gzip is on, but PHP was built without zlib support." .
+                    "use_gzip is on, but PHP was built without zlib support.".
                     "  Requesting file(s) without gzip encoding.",
                     E_USER_NOTICE);
             }
         }
         if (!empty($this->referer))
-            $headers .= "Referer: " . $this->referer . "\r\n";
+            $headers .= "Referer: ".$this->referer."\r\n";
         if (!empty($this->cookies)) {
             if (!is_array($this->cookies))
                 $this->cookies = (array)$this->cookies;
@@ -658,31 +658,31 @@ 
             if (count($this->cookies) > 0) {
                 $cookie_headers .= 'Cookie: ';
                 foreach ($this->cookies as $cookieKey => $cookieVal) {
-                    $cookie_headers .= $cookieKey . "=" . urlencode($cookieVal) . "; ";
+                    $cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
                 }
-                $headers .= substr($cookie_headers, 0, -2) . "\r\n";
+                $headers .= substr($cookie_headers, 0, -2)."\r\n";
             }
         }
         if (!empty($this->rawheaders)) {
             if (!is_array($this->rawheaders))
                 $this->rawheaders = (array)$this->rawheaders;
             while (list($headerKey, $headerVal) = each($this->rawheaders))
-                $headers .= $headerKey . ": " . $headerVal . "\r\n";
+                $headers .= $headerKey.": ".$headerVal."\r\n";
         }
         if (!empty($content_type)) {
             $headers .= "Content-type: $content_type";
             if ($content_type == "multipart/form-data")
-                $headers .= "; boundary=" . $this->_mime_boundary;
+                $headers .= "; boundary=".$this->_mime_boundary;
             $headers .= "\r\n";
         }
         if (!empty($body))
-            $headers .= "Content-length: " . strlen($body) . "\r\n";
+            $headers .= "Content-length: ".strlen($body)."\r\n";
         if (!empty($this->user) || !empty($this->pass))
-            $headers .= "Authorization: Basic " . base64_encode($this->user . ":" . $this->pass) . "\r\n";
+            $headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
 
         //add proxy auth headers
         if (!empty($this->proxy_user))
-            $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n";
+            $headers .= 'Proxy-Authorization: '.'Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass)."\r\n";
 
 
         $headers .= "\r\n";
@@ -692,7 +692,7 @@ 
             socket_set_timeout($fp, $this->read_timeout);
         $this->timed_out = false;
 
-        fwrite($fp, $headers . $body, strlen($headers . $body));
+        fwrite($fp, $headers.$body, strlen($headers.$body));
 
         $this->_redirectaddr = false;
         unset($this->headers);
@@ -716,10 +716,10 @@ 
                 // look for :// in the Location header to see if hostname is included
                 if (!preg_match("|\:\/\/|", $matches[2])) {
                     // no host in the path, so prepend
-                    $this->_redirectaddr = $URI_PARTS["scheme"] . "://" . $this->host . ":" . $this->port;
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
                     // eliminate double slash
                     if (!preg_match("|^/|", $matches[2]))
-                        $this->_redirectaddr .= "/" . $matches[2];
+                        $this->_redirectaddr .= "/".$matches[2];
                     else
                         $this->_redirectaddr .= $matches[2];
                 } else
@@ -771,7 +771,7 @@ 
         if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match)) {
             $this->results[] = $results;
             for ($x = 0; $x < count($match[1]); $x++)
-                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"] . "://" . $this->host);
+                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
         } // have we already fetched framed content?
         elseif (is_array($this->results))
             $this->results[] = $results;
@@ -858,14 +858,14 @@ 
                     $context_opts['ssl']['capath'] = $this->capath;
             }
                     
-            $host = 'ssl://' . $host;
+            $host = 'ssl://'.$host;
         }
 
         $context = stream_context_create($context_opts);
 
         if (version_compare(PHP_VERSION, '5.0.0', '>')) {
-            if($this->scheme == 'http')
-                $host = "tcp://" . $host;
+            if ($this->scheme == 'http')
+                $host = "tcp://".$host;
             $fp = stream_socket_client(
                 "$host:$port",
                 $errno,
@@ -897,7 +897,7 @@ 
                 case -5:
                     $this->error = "connection refused or timed out (-5)";
                 default:
-                    $this->error = "connection failed (" . $errno . ")";
+                    $this->error = "connection failed (".$errno.")";
             }
             return false;
         }
@@ -938,26 +938,26 @@ 
                 while (list($key, $val) = each($formvars)) {
                     if (is_array($val) || is_object($val)) {
                         while (list($cur_key, $cur_val) = each($val)) {
-                            $postdata .= urlencode($key) . "[]=" . urlencode($cur_val) . "&";
+                            $postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
                         }
                     } else
-                        $postdata .= urlencode($key) . "=" . urlencode($val) . "&";
+                        $postdata .= urlencode($key)."=".urlencode($val)."&";
                 }
                 break;
 
             case "multipart/form-data":
-                $this->_mime_boundary = "Snoopy" . md5(uniqid(microtime()));
+                $this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 
                 reset($formvars);
                 while (list($key, $val) = each($formvars)) {
                     if (is_array($val) || is_object($val)) {
                         while (list($cur_key, $cur_val) = each($val)) {
-                            $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                            $postdata .= "--".$this->_mime_boundary."\r\n";
                             $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
                             $postdata .= "$cur_val\r\n";
                         }
                     } else {
-                        $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
                         $postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
                         $postdata .= "$val\r\n";
                     }
@@ -974,12 +974,12 @@ 
                         fclose($fp);
                         $base_name = basename($file_name);
 
-                        $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
                         $postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
                         $postdata .= "$file_content\r\n";
                     }
                 }
-                $postdata .= "--" . $this->_mime_boundary . "--\r\n";
+                $postdata .= "--".$this->_mime_boundary."--\r\n";
                 break;
         }
 

Braces +192 added lines, -127 removed lines

@@ -121,14 +121,18 @@ 
     {
 
         $URI_PARTS = parse_url($URI);
-        if (!empty($URI_PARTS["user"]))
-            $this->user = $URI_PARTS["user"];
-        if (!empty($URI_PARTS["pass"]))
-            $this->pass = $URI_PARTS["pass"];
-        if (empty($URI_PARTS["query"]))
-            $URI_PARTS["query"] = '';
-        if (empty($URI_PARTS["path"]))
-            $URI_PARTS["path"] = '';
+        if (!empty($URI_PARTS["user"])) {
+                    $this->user = $URI_PARTS["user"];
+        }
+        if (!empty($URI_PARTS["pass"])) {
+                    $this->pass = $URI_PARTS["pass"];
+        }
+        if (empty($URI_PARTS["query"])) {
+                    $URI_PARTS["query"] = '';
+        }
+        if (empty($URI_PARTS["path"])) {
+                    $URI_PARTS["path"] = '';
+        }
 
         $fp = null;
 
@@ -142,8 +146,9 @@ 
             case "http":
                 $this->scheme = strtolower($URI_PARTS["scheme"]);
                 $this->host = $URI_PARTS["host"];
-                if (!empty($URI_PARTS["port"]))
-                    $this->port = $URI_PARTS["port"];
+                if (!empty($URI_PARTS["port"])) {
+                                    $this->port = $URI_PARTS["port"];
+                }
                 if ($this->_connect($fp)) {
                     if ($this->_isproxy) {
                         // using proxy, send entire URI
@@ -177,8 +182,9 @@ 
                             if ($this->_framedepth < $this->maxframes) {
                                 $this->fetch($frameurl);
                                 $this->_framedepth++;
-                            } else
-                                break;
+                            } else {
+                                                            break;
+                            }
                         }
                     }
                 } else {
@@ -213,14 +219,18 @@ 
         $postdata = $this->_prepare_post_body($formvars, $formfiles);
 
         $URI_PARTS = parse_url($URI);
-        if (!empty($URI_PARTS["user"]))
-            $this->user = $URI_PARTS["user"];
-        if (!empty($URI_PARTS["pass"]))
-            $this->pass = $URI_PARTS["pass"];
-        if (empty($URI_PARTS["query"]))
-            $URI_PARTS["query"] = '';
-        if (empty($URI_PARTS["path"]))
-            $URI_PARTS["path"] = '';
+        if (!empty($URI_PARTS["user"])) {
+                    $this->user = $URI_PARTS["user"];
+        }
+        if (!empty($URI_PARTS["pass"])) {
+                    $this->pass = $URI_PARTS["pass"];
+        }
+        if (empty($URI_PARTS["query"])) {
+                    $URI_PARTS["query"] = '';
+        }
+        if (empty($URI_PARTS["path"])) {
+                    $URI_PARTS["path"] = '';
+        }
 
         switch (strtolower($URI_PARTS["scheme"])) {
             case "https":
@@ -232,8 +242,9 @@ 
             case "http":
                 $this->scheme = strtolower($URI_PARTS["scheme"]);
                 $this->host = $URI_PARTS["host"];
-                if (!empty($URI_PARTS["port"]))
-                    $this->port = $URI_PARTS["port"];
+                if (!empty($URI_PARTS["port"])) {
+                                    $this->port = $URI_PARTS["port"];
+                }
                 if ($this->_connect($fp)) {
                     if ($this->_isproxy) {
                         // using proxy, send entire URI
@@ -249,18 +260,22 @@ 
                     if ($this->_redirectaddr) {
                         /* url was redirected, check if we've hit the max depth */
                         if ($this->maxredirs > $this->_redirectdepth) {
-                            if (!preg_match("|^" . $URI_PARTS["scheme"] . "://|", $this->_redirectaddr))
-                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"] . "://" . $URI_PARTS["host"]);
+                            if (!preg_match("|^" . $URI_PARTS["scheme"] . "://|", $this->_redirectaddr)) {
+                                                            $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"] . "://" . $URI_PARTS["host"]);
+                            }
 
                             // only follow redirect if it's on this site, or offsiteok is true
                             if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
-                                if (strpos($this->_redirectaddr, "?") > 0)
-                                    $this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
-                                else
-                                    $this->submit($this->_redirectaddr, $formvars, $formfiles);
+                                if (strpos($this->_redirectaddr, "?") > 0) {
+                                                                    $this->fetch($this->_redirectaddr);
+                                }
+                                // the redirect has changed the request method from post to get
+                                else {
+                                                                    $this->submit($this->_redirectaddr, $formvars, $formfiles);
+                                }
                             }
                         }
                     }
@@ -273,8 +288,9 @@ 
                             if ($this->_framedepth < $this->maxframes) {
                                 $this->fetch($frameurl);
                                 $this->_framedepth++;
-                            } else
-                                break;
+                            } else {
+                                                            break;
+                            }
                         }
                     }
 
@@ -302,19 +318,24 @@ 
     function fetchlinks($URI)
     {
         if ($this->fetch($URI) !== false) {
-            if ($this->lastredirectaddr)
-                $URI = $this->lastredirectaddr;
+            if ($this->lastredirectaddr) {
+                            $URI = $this->lastredirectaddr;
+            }
             if (is_array($this->results)) {
-                for ($x = 0; $x < count($this->results); $x++)
-                    $this->results[$x] = $this->_striplinks($this->results[$x]);
-            } else
-                $this->results = $this->_striplinks($this->results);
+                for ($x = 0; $x < count($this->results); $x++) {
+                                    $this->results[$x] = $this->_striplinks($this->results[$x]);
+                }
+            } else {
+                            $this->results = $this->_striplinks($this->results);
+            }
 
-            if ($this->expandlinks)
-                $this->results = $this->_expandlinks($this->results, $URI);
+            if ($this->expandlinks) {
+                            $this->results = $this->_expandlinks($this->results, $URI);
+            }
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /*======================================================================*\
@@ -330,14 +351,17 @@ 
         if ($this->fetch($URI) !== false) {
 
             if (is_array($this->results)) {
-                for ($x = 0; $x < count($this->results); $x++)
-                    $this->results[$x] = $this->_stripform($this->results[$x]);
-            } else
-                $this->results = $this->_stripform($this->results);
+                for ($x = 0; $x < count($this->results); $x++) {
+                                    $this->results[$x] = $this->_stripform($this->results[$x]);
+                }
+            } else {
+                            $this->results = $this->_stripform($this->results);
+            }
 
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
@@ -352,13 +376,16 @@ 
     {
         if ($this->fetch($URI) !== false) {
             if (is_array($this->results)) {
-                for ($x = 0; $x < count($this->results); $x++)
-                    $this->results[$x] = $this->_striptext($this->results[$x]);
-            } else
-                $this->results = $this->_striptext($this->results);
+                for ($x = 0; $x < count($this->results); $x++) {
+                                    $this->results[$x] = $this->_striptext($this->results[$x]);
+                }
+            } else {
+                            $this->results = $this->_striptext($this->results);
+            }
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /*======================================================================*\
@@ -371,22 +398,26 @@ 
     function submitlinks($URI, $formvars = "", $formfiles = "")
     {
         if ($this->submit($URI, $formvars, $formfiles) !== false) {
-            if ($this->lastredirectaddr)
-                $URI = $this->lastredirectaddr;
+            if ($this->lastredirectaddr) {
+                            $URI = $this->lastredirectaddr;
+            }
             if (is_array($this->results)) {
                 for ($x = 0; $x < count($this->results); $x++) {
                     $this->results[$x] = $this->_striplinks($this->results[$x]);
-                    if ($this->expandlinks)
-                        $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                    if ($this->expandlinks) {
+                                            $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                    }
                 }
             } else {
                 $this->results = $this->_striplinks($this->results);
-                if ($this->expandlinks)
-                    $this->results = $this->_expandlinks($this->results, $URI);
+                if ($this->expandlinks) {
+                                    $this->results = $this->_expandlinks($this->results, $URI);
+                }
             }
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /*======================================================================*\
@@ -399,22 +430,26 @@ 
     function submittext($URI, $formvars = "", $formfiles = "")
     {
         if ($this->submit($URI, $formvars, $formfiles) !== false) {
-            if ($this->lastredirectaddr)
-                $URI = $this->lastredirectaddr;
+            if ($this->lastredirectaddr) {
+                            $URI = $this->lastredirectaddr;
+            }
             if (is_array($this->results)) {
                 for ($x = 0; $x < count($this->results); $x++) {
                     $this->results[$x] = $this->_striptext($this->results[$x]);
-                    if ($this->expandlinks)
-                        $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                    if ($this->expandlinks) {
+                                            $this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
+                    }
                 }
             } else {
                 $this->results = $this->_striptext($this->results);
-                if ($this->expandlinks)
-                    $this->results = $this->_expandlinks($this->results, $URI);
+                if ($this->expandlinks) {
+                                    $this->results = $this->_expandlinks($this->results, $URI);
+                }
             }
             return $this;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
@@ -468,13 +503,15 @@ 
         // catenate the non-empty matches from the conditional subpattern
 
         while (list($key, $val) = each($links[2])) {
-            if (!empty($val))
-                $match[] = $val;
+            if (!empty($val)) {
+                            $match[] = $val;
+            }
         }
 
         while (list($key, $val) = each($links[3])) {
-            if (!empty($val))
-                $match[] = $val;
+            if (!empty($val)) {
+                            $match[] = $val;
+            }
         }
 
         // return the links
@@ -619,23 +656,28 @@ 
     function _httprequest($url, $fp, $URI, $http_method, $content_type = "", $body = "")
     {
         $cookie_headers = '';
-        if ($this->passcookies && $this->_redirectaddr)
-            $this->setcookies();
+        if ($this->passcookies && $this->_redirectaddr) {
+                    $this->setcookies();
+        }
 
         $URI_PARTS = parse_url($URI);
-        if (empty($url))
-            $url = "/";
+        if (empty($url)) {
+                    $url = "/";
+        }
         $headers = $http_method . " " . $url . " " . $this->_httpversion . "\r\n";
         if (!empty($this->host) && !isset($this->rawheaders['Host'])) {
             $headers .= "Host: " . $this->host;
-            if (!empty($this->port) && $this->port != '80')
-                $headers .= ":" . $this->port;
+            if (!empty($this->port) && $this->port != '80') {
+                            $headers .= ":" . $this->port;
+            }
             $headers .= "\r\n";
         }
-        if (!empty($this->agent))
-            $headers .= "User-Agent: " . $this->agent . "\r\n";
-        if (!empty($this->accept))
-            $headers .= "Accept: " . $this->accept . "\r\n";
+        if (!empty($this->agent)) {
+                    $headers .= "User-Agent: " . $this->agent . "\r\n";
+        }
+        if (!empty($this->accept)) {
+                    $headers .= "Accept: " . $this->accept . "\r\n";
+        }
         if ($this->use_gzip) {
             // make sure PHP was built with --with-zlib
             // and we can handle gzipp'ed data
@@ -648,11 +690,13 @@ 
                     E_USER_NOTICE);
             }
         }
-        if (!empty($this->referer))
-            $headers .= "Referer: " . $this->referer . "\r\n";
+        if (!empty($this->referer)) {
+                    $headers .= "Referer: " . $this->referer . "\r\n";
+        }
         if (!empty($this->cookies)) {
-            if (!is_array($this->cookies))
-                $this->cookies = (array)$this->cookies;
+            if (!is_array($this->cookies)) {
+                            $this->cookies = (array)$this->cookies;
+            }
 
             reset($this->cookies);
             if (count($this->cookies) > 0) {
@@ -664,32 +708,39 @@ 
             }
         }
         if (!empty($this->rawheaders)) {
-            if (!is_array($this->rawheaders))
-                $this->rawheaders = (array)$this->rawheaders;
-            while (list($headerKey, $headerVal) = each($this->rawheaders))
-                $headers .= $headerKey . ": " . $headerVal . "\r\n";
+            if (!is_array($this->rawheaders)) {
+                            $this->rawheaders = (array)$this->rawheaders;
+            }
+            while (list($headerKey, $headerVal) = each($this->rawheaders)) {
+                            $headers .= $headerKey . ": " . $headerVal . "\r\n";
+            }
         }
         if (!empty($content_type)) {
             $headers .= "Content-type: $content_type";
-            if ($content_type == "multipart/form-data")
-                $headers .= "; boundary=" . $this->_mime_boundary;
+            if ($content_type == "multipart/form-data") {
+                            $headers .= "; boundary=" . $this->_mime_boundary;
+            }
             $headers .= "\r\n";
         }
-        if (!empty($body))
-            $headers .= "Content-length: " . strlen($body) . "\r\n";
-        if (!empty($this->user) || !empty($this->pass))
-            $headers .= "Authorization: Basic " . base64_encode($this->user . ":" . $this->pass) . "\r\n";
+        if (!empty($body)) {
+                    $headers .= "Content-length: " . strlen($body) . "\r\n";
+        }
+        if (!empty($this->user) || !empty($this->pass)) {
+                    $headers .= "Authorization: Basic " . base64_encode($this->user . ":" . $this->pass) . "\r\n";
+        }
 
         //add proxy auth headers
-        if (!empty($this->proxy_user))
-            $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n";
+        if (!empty($this->proxy_user)) {
+                    $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n";
+        }
 
 
         $headers .= "\r\n";
 
         // set the read timeout if needed
-        if ($this->read_timeout > 0)
-            socket_set_timeout($fp, $this->read_timeout);
+        if ($this->read_timeout > 0) {
+                    socket_set_timeout($fp, $this->read_timeout);
+        }
         $this->timed_out = false;
 
         fwrite($fp, $headers . $body, strlen($headers . $body));
@@ -706,8 +757,9 @@ 
                 return false;
             }
 
-            if ($currentHeader == "\r\n")
-                break;
+            if ($currentHeader == "\r\n") {
+                            break;
+            }
 
             // if a header begins with Location: or URI:, set the redirect
             if (preg_match("/^(Location:|URI:)/i", $currentHeader)) {
@@ -718,12 +770,14 @@ 
                     // no host in the path, so prepend
                     $this->_redirectaddr = $URI_PARTS["scheme"] . "://" . $this->host . ":" . $this->port;
                     // eliminate double slash
-                    if (!preg_match("|^/|", $matches[2]))
-                        $this->_redirectaddr .= "/" . $matches[2];
-                    else
-                        $this->_redirectaddr .= $matches[2];
-                } else
-                    $this->_redirectaddr = $matches[2];
+                    if (!preg_match("|^/|", $matches[2])) {
+                                            $this->_redirectaddr .= "/" . $matches[2];
+                    } else {
+                                            $this->_redirectaddr .= $matches[2];
+                    }
+                } else {
+                                    $this->_redirectaddr = $matches[2];
+                }
             }
 
             if (preg_match("|^HTTP/|", $currentHeader)) {
@@ -770,14 +824,17 @@ 
         // have we hit our frame depth and is there frame src to fetch?
         if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match)) {
             $this->results[] = $results;
-            for ($x = 0; $x < count($match[1]); $x++)
-                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"] . "://" . $this->host);
+            for ($x = 0; $x < count($match[1]); $x++) {
+                            $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"] . "://" . $this->host);
+            }
         } // have we already fetched framed content?
-        elseif (is_array($this->results))
-            $this->results[] = $results;
+        elseif (is_array($this->results)) {
+                    $this->results[] = $results;
+        }
         // no framed content
-        else
-            $this->results = $results;
+        else {
+                    $this->results = $results;
+        }
 
         return $this;
     }
@@ -790,8 +847,9 @@ 
     function setcookies()
     {
         for ($x = 0; $x < count($this->headers); $x++) {
-            if (preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x], $match))
-                $this->cookies[$match[1]] = urldecode($match[2]);
+            if (preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x], $match)) {
+                            $this->cookies[$match[1]] = urldecode($match[2]);
+            }
         }
         return $this;
     }
@@ -852,10 +910,12 @@ 
                     'disable_compression' => true,
                 );
 
-                if (isset($this->cafile))
-                    $context_opts['ssl']['cafile'] = $this->cafile;
-                if (isset($this->capath))
-                    $context_opts['ssl']['capath'] = $this->capath;
+                if (isset($this->cafile)) {
+                                    $context_opts['ssl']['cafile'] = $this->cafile;
+                }
+                if (isset($this->capath)) {
+                                    $context_opts['ssl']['capath'] = $this->capath;
+                }
             }
                     
             $host = 'ssl://' . $host;
@@ -864,8 +924,9 @@ 
         $context = stream_context_create($context_opts);
 
         if (version_compare(PHP_VERSION, '5.0.0', '>')) {
-            if($this->scheme == 'http')
-                $host = "tcp://" . $host;
+            if($this->scheme == 'http') {
+                            $host = "tcp://" . $host;
+            }
             $fp = stream_socket_client(
                 "$host:$port",
                 $errno,
@@ -929,8 +990,9 @@ 
         settype($formfiles, "array");
         $postdata = '';
 
-        if (count($formvars) == 0 && count($formfiles) == 0)
-            return;
+        if (count($formvars) == 0 && count($formfiles) == 0) {
+                    return;
+        }
 
         switch ($this->_submit_type) {
             case "application/x-www-form-urlencoded":
@@ -940,8 +1002,9 @@ 
                         while (list($cur_key, $cur_val) = each($val)) {
                             $postdata .= urlencode($key) . "[]=" . urlencode($cur_val) . "&";
                         }
-                    } else
-                        $postdata .= urlencode($key) . "=" . urlencode($val) . "&";
+                    } else {
+                                            $postdata .= urlencode($key) . "=" . urlencode($val) . "&";
+                    }
                 }
                 break;
 
@@ -967,7 +1030,9 @@ 
                 while (list($field_name, $file_names) = each($formfiles)) {
                     settype($file_names, "array");
                     while (list(, $file_name) = each($file_names)) {
-                        if (!is_readable($file_name)) continue;
+                        if (!is_readable($file_name)) {
+                            continue;
+                        }
 
                         $fp = fopen($file_name, "r");
                         $file_content = fread($fp, filesize($file_name));