Commit 6c6dac35 authored by Taylor Otwell's avatar Taylor Otwell

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

parent fe101766
<?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);
}
}
\ No newline at end of file
...@@ -101,36 +101,42 @@ class File { ...@@ -101,36 +101,42 @@ 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 * @param string $path
* @param string $name * @return string
* @return Response
*/ */
public static function download($path, $name = null) public static function get($path)
{ {
if (is_null($name)) return file_get_contents($path);
{
$name = basename($path);
} }
$response = Response::make(file_get_contents($path)); /**
* Write to a file.
$response->header('Content-Description', 'File Transfer'); *
$response->header('Content-Type', static::mime(pathinfo($path, PATHINFO_EXTENSION))); * @param string $path
$response->header('Content-Disposition', 'attachment; filename="'.$name.'"'); * @param string $data
$response->header('Content-Transfer-Encoding', 'binary'); * @return int
$response->header('Expires', 0); */
$response->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0'); public static function put($path, $data)
$response->header('Pragma', 'public'); {
$response->header('Content-Length', filesize($path)); return file_put_contents($path, $data, LOCK_EX);
}
return $response; /**
* 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);
} }
/** /**
* Get a file's extension. * Extract the extension from a file path.
* *
* @param string $path * @param string $path
* @return string * @return string
...@@ -141,7 +147,7 @@ class File { ...@@ -141,7 +147,7 @@ class File {
} }
/** /**
* Get a MIME type by extension. * Get a file MIME type by extension.
* *
* @param string $extension * @param string $extension
* @param string $default * @param string $default
...@@ -152,4 +158,32 @@ class File { ...@@ -152,4 +158,32 @@ class File {
return (array_key_exists($extension, static::$mimes)) ? static::$mimes[$extension] : $default; 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
* @return Response
*/
public static function download($path, $name = null)
{
if (is_null($name))
{
$name = basename($path);
}
$response = Response::make(static::get($path));
$response->header('Content-Description', 'File Transfer');
$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);
$response->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
$response->header('Pragma', 'public');
$response->header('Content-Length', filesize($path));
return $response;
}
} }
\ No newline at end of file
...@@ -10,14 +10,25 @@ class Input { ...@@ -10,14 +10,25 @@ class Input {
public static $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 * @param string $key
* @return bool * @return bool
*/ */
public static function has($key) 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 @@ class Input { ...@@ -38,14 +49,25 @@ class Input {
} }
/** /**
* 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 * @param string $key
* @return bool * @return bool
*/ */
public static function had($key) 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)) !== '');
} }
/** /**
......
...@@ -45,44 +45,39 @@ class Log { ...@@ -45,44 +45,39 @@ class Log {
public static function write($type, $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'); $file = $directory.'/'.date('d').EXT;
if ( ! is_dir($directory))
{
static::make_directory($directory);
}
// ----------------------------------------------------- // -----------------------------------------------------
// Determine the daily file. // Append to the log file and set the permissions.
// ----------------------------------------------------- // -----------------------------------------------------
$file = $directory.'/'.date('d').EXT;
file_put_contents($file, date('Y-m-d H:i:s').' '.$type.' - '.$message.PHP_EOL, LOCK_EX | FILE_APPEND); file_put_contents($file, date('Y-m-d H:i:s').' '.$type.' - '.$message.PHP_EOL, LOCK_EX | FILE_APPEND);
chmod($file, 0666); chmod($file, 0666);
} }
/** /**
* Create a log directory. * Create a log directory.
* *
* If the directory already exists, no action will be taken.
*
* @param string $directory * @param string $directory
* @return void * @return void
*/ */
private static function make_directory($directory) private static function make_directory($directory)
{
if ( ! is_dir($directory))
{ {
mkdir($directory, 02777); mkdir($directory, 02777);
chmod($directory, 02777); chmod($directory, 02777);
} }
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment