chamilo / chamilo-lms

main/inc/lib/sortable_table.class.php

Braces +3 added lines, -2 removed lines

@@ -808,8 +808,9 @@
             foreach ($param as $key => & $value) {
                 $param_string_parts[] = urlencode($key).'='.urlencode($value);
             }
-            if (count($param_string_parts) > 0)
-                $result .= '&'.implode('&', $param_string_parts);
+            if (count($param_string_parts) > 0) {
+                            $result .= '&'.implode('&', $param_string_parts);
+            }
         }
         return $result;
     }

main/inc/lib/online.inc.php

Braces +3 added lines, -1 removed lines

@@ -389,7 +389,9 @@
 */
 function who_is_online_in_this_course($from, $number_of_items, $uid, $time_limit, $course_code)
 {
-	if (empty($course_code)) return false;
+	if (empty($course_code)) {
+	    return false;
+	}
 
     if (empty($time_limit)) {
         $time_limit = api_get_setting('time_limit_whosonline');

main/inc/lib/fileManage.lib.php

Braces +12 added lines, -4 removed lines

@@ -33,7 +33,9 @@ 
             Database::query($query);
             break;
         case 'update':
-            if ($new_path[0] == '.') $new_path = substr($new_path, 1);
+            if ($new_path[0] == '.') {
+                $new_path = substr($new_path, 1);
+            }
             $new_path = str_replace('//', '/', $new_path);
 
             // Attempt to update	- tested & working for root	dir
@@ -379,7 +381,9 @@ 
 			chdir($path);
 			$handle = opendir($path);
 			while ($element = readdir($handle)) {
-				if ($element == '.' || $element == '..') continue;
+				if ($element == '.' || $element == '..') {
+				    continue;
+				}
                 // Skip the current and parent directories
 				if (is_dir($element)) {
 					$dir_array[] = $path.'/'.$element;
@@ -419,7 +423,9 @@ 
 				chdir($directory);
 				$handle = opendir($directory);
 			   	while ($element = readdir($handle)) {
-					if ($element == '.' || $element == '..' || $element == '.htaccess') continue;
+					if ($element == '.' || $element == '..' || $element == '.htaccess') {
+					    continue;
+					}
                     // Skip the current and parent directories
 					if (!is_dir($element)) {
 						$element_array[] = $directory.'/'.$element;
@@ -469,7 +475,9 @@ 
 	 */
 	function set_default_settings($upload_path, $filename, $filetype = 'file', $glued_table, $default_visibility = 'v')
     {
-		if (!$default_visibility) $default_visibility = 'v';
+		if (!$default_visibility) {
+		    $default_visibility = 'v';
+		}
 
 		// Make sure path is not wrongly formed
 		$upload_path = !empty($upload_path) ? "/$upload_path" : '';

main/inc/lib/getid3/getid3.php

Braces +8 added lines, -17 removed lines

@@ -198,8 +198,7 @@ 
                     $tag_class = 'getid3_' . $tag_name;
                     $tag = new $tag_class($this);
                     $tag->Analyze();
-                }
-                catch (getid3_exception $e) {
+                } catch (getid3_exception $e) {
                     throw $e;
                 }
             }
@@ -243,9 +242,7 @@ 
             // use assume format on these if format detection failed
             if (preg_match('/\.mp[123a]$/i', $filename)) {
                 $determined_format = $file_format_array['mp3'];
-            }
-
-            else {
+            } else {
                 fclose($this->fp);
                 throw new getid3_exception('Unable to determine file format');
             }
@@ -259,8 +256,7 @@ 
             if ($determined_format['fail_id3'] === 'ERROR') {
                 fclose($this->fp);
                 throw new getid3_exception('ID3 tags not allowed on this file type.');
-            }
-            elseif ($determined_format['fail_id3'] === 'WARNING') {
+            } elseif ($determined_format['fail_id3'] === 'WARNING') {
                 @$this->info['id3v1'] and $this->warning('ID3v1 tags not allowed on this file type.');
                 @$this->info['id3v2'] and $this->warning('ID3v2 tags not allowed on this file type.');
             }
@@ -301,11 +297,9 @@ 
 
         try {
              $this->option_analyze and $class->Analyze();
-            }
-        catch (getid3_exception $e) {
+            } catch (getid3_exception $e) {
             throw $e;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             throw new getid3_exception('Corrupt file.');
         }
 
@@ -460,8 +454,7 @@ 
 
         if (is_array($message)) {
             $this->warnings = array_merge($this->warnings, $message);
-        }
-        else {
+        } else {
             $this->warnings[] = $message;
         }
     }
@@ -1101,8 +1094,7 @@ 
                             if (empty($this->info['comments'][$tag_name])) {
 
                                 // fall through and append value
-                            }
-                            elseif ($tag_type == 'id3v1') {
+                            } elseif ($tag_type == 'id3v1') {
 
                                 $new_value_length = strlen(trim($value));
                                 foreach ($this->info['comments'][$tag_name] as $existing_key => $existing_value) {
@@ -1112,8 +1104,7 @@ 
                                         break 2;
                                     }
                                 }
-                            }
-                            else {
+                            } else {
 
                                 $new_value_length = strlen(trim($value));
                                 foreach ($this->info['comments'][$tag_name] as $existing_key => $existing_value) {

main/inc/lib/sessionmanager.lib.php

Braces +14 added lines, -10 removed lines

@@ -1588,8 +1588,10 @@ 
         if (empty($session_visibility)) {
             $session_visibility = $session->getVisibility();
             //default status loaded if empty
-            if (empty($session_visibility))
-                $session_visibility = SESSION_VISIBLE_READ_ONLY; // by default readonly 1
+            if (empty($session_visibility)) {
+                            $session_visibility = SESSION_VISIBLE_READ_ONLY;
+            }
+            // by default readonly 1
         } else {
             if (!in_array($session_visibility, array(SESSION_VISIBLE_READ_ONLY, SESSION_VISIBLE, SESSION_INVISIBLE))) {
                 $session_visibility = SESSION_VISIBLE_READ_ONLY;
@@ -2792,10 +2794,11 @@ 
                                 c_id = $courseId AND
                                 user_id = $user_id ";
                     $result = Database::query($sql);
-                    if (Database::affected_rows($result) > 0)
-                        return true;
-                    else
-                        return false;
+                    if (Database::affected_rows($result) > 0) {
+                                            return true;
+                    } else {
+                                            return false;
+                    }
                 } else {
                     // The user is not subscribed to the session, so make sure
                     // he isn't subscribed to a course in this session either
@@ -2806,10 +2809,11 @@ 
                                 c_id = $courseId AND
                                 user_id = $user_id ";
                     $result = Database::query($sql);
-                    if (Database::affected_rows($result) > 0)
-                        return true;
-                    else
-                        return false;
+                    if (Database::affected_rows($result) > 0) {
+                                            return true;
+                    } else {
+                                            return false;
+                    }
                 }
             } else {
                 // Assign user as a coach to course

main/inc/lib/magpierss/rss_fetch.inc

Braces +9 added lines, -18 removed lines

@@ -102,8 +102,7 @@ 
         $resp = _fetch_remote_file( $url );
         if ( is_success( $resp->status ) ) {
             return _response_to_rss( $resp );
-        }
-        else {
+        } else {
             error("Failed to fetch $url and cache is off");
             return false;
         }
@@ -172,8 +171,7 @@ 
                 // reset cache on 304 (at minutillo insistent prodding)
                 $cache->set($cache_key, $rss);
                 return $rss;
-            }
-            elseif ( is_success( $resp->status ) ) {
+            } elseif ( is_success( $resp->status ) ) {
                 $rss = _response_to_rss( $resp );
                 if ( $rss ) {
                     if (MAGPIE_DEBUG > 1) {
@@ -183,24 +181,20 @@ 
                     $cache->set( $cache_key, $rss );
                     return $rss;
                 }
-            }
-            else {
+            } else {
                 $errormsg = "Failed to fetch $url ";
                 if ( $resp->status == '-100' ) {
                     $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
-                }
-                elseif ( $resp->error ) {
+                } elseif ( $resp->error ) {
                     # compensate for Snoopy's annoying habbit to tacking
                     # on '\n'
                     $http_error = substr($resp->error, 0, -2); 
                     $errormsg .= "(HTTP Error: $http_error)";
-                }
-                else {
+                } else {
                     $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
                 }
             }
-        }
-        else {
+        } else {
             $errormsg = "Unable to retrieve RSS file for unknown reasons.";
         }
         
@@ -299,8 +293,7 @@ 
             // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
             if (strpos($h, ": ")) {
                 list($field, $val) = explode(": ", $h, 2);
-            }
-            else {
+            } else {
                 $field = $h;
                 $val = "";
             }
@@ -336,8 +329,7 @@ 
 function init () {
     if ( defined('MAGPIE_INITALIZED') ) {
         return;
-    }
-    else {
+    } else {
         define('MAGPIE_INITALIZED', true);
     }
     
@@ -378,8 +370,7 @@ 
         
         if ( MAGPIE_CACHE_ON ) {
             $ua = $ua . ')';
-        }
-        else {
+        } else {
             $ua = $ua . '; No cache)';
         }
         

main/inc/lib/magpierss/rss_cache.inc

Braces +4 added lines, -8 removed lines

@@ -124,13 +124,11 @@ 
             if ( $this->MAX_AGE > $age ) {
                 // object exists and is current
                 return 'HIT';
-            }
-            else {
+            } else {
                 // object exists but is old
                 return 'STALE';
             }
-        }
-        else {
+        } else {
             // object does not exist
             return 'MISS';
         }
@@ -142,8 +140,7 @@ 
 			$mtime = filemtime( $filename );
             $age = time() - $mtime;
 			return $age;
-		}
-		else {
+		} else {
 			return -1;	
 		}
 	}
@@ -185,8 +182,7 @@ 
         $this->ERROR = $errormsg;
         if ( MAGPIE_DEBUG ) {
             trigger_error( $errormsg, $lvl);
-        }
-        else {
+        } else {
             error_log( $errormsg, 0);
         }
     }

main/inc/lib/magpierss/rss_utils.inc

Braces +2 added lines, -4 removed lines

@@ -37,8 +37,7 @@ 
         $offset = 0;
         if ( $match[10] == 'Z' ) {
             # zulu time, aka GMT
-        }
-        else {
+        } else {
             list( $tz_mod, $tz_hour, $tz_min ) =
                 array( $match[8], $match[9], $match[10]);
             
@@ -58,8 +57,7 @@ 
         }
         $epoch = $epoch + $offset;
         return $epoch;
-    }
-    else {
+    } else {
         return -1;
     }
 }

