XOOPS / XoopsCore25

htdocs/class/xoopsform/formhidden.php

Spacing +1 added lines, -1 removed lines

@@ -75,6 +75,6 @@
      */
     public function render()
     {
-        return '<input type="hidden" name="' . $this->getName() . '" id="' . $this->getName() . '" value="' . $this->getValue() . '" />';
+        return '<input type="hidden" name="'.$this->getName().'" id="'.$this->getName().'" value="'.$this->getValue().'" />';
     }
 }

htdocs/class/xoopsform/formelement.php

Spacing +6 added lines, -6 removed lines

@@ -193,7 +193,7 @@ 
     {
         $access = $this->getAccessKey();
         if (!empty($access) && (false !== ($pos = strpos($str, $access)))) {
-            return htmlspecialchars(substr($str, 0, $pos), ENT_QUOTES) . '<span style="text-decoration: underline;">' . htmlspecialchars(substr($str, $pos, 1), ENT_QUOTES) . '</span>' . htmlspecialchars(substr($str, $pos + 1), ENT_QUOTES);
+            return htmlspecialchars(substr($str, 0, $pos), ENT_QUOTES).'<span style="text-decoration: underline;">'.htmlspecialchars(substr($str, $pos, 1), ENT_QUOTES).'</span>'.htmlspecialchars(substr($str, $pos + 1), ENT_QUOTES);
         }
 
         return htmlspecialchars($str, ENT_QUOTES);
@@ -260,7 +260,7 @@ 
     public function getTitle($encode = true)
     {
         if (strlen($this->_description) > 0) {
-            return $encode ? htmlspecialchars(strip_tags($this->_caption . ' - ' . $this->_description), ENT_QUOTES) : strip_tags($this->_caption . ' - ' . $this->_description);
+            return $encode ? htmlspecialchars(strip_tags($this->_caption.' - '.$this->_description), ENT_QUOTES) : strip_tags($this->_caption.' - '.$this->_description);
         } else {
             return $encode ? htmlspecialchars(strip_tags($this->_caption), ENT_QUOTES) : strip_tags($this->_caption);
         }
@@ -345,14 +345,14 @@ 
     public function getExtra($encode = false)
     {
         if (!$encode) {
-            return ' ' . implode(' ', $this->_extra);
+            return ' '.implode(' ', $this->_extra);
         }
         $value = array();
         foreach ($this->_extra as $val) {
             $value[] = str_replace('>', '&gt;', str_replace('<', '&lt;', $val));
         }
 
-        return empty($value) ? '' : ' ' . implode(' ', $value);
+        return empty($value) ? '' : ' '.implode(' ', $value);
     }
 
     /**
@@ -428,10 +428,10 @@ 
             echo $this->getFormType();
             switch ($this->getFormType()) {
                 case 'checkbox':
-                    return NWLINE . "if (!myform.{$eltname}.checked) { window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
+                    return NWLINE."if (!myform.{$eltname}.checked) { window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
                     break;
                 default:
-                    return NWLINE . "if (myform.{$eltname}.value == \"\") { window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
+                    return NWLINE."if (myform.{$eltname}.value == \"\") { window.alert(\"{$eltmsg}\"); myform.{$eltname}.focus(); return false; }\n";
                     break;
             } // switch
         }

htdocs/class/xoopsform/formselectuser.php

Indentation +5 added lines, -5 removed lines

@@ -156,11 +156,11 @@
         $searchUsers->setExtra(' onclick="openWithSelfMain(\'' . XOOPS_URL . '/include/findusers.php?target=' . $name . '&multiple=' . $multiple . '&token=' . $token . '\', \'userselect\', 800, 600, null); return false;" ');
         $action_tray->addElement($searchUsers);
 
-         if (isset($GLOBALS['xoTheme']) && is_object($GLOBALS['xoTheme'])) {
-             $GLOBALS['xoTheme']->addScript('', array(), $js_addusers);
-         } else {
-             echo '<script>' . $js_addusers . '</script>';
-         }
+            if (isset($GLOBALS['xoTheme']) && is_object($GLOBALS['xoTheme'])) {
+                $GLOBALS['xoTheme']->addScript('', array(), $js_addusers);
+            } else {
+                echo '<script>' . $js_addusers . '</script>';
+            }
         parent::__construct($caption, '', $name);
         $this->addElement($select_element);
         $this->addElement($action_tray);

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
         $selectedUsers = array();
         if (count($value) > 0) {
             // fetch the set of uids in $value
-            $criteria = new Criteria('uid', '(' . implode(',', $value) . ')', 'IN');
+            $criteria = new Criteria('uid', '('.implode(',', $value).')', 'IN');
             $criteria->setSort('uname');
             $criteria->setOrder('ASC');
             $selectedUsers = $member_handler->getUserList($criteria);
@@ -122,7 +122,7 @@ 
             {
                 var num = opts.substring(0, opts.indexOf(':'));
                 opts = opts.substring(opts.indexOf(':')+1, opts.length);
-                var sel = xoopsGetElementById('" . $name . "');
+                var sel = xoopsGetElementById('" . $name."');
                 var arr = new Array(num);
                 for (var n=0; n < num; n++) {
                     var nm = opts.substring(0, opts.indexOf(':'));
@@ -148,18 +148,18 @@ 
             }";
         $token       = $GLOBALS['xoopsSecurity']->createToken();
         $action_tray = new XoopsFormElementTray('', '');
-        $removeUsers = new XoopsFormButton('', 'rmvusr_' . $name, _MA_USER_REMOVE, 'button');
-        $removeUsers->setExtra(' onclick="var sel = xoopsGetElementById(\'' . $name . '\');for (var i = sel.options.length-1; i >= 0; i--) {if (!sel.options[i].selected) {sel.options[i] = null;}}; return false;" ');
+        $removeUsers = new XoopsFormButton('', 'rmvusr_'.$name, _MA_USER_REMOVE, 'button');
+        $removeUsers->setExtra(' onclick="var sel = xoopsGetElementById(\''.$name.'\');for (var i = sel.options.length-1; i >= 0; i--) {if (!sel.options[i].selected) {sel.options[i] = null;}}; return false;" ');
         $action_tray->addElement($removeUsers);
 
-        $searchUsers = new XoopsFormButton('', 'srchusr_' . $name, _MA_USER_MORE, 'button');
-        $searchUsers->setExtra(' onclick="openWithSelfMain(\'' . XOOPS_URL . '/include/findusers.php?target=' . $name . '&amp;multiple=' . $multiple . '&amp;token=' . $token . '\', \'userselect\', 800, 600, null); return false;" ');
+        $searchUsers = new XoopsFormButton('', 'srchusr_'.$name, _MA_USER_MORE, 'button');
+        $searchUsers->setExtra(' onclick="openWithSelfMain(\''.XOOPS_URL.'/include/findusers.php?target='.$name.'&amp;multiple='.$multiple.'&amp;token='.$token.'\', \'userselect\', 800, 600, null); return false;" ');
         $action_tray->addElement($searchUsers);
 
          if (isset($GLOBALS['xoTheme']) && is_object($GLOBALS['xoTheme'])) {
              $GLOBALS['xoTheme']->addScript('', array(), $js_addusers);
          } else {
-             echo '<script>' . $js_addusers . '</script>';
+             echo '<script>'.$js_addusers.'</script>';
          }
         parent::__construct($caption, '', $name);
         $this->addElement($select_element);

htdocs/class/xoopsform/formhiddentoken.php

Spacing +1 added lines, -1 removed lines

@@ -32,6 +32,6 @@
      */
     public function __construct($name = 'XOOPS_TOKEN', $timeout = 0)
     {
-        parent::__construct($name . '_REQUEST', $GLOBALS['xoopsSecurity']->createToken($timeout, $name));
+        parent::__construct($name.'_REQUEST', $GLOBALS['xoopsSecurity']->createToken($timeout, $name));
     }
 }

htdocs/class/xoopsform/formselectcheckgroup.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     public function __construct($caption, $name, $value = null)
     {
         /* @var $member_handler XoopsMemberHandler */
-        $member_handler   = xoops_getHandler('member');
+        $member_handler = xoops_getHandler('member');
         $userGroups = $member_handler->getGroupList();
         parent::__construct($caption, $name, $value);
         $this->columns = 3;

htdocs/class/snoopy.php

Spacing +60 added lines, -60 removed lines

@@ -143,7 +143,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);
                     }
