D3Public/daux.io
8
0
Fork 0
Code Pull Requests Releases Activity

Ensure that pathinfo() does not skip Chinese filenames

Browse Source
This commit is contained in:
Gautham Warrier 2014-08-11 23:58:59 +05:30
parent 2d622e40c0
commit 410fea03c1
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/daux_directory.php
View File

@ -20,7 +20,8 @@
$this->local_path = $path; $this->local_path = $path;
$this->parents = $parents; $this->parents = $parents;
$this->last_modified = filemtime($path); $this->last_modified = filemtime($path);
$this->name = pathinfo($path, PATHINFO_FILENAME); $this->name = DauxHelper::pathinfo($path);
$this->name = $this->name['filename'];
$this->title = DauxHelper::get_title_from_file($this->name); $this->title = DauxHelper::get_title_from_file($this->name);
$this->uri = DauxHelper::get_url_from_filename($this->name); $this->uri = DauxHelper::get_url_from_filename($this->name);
$this->index_page = false; $this->index_page = false;

18
libs/daux_helper.php
View File

@ -24,7 +24,8 @@
} }
public static function get_title_from_file($file) { public static function get_title_from_file($file) {
return static::get_title_from_filename(pathinfo($file, PATHINFO_FILENAME)); $file = static::pathinfo($file);
return static::get_title_from_filename($file['filename']);
} }
public static function get_title_from_filename($filename) { public static function get_title_from_filename($filename) {
@ -36,7 +37,8 @@
} }
public static function get_url_from_file($file) { public static function get_url_from_file($file) {
return static::get_url_from_filename(pathinfo($file, PATHINFO_FILENAME)); $file = static::pathinfo($file);
return static::get_url_from_filename($file['filename']);
} }
public static function get_url_from_filename($filename) { public static function get_url_from_filename($filename) {
@ -172,8 +174,9 @@ EOT;
if (is_dir($path) && in_array($entry, $ignore['folders'])) continue; if (is_dir($path) && in_array($entry, $ignore['folders'])) continue;
if (!is_dir($path) && in_array($entry, $ignore['files'])) continue; if (!is_dir($path) && in_array($entry, $ignore['files'])) continue;
$file_details = static::pathinfo($path);
if (is_dir($path)) $entry = static::directory_tree_builder($path, $ignore, $mode, $new_parents); if (is_dir($path)) $entry = static::directory_tree_builder($path, $ignore, $mode, $new_parents);
else if (in_array(pathinfo($path, PATHINFO_EXTENSION), Daux::$VALID_MARKDOWN_EXTENSIONS)) else if (in_array($file_details['extension'], Daux::$VALID_MARKDOWN_EXTENSIONS))
{ {
$entry = new Directory_Entry($path, $new_parents); $entry = new Directory_Entry($path, $new_parents);
if ($mode === Daux::STATIC_MODE) $entry->uri .= '.html'; if ($mode === Daux::STATIC_MODE) $entry->uri .= '.html';
@ -191,6 +194,15 @@ EOT;
} }
} }
public static function pathinfo($path) {
preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $m);
if (isset($m[1])) $ret['dir']=$m[1];
if (isset($m[2])) $ret['basename']=$m[2];
if (isset($m[5])) $ret['extension']=$m[5];
if (isset($m[3])) $ret['filename']=$m[3];
return $ret;
}
public static function clean_copy_assets($path, $local_base){ public static function clean_copy_assets($path, $local_base){
@mkdir($path); @mkdir($path);
static::clean_directory($path); static::clean_directory($path);