deprecated download class. added methods to file class. tweaked log class. tweaked input class.

system/download.php

@@ -1,21 +0,0 @@
-<?php namespace System;
-
-class Download extends File {
-
-	/**
-	 * Create a download response. The proper headers will be sent
-	 * to the browser to force the file to be downloaded.
-	 *
-	 * 
-	 * @deprecated For older apps, use File class
-	 * 
-	 * @param  string  $path
-	 * @param  string  $name
-	 * @return Response
-	 */
-	public static function file($path, $name = null)
-	{
-		return parent::download($path, $name);
-	}
-
-}

system/file.php

@@ -101,8 +101,65 @@ class File {
 	);
 
 	/**
-	 * Create a download response. The proper headers will be sent
+	 * Get the contents of a file.
-	 * to the browser to force the file to be downloaded.
+	 *
+	 * @param  string  $path
+	 * @return string
+	 */
+	public static function get($path)
+	{
+		return file_get_contents($path);
+	}
+
+	/**
+	 * Write to a file.
+	 *
+	 * @param  string  $path
+	 * @param  string  $data
+	 * @return int
+	 */
+	public static function put($path, $data)
+	{
+		return file_put_contents($path, $data, LOCK_EX);
+	}
+
+	/**
+	 * Append to a file.
+	 *
+	 * @param  string  $path
+	 * @param  string  $data
+	 * @return int
+	 */
+	public static function append($path, $data)
+	{
+		return file_put_contents($path, $data, LOCK_EX | FILE_APPEND);
+	}
+
+	/**
+	 * Extract the extension from a file path.
+	 * 
+	 * @param  string  $path
+	 * @return string
+	 */
+	public static function extension($path)
+	{
+		return pathinfo($path, PATHINFO_EXTENSION);
+	}
+
+	/**
+	 * Get a file MIME type by extension.
+	 *
+	 * @param  string  $extension
+	 * @param  string  $default
+	 * @return string
+	 */
+	public static function mime($extension, $default = 'application/octet-stream')
+	{
+		return (array_key_exists($extension, static::$mimes)) ? static::$mimes[$extension] : $default;
+	}
+
+	/**
+	 * Create a response that will force a file to be downloaded.
 	 *
 	 * @param  string  $path
 	 * @param  string  $name
@@ -115,10 +172,10 @@ public static function download($path, $name = null)
 			$name = basename($path);
 		}
 
-		$response = Response::make(file_get_contents($path));
+		$response = Response::make(static::get($path));
 
 		$response->header('Content-Description', 'File Transfer');
-		$response->header('Content-Type', static::mime(pathinfo($path, PATHINFO_EXTENSION)));
+		$response->header('Content-Type', static::mime(static::extension($path)));
 		$response->header('Content-Disposition', 'attachment; filename="'.$name.'"');
 		$response->header('Content-Transfer-Encoding', 'binary');
 		$response->header('Expires', 0);
@@ -129,27 +186,4 @@ public static function download($path, $name = null)
 		return $response;
 	}
 
-	/**
-	 * Get a file's extension. 
-	 * 
-	 * @param  string  $path
-	 * @return string
-	 */
-	public static function extension($path)
-	{
-		return pathinfo($path, PATHINFO_EXTENSION);
-	}
-
-	/**
-	 * Get a MIME type by extension.
-	 *
-	 * @param  string  $extension
-	 * @param  string  $default
-	 * @return string
-	 */
-	public static function mime($extension, $default = 'application/octet-stream')
-	{
-		return (array_key_exists($extension, static::$mimes)) ? static::$mimes[$extension] : $default;
-	}
-
 }

system/input.php

@@ -10,14 +10,25 @@ class Input {
 	public static $input;
 
 	/**
-	 * Determine if the input data contains an item that is not empty.
+	 * Determine if the input data contains an item.
 	 *
 	 * @param  string  $key
 	 * @return bool
 	 */
 	public static function has($key)
 	{
-		return ( ! is_null(static::get($key)) and trim((string) static::get($key)) != '');
+		return ( ! is_null(static::get($key)));
+	}
+
+	/**
+	 * Determine if the input data contains an item that is not empty.
+	 *
+	 * @param  string  $key
+	 * @return bool
+	 */
+	public static function filled($key)
+	{
+		return (static::has($key) and trim((string) static::get($key)) !== '');
 	}
 
 	/**
@@ -38,14 +49,25 @@ public static function get($key = null, $default = null)
 	}
 
 	/**
-	 * Determine if the old input data contains an item that is not empty.
+	 * Determine if the old input data contains an item.
 	 *
 	 * @param  string  $key
 	 * @return bool
 	 */
 	public static function had($key)
 	{
-		return ( ! is_null(static::old($key)) and trim((string) static::old($key)) != '');
+		return ( ! is_null(static::old($key)));
+	}
+
+	/**
+	 * Determine if the old input data contains an item that is not empty.
+	 *
+	 * @param  string  $key
+	 * @return bool
+	 */
+	public static function was_filled($key)
+	{
+		return (static::had($key) and trim((string) static::old($key)) !== '');
 	}
 
 	/**

system/log.php

@@ -45,44 +45,39 @@ public static function error($message)
 	public static function write($type, $message)
 	{
 		// -----------------------------------------------------
-		// Determine the yearly directory.
+		// Create the yearly and monthly directories if needed.
 		// -----------------------------------------------------
-		$directory = APP_PATH.'logs/'.date('Y');
+		static::make_directory($directory = APP_PATH.'logs/'.date('Y'));
-
+		static::make_directory($directory .= '/'.date('m'));
-		if ( ! is_dir($directory))
-		{
-			static::make_directory($directory);
-		}
 
 		// -----------------------------------------------------
-		// Determine the monthly directory.
+		// Each day has its own log file.
-		// -----------------------------------------------------
-		$directory .= '/'.date('m');
-
-		if ( ! is_dir($directory))
-		{
-			static::make_directory($directory);
-		}
-
-		// -----------------------------------------------------
-		// Determine the daily file.
 		// -----------------------------------------------------
 		$file = $directory.'/'.date('d').EXT;
 
+		// -----------------------------------------------------
+		// Append to the log file and set the permissions.
+		// -----------------------------------------------------
 		file_put_contents($file, date('Y-m-d H:i:s').' '.$type.' - '.$message.PHP_EOL, LOCK_EX | FILE_APPEND);
+
 		chmod($file, 0666);
 	}
 
 	/**
 	 * Create a log directory.
 	 *
+	 * If the directory already exists, no action will be taken.
+	 *
 	 * @param  string  $directory
 	 * @return void
 	 */
 	private static function make_directory($directory)
+	{
+		if ( ! is_dir($directory))
 		{
 			mkdir($directory, 02777);
 			chmod($directory, 02777);
 		}
+	}
 
 }