git://git.onelab.eu
/
www-register-wizard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to codeigniter 1.7.2 for f12
[www-register-wizard.git]
/
helpers
/
file_helper.php
diff --git
a/helpers/file_helper.php
b/helpers/file_helper.php
index
8078d96
..
0d7b5d5
100644
(file)
--- a/
helpers/file_helper.php
+++ b/
helpers/file_helper.php
@@
-6,7
+6,7
@@
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
- * @copyright Copyright (c) 2008, EllisLab, Inc.
+ * @copyright Copyright (c) 2008
- 2009
, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
@@
-22,7
+22,7
@@
* @subpackage Helpers
* @category Helpers
* @author ExpressionEngine Dev Team
* @subpackage Helpers
* @category Helpers
* @author ExpressionEngine Dev Team
- * @link http://codeigniter.com/user_guide/helpers/file_helper.html
+ * @link http://codeigniter.com/user_guide/helpers/file_helper
s
.html
*/
// ------------------------------------------------------------------------
*/
// ------------------------------------------------------------------------
@@
-121,8
+121,8
@@
if ( ! function_exists('delete_files'))
function delete_files($path, $del_dir = FALSE, $level = 0)
{
// Trim the trailing slash
function delete_files($path, $del_dir = FALSE, $level = 0)
{
// Trim the trailing slash
- $path =
preg_replace("|^(.+?)/*$|", "\\1", $path
);
-
+ $path =
rtrim($path, DIRECTORY_SEPARATOR
);
+
if ( ! $current_dir = @opendir($path))
return;
if ( ! $current_dir = @opendir($path))
return;
@@
-130,17
+130,17
@@
if ( ! function_exists('delete_files'))
{
if ($filename != "." and $filename != "..")
{
{
if ($filename != "." and $filename != "..")
{
- if (is_dir($path.
'/'
.$filename))
+ if (is_dir($path.
DIRECTORY_SEPARATOR
.$filename))
{
// Ignore empty folders
if (substr($filename, 0, 1) != '.')
{
{
// Ignore empty folders
if (substr($filename, 0, 1) != '.')
{
- delete_files($path.
'/'
.$filename, $del_dir, $level + 1);
- }
+ delete_files($path.
DIRECTORY_SEPARATOR
.$filename, $del_dir, $level + 1);
+ }
}
else
{
}
else
{
- unlink($path.
'/'
.$filename);
+ unlink($path.
DIRECTORY_SEPARATOR
.$filename);
}
}
}
}
}
}
@@
-190,7
+190,6
@@
if ( ! function_exists('get_filenames'))
}
elseif (strncmp($file, '.', 1) !== 0)
{
}
elseif (strncmp($file, '.', 1) !== 0)
{
-
$_filedata[] = ($include_path == TRUE) ? $source_dir.$file : $file;
}
}
$_filedata[] = ($include_path == TRUE) ? $source_dir.$file : $file;
}
}
@@
-223,9
+222,9
@@
if ( ! function_exists('get_dir_file_info'))
{
function get_dir_file_info($source_dir, $include_path = FALSE, $_recursion = FALSE)
{
{
function get_dir_file_info($source_dir, $include_path = FALSE, $_recursion = FALSE)
{
- $_filedata = array();
+
static
$_filedata = array();
$relative_path = $source_dir;
$relative_path = $source_dir;
-
+
if ($fp = @opendir($source_dir))
{
// reset the array and make sure $source_dir has a trailing slash on the initial call
if ($fp = @opendir($source_dir))
{
// reset the array and make sure $source_dir has a trailing slash on the initial call
@@
-267,8
+266,8
@@
if ( ! function_exists('get_dir_file_info'))
* Returns FALSE if the file cannot be found.
*
* @access public
* Returns FALSE if the file cannot be found.
*
* @access public
-* @param string
path to file
-* @param mixed
array or comma separated string of information returned
+* @param string path to file
+* @param mixed array or comma separated string of information returned
* @return array
*/
if ( ! function_exists('get_file_info'))
* @return array
*/
if ( ! function_exists('get_file_info'))
@@
-291,7
+290,7
@@
if ( ! function_exists('get_file_info'))
switch ($key)
{
case 'name':
switch ($key)
{
case 'name':
- $fileinfo['name'] = substr(strrchr($file,
'/'
), 1);
+ $fileinfo['name'] = substr(strrchr($file,
DIRECTORY_SEPARATOR
), 1);
break;
case 'server_path':
$fileinfo['server_path'] = $file;
break;
case 'server_path':
$fileinfo['server_path'] = $file;
@@
-342,9
+341,9
@@
if ( ! function_exists('get_mime_by_extension'))
function get_mime_by_extension($file)
{
$extension = substr(strrchr($file, '.'), 1);
function get_mime_by_extension($file)
{
$extension = substr(strrchr($file, '.'), 1);
-
+
global $mimes;
global $mimes;
-
+
if ( ! is_array($mimes))
{
if ( ! require_once(APPPATH.'config/mimes.php'))
if ( ! is_array($mimes))
{
if ( ! require_once(APPPATH.'config/mimes.php'))