nextcloud / server

lib/private/Files/Cache/HomeCache.php

Indentation +51 added lines, -51 removed lines

@@ -30,58 +30,58 @@
 use OCP\Files\Cache\ICacheEntry;
 
 class HomeCache extends Cache {
-	/**
-	 * get the size of a folder and set it in the cache
-	 *
-	 * @param string $path
-	 * @param array $entry (optional) meta data of the folder
-	 * @return int
-	 */
-	public function calculateFolderSize($path, $entry = null) {
-		if ($path !== '/' and $path !== '' and $path !== 'files' and $path !== 'files_trashbin' and $path !== 'files_versions') {
-			return parent::calculateFolderSize($path, $entry);
-		} elseif ($path === '' or $path === '/') {
-			// since the size of / isn't used (the size of /files is used instead) there is no use in calculating it
-			return 0;
-		}
+    /**
+     * get the size of a folder and set it in the cache
+     *
+     * @param string $path
+     * @param array $entry (optional) meta data of the folder
+     * @return int
+     */
+    public function calculateFolderSize($path, $entry = null) {
+        if ($path !== '/' and $path !== '' and $path !== 'files' and $path !== 'files_trashbin' and $path !== 'files_versions') {
+            return parent::calculateFolderSize($path, $entry);
+        } elseif ($path === '' or $path === '/') {
+            // since the size of / isn't used (the size of /files is used instead) there is no use in calculating it
+            return 0;
+        }
 
-		$totalSize = 0;
-		if (is_null($entry)) {
-			$entry = $this->get($path);
-		}
-		if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
-			$id = $entry['fileid'];
-			$sql = 'SELECT SUM(`size`) AS f1 ' .
-			   'FROM `*PREFIX*filecache` ' .
-				'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0';
-			$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
-			if ($row = $result->fetchRow()) {
-				$result->closeCursor();
-				list($sum) = array_values($row);
-				$totalSize = 0 + $sum;
-				$entry['size'] += 0;
-				if ($entry['size'] !== $totalSize) {
-					$this->update($id, array('size' => $totalSize));
-				}
-			}
-		}
-		return $totalSize;
-	}
+        $totalSize = 0;
+        if (is_null($entry)) {
+            $entry = $this->get($path);
+        }
+        if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
+            $id = $entry['fileid'];
+            $sql = 'SELECT SUM(`size`) AS f1 ' .
+                'FROM `*PREFIX*filecache` ' .
+                'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0';
+            $result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
+            if ($row = $result->fetchRow()) {
+                $result->closeCursor();
+                list($sum) = array_values($row);
+                $totalSize = 0 + $sum;
+                $entry['size'] += 0;
+                if ($entry['size'] !== $totalSize) {
+                    $this->update($id, array('size' => $totalSize));
+                }
+            }
+        }
+        return $totalSize;
+    }
 
-	/**
-	 * @param string $path
-	 * @return ICacheEntry
-	 */
-	public function get($path) {
-		$data = parent::get($path);
-		if ($path === '' or $path === '/') {
-			// only the size of the "files" dir counts
-			$filesData = parent::get('files');
+    /**
+     * @param string $path
+     * @return ICacheEntry
+     */
+    public function get($path) {
+        $data = parent::get($path);
+        if ($path === '' or $path === '/') {
+            // only the size of the "files" dir counts
+            $filesData = parent::get('files');
 
-			if (isset($filesData['size'])) {
-				$data['size'] = $filesData['size'];
-			}
-		}
-		return $data;
-	}
+            if (isset($filesData['size'])) {
+                $data['size'] = $filesData['size'];
+            }
+        }
+        return $data;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -51,8 +51,8 @@
 		}
 		if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
 			$id = $entry['fileid'];
-			$sql = 'SELECT SUM(`size`) AS f1 ' .
-			   'FROM `*PREFIX*filecache` ' .
+			$sql = 'SELECT SUM(`size`) AS f1 '.
+			   'FROM `*PREFIX*filecache` '.
 				'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0';
 			$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
 			if ($row = $result->fetchRow()) {

lib/private/Files/Cache/MoveFromCacheTrait.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 		if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
 			$folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId());
 			foreach ($folderContent as $subEntry) {
-				$subTargetPath = $targetPath . '/' . $subEntry->getName();
+				$subTargetPath = $targetPath.'/'.$subEntry->getName();
 				$this->copyFromCache($sourceCache, $subEntry, $subTargetPath);
 			}
 		}