@@ -154,7 +154,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("|^http://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                            if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
@@ -193,7 +193,7 @@ 
                     // using proxy, send entire URI
                     $this->_httpsrequest($URI, $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->_httpsrequest($path, $URI, $this->_httpmethod);
                 }
@@ -202,7 +202,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("|^http://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                        if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                             /* follow the redirect */
                             $this->_redirectdepth++;
                             $this->lastredirectaddr = $this->_redirectaddr;
@@ -227,7 +227,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;
         }
@@ -271,7 +271,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);
                     }
@@ -281,11 +281,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("|^http://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                            if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
@@ -328,7 +328,7 @@ 
                     // using proxy, send entire URI
                     $this->_httpsrequest($URI, $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->_httpsrequest($path, $URI, $this->_submit_method, $this->_submit_type, $postdata);
                 }
@@ -336,11 +336,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("|^http://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                        if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                             /* follow the redirect */
                             $this->_redirectdepth++;
                             $this->lastredirectaddr = $this->_redirectaddr;
@@ -369,7 +369,7 @@ 
 
             default:
                 // not a valid protocol
-                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
                 return false;
                 break;
         }
@@ -667,9 +667,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",
             "|/\./|",
@@ -677,8 +677,8 @@ 
         );
 
         $replace = array("",
-            $match_root . "/",
-            $match . "/",
+            $match_root."/",
+            $match."/",
             "/",
             "/"
         );