main/inc/lib/magpierss/extlib/Snoopy.class.inc

Braces +159 added lines, -118 removed lines

@@ -124,24 +124,26 @@ 
 	public function fetch($URI) {
 		//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["user"])) {
+					$this->user = $URI_PARTS["user"];
+		}
+		if (!empty($URI_PARTS["pass"])) {
+					$this->pass = $URI_PARTS["pass"];
+		}
 		if (!isset($fp)) { $fp = false; }
 		switch ($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
 						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
-					}
-					else
+					} else
 					{
 						$path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
 						// no proxy, send only the path
@@ -177,13 +179,12 @@ 
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
+							} else {
+															break;
 							}
-							else
-								break;
 						}
 					}					
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -195,14 +196,14 @@ 
 					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);
-				}
-				else
+				} else
 				{
 					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
 					// no proxy, send only the path
@@ -236,9 +237,9 @@ 
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
+						} else {
+													break;
 						}
-						else
-							break;
 					}
 				}					
 				return true;					
@@ -279,14 +280,16 @@ 
 
 		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
@@ -402,27 +405,31 @@ 
 	
 	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
 	{
-		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->host) && !isset($this->rawheaders['Host']))
-			$headers .= "Host: ".$this->host."\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->host) && !isset($this->rawheaders['Host'])) {
+					$headers .= "Host: ".$this->host."\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
 			if ( function_exists(gzinflate) ) {
 			   $headers .= "Accept-encoding: gzip\r\n";
-			}
-			else {
+			} else {
 			   trigger_error(
 			   	"use_gzip is on, but PHP was built without zlib support.".
 				"  Requesting file(s) without gzip encoding.", 
@@ -430,12 +437,14 @@ 
 			}
 		}
 		
