fix #302 windows에서 설치가 되지 않는 문제 해결-beta

This commit is contained in:
bnu 2014-01-22 20:17:59 +09:00
parent f5267acf28
commit 9cc43f3159

View file

@ -26,9 +26,9 @@ class FileHandler
}
/**
* Copy a directory to target
* Copy a directory to target
*
* If target directory does not exist, this function creates it
* If target directory does not exist, this function creates it
*
* @param string $source_dir Path of source directory
* @param string $target_dir Path of target dir
@ -94,7 +94,7 @@ class FileHandler
}
/**
* Copy a file to target
* Copy a file to target
*
* @param string $source Path of source file
* @param string $target Path of target file
@ -119,7 +119,7 @@ class FileHandler
}
/**
* Returns the content of the file
* Returns the content of the file
*
* @param string $filename Path of target file
* @return string The content of the file. If target file does not exist, this function returns nothing.
@ -201,7 +201,7 @@ class FileHandler
}
/**
* Move a directory
* Move a directory
*
* This function just wraps rename function.
*
@ -223,7 +223,7 @@ class FileHandler
* @param string $filter If specified, return only files matching with the filter
* @param bool $to_lower If TRUE, file names will be changed into lower case.
* @param bool $concat_prefix If TRUE, return file name as absolute path
* @return string[] Array of the filenames in the path
* @return string[] Array of the filenames in the path
*/
function readDir($path, $filter = '', $to_lower = FALSE, $concat_prefix = FALSE)
{
@ -263,9 +263,9 @@ class FileHandler
$file = sprintf('%s%s', str_replace(_XE_PATH_, '', $path), $file);
}
$output[] = $file;
$output[] = str_replace(DIRECTORY_SEPARATOR, '', $file);
}
return $output;
}
@ -293,7 +293,7 @@ class FileHandler
else
{
static $oFtp = NULL;
$ftp_info = Context::getFTPInfo();
if($oFtp == NULL)
{
@ -327,10 +327,10 @@ class FileHandler
{
$ftp_path = DIRECTORY_SEPARATOR;
}
$path_string = str_replace(_XE_PATH_, '', $path_string);
$path_list = explode(DIRECTORY_SEPARATOR, $path_string);
$path = _XE_PATH_;
for($i = 0, $c = count($path_list); $i < $c; $i++)
{
@ -338,7 +338,7 @@ class FileHandler
{
continue;
}
$path .= $path_list[$i] . DIRECTORY_SEPARATOR;
$ftp_path .= $path_list[$i] . DIRECTORY_SEPARATOR;
if(!is_dir($path))
@ -346,7 +346,7 @@ class FileHandler
$oFtp->ftp_mkdir($ftp_path);
$oFtp->ftp_site("CHMOD 777 " . $ftp_path);
}
}
}
}
return is_dir($path_string);
@ -394,7 +394,7 @@ class FileHandler
}
/**
* Remove a directory only if it is empty
* Remove a directory only if it is empty
*
* @param string $path Path of the target directory
* @return void
@ -428,7 +428,7 @@ class FileHandler
/**
* Remove files in the target directory
*
* This function keeps the directory structure.
* This function keeps the directory structure.
*
* @param string $path Path of the target directory
* @return void
@ -505,7 +505,7 @@ class FileHandler
*
* If the target is moved (when return code is 300~399), this function follows the location specified response header.
*
* @param string $url The address of the target file
* @param string $url The address of the target file
* @param string $body HTTP request body
* @param int $timeout Connection timeout
* @param string $method GET/POST
@ -618,7 +618,7 @@ class FileHandler
}
/**
* Convert size in string into numeric value
* Convert size in string into numeric value
*
* @see self::filesize()
* @param $val Size in string (ex., 10, 10K, 10M, 10G )
@ -644,9 +644,9 @@ class FileHandler
}
/**
* Check available memory to load image file
* Check available memory to load image file
*
* @param array $imageInfo Image info retrieved by getimagesize function
* @param array $imageInfo Image info retrieved by getimagesize function
* @return bool TRUE: it's ok, FALSE: otherwise
*/
function checkMemoryLoadImage(&$imageInfo)
@ -672,7 +672,7 @@ class FileHandler
*
* @param string $source_file Path of the source file
* @param string $target_file Path of the target file
* @param int $resize_width Width to resize
* @param int $resize_width Width to resize
* @param int $resize_height Height to resize
* @param string $target_type If $target_type is set (gif, jpg, png, bmp), result image will be saved as target type
* @param string $thumbnail_type Thumbnail type(crop, ratio)
@ -827,7 +827,7 @@ class FileHandler
imagecopyresized($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
}
// create directory
// create directory
self::makeDir(dirname($target_file));
// write into the file
@ -957,13 +957,13 @@ class FileHandler
}
/**
* Returns a file object
* Returns a file object
*
* If the directory of the file does not exist, create it.
*
* @param string $filename Target file name
* @param string $mode File mode for fopen
* @return FileObject File object
* @return FileObject File object
*/
function openFile($filename, $mode)
{