@@ -707,17 +707,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->agent))
-            $headers .= "User-Agent: " . $this->agent . "\r\n";
+            $headers .= "User-Agent: ".$this->agent."\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->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
@@ -725,13 +725,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;
@@ -740,31 +740,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";
@@ -774,7 +774,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);
@@ -798,10 +798,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
@@ -853,7 +853,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;
@@ -886,16 +886,16 @@ 
         // GET ... header not needed for curl
         //$headers[] = $http_method." ".$url." ".$this->_httpversion;
         if (!empty($this->agent))
-            $headers[] = "User-Agent: " . $this->agent;
+            $headers[] = "User-Agent: ".$this->agent;
         if (!empty($this->host))
             if (!empty($this->port))
-                $headers[] = "Host: " . $this->host . ":" . $this->port;
+                $headers[] = "Host: ".$this->host.":".$this->port;
             else
-                $headers[] = "Host: " . $this->host;
+                $headers[] = "Host: ".$this->host;
         if (!empty($this->accept))
-            $headers[] = "Accept: " . $this->accept;
+            $headers[] = "Accept: ".$this->accept;
         if (!empty($this->referer))
-            $headers[] = "Referer: " . $this->referer;
+            $headers[] = "Referer: ".$this->referer;
         if (!empty($this->cookies)) {
             if (!is_array($this->cookies))
                 $this->cookies = (array)$this->cookies;
@@ -904,7 +904,7 @@ 
             if (count($this->cookies) > 0) {
                 $cookie_str = 'Cookie: ';
                 foreach ($this->cookies as $cookieKey => $cookieVal) {
-                    $cookie_str .= $cookieKey . "=" . urlencode($cookieVal) . "; ";
+                    $cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
                 }
                 $headers[] = substr($cookie_str, 0, -2);
             }
@@ -913,33 +913,33 @@ 
             if (!is_array($this->rawheaders))
                 $this->rawheaders = (array)$this->rawheaders;
             while (list($headerKey, $headerVal) = each($this->rawheaders))
-                $headers[] = $headerKey . ": " . $headerVal;
+                $headers[] = $headerKey.": ".$headerVal;
         }
         if (!empty($content_type)) {
             if ($content_type == "multipart/form-data")
-                $headers[] = "Content-type: $content_type; boundary=" . $this->_mime_boundary;
+                $headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
             else
                 $headers[] = "Content-type: $content_type";
         }
         if (!empty($body))
