From 07b9bd85271a2a1fcf4363bfd474d44401a13c18 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will.rossiter@gmail.com>
Date: Fri, 10 May 2013 21:59:20 +1200
Subject: [PATCH] PHPDoc + coding conventions

---
 control/HTTP.php | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/control/HTTP.php b/control/HTTP.php
index 7e991b3fa..f6d578b1a 100644
--- a/control/HTTP.php
+++ b/control/HTTP.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * A class with HTTP-related helpers.
  * Like Debug, this is more a bundle of methods than a class ;-)
@@ -8,17 +9,30 @@
  */
 class HTTP {
 
+	/**
+	 * @var int $cache_age
+	 */
 	protected static $cache_age = 0;
 
+	/**
+	 * @var timestamp $modification_date
+	 */
 	protected static $modification_date = null;
 
+	/**
+	 * @var string $etag
+	 */
 	protected static $etag = null;
 
 	/**
-	 * Turns a local system filename into a URL by comparing it to the script filename
+	 * Turns a local system filename into a URL by comparing it to the script 
+	 * filename.
+	 *
+	 * @param string
 	 */
 	public static function filename2url($filename) {
 		$slashPos = -1;
+
 		while(($slashPos = strpos($filename, "/", $slashPos+1)) !== false) {
 			if(substr($filename, 0, $slashPos) == substr($_SERVER['SCRIPT_FILENAME'],0,$slashPos)) {
 				$commonLength = $slashPos;
@@ -27,13 +41,19 @@ class HTTP {
 			}
 		}
 
-		$urlBase = substr($_SERVER['PHP_SELF'], 0, -(strlen($_SERVER['SCRIPT_FILENAME']) - $commonLength));
+		$urlBase = substr(
+			$_SERVER['PHP_SELF'], 
+			0, 
+			-(strlen($_SERVER['SCRIPT_FILENAME']) - $commonLength)
+		);
+		
 		$url = $urlBase . substr($filename, $commonLength);
 		$protocol = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') ? "https" : "http";
-		return "$protocol://". $_SERVER['HTTP_HOST'] . $url;
 
 		// Count the number of extra folders the script is in.
 		// $prefix = str_repeat("../", substr_count(substr($_SERVER[SCRIPT_FILENAME],$commonBaseLength)));
+	
+		return "$protocol://". $_SERVER['HTTP_HOST'] . $url;
 	}
 
 	/**