-		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 ) {
@@ -448,27 +457,33 @@ 
 		}
 		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";
+		}
 
 		$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));
@@ -488,8 +503,9 @@ 
 			}
 				
 		//	if($currentHeader == "\r\n")
-			if(preg_match("/^\r?\n$/", $currentHeader) )
-			      break;
+			if(preg_match("/^\r?\n$/", $currentHeader) ) {
+						      break;
+			}
 						
 			// if a header begins with Location: or URI:, set the redirect
 			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
@@ -502,13 +518,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];
+					if(!preg_match("|^/|",$matches[2])) {
+												$this->_redirectaddr .= "/".$matches[2];
+					} else {
+												$this->_redirectaddr .= $matches[2];
+					}
+				} else {
+									$this->_redirectaddr = $matches[2];
 				}
-				else
-					$this->_redirectaddr = $matches[2];
 			}
 		
 			if(preg_match("|^HTTP/|",$currentHeader))
@@ -561,15 +578,18 @@ 
 		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;
 	}
@@ -585,28 +605,35 @@ 
 	
 	private 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))
-			$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
-			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
-			$headers[] = "Referer: ".$this->referer;
+		if(!empty($this->agent)) {
+					$headers[] = "User-Agent: ".$this->agent;
+		}
+		if(!empty($this->host)) {
+					$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 ) {
@@ -619,31 +646,38 @@ 
 		}
 		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(!empty($body))	