-            $headers[] = "Content-length: " . strlen($body);
+            $headers[] = "Content-length: ".strlen($body);
         if (!empty($this->user) || !empty($this->pass))
-            $headers[] = "Authorization: BASIC " . base64_encode($this->user . ":" . $this->pass);
+            $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 
         for ($curr_header = 0; $curr_header < count($headers); $curr_header++) {
             $safer_header = strtr($headers[$curr_header], "\"", " ");
-            $cmdline_params .= " -H \"" . $safer_header . "\"";
+            $cmdline_params .= " -H \"".$safer_header."\"";
         }
 
         if (!empty($body))
             $cmdline_params .= " -d \"$body\"";
 
         if ($this->read_timeout > 0)
-            $cmdline_params .= " -m " . $this->read_timeout;
+            $cmdline_params .= " -m ".$this->read_timeout;
 
         $headerfile = tempnam($temp_dir, "sno");
 
-        exec($this->curl_path . " -k -D \"$headerfile\"" . $cmdline_params . " " . escapeshellarg($URI), $results, $return);
+        exec($this->curl_path." -k -D \"$headerfile\"".$cmdline_params." ".escapeshellarg($URI), $results, $return);
 
         if ($return) {
             $this->error = "Error: cURL could not retrieve the document, error $return.";
@@ -963,10 +963,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
@@ -993,7 +993,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;
@@ -1080,7 +1080,7 @@ 
                 case -5:
                     $this->error = "connection refused or timed out (-5)";
                 default:
-                    $this->error = "connection failed (" . $errno . ")";
+                    $this->error = "connection failed (".$errno.")";
             }
             return false;
         }
@@ -1121,26 +1121,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";
                     }
@@ -1157,12 +1157,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 +280 added lines, -187 removed lines

@@ -124,20 +124,25 @@ 
 
         //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
         $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 "http":
                 $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
@@ -171,8 +176,9 @@ 
                             if ($this->_framedepth < $this->maxframes) {
                                 $this->fetch($frameurl);
                                 $this->_framedepth++;
-                            } else
-                                break;
+                            } else {
+                                                            break;
+                            }
                         }
                     }
                 } else {
@@ -181,14 +187,17 @@ 
                 return true;
                 break;
             case "https":
-                if (!$this->curl_path)
-                    return false;
-                if (function_exists("is_executable"))
-                    if (!is_executable($this->curl_path))
+                if (!$this->curl_path) {
+                                    return false;
+                }
+                if (function_exists("is_executable")) {
+                                    if (!is_executable($this->curl_path))
                         return false;
+                }
                 $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->_isproxy) {
                     // using proxy, send entire URI
                     $this->_httpsrequest($URI, $URI, $this->_httpmethod);
@@ -219,8 +228,9 @@ 
                         if ($this->_framedepth < $this->maxframes) {
                             $this->fetch($frameurl);
                             $this->_framedepth++;
-                        } else
-                            break;
+                        } else {
+                                                    break;
+                        }
                     }
                 }
                 return true;
@@ -252,20 +262,25 @@ 
         $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 "http":
                 $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
@@ -281,18 +296,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("|^http://" . 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);
+                                }
                             }
                         }
                     }
@@ -305,8 +324,9 @@ 
                             if ($this->_framedepth < $this->maxframes) {
                                 $this->fetch($frameurl);
                                 $this->_framedepth++;
-                            } else
-                                break;
+                            } else {
+                                                            break;
+                            }
                         }
                     }
 
@@ -316,14 +336,17 @@ 
                 return true;
                 break;
             case "https":
