Merge remote-tracking branch 'origin/3.5' into develop

Dolibarr · Jan 19, 2014 · 123cd78 · 123cd78
2 parents cbf6e85 + 79e4c28
commit 123cd78
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
@@ -538,13 +538,13 @@ function dol_move($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
         $newpathofdestfile=dol_osencode($destfile);
 
         $result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-        if (! $result) 
+        if (! $result)
         {
-        	if ($destexists) 
+        	if ($destexists)
         	{
         		dol_syslog("files.lib.php::dol_move failed. We try to delete first and move after.", LOG_WARNING);
         		// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
-        		dol_delete_file($destfile);	
+        		dol_delete_file($destfile);
         		$result=@rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
         	}
         	else dol_syslog("files.lib.php::dol_move failed", LOG_WARNING);
@@ -726,6 +726,8 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 	$langs->load("other");
 	$langs->load("errors");
 
+	dol_syslog("dol_delete_file file=".$file." disableglob=".$disableglob." nophperrors=".$nophperrors." nohook=".$nohook);
+
 	if (empty($nohook))
 	{
 		$hookmanager->initHooks(array('fileslib'));
@@ -1301,7 +1303,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 
 	if (empty($modulepart)) return 'ErrorBadParameter';
 	if (empty($entity)) $entity=0;
-	dol_syslog('modulepart='.$modulepart.' original_file= '.$original_file);
+	dol_syslog('modulepart='.$modulepart.' original_file='.$original_file);
 	// We define $accessallowed and $sqlprotectagainstexternals
 	$accessallowed=0;
 	$sqlprotectagainstexternals='';

diff --git a/htdocs/core/tpl/document_actions_pre_headers.tpl.php b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
@@ -41,12 +41,17 @@
 {
     if ($object->id)
     {
-        $urlfile = GETPOST('urlfile', 'alpha');
-        $linkid = GETPOST('linkid', 'int');
+        $urlfile = GETPOST('urlfile', 'alpha');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+        if (GETPOST('section')) $file = $upload_dir . "/" . $urlfile;	// For a delete of GED module urlfile contains full path from upload_dir
+        else															// For documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
+		{
+       		$urlfile=basename($urlfile);
+			$file = $upload_dir . "/" . $urlfile;
+		}
+        $linkid = GETPOST('linkid', 'int');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+
         if ($urlfile)
         {
-            $file = $upload_dir . "/" . $urlfile;	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
-
             $ret = dol_delete_file($file, 0, 0, 0, $object);
             if ($ret) {
                 setEventMessage($langs->trans("FileWasRemoved", $urlfile));