fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-24 05:39:58 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/session-class

Browse source
This commit is contained in:
Kijin Sung 2016-07-17 23:07:06 +09:00
commit 1d1171344a
13 changed files with 83 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/framework/parsers/langparser.php
View file

@ -58,7 +58,7 @@ class LangParser
}
// Load the XML lang file.
$xml = @simplexml_load_file($filename);
$xml = simplexml_load_string(Storage::read($filename));
if ($xml === false)
{
Storage::write($output_filename, '');

19
common/framework/storage.php
View file

@ -240,11 +240,16 @@ class Storage
}
}
if (self::$safe_overwrite && strncasecmp($mode, 'a', 1))
if (self::$safe_overwrite && strncasecmp($mode, 'a', 1) && @is_writable($destination_dir))
{
$use_atomic_rename = true;
$original_filename = $filename;
$filename = $filename . '.tmp.' . microtime(true);
}
else
{
$use_atomic_rename = false;
}
if ($fp = @fopen($filename, $mode))
{
@ -275,7 +280,7 @@ class Storage
@chmod($filename, ($perms === null ? (0666 & ~self::getUmask()) : $perms));
if (self::$safe_overwrite && strncasecmp($mode, 'a', 1))
if ($use_atomic_rename)
{
$rename_success = @rename($filename, $original_filename);
if (!$rename_success)
@ -350,14 +355,20 @@ class Storage
}
elseif (self::isDirectory($destination))
{
$destination_dir = $destination;
$destination = $destination . '/' . basename($source);
}
if (self::$safe_overwrite)
if (self::$safe_overwrite && @is_writable($destination_dir))
{
$use_atomic_rename = true;
$original_destination = $destination;
$destination = $destination . '.tmp.' . microtime(true);
}
else
{
$use_atomic_rename = false;
}
$copy_success = @copy($source, $destination);
if (!$copy_success)
@ -382,7 +393,7 @@ class Storage
@chmod($destination, $destination_perms);
}
if (self::$safe_overwrite)
if ($use_atomic_rename)
{
$rename_success = @rename($destination, $original_destination);
if (!$rename_success)