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

Conflicts:
	build/debian/watch

build/debian/copyright

@@ -59,6 +59,24 @@ License: GPL-3+
  `/usr/share/common-licenses/GPL-2'.
 
 
+Files: docs/images/*
+Copyright: Laurent Destailleur 
+License: CC-BY-SA-3.0
+ You are free:
+ to Share (to copy, distribute and transmit the work) and
+ to Remix (to adapt the work) under the following conditions:
+ .
+ Attribution - You must attribute the work in the manner specified by the
+ author or licensor (but not in any way that suggests that they endorse you
+ or your use of the work).
+ .
+ Share Alike - If you alter, transform, or build upon this work, you may
+ distribute the resulting work only under the same, similar or a compatible
+ license.
+ .
+ For more information, see http://creativecommons.org/licenses/by-sa/3.0/
+
+
 Files: htdocs/includes/fpdi/*
 Copyright: FPDFI team
 License: GPL-2+

build/debian/get-orig-source.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+# run with
+# debian/get-orig-source.sh [x.y.z]
+
+tmpdir=$(mktemp -d)
+echo "tmpdir = $tmpdir"
+
+if [ -n "$1" ]; then
+    uscan_opts="--download-version=$1"
+fi
+uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_opts
+
+cd $tmpdir
+
+tgzfile=$(echo *.tar.gz)
+version=$(echo "$tgzfile" | perl -pi -e 's/^dolibarr_//; s/\.zip$//; s/_/./g; s/\+nmu1//; s/$/+dfsg/;')
+
+# Extract the zip file
+tar -xvf $tgzfile
+srcdir=$(find . -maxdepth 1 -mindepth 1 -type d | sed -e 's/\.\///')
+
+if [ ! -d "$srcdir" ]; then
+    echo "ERROR: Failed to identify the extracted directory in $tmpdir (got $srcdir)" >&2
+    rm -rf $tmpdir
+    exit 1
+fi
+
+# Repack as tar.xz
+tar Jcf dolibarr_${version}.orig.tar.xz $srcdir
+
+cd - >/dev/null
+
+if [ -e ../dolibarr_${version}.orig.tar.xz ]; then
+    echo "Not overwriting ../dolibarr_${version}.orig.tar.xz";
+else
+    echo "Created ../dolibarr_${version}.orig.tar.xz"
+    mv $tmpdir/dolibarr_${version}.orig.tar.xz ../
+fi
+
+#rm -rf $tmpdir

build/debian/watch

@@ -1,4 +1,5 @@
 # watch control file for uscan
 version=3
 
-http://sf.net/dolibarr/dolibarr-(.+)\.tgz
+#http://sf.net/dolibarr/dolibarr-(.+)\.tgz
+http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_(.+)\.tar\.gz

htdocs/core/lib/files.lib.php

@@ -742,7 +742,10 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 		{
 			$globencoded=str_replace('[','\[',$file_osencoded);
 			$globencoded=str_replace(']','\]',$globencoded);
-			foreach (glob($globencoded) as $filename)
+			$listofdir=glob($globencoded);
+			if (! empty($listofdir) && is_array($listofdir))
+			{
+				foreach ($listofdir as $filename)
 				{
 					if ($nophperrors) $ok=@unlink($filename);  // The unlink encapsulated by dolibarr
 					else $ok=unlink($filename);  // The unlink encapsulated by dolibarr
@@ -750,6 +753,8 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 				}
 			}
+			else dol_syslog("No files to delete found", LOG_WARNING);
+		}
 		else
 		{
 			if ($nophperrors) $ok=@unlink($file_osencoded);        // The unlink encapsulated by dolibarr