Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Taylor Otwell 2011-06-17 12:23:26 -05:00
parent fe10176694
commit 6c6dac3579
4 changed files with 192 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
system/download.php
View File

@ -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);
}
}

268
system/file.php
View File

@ -8,101 +8,158 @@ class File {
* @var array * @var array
*/ */
public static $mimes = array( public static $mimes = array(
'hqx' => 'application/mac-binhex40', 'hqx' => 'application/mac-binhex40',
'cpt' => 'application/mac-compactpro', 'cpt' => 'application/mac-compactpro',
'csv' => 'text/x-comma-separated-values', 'csv' => 'text/x-comma-separated-values',
'bin' => 'application/macbinary', 'bin' => 'application/macbinary',
'dms' => 'application/octet-stream', 'dms' => 'application/octet-stream',
'lha' => 'application/octet-stream', 'lha' => 'application/octet-stream',
'lzh' => 'application/octet-stream', 'lzh' => 'application/octet-stream',
'exe' => 'application/octet-stream', 'exe' => 'application/octet-stream',
'class' => 'application/octet-stream', 'class' => 'application/octet-stream',
'psd' => 'application/x-photoshop', 'psd' => 'application/x-photoshop',
'so' => 'application/octet-stream', 'so' => 'application/octet-stream',
'sea' => 'application/octet-stream', 'sea' => 'application/octet-stream',
'dll' => 'application/octet-stream', 'dll' => 'application/octet-stream',
'oda' => 'application/oda', 'oda' => 'application/oda',
'pdf' => 'application/pdf', 'pdf' => 'application/pdf',
'ai' => 'application/postscript', 'ai' => 'application/postscript',
'eps' => 'application/postscript', 'eps' => 'application/postscript',
'ps' => 'application/postscript', 'ps' => 'application/postscript',
'smi' => 'application/smil', 'smi' => 'application/smil',
'smil' => 'application/smil', 'smil' => 'application/smil',
'mif' => 'application/vnd.mif', 'mif' => 'application/vnd.mif',
'xls' => 'application/excel', 'xls' => 'application/excel',
'ppt' => 'application/powerpoint', 'ppt' => 'application/powerpoint',
'wbxml' => 'application/wbxml', 'wbxml' => 'application/wbxml',
'wmlc' => 'application/wmlc', 'wmlc' => 'application/wmlc',
'dcr' => 'application/x-director', 'dcr' => 'application/x-director',
'dir' => 'application/x-director', 'dir' => 'application/x-director',
'dxr' => 'application/x-director', 'dxr' => 'application/x-director',
'dvi' => 'application/x-dvi', 'dvi' => 'application/x-dvi',
'gtar' => 'application/x-gtar', 'gtar' => 'application/x-gtar',
'gz' => 'application/x-gzip', 'gz' => 'application/x-gzip',
'php' => 'application/x-httpd-php', 'php' => 'application/x-httpd-php',
'php4' => 'application/x-httpd-php', 'php4' => 'application/x-httpd-php',
'php3' => 'application/x-httpd-php', 'php3' => 'application/x-httpd-php',
'phtml' => 'application/x-httpd-php', 'phtml' => 'application/x-httpd-php',
'phps' => 'application/x-httpd-php-source', 'phps' => 'application/x-httpd-php-source',
'js' => 'application/x-javascript', 'js' => 'application/x-javascript',
'swf' => 'application/x-shockwave-flash', 'swf' => 'application/x-shockwave-flash',
'sit' => 'application/x-stuffit', 'sit' => 'application/x-stuffit',
'tar' => 'application/x-tar', 'tar' => 'application/x-tar',
'tgz' => 'application/x-tar', 'tgz' => 'application/x-tar',
'xhtml' => 'application/xhtml+xml', 'xhtml' => 'application/xhtml+xml',
'xht' => 'application/xhtml+xml', 'xht' => 'application/xhtml+xml',
'zip' => 'application/x-zip', 'zip' => 'application/x-zip',
'mid' => 'audio/midi', 'mid' => 'audio/midi',
'midi' => 'audio/midi', 'midi' => 'audio/midi',
'mpga' => 'audio/mpeg', 'mpga' => 'audio/mpeg',
'mp2' => 'audio/mpeg', 'mp2' => 'audio/mpeg',
'mp3' => 'audio/mpeg', 'mp3' => 'audio/mpeg',
'aif' => 'audio/x-aiff', 'aif' => 'audio/x-aiff',
'aiff' => 'audio/x-aiff', 'aiff' => 'audio/x-aiff',
'aifc' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff',
'ram' => 'audio/x-pn-realaudio', 'ram' => 'audio/x-pn-realaudio',
'rm' => 'audio/x-pn-realaudio', 'rm' => 'audio/x-pn-realaudio',
'rpm' => 'audio/x-pn-realaudio-plugin', 'rpm' => 'audio/x-pn-realaudio-plugin',
'ra' => 'audio/x-realaudio', 'ra' => 'audio/x-realaudio',
'rv' => 'video/vnd.rn-realvideo', 'rv' => 'video/vnd.rn-realvideo',
'wav' => 'audio/x-wav', 'wav' => 'audio/x-wav',
'bmp' => 'image/bmp', 'bmp' => 'image/bmp',
'gif' => 'image/gif', 'gif' => 'image/gif',
'jpeg' => 'image/jpeg', 'jpeg' => 'image/jpeg',
'jpg' => 'image/jpeg', 'jpg' => 'image/jpeg',
'jpe' => 'image/jpeg', 'jpe' => 'image/jpeg',
'png' => 'image/png', 'png' => 'image/png',
'tiff' => 'image/tiff', 'tiff' => 'image/tiff',
'tif' => 'image/tiff', 'tif' => 'image/tiff',
'css' => 'text/css', 'css' => 'text/css',
'html' => 'text/html', 'html' => 'text/html',
'htm' => 'text/html', 'htm' => 'text/html',
'shtml' => 'text/html', 'shtml' => 'text/html',
'txt' => 'text/plain', 'txt' => 'text/plain',
'text' => 'text/plain', 'text' => 'text/plain',
'log' => 'text/plain', 'log' => 'text/plain',
'rtx' => 'text/richtext', 'rtx' => 'text/richtext',
'rtf' => 'text/rtf', 'rtf' => 'text/rtf',
'xml' => 'text/xml', 'xml' => 'text/xml',
'xsl' => 'text/xml', 'xsl' => 'text/xml',
'mpeg' => 'video/mpeg', 'mpeg' => 'video/mpeg',
'mpg' => 'video/mpeg', 'mpg' => 'video/mpeg',
'mpe' => 'video/mpeg', 'mpe' => 'video/mpeg',
'qt' => 'video/quicktime', 'qt' => 'video/quicktime',
'mov' => 'video/quicktime', 'mov' => 'video/quicktime',
'avi' => 'video/x-msvideo', 'avi' => 'video/x-msvideo',
'movie' => 'video/x-sgi-movie', 'movie' => 'video/x-sgi-movie',
'doc' => 'application/msword', 'doc' => 'application/msword',
'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'word' => 'application/msword', 'word' => 'application/msword',
'xl' => 'application/excel', 'xl' => 'application/excel',
'eml' => 'message/rfc822' 'eml' => 'message/rfc822'
); );
/** /**
* 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 $path
* @param string $name * @param string $name
@ -115,10 +172,10 @@ public static function download($path, $name = null)
$name = basename($path); $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-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-Disposition', 'attachment; filename="'.$name.'"');
$response->header('Content-Transfer-Encoding', 'binary'); $response->header('Content-Transfer-Encoding', 'binary');
$response->header('Expires', 0); $response->header('Expires', 0);
@ -129,27 +186,4 @@ public static function download($path, $name = null)
return $response; 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;
}
} }

30
system/input.php
View File

@ -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 @@ 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 * @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)) !== '');
} }
/** /**

35
system/log.php
View File

@ -45,44 +45,39 @@ public static function error($message)
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');
if ( ! is_dir($directory))
{
static::make_directory($directory);
}
// -----------------------------------------------------
// Determine the daily file.
// ----------------------------------------------------- // -----------------------------------------------------
$file = $directory.'/'.date('d').EXT; $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); 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)
{ {
mkdir($directory, 02777); if ( ! is_dir($directory))
chmod($directory, 02777); {
mkdir($directory, 02777);
chmod($directory, 02777);
}
} }
} }