Indentation +54 added lines, -54 removed lines

@@ -29,63 +29,63 @@
  * Fallback implementation for moveFromCache
  */
 trait MoveFromCacheTrait {
-	/**
-	 * store meta data for a file or folder
-	 *
-	 * @param string $file
-	 * @param array $data
-	 *
-	 * @return int file id
-	 * @throws \RuntimeException
-	 */
-	abstract public function put($file, array $data);
+    /**
+     * store meta data for a file or folder
+     *
+     * @param string $file
+     * @param array $data
+     *
+     * @return int file id
+     * @throws \RuntimeException
+     */
+    abstract public function put($file, array $data);
 
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * @param \OCP\Files\Cache\ICache $sourceCache
-	 * @param string $sourcePath
-	 * @param string $targetPath
-	 */
-	public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
-		$sourceEntry = $sourceCache->get($sourcePath);
+    /**
+     * Move a file or folder in the cache
+     *
+     * @param \OCP\Files\Cache\ICache $sourceCache
+     * @param string $sourcePath
+     * @param string $targetPath
+     */
+    public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
+        $sourceEntry = $sourceCache->get($sourcePath);
 
-		$this->copyFromCache($sourceCache, $sourceEntry, $targetPath);
+        $this->copyFromCache($sourceCache, $sourceEntry, $targetPath);
 
-		$sourceCache->remove($sourcePath);
-	}
+        $sourceCache->remove($sourcePath);
+    }
 
-	/**
-	 * Copy a file or folder in the cache
-	 *
-	 * @param \OCP\Files\Cache\ICache $sourceCache
-	 * @param ICacheEntry $sourceEntry
-	 * @param string $targetPath
-	 */
-	public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, $targetPath) {
-		$this->put($targetPath, $this->cacheEntryToArray($sourceEntry));
-		if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
-			$folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId());
-			foreach ($folderContent as $subEntry) {
-				$subTargetPath = $targetPath . '/' . $subEntry->getName();
-				$this->copyFromCache($sourceCache, $subEntry, $subTargetPath);
-			}
-		}
-	}
+    /**
+     * Copy a file or folder in the cache
+     *
+     * @param \OCP\Files\Cache\ICache $sourceCache
+     * @param ICacheEntry $sourceEntry
+     * @param string $targetPath
+     */
+    public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, $targetPath) {
+        $this->put($targetPath, $this->cacheEntryToArray($sourceEntry));
+        if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
+            $folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId());
+            foreach ($folderContent as $subEntry) {
+                $subTargetPath = $targetPath . '/' . $subEntry->getName();
+                $this->copyFromCache($sourceCache, $subEntry, $subTargetPath);
+            }
+        }
+    }
 
-	private function cacheEntryToArray(ICacheEntry $entry) {
-		return [
-			'size' => $entry->getSize(),
-			'mtime' => $entry->getMTime(),
-			'storage_mtime' => $entry->getStorageMTime(),
-			'mimetype' => $entry->getMimeType(),
-			'mimepart' => $entry->getMimePart(),
-			'etag' => $entry->getEtag(),
-			'permissions' => $entry->getPermissions(),
-			'encrypted' => $entry->isEncrypted(),
-			'creation_time' => $entry->getCreationTime(),
-			'upload_time' => $entry->getUploadTime(),
-			'metadata_etag' => $entry->getMetadataEtag(),
-		];
-	}
+    private function cacheEntryToArray(ICacheEntry $entry) {
+        return [
+            'size' => $entry->getSize(),
+            'mtime' => $entry->getMTime(),
+            'storage_mtime' => $entry->getStorageMTime(),
+            'mimetype' => $entry->getMimeType(),
+            'mimepart' => $entry->getMimePart(),
+            'etag' => $entry->getEtag(),
+            'permissions' => $entry->getPermissions(),
+            'encrypted' => $entry->isEncrypted(),
+            'creation_time' => $entry->getCreationTime(),
+            'upload_time' => $entry->getUploadTime(),
+            'metadata_etag' => $entry->getMetadataEtag(),
+        ];
+    }
 }

lib/private/Search/Provider/File.php

Spacing +4 added lines, -4 removed lines

@@ -51,19 +51,19 @@
 				continue;
 			}
 			// create audio result
-			if($fileData['mimepart'] === 'audio'){
+			if ($fileData['mimepart'] === 'audio') {
 				$result = new \OC\Search\Result\Audio($fileData);
 			}
 			// create image result
-			elseif($fileData['mimepart'] === 'image'){
+			elseif ($fileData['mimepart'] === 'image') {
 				$result = new \OC\Search\Result\Image($fileData);
 			}
 			// create folder result
-			elseif($fileData['mimetype'] === 'httpd/unix-directory'){
+			elseif ($fileData['mimetype'] === 'httpd/unix-directory') {
 				$result = new \OC\Search\Result\Folder($fileData);
 			}
 			// or create file result
-			else{
+			else {
 				$result = new \OC\Search\Result\File($fileData);
 			}
 			// add to results

Indentation +40 added lines, -40 removed lines

@@ -32,45 +32,45 @@
  */
 class File extends \OCP\Search\Provider {
 
-	/**
-	 * Search for files and folders matching the given query
-	 * @param string $query
-	 * @return \OCP\Search\Result
-	 */
-	public function search($query) {
-		$files = Filesystem::search($query);
-		$results = array();
-		// edit results
-		foreach ($files as $fileData) {
-			// skip versions
-			if (strpos($fileData['path'], '_versions') === 0) {
-				continue;
-			}
-			// skip top-level folder
-			if ($fileData['name'] === 'files' && $fileData['parent'] === -1) {
-				continue;
-			}
-			// create audio result
-			if($fileData['mimepart'] === 'audio'){
-				$result = new \OC\Search\Result\Audio($fileData);
-			}
-			// create image result
-			elseif($fileData['mimepart'] === 'image'){
-				$result = new \OC\Search\Result\Image($fileData);
-			}
-			// create folder result
-			elseif($fileData['mimetype'] === 'httpd/unix-directory'){
-				$result = new \OC\Search\Result\Folder($fileData);
-			}
-			// or create file result
-			else{
-				$result = new \OC\Search\Result\File($fileData);
-			}
-			// add to results
-			$results[] = $result;
-		}
-		// return
-		return $results;
-	}
+    /**
+     * Search for files and folders matching the given query
+     * @param string $query
+     * @return \OCP\Search\Result
+     */
+    public function search($query) {
+        $files = Filesystem::search($query);
+        $results = array();
+        // edit results
+        foreach ($files as $fileData) {
+            // skip versions
+            if (strpos($fileData['path'], '_versions') === 0) {
+                continue;
+            }
+            // skip top-level folder
+            if ($fileData['name'] === 'files' && $fileData['parent'] === -1) {
+                continue;
+            }
+            // create audio result
+            if($fileData['mimepart'] === 'audio'){
+                $result = new \OC\Search\Result\Audio($fileData);
+            }
+            // create image result
+            elseif($fileData['mimepart'] === 'image'){
+                $result = new \OC\Search\Result\Image($fileData);
+            }
+            // create folder result
+            elseif($fileData['mimetype'] === 'httpd/unix-directory'){
+                $result = new \OC\Search\Result\Folder($fileData);
+            }
+            // or create file result
+            else{
+                $result = new \OC\Search\Result\File($fileData);
+            }
+            // add to results
+            $results[] = $result;
+        }
+        // return
+        return $results;
+    }
 	
 }

lib/private/Search/Result/Image.php

Indentation +8 added lines, -8 removed lines

@@ -29,13 +29,13 @@
  */
 class Image extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'image';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'image';
 	
-	/**
-	 * @TODO add EXIF information
-	 */
+    /**
+     * @TODO add EXIF information
+     */
 }

lib/private/Search/Result/File.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 	 * @param string $path
 	 * @return string relative path
 	 */
-	protected function getRelativePath ($path) {
+	protected function getRelativePath($path) {
 		if (!isset(self::$userFolderCache)) {
 			$user = \OC::$server->getUserSession()->getUser()->getUID();
 			self::$userFolderCache = \OC::$server->getUserFolder($user);

Indentation +70 added lines, -70 removed lines

@@ -32,85 +32,85 @@
  */
 class File extends \OCP\Search\Result {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'file';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'file';
 
-	/**
-	 * Path to file
-	 * @var string
-	 */
-	public $path;
+    /**
+     * Path to file
+     * @var string
+     */
+    public $path;
 
-	/**
-	 * Size, in bytes
-	 * @var int 
-	 */
-	public $size;
+    /**
+     * Size, in bytes
+     * @var int 
+     */
+    public $size;
 
-	/**
-	 * Date modified, in human readable form
-	 * @var string
-	 */
-	public $modified;
+    /**
+     * Date modified, in human readable form
+     * @var string
+     */
+    public $modified;
 
-	/**
-	 * File mime type
-	 * @var string
-	 */
-	public $mime_type;
+    /**
+     * File mime type
+     * @var string
+     */
+    public $mime_type;
 
-	/**
-	 * File permissions:
-	 * 
-	 * @var string
-	 */
-	public $permissions;
+    /**
+     * File permissions:
+     * 
+     * @var string
+     */
+    public $permissions;
 
-	/**
-	 * Create a new file search result
-	 * @param FileInfo $data file data given by provider
-	 */
-	public function __construct(FileInfo $data) {
+    /**
+     * Create a new file search result
+     * @param FileInfo $data file data given by provider
+     */
+    public function __construct(FileInfo $data) {
 
-		$path = $this->getRelativePath($data->getPath());
+        $path = $this->getRelativePath($data->getPath());
 
-		$info = pathinfo($path);
-		$this->id = $data->getId();
-		$this->name = $info['basename'];
-		$this->link = \OC::$server->getURLGenerator()->linkToRoute(
-			'files.view.index',
-			[
-				'dir' => $info['dirname'],
-				'scrollto' => $info['basename'],
-			]
-		);
-		$this->permissions = $data->getPermissions();
-		$this->path = $path;
-		$this->size = $data->getSize();
-		$this->modified = $data->getMtime();
-		$this->mime_type = $data->getMimetype();
-	}
+        $info = pathinfo($path);
+        $this->id = $data->getId();
+        $this->name = $info['basename'];
+        $this->link = \OC::$server->getURLGenerator()->linkToRoute(
+            'files.view.index',
+            [
+                'dir' => $info['dirname'],
+                'scrollto' => $info['basename'],
+            ]
+        );
+        $this->permissions = $data->getPermissions();
+        $this->path = $path;
+        $this->size = $data->getSize();
+        $this->modified = $data->getMtime();
+        $this->mime_type = $data->getMimetype();
+    }
 
-	/**
-	 * @var Folder $userFolderCache
-	 */
-	static protected $userFolderCache = null;
+    /**
+     * @var Folder $userFolderCache
+     */
+    static protected $userFolderCache = null;
 
-	/**
-	 * converts a path relative to the users files folder
-	 * eg /user/files/foo.txt -> /foo.txt
-	 * @param string $path
-	 * @return string relative path
-	 */
-	protected function getRelativePath ($path) {
-		if (!isset(self::$userFolderCache)) {
-			$user = \OC::$server->getUserSession()->getUser()->getUID();
-			self::$userFolderCache = \OC::$server->getUserFolder($user);
-		}
-		return self::$userFolderCache->getRelativePath($path);
-	}
+    /**
+     * converts a path relative to the users files folder
+     * eg /user/files/foo.txt -> /foo.txt
+     * @param string $path
+     * @return string relative path
+     */
+    protected function getRelativePath ($path) {
+        if (!isset(self::$userFolderCache)) {
+            $user = \OC::$server->getUserSession()->getUser()->getUID();
+            self::$userFolderCache = \OC::$server->getUserFolder($user);
+        }
+        return self::$userFolderCache->getRelativePath($path);
+    }
 
 }

lib/private/Search/Result/Audio.php

Indentation +8 added lines, -8 removed lines

@@ -29,13 +29,13 @@
  */
 class Audio extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'audio';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'audio';
 	
-	/**
-	 * @TODO add ID3 information
-	 */
+    /**
+     * @TODO add ID3 information
+     */
 }

lib/private/Search/Result/Folder.php

Indentation +5 added lines, -5 removed lines

@@ -29,10 +29,10 @@
  */
 class Folder extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'folder';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'folder';
 	
 }

lib/private/AppFramework/Http/Output.php

Indentation +58 added lines, -58 removed lines

@@ -30,70 +30,70 @@
  * Very thin wrapper class to make output testable
  */
 class Output implements IOutput {
-	/** @var string */
-	private $webRoot;
+    /** @var string */
+    private $webRoot;
 
-	/**
-	 * @param $webRoot
-	 */
-	public function __construct($webRoot) {
-		$this->webRoot = $webRoot;
-	}
+    /**
+     * @param $webRoot
+     */
+    public function __construct($webRoot) {
+        $this->webRoot = $webRoot;
+    }
 
-	/**
-	 * @param string $out
-	 */
-	public function setOutput($out) {
-		print($out);
-	}
+    /**
+     * @param string $out
+     */
+    public function setOutput($out) {
+        print($out);
+    }
 
-	/**
-	 * @param string|resource $path or file handle
-	 *
-	 * @return bool false if an error occurred
-	 */
-	public function setReadfile($path) {
-		if (is_resource($path)) {
-			$output = fopen('php://output', 'w');
-			return stream_copy_to_stream($path, $output) > 0;
-		} else {
-			return @readfile($path);
-		}
-	}
+    /**
+     * @param string|resource $path or file handle
+     *
+     * @return bool false if an error occurred
+     */
+    public function setReadfile($path) {
+        if (is_resource($path)) {
+            $output = fopen('php://output', 'w');
+            return stream_copy_to_stream($path, $output) > 0;
+        } else {
+            return @readfile($path);
+        }
+    }
 
-	/**
-	 * @param string $header
-	 */
-	public function setHeader($header) {
-		header($header);
-	}
+    /**
+     * @param string $header
+     */
+    public function setHeader($header) {
+        header($header);
+    }
 
-	/**
-	 * @param int $code sets the http status code
-	 */
-	public function setHttpResponseCode($code) {
-		http_response_code($code);
-	}
+    /**
+     * @param int $code sets the http status code
+     */
+    public function setHttpResponseCode($code) {
+        http_response_code($code);
+    }
 
-	/**
-	 * @return int returns the current http response code
-	 */
-	public function getHttpResponseCode() {
-		return http_response_code();
-	}
+    /**
+     * @return int returns the current http response code
+     */
+    public function getHttpResponseCode() {
+        return http_response_code();
+    }
 
-	/**
-	 * @param string $name
-	 * @param string $value
-	 * @param int $expire
-	 * @param string $path
-	 * @param string $domain
-	 * @param bool $secure
-	 * @param bool $httpOnly
-	 */
-	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly) {
-		$path = $this->webRoot ? : '/';
-		setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
-	}
+    /**
+     * @param string $name
+     * @param string $value
+     * @param int $expire
+     * @param string $path
+     * @param string $domain
+     * @param bool $secure
+     * @param bool $httpOnly
+     */
+    public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly) {
+        $path = $this->webRoot ? : '/';
+        setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 	 * @param bool $httpOnly
 	 */
 	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly) {
-		$path = $this->webRoot ? : '/';
+		$path = $this->webRoot ?: '/';
 		setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
 	}
 

lib/private/AppFramework/Http.php

Spacing +7 added lines, -7 removed lines

@@ -41,7 +41,7 @@ 
 	 * @param array $server $_SERVER
 	 * @param string $protocolVersion the http version to use defaults to HTTP/1.1
 	 */
-	public function __construct($server, $protocolVersion='HTTP/1.1') {
+	public function __construct($server, $protocolVersion = 'HTTP/1.1') {
 		$this->server = $server;
 		$this->protocolVersion = $protocolVersion;
 
@@ -116,16 +116,16 @@ 
 	 * @param string $ETag the etag
 	 * @return string
 	 */
-	public function getStatusHeader($status, \DateTime $lastModified=null, 
-	                                $ETag=null) {
+	public function getStatusHeader($status, \DateTime $lastModified = null, 
+	                                $ETag = null) {
 
-		if(!is_null($lastModified)) {
+		if (!is_null($lastModified)) {
 			$lastModified = $lastModified->format(\DateTime::RFC2822);
 		}
 
 		// if etag or lastmodified have not changed, return a not modified
 		if ((isset($this->server['HTTP_IF_NONE_MATCH'])
-			&& trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string)$ETag)
+			&& trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string) $ETag)
 
 			||
 
@@ -139,13 +139,13 @@ 
 		// we have one change currently for the http 1.0 header that differs
 		// from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
 		// if this differs any more, we want to create childclasses for this
-		if($status === self::STATUS_TEMPORARY_REDIRECT 
+		if ($status === self::STATUS_TEMPORARY_REDIRECT 
 			&& $this->protocolVersion === 'HTTP/1.0') {
 
 			$status = self::STATUS_FOUND;
 		}
 
-		return $this->protocolVersion . ' ' . $status . ' ' . 
+		return $this->protocolVersion.' '.$status.' '. 
 			$this->headers[$status];
 	}
 

Indentation +115 added lines, -115 removed lines

@@ -33,121 +33,121 @@
 
 class Http extends BaseHttp {
 
-	private $server;
-	private $protocolVersion;
-	protected $headers;
-
-	/**
-	 * @param array $server $_SERVER
-	 * @param string $protocolVersion the http version to use defaults to HTTP/1.1
-	 */
-	public function __construct($server, $protocolVersion='HTTP/1.1') {
-		$this->server = $server;
-		$this->protocolVersion = $protocolVersion;
-
-		$this->headers = array(
-			self::STATUS_CONTINUE => 'Continue',
-			self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
-			self::STATUS_PROCESSING => 'Processing',
-			self::STATUS_OK => 'OK',
-			self::STATUS_CREATED => 'Created',
-			self::STATUS_ACCEPTED => 'Accepted',
-			self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
-			self::STATUS_NO_CONTENT => 'No Content',
-			self::STATUS_RESET_CONTENT => 'Reset Content',
-			self::STATUS_PARTIAL_CONTENT => 'Partial Content',
-			self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
-			self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
-			self::STATUS_IM_USED => 'IM Used', // RFC 3229
-			self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
-			self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
-			self::STATUS_FOUND => 'Found',
-			self::STATUS_SEE_OTHER => 'See Other',
-			self::STATUS_NOT_MODIFIED => 'Not Modified',
-			self::STATUS_USE_PROXY => 'Use Proxy',
-			self::STATUS_RESERVED => 'Reserved',
-			self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
-			self::STATUS_BAD_REQUEST => 'Bad request',
-			self::STATUS_UNAUTHORIZED => 'Unauthorized',
-			self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
-			self::STATUS_FORBIDDEN => 'Forbidden',
-			self::STATUS_NOT_FOUND => 'Not Found',
-			self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
-			self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
-			self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
-			self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
-			self::STATUS_CONFLICT => 'Conflict',
-			self::STATUS_GONE => 'Gone',
-			self::STATUS_LENGTH_REQUIRED => 'Length Required',
-			self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
-			self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
-			self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
-			self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
-			self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
-			self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
-			self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
-			self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
-			self::STATUS_LOCKED => 'Locked', // RFC 4918
-			self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
-			self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
-			self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
-			self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
-			self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
-			self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
-			self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
-			self::STATUS_BAD_GATEWAY => 'Bad Gateway',
-			self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
-			self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
-			self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
-			self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
-			self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
-			self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
-			self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
-			self::STATUS_NOT_EXTENDED => 'Not extended',
-			self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
-		);
-	}
-
-
-	/**
-	 * Gets the correct header
-	 * @param int Http::CONSTANT $status the constant from the Http class
-	 * @param \DateTime $lastModified formatted last modified date
-	 * @param string $ETag the etag
-	 * @return string
-	 */
-	public function getStatusHeader($status, \DateTime $lastModified=null, 
-	                                $ETag=null) {
-
-		if(!is_null($lastModified)) {
-			$lastModified = $lastModified->format(\DateTime::RFC2822);
-		}
-
-		// if etag or lastmodified have not changed, return a not modified
-		if ((isset($this->server['HTTP_IF_NONE_MATCH'])
-			&& trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string)$ETag)
-
-			||
-
-			(isset($this->server['HTTP_IF_MODIFIED_SINCE'])
-			&& trim($this->server['HTTP_IF_MODIFIED_SINCE']) === 
-				$lastModified)) {
-
-			$status = self::STATUS_NOT_MODIFIED;
-		}
-
-		// we have one change currently for the http 1.0 header that differs
-		// from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
-		// if this differs any more, we want to create childclasses for this
-		if($status === self::STATUS_TEMPORARY_REDIRECT 
-			&& $this->protocolVersion === 'HTTP/1.0') {
-
-			$status = self::STATUS_FOUND;
-		}
-
-		return $this->protocolVersion . ' ' . $status . ' ' . 
-			$this->headers[$status];
-	}
+    private $server;
+    private $protocolVersion;
+    protected $headers;
+
+    /**
+     * @param array $server $_SERVER
+     * @param string $protocolVersion the http version to use defaults to HTTP/1.1
+     */
+    public function __construct($server, $protocolVersion='HTTP/1.1') {
+        $this->server = $server;
+        $this->protocolVersion = $protocolVersion;
+
+        $this->headers = array(
+            self::STATUS_CONTINUE => 'Continue',
+            self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
+            self::STATUS_PROCESSING => 'Processing',
+            self::STATUS_OK => 'OK',
+            self::STATUS_CREATED => 'Created',
+            self::STATUS_ACCEPTED => 'Accepted',
+            self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
+            self::STATUS_NO_CONTENT => 'No Content',
+            self::STATUS_RESET_CONTENT => 'Reset Content',
+            self::STATUS_PARTIAL_CONTENT => 'Partial Content',
+            self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
+            self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
+            self::STATUS_IM_USED => 'IM Used', // RFC 3229
+            self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
+            self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
+            self::STATUS_FOUND => 'Found',
+            self::STATUS_SEE_OTHER => 'See Other',
+            self::STATUS_NOT_MODIFIED => 'Not Modified',
+            self::STATUS_USE_PROXY => 'Use Proxy',
+            self::STATUS_RESERVED => 'Reserved',
+            self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
+            self::STATUS_BAD_REQUEST => 'Bad request',
+            self::STATUS_UNAUTHORIZED => 'Unauthorized',
+            self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
+            self::STATUS_FORBIDDEN => 'Forbidden',
+            self::STATUS_NOT_FOUND => 'Not Found',
+            self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
+            self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
+            self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
+            self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
+            self::STATUS_CONFLICT => 'Conflict',
+            self::STATUS_GONE => 'Gone',
+            self::STATUS_LENGTH_REQUIRED => 'Length Required',
+            self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
+            self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
+            self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
+            self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
+            self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
+            self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
+            self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
+            self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
+            self::STATUS_LOCKED => 'Locked', // RFC 4918
+            self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
+            self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
+            self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
+            self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
+            self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
+            self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
+            self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
+            self::STATUS_BAD_GATEWAY => 'Bad Gateway',
+            self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
+            self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
+            self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
+            self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
+            self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
+            self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
+            self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
+            self::STATUS_NOT_EXTENDED => 'Not extended',
+            self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
+        );
+    }
+
+
+    /**
+     * Gets the correct header
+     * @param int Http::CONSTANT $status the constant from the Http class
+     * @param \DateTime $lastModified formatted last modified date
+     * @param string $ETag the etag
+     * @return string
+     */
+    public function getStatusHeader($status, \DateTime $lastModified=null, 
+                                    $ETag=null) {
+
+        if(!is_null($lastModified)) {
+            $lastModified = $lastModified->format(\DateTime::RFC2822);
+        }
+
+        // if etag or lastmodified have not changed, return a not modified
+        if ((isset($this->server['HTTP_IF_NONE_MATCH'])
+            && trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string)$ETag)
+
+            ||
+
+            (isset($this->server['HTTP_IF_MODIFIED_SINCE'])
+            && trim($this->server['HTTP_IF_MODIFIED_SINCE']) === 
+                $lastModified)) {
+
+            $status = self::STATUS_NOT_MODIFIED;
+        }
+
+        // we have one change currently for the http 1.0 header that differs
+        // from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
+        // if this differs any more, we want to create childclasses for this
+        if($status === self::STATUS_TEMPORARY_REDIRECT 
+            && $this->protocolVersion === 'HTTP/1.0') {
+
+            $status = self::STATUS_FOUND;
+        }
+
+        return $this->protocolVersion . ' ' . $status . ' ' . 
+            $this->headers[$status];
+    }
 
 
 }