-                if (!$this->curl_path)
-                    return false;
-                if (function_exists("is_executable"))
-                    if (!is_executable($this->curl_path))
+                if (!$this->curl_path) {
+                                    return false;
+                }
+                if (function_exists("is_executable")) {
+                                    if (!is_executable($this->curl_path))
                         return false;
+                }
                 $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->_isproxy) {
                     // using proxy, send entire URI
                     $this->_httpsrequest($URI, $URI, $this->_submit_method, $this->_submit_type, $postdata);
@@ -336,18 +359,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("|^http://" . 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);
+                            }
                         }
                     }
                 }
@@ -360,8 +387,9 @@ 
                         if ($this->_framedepth < $this->maxframes) {
                             $this->fetch($frameurl);
                             $this->_framedepth++;
-                        } else
-                            break;
+                        } else {
+                                                    break;
+                        }
                     }
                 }
                 return true;
@@ -386,19 +414,24 @@ 
     function fetchlinks($URI)
     {
         if ($this->fetch($URI)) {
-            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 true;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /*======================================================================*\
@@ -414,14 +447,17 @@ 
         if ($this->fetch($URI)) {
 
             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 true;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
@@ -436,13 +472,16 @@ 
     {
         if ($this->fetch($URI)) {
             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 true;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /*======================================================================*\
@@ -455,22 +494,26 @@ 
     function submitlinks($URI, $formvars = "", $formfiles = "")
     {
         if ($this->submit($URI, $formvars, $formfiles)) {
-            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 true;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
     /*======================================================================*\
@@ -483,22 +526,26 @@ 
     function submittext($URI, $formvars = "", $formfiles = "")
     {
         if ($this->submit($URI, $formvars, $formfiles)) {
-            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 true;
-        } else
-            return false;
+        } else {
+                    return false;
+        }
     }
 
 
@@ -550,13 +597,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
@@ -701,23 +750,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->agent))
-            $headers .= "User-Agent: " . $this->agent . "\r\n";
+        if (!empty($this->agent)) {
+                    $headers .= "User-Agent: " . $this->agent . "\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->accept))
-            $headers .= "Accept: " . $this->accept . "\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
@@ -730,11 +784,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) {
@@ -746,32 +802,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));
@@ -788,8 +851,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)) {
@@ -800,12 +864,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)) {
@@ -852,14 +918,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 true;
     }
@@ -875,30 +944,37 @@ 
 
     function _httpsrequest($url, $URI, $http_method, $content_type = "", $body = "")
     {
-        if ($this->passcookies && $this->_redirectaddr)
-            $this->setcookies();
+        if ($this->passcookies && $this->_redirectaddr) {
+                    $this->setcookies();
+        }
 
         $headers = array();
 
         $URI_PARTS = parse_url($URI);
-        if (empty($url))
-            $url = "/";
+        if (empty($url)) {
+                    $url = "/";
+        }
         // GET ... header not needed for curl
         //$headers[] = $http_method." ".$url." ".$this->_httpversion;
-        if (!empty($this->agent))
-            $headers[] = "User-Agent: " . $this->agent;
-        if (!empty($this->host))
-            if (!empty($this->port))
+        if (!empty($this->agent)) {
+                    $headers[] = "User-Agent: " . $this->agent;
+        }
+        if (!empty($this->host)) {
+                    if (!empty($this->port))
                 $headers[] = "Host: " . $this->host . ":" . $this->port;
-            else
-                $headers[] = "Host: " . $this->host;
-        if (!empty($this->accept))
-            $headers[] = "Accept: " . $this->accept;
-        if (!empty($this->referer))
-            $headers[] = "Referer: " . $this->referer;
+        } else {
+                            $headers[] = "Host: " . $this->host;
+            }
+        if (!empty($this->accept)) {
+                    $headers[] = "Accept: " . $this->accept;
+        }
+        if (!empty($this->referer)) {
+                    $headers[] = "Referer: " . $this->referer;
+        }
         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) {
@@ -910,32 +986,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;
+            if (!is_array($this->rawheaders)) {
+                            $this->rawheaders = (array)$this->rawheaders;
+            }
+            while (list($headerKey, $headerVal) = each($this->rawheaders)) {
+                            $headers[] = $headerKey . ": " . $headerVal;
+            }
         }
         if (!empty($content_type)) {
-            if ($content_type == "multipart/form-data")
-                $headers[] = "Content-type: $content_type; boundary=" . $this->_mime_boundary;
-            else
-                $headers[] = "Content-type: $content_type";
+            if ($content_type == "multipart/form-data") {
+                            $headers[] = "Content-type: $content_type; boundary=" . $this->_mime_boundary;
+            } else {
+                            $headers[] = "Content-type: $content_type";
+            }
+        }
+        if (!empty($body)) {
+                    $headers[] = "Content-length: " . strlen($body);
+        }
+        if (!empty($this->user) || !empty($this->pass)) {
+                    $headers[] = "Authorization: BASIC " . base64_encode($this->user . ":" . $this->pass);
         }
-        if (!empty($body))
-            $headers[] = "Content-length: " . strlen($body);
-        if (!empty($this->user) || !empty($this->pass))
-            $headers[] = "Authorization: BASIC " . base64_encode($this->user . ":" . $this->pass);
 
         for ($curr_header = 0; $curr_header < count($headers); $curr_header++) {
             $safer_header = strtr($headers[$curr_header], "\"", " ");
             $cmdline_params .= " -H \"" . $safer_header . "\"";
         }
 
-        if (!empty($body))
-            $cmdline_params .= " -d \"$body\"";
+        if (!empty($body)) {
+                    $cmdline_params .= " -d \"$body\"";
+        }
 
-        if ($this->read_timeout > 0)
-            $cmdline_params .= " -m " . $this->read_timeout;
+        if ($this->read_timeout > 0) {
+                    $cmdline_params .= " -m " . $this->read_timeout;
+        }
 
         $headerfile = tempnam($temp_dir, "sno");
 
@@ -965,12 +1048,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/|", $result_headers[$currentHeader])) {
@@ -992,14 +1077,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;
+        }
 
         unlink("$headerfile");
 
@@ -1014,8 +1102,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]);
+            }
         }
     }
 
@@ -1112,8 +1201,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":
@@ -1123,8 +1213,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;
 
@@ -1150,7 +1241,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));

htdocs/class/class.tar.php

Spacing +17 added lines, -17 removed lines

@@ -216,7 +216,7 @@ 
                 // Increment number of files
                 $this->numFiles++;
                 // Create us a new file in our array
-                $activeFile =& $this->files[];
+                $activeFile = & $this->files[];
                 // Asign Values
                 $activeFile['name']       = $file_name;
                 $activeFile['mode']       = $file_mode;
@@ -232,7 +232,7 @@ 
                 // Increment number of directories
                 $this->numDirectories++;
                 // Create a new directory in our array
-                $activeDir =& $this->directories[];
+                $activeDir = & $this->directories[];
                 // Assign values
                 $activeDir['name']       = $file_name;
                 $activeDir['mode']       = $file_mode;
@@ -298,16 +298,16 @@ 
                 // Generate tar header for this directory
                 // Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
                 $header .= str_pad($information['name'], 100, chr(0));
-                $header .= str_pad(decoct($information['mode']), 7, '0', STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information['user_id']), 7, '0', STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information['group_id']), 7, '0', STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct(0), 11, '0', STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information['time']), 11, '0', STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information['mode']), 7, '0', STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information['user_id']), 7, '0', STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information['group_id']), 7, '0', STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct(0), 11, '0', STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information['time']), 11, '0', STR_PAD_LEFT).chr(0);
                 $header .= str_repeat(' ', 8);
                 $header .= '5';
                 $header .= str_repeat(chr(0), 100);
                 $header .= str_pad('ustar', 6, chr(32));
-                $header .= chr(32) . chr(0);
+                $header .= chr(32).chr(0);
                 $header .= str_pad('', 32, chr(0));
                 $header .= str_pad('', 32, chr(0));
                 $header .= str_repeat(chr(0), 8);
@@ -333,16 +333,16 @@ 
                 // Generate the TAR header for this file
                 // Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
                 $header = str_pad($information['name'], 100, chr(0));
-                $header .= str_pad(decoct($information['mode']), 7, '0', STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information['user_id']), 7, '0', STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information['group_id']), 7, '0', STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information['size']), 11, '0', STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information['time']), 11, '0', STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information['mode']), 7, '0', STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information['user_id']), 7, '0', STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information['group_id']), 7, '0', STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information['size']), 11, '0', STR_PAD_LEFT).chr(0);
+                $header .= str_pad(decoct($information['time']), 11, '0', STR_PAD_LEFT).chr(0);
                 $header .= str_repeat(' ', 8);
                 $header .= '0';
                 $header .= str_repeat(chr(0), 100);
                 $header .= str_pad('ustar', 6, chr(32));
-                $header .= chr(32) . chr(0);
+                $header .= chr(32).chr(0);
                 $header .= str_pad($information['user_name'], 32, chr(0)); // How do I get a file's user name from PHP?
                 $header .= str_pad($information['group_name'], 32, chr(0)); // How do I get a file's group name from PHP?
                 $header .= str_repeat(chr(0), 8);
@@ -359,7 +359,7 @@ 
                 // Pad file contents to byte count divisible by 512
                 $file_contents = str_pad($information['file'], ceil($information['size'] / 512) * 512, chr(0));
                 // Add new tar formatted data to tar file contents
-                $this->tar_file .= $header . $file_contents;
+                $this->tar_file .= $header.$file_contents;
             }
         }
         // Add 512 bytes of NULLs to designate EOF
@@ -499,7 +499,7 @@ 
         $file_information = stat($dirname);
         // Add directory to processed data
         $this->numDirectories++;
-        $activeDir             =& $this->directories[];
+        $activeDir             = & $this->directories[];
         $activeDir['name']     = $dirname;
         $activeDir['mode']     = $file_information['mode'];
         $activeDir['time']     = $file_information['time'];
@@ -539,7 +539,7 @@ 
         fclose($fp);
         // Add file to processed data
         $this->numFiles++;
-        $activeFile               =& $this->files[];
+        $activeFile               = & $this->files[];
         $activeFile['name']       = $filename;
         $activeFile['mode']       = $file_information['mode'];
         $activeFile['user_id']    = $file_information['uid'];

htdocs/class/logger.php

Spacing +1 added lines, -1 removed lines

@@ -28,4 +28,4 @@
  * Load the new XoopsLogger class
  **/
 require_once $GLOBALS['xoops']->path('class/logger/xoopslogger.php');
-trigger_error('Instance of ' . __FILE__ . " file is deprecated, check 'XoopsLogger' in class/logger/xoopslogger.php");
+trigger_error('Instance of '.__FILE__." file is deprecated, check 'XoopsLogger' in class/logger/xoopslogger.php");

htdocs/class/xml/themesetparser.php

Spacing +3 added lines, -3 removed lines

@@ -18,8 +18,8 @@ 
  */
 defined('XOOPS_ROOT_PATH') || exit('Restricted access');
 
-include_once XOOPS_ROOT_PATH . '/class/xml/saxparser.php';
-include_once XOOPS_ROOT_PATH . '/class/xml/xmltaghandler.php';
+include_once XOOPS_ROOT_PATH.'/class/xml/saxparser.php';
+include_once XOOPS_ROOT_PATH.'/class/xml/xmltaghandler.php';
 
 /**
  * Class XoopsThemeSetParser
@@ -121,7 +121,7 @@ 
         if (!isset($this->tempArr[$name])) {
             $this->tempArr[$name] = &$value;
         } else {
-            $this->tempArr[$name] .= $delim . $value;
+            $this->tempArr[$name] .= $delim.$value;
         }
     }