DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add -conflict postfix for files modified externally

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-09-21 00:01:11 +03:00
parent 3532cd6f1b
commit f96944b867
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ajax/sessionController.php
View File

@ -86,7 +86,7 @@ class SessionController extends Controller{
$currentHash = sha1($view->file_get_contents($path)); $currentHash = sha1($view->file_get_contents($path));
if ($currentHash !== $session['genesis_hash']){ if ($currentHash !== $session['genesis_hash']){
// Original file was modified externally. Save to a new one // Original file was modified externally. Save to a new one
$path = Helper::getNewFileName($view, $path); $path = Helper::getNewFileName($view, $path, '-conflict');
} }
} }

4
lib/helper.php
View File

@ -15,12 +15,12 @@ class Helper{
const APP_ID = 'documents'; const APP_ID = 'documents';
public static function getNewFileName($view, $path){ public static function getNewFileName($view, $path, $prepend = ' '){
$fileNum = 0; $fileNum = 0;
while ($view->file_exists($path)){ while ($view->file_exists($path)){
$fileNum += 1; $fileNum += 1;
$path = preg_replace('/(\.odt|\(\d+\)\.odt)$/', ' (' .$fileNum . ').odt', $path); $path = preg_replace('/(\.odt|' . $prepend . '\(\d+\)\.odt)$/', $prepend . '(' .$fileNum . ').odt', $path);
}; };
return $path; return $path;