-			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
+			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);
+		}
 			
 		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
 			$cmdline_params .= " -H \"".$headers[$curr_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 = uniqid(time());
 		
@@ -681,13 +715,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];
+					if(!preg_match("|^/|",$matches[2])) {
+												$this->_redirectaddr .= "/".$matches[2];
+					} else {
+												$this->_redirectaddr .= $matches[2];
+					}
+				} else {
+									$this->_redirectaddr = $matches[2];
 				}
-				else
-					$this->_redirectaddr = $matches[2];
 			}
 		
 			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
@@ -712,15 +747,18 @@ 
 		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("/tmp/$headerfile");
 		
@@ -736,8 +774,9 @@ 
 	{
 		for($x=0; $x<count($this->headers); $x++)
 		{
-		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
-			$this->cookies[$match[1]] = $match[2];
+		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match)) {
+					$this->cookies[$match[1]] = $match[2];
+		}
 		}
 	}
 
@@ -773,8 +812,7 @@ 
 				$this->_isproxy = true;
 				$host = $this->proxy_host;
 				$port = $this->proxy_port;
-			}
-		else
+			} else
 		{
 			$host = $this->host;
 			$port = $this->port;
@@ -793,8 +831,7 @@ 
 			// socket connection succeeded
 
 			return true;
-		}
-		else
+		} else
 		{
 			// socket connection failed
 			$this->status = $errno;
@@ -837,8 +874,9 @@ 
 		settype($formvars, "array");
 		settype($formfiles, "array");
 
-		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":
@@ -848,8 +886,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;
 
@@ -875,7 +914,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));