From 00e0649cde9a010aca9bd5f47c4142790ec4a617 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 9 Aug 2012 07:38:06 +0200
Subject: [PATCH 01/12] Fix: strict mode plaza

---
 htdocs/ecm/class/ecmdirectory.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index e0519073386..a684be57701 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -567,9 +567,9 @@ class EcmDirectory // extends CommonObject
 				$this->cats[$obj->rowid]['fk_user_c'] = $obj->fk_user_c;
 				$this->cats[$obj->rowid]['login_c'] = $obj->login_c;
 
-				if ($obj->rowid_fille)
+				if (! empty($obj->rowid_fille))
 				{
-					if (is_array($this->cats[$obj->rowid]['id_children']))
+					if (isset($this->cats[$obj->rowid]['id_children']) && is_array($this->cats[$obj->rowid]['id_children']))
 					{
 						$newelempos=count($this->cats[$obj->rowid]['id_children']);
 						//print "this->cats[$i]['id_children'] est deja un tableau de $newelem elements<br>";

From 0ad137e73419bdb077c375dc75add335e4f5b5dd Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 9 Aug 2012 07:47:41 +0200
Subject: [PATCH 02/12] Fix: uniformize code

---
 htdocs/core/lib/files.lib.php |  4 ++--
 htdocs/ecm/search.php         | 17 +++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 36851694460..4ac18c0985f 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -139,12 +139,12 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 		closedir($dir);
 
 		// Obtain a list of columns
-		if ($sortcriteria)
+		if (! empty($sortcriteria))
 		{
     		$myarray=array();
     		foreach ($file_list as $key => $row)
     		{
-    			$myarray[$key]  = $row[$sortcriteria];
+    			$myarray[$key] = (isset($row[$sortcriteria])?$row[$sortcriteria]:'');
     		}
     		// Sort the data
     		if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 16ca5d56a36..8870d50c639 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -48,9 +48,9 @@ $result = restrictedArea($user, 'ecm','');
 $user->getrights('ecm');
 
 // Get parameters
-$socid = isset($_GET["socid"])?$_GET["socid"]:'';
-$action = isset($_GET["action"])?$_GET["action"]:$_POST['action'];
-$section=isset($_GET["section"])?$_GET["section"]:$_POST['section'];
+$socid = GETPOST('socid','int');
+$action = GETPOST('action','alpha');
+$section=GETPOST('section');
 if (! $section) $section=0;
 
 $upload_dir = $conf->ecm->dir_output.'/'.$section;
@@ -66,9 +66,9 @@ if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="label";
 
 $ecmdir = new EcmDirectory($db);
-if (! empty($_REQUEST["section"]))
+if (! empty($section))
 {
-	$result=$ecmdir->fetch($_REQUEST["section"]);
+	$result=$ecmdir->fetch($section);
 	if (! $result > 0)
 	{
 		dol_print_error($db,$ecmdir->error);
@@ -123,10 +123,8 @@ print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("Search"));
 //print "<br>\n";
 print $langs->trans("FeatureNotYetAvailable").'.<br><br>';
 
-if ($mesg) { print $mesg."<br>"; }
-
 // Tool bar
-$head = ecm_prepare_head_fm($fac);
+$head = ecm_prepare_head_fm($ecmdir);
 //dol_fiche_head($head, 'search_form', '', 1);
 
 
@@ -210,7 +208,6 @@ print '</table>';
 print '<br>';
 
 // End of page
-$db->close();
-
 llxFooter();
+$db->close();
 ?>

From 026cf124afe72d417a9d8947df6f2a55d177e0ff Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 9 Aug 2012 16:35:39 +0200
Subject: [PATCH 03/12] Fix: avoid php warning

---
 htdocs/admin/security_other.php | 48 ++++++++++++++-------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 2ba43a0aedf..dab17330f27 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,10 @@ $langs->load("users");
 $langs->load("admin");
 $langs->load("other");
 
-if (!$user->admin) accessforbidden();
+if (! $user->admin)
+	accessforbidden();
+
+$action=GETPOST('action','alpha');
 
 $upload_dir=$conf->admin->dir_temp;
 
@@ -46,57 +49,51 @@ if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
     dol_add_file_process($upload_dir,0,0);
 }
 
-if ($_GET["action"] == 'activate_captcha')
+if ($action == 'activate_captcha')
 {
     dolibarr_set_const($db, "MAIN_SECURITY_ENABLECAPTCHA", '1','chaine',0,'',$conf->entity);
     header("Location: security_other.php");
     exit;
 }
-else if ($_GET["action"] == 'disable_captcha')
+else if ($action == 'disable_captcha')
 {
     dolibarr_del_const($db, "MAIN_SECURITY_ENABLECAPTCHA",$conf->entity);
     header("Location: security_other.php");
     exit;
 }
-
-if ($_GET["action"] == 'activate_advancedperms')
+else if ($action == 'activate_advancedperms')
 {
     dolibarr_set_const($db, "MAIN_USE_ADVANCED_PERMS", '1','chaine',0,'',$conf->entity);
     header("Location: security_other.php");
     exit;
 }
-else if ($_GET["action"] == 'disable_advancedperms')
+else if ($action == 'disable_advancedperms')
 {
     dolibarr_del_const($db, "MAIN_USE_ADVANCED_PERMS",$conf->entity);
     header("Location: security_other.php");
     exit;
 }
-
-if ($_GET["action"] == 'MAIN_SESSION_TIMEOUT')
+else if ($action == 'MAIN_SESSION_TIMEOUT')
 {
     if (! dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", $_POST["MAIN_SESSION_TIMEOUT"],'chaine',0,'',$conf->entity)) dol_print_error($db);
     else $mesg=$langs->trans("RecordModifiedSuccessfully");
 }
-
-if ($_GET["action"] == 'MAIN_UPLOAD_DOC')
+else if ($action == 'MAIN_UPLOAD_DOC')
 {
     if (! dolibarr_set_const($db, 'MAIN_UPLOAD_DOC',$_POST["MAIN_UPLOAD_DOC"],'chaine',0,'',$conf->entity)) dol_print_error($db);
     else $mesg=$langs->trans("RecordModifiedSuccessfully");
 }
-
-if ($_GET["action"] == 'MAIN_UMASK')
+else if ($action == 'MAIN_UMASK')
 {
     if (! dolibarr_set_const($db, "MAIN_UMASK", $_POST["MAIN_UMASK"],'chaine',0,'',$conf->entity)) dol_print_error($db);
     else $mesg=$langs->trans("RecordModifiedSuccessfully");
 }
-
-if ($_GET["action"] == 'MAIN_ANTIVIRUS_COMMAND')
+else if ($action == 'MAIN_ANTIVIRUS_COMMAND')
 {
     if (! dolibarr_set_const($db, "MAIN_ANTIVIRUS_COMMAND", $_POST["MAIN_ANTIVIRUS_COMMAND"],'chaine',0,'',$conf->entity)) dol_print_error($db);
     else $mesg=$langs->trans("RecordModifiedSuccessfully");
 }
-
-if ($_GET["action"] == 'MAIN_ANTIVIRUS_PARAM')
+else if ($action == 'MAIN_ANTIVIRUS_PARAM')
 {
     if (! dolibarr_set_const($db, "MAIN_ANTIVIRUS_PARAM", $_POST["MAIN_ANTIVIRUS_PARAM"],'chaine',0,'',$conf->entity)) dol_print_error($db);
     else $mesg=$langs->trans("RecordModifiedSuccessfully");
@@ -168,11 +165,11 @@ print '<td colspan="3">'.$langs->trans("UseCaptchaCode").'</td>';
 print '<td align="right">';
 if (function_exists("imagecreatefrompng"))
 {
-    if ($conf->global->MAIN_SECURITY_ENABLECAPTCHA == 0)
+    if (empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
     {
         print '<a href="security_other.php?action=activate_captcha">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
     }
-    if($conf->global->MAIN_SECURITY_ENABLECAPTCHA == 1)
+    else
     {
         print '<a href="security_other.php?action=disable_captcha">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
     }
@@ -193,11 +190,11 @@ $var=!$var;
 print "<tr ".$bc[$var].">";
 print '<td colspan="3">'.$langs->trans("UseAdvancedPerms").'</td>';
 print '<td align="right">';
-if ($conf->global->MAIN_USE_ADVANCED_PERMS == 0)
+if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
     print '<a href="security_other.php?action=activate_advancedperms">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
 }
-if($conf->global->MAIN_USE_ADVANCED_PERMS == 1)
+else
 {
     print '<a href="security_other.php?action=disable_advancedperms">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
 }
@@ -274,7 +271,7 @@ if (ini_get('safe_mode') && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
         dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
     }
 }
-print '<input type="text" name="MAIN_ANTIVIRUS_COMMAND" size="72" value="'.htmlentities($conf->global->MAIN_ANTIVIRUS_COMMAND).'">';
+print '<input type="text" name="MAIN_ANTIVIRUS_COMMAND" size="72" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)?dol_htmlentities($conf->global->MAIN_ANTIVIRUS_COMMAND):'').'">';
 print "</td>";
 print '<td align="right">';
 print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
@@ -291,7 +288,7 @@ print '<td colspan="2">'.$langs->trans("AntiVirusParam").'<br>';
 print $langs->trans("AntiVirusParamExample");
 print '</td>';
 print '<td>';
-print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" size="72" value="'.htmlentities($conf->global->MAIN_ANTIVIRUS_PARAM).'">';
+print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" size="72" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_PARAM)?dol_htmlentities($conf->global->MAIN_ANTIVIRUS_PARAM):'').'">';
 print "</td>";
 print '<td align="right">';
 print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
@@ -303,17 +300,12 @@ print '</table>';
 
 print '</div>';
 
-
 // Form to test upload
-dol_htmloutput_mesg($mesg);
-
-// Affiche formulaire upload
 print '<br>';
 $formfile=new FormFile($db);
 $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs->trans("FormToTestFileUploadForm"),0,0,1);
 
 
 llxFooter();
-
 $db->close();
 ?>

From b9ac974013fbcdb18904160d10893aada6cd017d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 2 Sep 2012 22:04:30 +0200
Subject: [PATCH 04/12] Fix: use ajax button on/off

---
 htdocs/admin/security_other.php | 91 +++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 39 deletions(-)

diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index dab17330f27..a77e70deb45 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -49,30 +49,35 @@ if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
     dol_add_file_process($upload_dir,0,0);
 }
 
-if ($action == 'activate_captcha')
+if (preg_match('/set_(.*)/',$action,$reg))
 {
-    dolibarr_set_const($db, "MAIN_SECURITY_ENABLECAPTCHA", '1','chaine',0,'',$conf->entity);
-    header("Location: security_other.php");
-    exit;
+	$code=$reg[1];
+	$value=(GETPOST($code) ? GETPOST($code) : 1);
+	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		Header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
 }
-else if ($action == 'disable_captcha')
+
+else if (preg_match('/del_(.*)/',$action,$reg))
 {
-    dolibarr_del_const($db, "MAIN_SECURITY_ENABLECAPTCHA",$conf->entity);
-    header("Location: security_other.php");
-    exit;
-}
-else if ($action == 'activate_advancedperms')
-{
-    dolibarr_set_const($db, "MAIN_USE_ADVANCED_PERMS", '1','chaine',0,'',$conf->entity);
-    header("Location: security_other.php");
-    exit;
-}
-else if ($action == 'disable_advancedperms')
-{
-    dolibarr_del_const($db, "MAIN_USE_ADVANCED_PERMS",$conf->entity);
-    header("Location: security_other.php");
-    exit;
+	$code=$reg[1];
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+	{
+		Header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
 }
+
 else if ($action == 'MAIN_SESSION_TIMEOUT')
 {
     if (! dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", $_POST["MAIN_SESSION_TIMEOUT"],'chaine',0,'',$conf->entity)) dol_print_error($db);
@@ -165,14 +170,21 @@ print '<td colspan="3">'.$langs->trans("UseCaptchaCode").'</td>';
 print '<td align="right">';
 if (function_exists("imagecreatefrompng"))
 {
-    if (empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
-    {
-        print '<a href="security_other.php?action=activate_captcha">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-    }
-    else
-    {
-        print '<a href="security_other.php?action=disable_captcha">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
-    }
+	if (! empty($conf->use_javascript_ajax))
+	{
+		print ajax_constantonoff('MAIN_SECURITY_ENABLECAPTCHA');
+	}
+	else
+	{
+		if (empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
+		{
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_SECURITY_ENABLECAPTCHA">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+		}
+		else
+		{
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_SECURITY_ENABLECAPTCHA">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+		}
+	}
 }
 else
 {
@@ -180,28 +192,29 @@ else
     $desc = $form->textwithpicto('',$langs->transnoentities("EnableGDLibraryDesc"),1,'warning');
     print $desc;
 }
-print "</td>";
-
-print "</td>";
-print '</tr>';
+print '</td></tr>';
 
 // Enable advanced perms
 $var=!$var;
 print "<tr ".$bc[$var].">";
 print '<td colspan="3">'.$langs->trans("UseAdvancedPerms").'</td>';
 print '<td align="right">';
-if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+if (! empty($conf->use_javascript_ajax))
 {
-    print '<a href="security_other.php?action=activate_advancedperms">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+	print ajax_constantonoff('MAIN_USE_ADVANCED_PERMS');
 }
 else
 {
-    print '<a href="security_other.php?action=disable_advancedperms">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+	{
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_USE_ADVANCED_PERMS">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+	}
+	else
+	{
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_USE_ADVANCED_PERMS">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+	}
 }
-print "</td>";
-
-print "</td>";
-print '</tr>';
+print "</td></tr>";
 
 print '</table>';
 

From a00205a17d4c7e83221b09ae1352a0b97394fe53 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 13 Aug 2012 11:42:50 +0200
Subject: [PATCH 05/12] New: add possibility to set and del anothers constants

---
 htdocs/core/ajax/constantonoff.php |  9 +--
 htdocs/core/lib/ajax.lib.php       | 94 +++++++++++++++++++-----------
 2 files changed, 66 insertions(+), 37 deletions(-)

diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index a79a9f5d0ff..d195df7631f 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -30,6 +30,8 @@ if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
+$action=GETPOST('action','alpha');
+$name=GETPOST('name','alpha');
 
 /*
  * View
@@ -45,17 +47,16 @@ top_httphead();
 print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
 
 // Registering the location of boxes
-if ((isset($_GET['action']) && ! empty($_GET['action'])) && (isset($_GET['name']) && ! empty($_GET['name'])) )
+if (! empty($action) && ! empty($name))
 {
 	$entity = GETPOST('entity','int');
-	$action = GETPOST('action', 'alpha');
-	$name = GETPOST('name', 'alpha');
+	$value = (GETPOST('value')?GETPOST('value'):1);
 
 	if ($user->admin)
 	{
 		if ($action == 'set')
 		{
-			dolibarr_set_const($db, $name, 1, 'chaine', 0, '', $entity);
+			dolibarr_set_const($db, $name, $value, 'chaine', 0, '', $entity);
 		}
 		else if ($action == 'del')
 		{
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 2993197b660..ebfb2cfdd8d 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -346,7 +346,7 @@ function ajax_combobox($htmlname, $event=array())
  * 	On/off button for constant
  *
  * 	@param	string	$code		Name of constant
- * 	@param	array	$input		Input element
+ * 	@param	array	$input		Input element (enable/disable or show/hide another element, set/del another constant)
  * 	@param	int		$entity		Entity to set
  * 	@return	void
  */
@@ -359,10 +359,11 @@ function ajax_constantonoff($code,$input=array(),$entity=false)
 	$out= '<script type="text/javascript">
 		$(function() {
 			var input = '.json_encode($input).';
+			var url = \''.DOL_URL_ROOT.'/core/ajax/constantonoff.php\';
 
 			// Set constant
 			$("#set_'.$code.'").click(function() {
-				$.get( "'.DOL_URL_ROOT.'/core/ajax/constantonoff.php", {
+				$.get( url, {
 					action: \'set\',
 					name: \''.$code.'\',
 					entity: \''.$entity.'\'
@@ -370,27 +371,41 @@ function ajax_constantonoff($code,$input=array(),$entity=false)
 				function() {
 					$("#set_'.$code.'").hide();
 					$("#del_'.$code.'").show();
-					// Enable another element
-					if (input.disabled && input.disabled.length > 0) {
-						$.each(input.disabled, function(key,value) {
-							$("#" + value).removeAttr("disabled");
-							if ($("#" + value).hasClass("butActionRefused") == true) {
-								$("#" + value).removeClass("butActionRefused");
-								$("#" + value).addClass("butAction");
-							}
-						});
-					// Show another element
-					} else if (input.showhide && input.showhide.length > 0) {
-						$.each(input.showhide, function(key,value) {
-							$("#" + value).show();
-						});
-					}
+					$.each(input, function(type, data) {
+						// Enable another element
+						if (type == "disabled") {
+							$.each(data, function(key, value) {
+								$("#" + value).removeAttr("disabled");
+								if ($("#" + value).hasClass("butActionRefused") == true) {
+									$("#" + value).removeClass("butActionRefused");
+									$("#" + value).addClass("butAction");
+								}
+							});
+						// Show another element
+						} else if (type == "showhide" || type == "show") {
+							$.each(data, function(key, value) {
+								$("#" + value).show();
+							});
+						// Set another constant
+						} else if (type == "set") {
+							$.each(data, function(key, value) {
+								$("#set_" + key).hide();
+								$("#del_" + key).show();
+								$.get( url, {
+									action: \'set\',
+									name: key,
+									value: value,
+									entity: \''.$entity.'\'
+								});
+							});
+						}
+					});
 				});
 			});
 
 			// Del constant
 			$("#del_'.$code.'").click(function() {
-				$.get( "'.DOL_URL_ROOT.'/core/ajax/constantonoff.php", {
+				$.get( url, {
 					action: \'del\',
 					name: \''.$code.'\',
 					entity: \''.$entity.'\'
@@ -398,21 +413,34 @@ function ajax_constantonoff($code,$input=array(),$entity=false)
 				function() {
 					$("#del_'.$code.'").hide();
 					$("#set_'.$code.'").show();
-					// Disable another element
-					if (input.disabled && input.disabled.length > 0) {
-						$.each(input.disabled, function(key,value) {
-							$("#" + value).attr("disabled", true);
-							if ($("#" + value).hasClass("butAction") == true) {
-								$("#" + value).removeClass("butAction");
-								$("#" + value).addClass("butActionRefused");
-							}
-						});
-					// Hide another element
-					} else if (input.showhide && input.showhide.length > 0) {
-						$.each(input.showhide, function(key,value) {
-							$("#" + value).hide();
-						});
-					}
+					$.each(input, function(type, data) {
+						// Disable another element
+						if (type == "disabled") {
+							$.each(data, function(key, value) {
+								$("#" + value).attr("disabled", true);
+								if ($("#" + value).hasClass("butAction") == true) {
+									$("#" + value).removeClass("butAction");
+									$("#" + value).addClass("butActionRefused");
+								}
+							});
+						// Hide another element
+						} else if (type == "showhide" || type == "hide") {
+							$.each(data, function(key, value) {
+								$("#" + value).hide();
+							});
+						// Delete another constant
+						} else if (type == "del") {
+							$.each(data, function(key, value) {
+								$("#del_" + value).hide();
+								$("#set_" + value).show();
+								$.get( url, {
+									action: \'del\',
+									name: value,
+									entity: \''.$entity.'\'
+								});
+							});
+						}
+					});
 				});
 			});
 		});

From afdab32bbf1251c4dd22283052aff0825d11267b Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 2 Sep 2012 22:12:56 +0200
Subject: [PATCH 06/12] Fix: avoid warnings (strict mode)

---
 htdocs/comm/action/class/actioncomm.class.php | 28 +++++++-------
 htdocs/compta/facture/class/facture.class.php |  2 +-
 .../core/class/commondocgenerator.class.php   | 16 ++++----
 htdocs/core/lib/doc.lib.php                   | 33 +++++++++--------
 .../modules/expedition/modules_expedition.php |  2 +-
 .../doc/doc_generic_invoice_odt.modules.php   | 11 +++---
 .../modules/import/import_csv.modules.php     | 37 +++++++++++--------
 htdocs/core/modules/import/modules_import.php |  4 +-
 8 files changed, 70 insertions(+), 63 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index caab3dcc3a6..0c5722ac0a7 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -120,11 +120,11 @@ class ActionComm extends CommonObject
         if (empty($this->punctual))     $this->punctual = 0;
         if ($this->percentage > 100) $this->percentage = 100;
         if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
-        if ($this->datep && $this->datef)   $this->durationp=($this->datef - $this->datep);
-        if ($this->date  && $this->dateend) $this->durationa=($this->dateend - $this->date);
-        if ($this->datep && $this->datef && $this->datep > $this->datef) $this->datef=$this->datep;
-        if ($this->date  && $this->dateend && $this->date > $this->dateend) $this->dateend=$this->date;
-        if ($this->fk_project < 0) $this->fk_project = 0;
+        if (! empty($this->datep) && ! empty($this->datef))   $this->durationp=($this->datef - $this->datep);
+        if (! empty($this->date)  && ! empty($this->dateend)) $this->durationa=($this->dateend - $this->date);
+        if (! empty($this->datep) && ! empty($this->datef) && $this->datep > $this->datef) $this->datef=$this->datep;
+        if (! empty($this->date)  && ! empty($this->dateend) && $this->date > $this->dateend) $this->dateend=$this->date;
+        if (! isset($this->fk_project) || $this->fk_project < 0) $this->fk_project = 0;
         if ($this->elementtype=='facture')  $this->elementtype='invoice';
         if ($this->elementtype=='commande') $this->elementtype='order';
         if ($this->elementtype=='contrat')  $this->elementtype='contract';
@@ -186,19 +186,19 @@ class ActionComm extends CommonObject
         $sql.= (strval($this->datef)!=''?"'".$this->db->idate($this->datef)."'":"null").",";
         //$sql.= (strval($this->date)!=''?"'".$this->db->idate($this->date)."'":"null").",";
         //$sql.= (strval($this->dateend)!=''?"'".$this->db->idate($this->dateend)."'":"null").",";
-        $sql.= ($this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null").",";
+        $sql.= (isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null").",";
         //$sql.= ($this->durationa >= 0 && $this->durationa != ''?"'".$this->durationa."'":"null").",";
         $sql.= " '".$this->type_id."',";
-        $sql.= ($this->societe->id>0?" '".$this->societe->id."'":"null").",";
-        $sql.= ($this->fk_project>0?" '".$this->fk_project."'":"null").",";
+        $sql.= (isset($this->societe->id) && $this->societe->id > 0?" '".$this->societe->id."'":"null").",";
+        $sql.= (isset($this->fk_project) && $this->fk_project > 0?" '".$this->fk_project."'":"null").",";
         $sql.= " '".$this->db->escape($this->note)."',";
-        $sql.= ($this->contact->id > 0?"'".$this->contact->id."'":"null").",";
-        $sql.= ($user->id > 0 ? "'".$user->id."'":"null").",";
-        $sql.= ($this->usertodo->id > 0?"'".$this->usertodo->id."'":"null").",";
-        $sql.= ($this->userdone->id > 0?"'".$this->userdone->id."'":"null").",";
+        $sql.= (isset($this->contact->id) && $this->contact->id > 0?"'".$this->contact->id."'":"null").",";
+        $sql.= (isset($user->id) && $user->id > 0 ? "'".$user->id."'":"null").",";
+        $sql.= (isset($this->usertodo->id) && $this->usertodo->id > 0?"'".$this->usertodo->id."'":"null").",";
+        $sql.= (isset($this->userdone->id) && $this->userdone->id > 0?"'".$this->userdone->id."'":"null").",";
         $sql.= "'".$this->db->escape($this->label)."','".$this->percentage."','".$this->priority."','".$this->fulldayevent."','".$this->db->escape($this->location)."','".$this->punctual."',";
-        $sql.= ($this->fk_element?$this->fk_element:"null").",";
-        $sql.= ($this->elementtype?"'".$this->elementtype."'":"null").",";
+        $sql.= (! empty($this->fk_element)?$this->fk_element:"null").",";
+        $sql.= (! empty($this->elementtype)?"'".$this->elementtype."'":"null").",";
         $sql.= $conf->entity;
         $sql.= ")";
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 04fc64cdc6b..d14eadca5b5 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1688,7 +1688,7 @@ class Facture extends CommonInvoice
                 $result=$this->client->set_as_client();
 
                 // Si active on decremente le produit principal et ses composants a la validation de facture
-                if ($this->type != 3 && $result >= 0 && $conf->stock->enabled && $conf->global->STOCK_CALCULATE_ON_BILL)
+                if ($this->type != 3 && $result >= 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL))
                 {
                     require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
                     $langs->load("agenda");
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 9a589a06fa6..4304437196a 100755
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+/* Copyright (C) 2003-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,11 +50,11 @@ abstract class CommonDocGenerator
             'myuser_lastname'=>$user->lastname,
             'myuser_firstname'=>$user->firstname,
             'myuser_login'=>$user->login,
-            'myuser_phone'=>$user->officephone,
-            'myuser_fax'=>$user->officefax,
+            'myuser_phone'=>$user->office_phone,
+            'myuser_fax'=>$user->office_fax,
             'myuser_mobile'=>$user->user_mobile,
-            'myuser_email'=>$user->user_email,
-            'myuser_web'=>$user->url
+            'myuser_email'=>$user->email,
+            //'myuser_web'=>$user->url // FIXME url not exist in $user object
         );
     }
 
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index d6da55569ca..bc5cd90951b 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
- * Copyright (C) 2010-2011 Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
+/* Copyright (C) 2006-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2007		Patrick Raguin			<patrick.raguin@gmail.com>
+ * Copyright (C) 2010-2012	Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,10 +43,10 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
 	global $db, $conf, $langs;
 
 	$idprod=$line->fk_product;
-	$label=$line->label; if (empty($label))  $label=$line->libelle;
-	$desc=$line->desc; if (empty($desc))   $desc=$line->description;
-	$ref_supplier=$line->ref_supplier; if (empty($ref_supplier))   $ref_supplier=$line->ref_fourn;    // TODO Not yet saved for supplier invoices, only supplier orders
-	$note=$line->note;
+	$label=(! empty($line->label)?$line->label:(! empty($line->libelle)?$line->libelle:''));
+	$desc=(! empty($line->desc)?$line->desc:(! empty($line->description)?$line->description:''));
+	$ref_supplier=(! empty($line->ref_supplier)?$line->ref_supplier:(! empty($line->ref_fourn)?$line->ref_fourn:''));    // TODO Not yet saved for supplier invoices, only supplier orders
+	$note=(! empty($line->note)?$line->note:'');
 
 	if ($issupplierline) $prodser = new ProductFournisseur($db);
 	else $prodser = new Product($db);
@@ -55,7 +55,7 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
 	{
 		$prodser->fetch($idprod);
 		// If a predefined product and multilang and on other lang, we renamed label with label translated
-		if ($conf->global->MAIN_MULTILANGS && ($outputlangs->defaultlang != $langs->defaultlang))
+		if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
 		{
 			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label)     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
 			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
@@ -89,7 +89,8 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
 		{
 			if ($idprod)
 			{
-				if ( empty($hidedesc) ) $libelleproduitservice.=$desc;
+				if (empty($hidedesc))
+					$libelleproduitservice.=$desc;
 			}
 			else
 			{
@@ -106,9 +107,9 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
 		{
 			$prefix_prodserv = "";
 			$ref_prodserv = "";
-			if ($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)   // In standard mode, we do not show this
+			if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
 			{
-				if($prodser->isservice())
+				if ($prodser->isservice())
 				{
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
 				}
@@ -118,7 +119,7 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
 				}
 			}
 
-			if ( empty($hideref) )
+			if (empty($hideref))
 			{
 				if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')';   // Show local ref and supplier ref
 				else $ref_prodserv = $prodser->ref; // Show local ref only
@@ -130,7 +131,7 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
 		}
 	}
 
-	if ($line->date_start || $line->date_end)
+	if (! empty($line->date_start) || ! empty($line->date_end))
 	{
 		$format='day';
 		// Show duration if exists
diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
index a40fddc9ef6..f650e4bd84f 100644
--- a/htdocs/core/modules/expedition/modules_expedition.php
+++ b/htdocs/core/modules/expedition/modules_expedition.php
@@ -246,4 +246,4 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs)
 		return -1;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index e04c9b5c759..d796fee8441 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2012 Laurent Destailleur <ely@users.sourceforge.net>
+/* Copyright (C) 2010-2012	Laurent Destailleur	<ely@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -108,12 +109,12 @@ class doc_generic_invoice_odt extends ModelePDFFactures
             'object_ref'=>$object->ref,
             'object_ref_ext'=>$object->ref_ext,
         	'object_ref_customer'=>$object->ref_client,
-            'object_ref_supplier'=>$object->ref_fournisseur,
+            'object_ref_supplier'=>(! empty($object->ref_fournisseur)?$object->ref_fournisseur:''),
             'object_source_invoice_ref'=>$invoice_source->ref,
         	'object_date'=>dol_print_date($object->date,'day'),
         	'object_date_limit'=>dol_print_date($object->date_lim_reglement,'day'),
         	'object_date_creation'=>dol_print_date($object->date_creation,'day'),
-            'object_date_modification'=>dol_print_date($object->date_modification,'day'),
+            'object_date_modification'=>(! empty($object->date_modification)?dol_print_date($object->date_modification,'day'):''),
             'object_date_validation'=>dol_print_date($object->date_validation,'dayhour'),
             'object_payment_mode_code'=>$object->mode_reglement_code,
         	'object_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
@@ -122,7 +123,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
         	'object_total_ht'=>price($object->total_ht,0,$outputlangs),
             'object_total_vat'=>price($object->total_tva,0,$outputlangs),
             'object_total_ttc'=>price($object->total_ttc,0,$outputlangs),
-            'object_vatrate'=>vatrate($object->tva),
+            'object_vatrate'=>(isset($object->tva)?vatrate($object->tva):''),
             'object_note_private'=>$object->note,
             'object_note'=>$object->note_public,
         	// Payments
@@ -339,7 +340,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
                     '__FROM_EMAIL__' => $this->emetteur->email,
                     '__TOTAL_TTC__' => $object->total_ttc,
                     '__TOTAL_HT__' => $object->total_ht,
-                    '__TOTAL_VAT__' => $object->total_vat
+                    '__TOTAL_VAT__' => $object->total_tva
                 );
                 complete_substitutions_array($substitutionarray, $langs, $object);
 
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 783f9f053dd..dce9949a47c 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2006-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2009-2010 Regis Houssin        <regis@dolibarr.fr>
+/* Copyright (C) 2006-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin		<regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -95,21 +95,23 @@ class ImportCsv extends ModeleImports
 	}
 
 	/**
-	 * getDriverLabel
+	 *	getDriverLabel
 	 *
-	 * @return string	Label
+	 *	@param	string	$key	Key
+	 *	@return string	Label
 	 */
-	function getDriverLabel()
+	function getDriverLabel($key='')
 	{
 		return $this->label;
 	}
 
 	/**
-	 * getDriverDesc
+	 *	getDriverDesc
 	 *
-	 * @return string	Description
+	 *	@param	string	$key	Key
+	 *	@return string	Description
 	 */
-	function getDriverDesc()
+	function getDriverDesc($key='')
 	{
 		return $this->desc;
 	}
@@ -125,21 +127,23 @@ class ImportCsv extends ModeleImports
 	}
 
 	/**
-	 * getDriverVersion
+	 *	getDriverVersion
 	 *
-	 * @return string	Driver version
+	 *	@param	string	$key	Key
+	 *	@return string	Driver version
 	 */
-	function getDriverVersion()
+	function getDriverVersion($key='')
 	{
 		return $this->version;
 	}
 
 	/**
-	 * getDriverLabel
+	 *	getDriverLabel
 	 *
-	 * @return string	Label of external lib
+	 *	@param	string	$key	Key
+	 *	@return string	Label of external lib
 	 */
-	function getLibLabel()
+	function getLibLabel($key='')
 	{
 		return $this->label_lib;
 	}
@@ -147,9 +151,10 @@ class ImportCsv extends ModeleImports
 	/**
 	 * getLibVersion
 	 *
-	 * @return string	Version of external lib
+	 *	@param	string	$key	Key
+	 *	@return string	Version of external lib
 	 */
-	function getLibVersion()
+	function getLibVersion($key='')
 	{
 		return $this->version_lib;
 	}
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index eda1702da5b..ba4c61555a4 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis@dolibarr.fr>
+/* Copyright (C) 2005-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin		<regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

From 3659887134cd7eb9b9ce47ffe9de82ae87b321d0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 2 Sep 2012 22:15:00 +0200
Subject: [PATCH 07/12] Fix: add list of files

---
 htdocs/admin/security_other.php | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index a77e70deb45..2d46976428f 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -24,6 +24,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 $langs->load("users");
@@ -46,7 +47,7 @@ if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    dol_add_file_process($upload_dir,0,0);
+    dol_add_file_process($upload_dir, 0, 0, 'userfile');
 }
 
 if (preg_match('/set_(.*)/',$action,$reg))
@@ -104,6 +105,17 @@ else if ($action == 'MAIN_ANTIVIRUS_PARAM')
     else $mesg=$langs->trans("RecordModifiedSuccessfully");
 }
 
+// Delete file
+else if ($action == 'delete')
+{
+	$langs->load("other");
+	$file = $conf->admin->dir_temp . '/' . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+	$ret=dol_delete_file($file);
+	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+	Header('Location: '.$_SERVER["PHP_SELF"]);
+	exit;
+}
 
 /*
  * View
@@ -218,10 +230,8 @@ print "</td></tr>";
 
 print '</table>';
 
-
 print '<br>';
 
-
 // Upload options
 $var=false;
 
@@ -311,12 +321,14 @@ print '</form>';
 
 print '</table>';
 
-print '</div>';
-
 // Form to test upload
 print '<br>';
 $formfile=new FormFile($db);
-$formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs->trans("FormToTestFileUploadForm"),0,0,1);
+$formfile->form_attach_new_file($_SERVER['PHP_SELF'], $langs->trans("FormToTestFileUploadForm"), 0, 0, 1);
+
+// List of document
+$filearray=dol_dir_list($upload_dir, "files", 0, '', '', 'name', SORT_ASC, 1);
+$formfile->list_of_documents($filearray, '', 'admin_temp', '');
 
 
 llxFooter();

From 7e5971f2d1add49fe1bfea9aca3c82d94a0d4eb5 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 13 Aug 2012 16:18:02 +0200
Subject: [PATCH 08/12] Fix: missing conf max_file_size

---
 htdocs/core/class/conf.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index fc44cc02332..97481a4edf4 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -382,6 +382,9 @@ class Conf
 		if (! isset($this->global->MAIN_MAX_DECIMALS_TOT))   $this->global->MAIN_MAX_DECIMALS_TOT=2;
 		if (! isset($this->global->MAIN_MAX_DECIMALS_SHOWN)) $this->global->MAIN_MAX_DECIMALS_SHOWN=8;
 
+		// Default max file size for upload
+		$this->maxfilesize = (! empty($this->global->MAIN_UPLOAD_DOC) ? $this->global->MAIN_UPLOAD_DOC * 1024 : 2097152);
+
 		// Timeouts
         if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT=10;
         if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) $this->global->MAIN_USE_RESPONSE_TIMEOUT=30;

From 0a88287b5092e06143f7702bcf32080bff0ca175 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 2 Sep 2012 22:16:57 +0200
Subject: [PATCH 09/12] Fix: strict mode circus

---
 htdocs/core/modules/livraison/modules_livraison.php | 2 +-
 htdocs/imports/class/import.class.php               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php
index 663c7198755..de778563c46 100644
--- a/htdocs/core/modules/livraison/modules_livraison.php
+++ b/htdocs/core/modules/livraison/modules_livraison.php
@@ -251,4 +251,4 @@ function delivery_order_pdf_create($db, $object, $modele, $outputlangs='')
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 40ec8d6a274..e3949eafd2e 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -96,7 +96,7 @@ class Import
 				require_once $file;
 				$module = new $classname($this->db);
 
-				if (is_array($module->import_code))
+				if (isset($module->import_code) && is_array($module->import_code))
 				{
 					foreach($module->import_code as $r => $value)
 					{
@@ -138,7 +138,7 @@ class Import
 						// Array of tables to import (key=alias, value=tablename)
 						$this->array_import_tables[$i]=$module->import_tables_array[$r];
 						// Array of tables creator field to import (key=alias, value=creator field)
-						$this->array_import_tables_creator[$i]=$module->import_tables_creator_array[$r];
+						$this->array_import_tables_creator[$i]=(isset($module->import_tables_creator_array[$r])?$module->import_tables_creator_array[$r]:'');
 						// Array of fields to import (key=field, value=label)
 						$this->array_import_fields[$i]=$module->import_fields_array[$r];
 						// Array of hidden fields to import (key=field, value=label)
@@ -150,7 +150,7 @@ class Import
 						// Tableau des alias a exporter (cle=champ, valeur=exemple)
 						$this->array_import_examplevalues[$i]=$module->import_examplevalues_array[$r];
 						// Tableau des regles de conversion d'une valeur depuis une autre source (cle=champ, valeur=tableau des regles)
-						$this->array_import_convertvalue[$i]=$module->import_convertvalue_array[$r];
+						$this->array_import_convertvalue[$i]=(isset($module->import_convertvalue_array[$r])?$module->import_convertvalue_array[$r]:'');
 						// Module
 						$this->array_import_module[$i]=$module;
 

From e36af3085ac299273093a0c926ba5fbca37b5e63 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 13 Aug 2012 20:53:48 +0200
Subject: [PATCH 10/12] New: add possibility to have a confirm dialog box with
 on/off buttons Qual: move some functions in lib_head.js

---
 htdocs/core/js/lib_head.js   | 128 ++++++++++++++++++++++++++++++++++-
 htdocs/core/lib/ajax.lib.php |  96 +++++---------------------
 2 files changed, 145 insertions(+), 79 deletions(-)

diff --git a/htdocs/core/js/lib_head.js b/htdocs/core/js/lib_head.js
index aee93a8f0dc..2f9de0c6e27 100644
--- a/htdocs/core/js/lib_head.js
+++ b/htdocs/core/js/lib_head.js
@@ -1,5 +1,5 @@
 // Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
-// Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+// Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -627,8 +627,134 @@ function hideMessage(fieldId,message) {
 	if (textbox.value == message) textbox.value = '';
 }
 
+/*
+ * 
+ */
+function setConstant(url, code, input, entity) {
+	$.get( url, {
+		action: "set",
+		name: code,
+		entity: entity
+	},
+	function() {
+		$("#set_" + code).hide();
+		$("#del_" + code).show();
+		$.each(input, function(type, data) {
+			// Enable another element
+			if (type == "disabled") {
+				$.each(data, function(key, value) {
+					$("#" + value).removeAttr("disabled");
+					if ($("#" + value).hasClass("butActionRefused") == true) {
+						$("#" + value).removeClass("butActionRefused");
+						$("#" + value).addClass("butAction");
+					}
+				});
+			// Show another element
+			} else if (type == "showhide" || type == "show") {
+				$.each(data, function(key, value) {
+					$("#" + value).show();
+				});
+			// Set another constant
+			} else if (type == "set") {
+				$.each(data, function(key, value) {
+					$("#set_" + key).hide();
+					$("#del_" + key).show();
+					$.get( url, {
+						action: "set",
+						name: key,
+						value: value,
+						entity: entity
+					});
+				});
+			}
+		});
+	});
+}
 
+/*
+ * 
+ */
+function delConstant(url, code, input, entity) {
+	$.get( url, {
+		action: "del",
+		name: code,
+		entity: entity
+	},
+	function() {
+		$("#del_" + code).hide();
+		$("#set_" + code).show();
+		$.each(input, function(type, data) {
+			// Disable another element
+			if (type == "disabled") {
+				$.each(data, function(key, value) {
+					$("#" + value).attr("disabled", true);
+					if ($("#" + value).hasClass("butAction") == true) {
+						$("#" + value).removeClass("butAction");
+						$("#" + value).addClass("butActionRefused");
+					}
+				});
+			// Hide another element
+			} else if (type == "showhide" || type == "hide") {
+				$.each(data, function(key, value) {
+					$("#" + value).hide();
+				});
+			// Delete another constant
+			} else if (type == "del") {
+				$.each(data, function(key, value) {
+					$("#del_" + value).hide();
+					$("#set_" + value).show();
+					$.get( url, {
+						action: "del",
+						name: value,
+						entity: entity
+					});
+				});
+			}
+		});
+	});
+}
 
+/*
+ * 
+ */
+function confirmConstantAction(action, url, code, input, box, entity, yesButton, noButton) {
+	$("#confirm_" + code)
+			.attr("title", box.title)
+			.html(box.content)
+			.dialog({
+				resizable: false,
+				height: 170,
+				width: 500,
+				modal: true,
+				buttons: [
+					{
+						text : yesButton,
+						click : function() {
+							if (action == "set") {
+								setConstant(url, code, input, entity);
+							} else if (action == "del") {
+								delConstant(url, code, input, entity);
+							}
+							// Close dialog
+							$(this).dialog("close");
+							// Execute another function
+							if (box.function) {
+								var fnName = box.function;
+								if (window.hasOwnProperty(fnName)) {
+									window[fnName]();
+								}
+							}
+						}
+					},
+					{
+						text : noButton,
+						click : function() {
+							$(this).dialog("close");
+						}
+					}
+				]
+			});
+}
 
 /* This is to allow to transform all select box into ajax autocomplete box
  * with just one line: $(function() { $( "#listmotifcons" ).combobox(); });
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index ebfb2cfdd8d..70a88760adf 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -277,7 +277,7 @@ function ajax_dialog($title,$message,$w=350,$h=150)
 	        modal: true,
 	        buttons: {
 	        	Ok: function() {
-					jQuery(this ).dialog(\'close\');
+					jQuery(this).dialog(\'close\');
 				}
 	        }
 	    });
@@ -360,92 +360,32 @@ function ajax_constantonoff($code,$input=array(),$entity=false)
 		$(function() {
 			var input = '.json_encode($input).';
 			var url = \''.DOL_URL_ROOT.'/core/ajax/constantonoff.php\';
+			var code = \''.$code.'\';
+			var entity = \''.$entity.'\';
+			var yesButton = "'.dol_escape_js($langs->transnoentities("Yes")).'";
+			var noButton = "'.dol_escape_js($langs->transnoentities("No")).'";
 
 			// Set constant
-			$("#set_'.$code.'").click(function() {
-				$.get( url, {
-					action: \'set\',
-					name: \''.$code.'\',
-					entity: \''.$entity.'\'
-				},
-				function() {
-					$("#set_'.$code.'").hide();
-					$("#del_'.$code.'").show();
-					$.each(input, function(type, data) {
-						// Enable another element
-						if (type == "disabled") {
-							$.each(data, function(key, value) {
-								$("#" + value).removeAttr("disabled");
-								if ($("#" + value).hasClass("butActionRefused") == true) {
-									$("#" + value).removeClass("butActionRefused");
-									$("#" + value).addClass("butAction");
-								}
-							});
-						// Show another element
-						} else if (type == "showhide" || type == "show") {
-							$.each(data, function(key, value) {
-								$("#" + value).show();
-							});
-						// Set another constant
-						} else if (type == "set") {
-							$.each(data, function(key, value) {
-								$("#set_" + key).hide();
-								$("#del_" + key).show();
-								$.get( url, {
-									action: \'set\',
-									name: key,
-									value: value,
-									entity: \''.$entity.'\'
-								});
-							});
-						}
-					});
-				});
+			$("#set_" + code).click(function() {
+				if (input.alert && input.alert.set) {
+					confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton);
+				} else {
+					setConstant(url, code, input, entity);
+				}
 			});
 
 			// Del constant
-			$("#del_'.$code.'").click(function() {
-				$.get( url, {
-					action: \'del\',
-					name: \''.$code.'\',
-					entity: \''.$entity.'\'
-				},
-				function() {
-					$("#del_'.$code.'").hide();
-					$("#set_'.$code.'").show();
-					$.each(input, function(type, data) {
-						// Disable another element
-						if (type == "disabled") {
-							$.each(data, function(key, value) {
-								$("#" + value).attr("disabled", true);
-								if ($("#" + value).hasClass("butAction") == true) {
-									$("#" + value).removeClass("butAction");
-									$("#" + value).addClass("butActionRefused");
-								}
-							});
-						// Hide another element
-						} else if (type == "showhide" || type == "hide") {
-							$.each(data, function(key, value) {
-								$("#" + value).hide();
-							});
-						// Delete another constant
-						} else if (type == "del") {
-							$.each(data, function(key, value) {
-								$("#del_" + value).hide();
-								$("#set_" + value).show();
-								$.get( url, {
-									action: \'del\',
-									name: value,
-									entity: \''.$entity.'\'
-								});
-							});
-						}
-					});
-				});
+			$("#del_" + code).click(function() {
+				if (input.alert && input.alert.del) {
+					confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton);
+				} else {
+					delConstant(url, code, input, entity);
+				}
 			});
 		});
 	</script>';
 
+	$out.= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>';
 	$out.= '<span id="set_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'hideobject':'').'">'.img_picto($langs->trans("Disabled"),'switch_off').'</span>';
 	$out.= '<span id="del_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'':'hideobject').'">'.img_picto($langs->trans("Enabled"),'switch_on').'</span>';
 

From 8a5fe809f441c4a163c343c3e5df161518c0e4f3 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 2 Sep 2012 22:31:25 +0200
Subject: [PATCH 11/12] Fix: remove deprecated function and avoid warnings

---
 htdocs/societe/canvas/actions_card_common.class.php | 4 ++--
 htdocs/societe/soc.php                              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 0e22c08b86d..3faba3cf2d8 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -436,7 +436,7 @@ abstract class ActionsCardCommon
                 $res=dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
-            $modCodeClient = new $module;
+            $modCodeClient = new $module($db);
             $this->tpl['auto_customercode'] = $modCodeClient->code_auto;
             // We verified if the tag prefix is used
             if ($modCodeClient->code_auto) $this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed();
@@ -714,4 +714,4 @@ abstract class ActionsCardCommon
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index b08667613af..156133c9252 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1013,7 +1013,7 @@ else
                 $res=dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
-            $modCodeClient = new $module;
+            $modCodeClient = new $module($db);
             // We verified if the tag prefix is used
             if ($modCodeClient->code_auto)
             {
@@ -1031,7 +1031,7 @@ else
                 $res=dol_include_once($dirroot.$module.'.php');
                 if ($res) break;
             }
-            $modCodeFournisseur = new $module;
+            $modCodeFournisseur = new $module($db);
             // On verifie si la balise prefix est utilisee
             if ($modCodeFournisseur->code_auto)
             {

From d2ae90f938c6c34022bfec61196431ee2c22b38f Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 2 Sep 2012 22:48:52 +0200
Subject: [PATCH 12/12] Fix: strict mode everywhere

---
 htdocs/core/db/mysql.class.php                | 14 +++++------
 htdocs/core/db/mysqli.class.php               | 14 +++++------
 htdocs/core/lib/ajax.lib.php                  |  2 +-
 htdocs/core/lib/functions.lib.php             | 19 ++++++++++-----
 htdocs/core/modules/DolibarrModules.class.php | 16 ++++++-------
 .../modules/expedition/modules_expedition.php |  2 +-
 .../modules/livraison/modules_livraison.php   |  2 +-
 htdocs/imports/import.php                     | 24 ++++++++++++-------
 htdocs/main.inc.php                           |  2 +-
 9 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php
index 8d6b08d90de..7bb8b77f399 100644
--- a/htdocs/core/db/mysql.class.php
+++ b/htdocs/core/db/mysql.class.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2001      Fabien Seisen        <seisen@linuxfr.org>
- * Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+/* Copyright (C) 2001		Fabien Seisen			<seisen@linuxfr.org>
+ * Copyright (C) 2002-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -714,10 +714,10 @@ class DoliDBMysql
 		global $conf;
 
 		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-		$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+		$cryptType = (isset($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
 
 		//Encryption key
-		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+		$cryptKey = (! empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
 
 		$return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
 
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 3db424d4db2..4d4b9d9be1b 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2001      Fabien Seisen        <seisen@linuxfr.org>
- * Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+/* Copyright (C) 2001		Fabien Seisen			<seisen@linuxfr.org>
+ * Copyright (C) 2002-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -709,10 +709,10 @@ class DoliDBMysqli
         global $conf;
 
         // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+        $cryptType = (isset($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
 
         //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+        $cryptKey = (! empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
 
         $return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
 
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 70a88760adf..e5b8a1d5f12 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -350,7 +350,7 @@ function ajax_combobox($htmlname, $event=array())
  * 	@param	int		$entity		Entity to set
  * 	@return	void
  */
-function ajax_constantonoff($code,$input=array(),$entity=false)
+function ajax_constantonoff($code, $input=array(), $entity=false)
 {
 	global $conf, $langs;
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index cccc2429817..86ad6f2a2fb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3033,12 +3033,13 @@ function get_exdir($num,$level=3,$alpha=0,$withoutslash=0)
 /**
  *	Creation of a directory (this can create recursive subdir)
  *
- *	@param	string	$dir	Directory to create (Separator must be '/'. Example: '/mydir/mysubdir')
- *	@return int         	< 0 if KO, 0 = already exists, > 0 if OK
+ *	@param	string	$dir		Directory to create (Separator must be '/'. Example: '/mydir/mysubdir')
+ *	@param	string	$dataroot	Data root directory (to avoid having the data root in the loop)
+ *	@return int         		< 0 if KO, 0 = already exists, > 0 if OK
  */
-function dol_mkdir($dir)
+function dol_mkdir($dir, $dataroot='')
 {
-	global $conf;
+	global $db, $conf;
 
 	dol_syslog("functions.lib::dol_mkdir: dir=".$dir,LOG_INFO);
 
@@ -3048,8 +3049,14 @@ function dol_mkdir($dir)
 	$nberr=0;
 	$nbcreated=0;
 
-	$ccdir = '';
-	$cdir = explode("/",$dir);
+	$ccdir='';
+	if (! empty($dataroot)) {
+		// Remove data root from loop
+		$dir = str_replace($dataroot.'/', '', $dir);
+		$ccdir = $dataroot.'/';
+	}
+
+	$cdir = explode("/", $dir);
 	$num=count($cdir);
 	for ($i = 0; $i < $num; $i++)
 	{
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index ab33d464c8d..0e676200fcb 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1170,7 +1170,7 @@ abstract class DolibarrModules
 
         $err=0;
 
-        if (is_array($this->dirs))
+        if (isset($this->dirs) && is_array($this->dirs) && ! empty($this->dirs))
         {
             foreach ($this->dirs as $key => $value)
             {
@@ -1184,19 +1184,19 @@ abstract class DolibarrModules
                     $subname   = empty($this->dirs[$key][3])?'':strtoupper($this->dirs[$key][3]); // Add submodule name (ex: $conf->module->submodule->dir_output)
                     $forcename = empty($this->dirs[$key][4])?'':strtoupper($this->dirs[$key][4]); // Change the module name if different
 
-                    if ($forcename) $constname = 'MAIN_MODULE_'.$forcename."_DIR_";
-                    if ($subname)   $constname = $constname.$subname."_";
+                    if (! empty($forcename)) $constname = 'MAIN_MODULE_'.$forcename."_DIR_";
+                    if (! empty($subname))   $constname = $constname.$subname."_";
 
-                    $name      = $constname.strtoupper($this->dirs[$key][0]);
+                    $name = $constname.strtoupper($this->dirs[$key][0]);
                 }
 
                 // Define directory full path ($dir must start with "/")
                 if (empty($conf->global->MAIN_MODULE_MULTICOMPANY) || $conf->entity == 1) $fulldir = DOL_DATA_ROOT.$dir;
                 else $fulldir = DOL_DATA_ROOT."/".$conf->entity.$dir;
                 // Create dir if it does not exists
-                if ($fulldir && ! file_exists($fulldir))
+                if (! empty($fulldir) && ! file_exists($fulldir))
                 {
-                    if (dol_mkdir($fulldir) < 0)
+                    if (dol_mkdir($fulldir, DOL_DATA_ROOT) < 0)
                     {
                         $this->error = $langs->trans("ErrorCanNotCreateDir",$fulldir);
                         dol_syslog(get_class($this)."::_init ".$this->error, LOG_ERR);
@@ -1205,9 +1205,9 @@ abstract class DolibarrModules
                 }
 
                 // Define the constant in database if requested (not the default mode)
-                if ($addtodatabase)
+                if (! empty($addtodatabase))
                 {
-                    $result = $this->insert_dirs($name,$dir);
+                    $result = $this->insert_dirs($name, $dir);
                     if ($result) $err++;
                 }
             }
diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
index f650e4bd84f..a40fddc9ef6 100644
--- a/htdocs/core/modules/expedition/modules_expedition.php
+++ b/htdocs/core/modules/expedition/modules_expedition.php
@@ -246,4 +246,4 @@ function expedition_pdf_create($db, $object, $modele, $outputlangs)
 		return -1;
     }
 }
-?>
+?>
\ No newline at end of file
diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php
index de778563c46..663c7198755 100644
--- a/htdocs/core/modules/livraison/modules_livraison.php
+++ b/htdocs/core/modules/livraison/modules_livraison.php
@@ -251,4 +251,4 @@ function delivery_order_pdf_create($db, $object, $modele, $outputlangs='')
 	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index c9bd77bacb6..5b28b54af5a 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -35,8 +35,8 @@ $langs->load("exports");
 $langs->load("errors");
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'import',$origin_id,'');
+if (! empty($user->societe_id)) $socid=$user->societe_id;
+$result=restrictedArea($user, 'import');
 
 $entitytoicon=array(
 	'invoice'=>'bill','invoice_line'=>'bill',
@@ -68,7 +68,8 @@ $entitytolang=array(		// Translation code
 $datatoimport		= GETPOST('datatoimport');
 $format				= GETPOST('format');
 $filetoimport		= GETPOST('filetoimport');
-$action				= GETPOST('action');
+$action				= GETPOST('action','alpha');
+$confirm			= GETPOST('confirm','alpha');
 $step				= (GETPOST('step') ? GETPOST('step') : 1);
 $import_name		= GETPOST('import_name');
 $hexa				= GETPOST('hexa');
@@ -92,7 +93,7 @@ foreach($fieldsarray as $elem)
 {
 	$tabelem=explode('=',$elem,2);
 	$key=$tabelem[0];
-	$val=$tabelem[1];
+	$val=(isset($tabelem[1])?$tabelem[1]:'');
 	if ($key && $val)
 	{
 		$array_match_file_to_database[$key]=$val;
@@ -192,7 +193,7 @@ if ($action == 'add_import_model')
 
 if ($step == 3 && $datatoimport)
 {
-	if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
+	if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
 	{
 		dol_mkdir($conf->import->dir_temp);
 		$nowyearmonth=dol_print_date(dol_now(),'%Y%m%d%H%M%S');
@@ -451,6 +452,14 @@ if ($step == 3 && $datatoimport)
 
 	dol_fiche_head($head, 'step3', $langs->trans("NewImport"));
 
+	/*
+	 * Confirm delete file
+	 */
+	if ($action == 'delete')
+	{
+		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?urlfile='.urlencode(GETPOST('urlfile')).'&step=3'.$param, $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+		if ($ret == 'html') print '<br>';
+	}
 
 	print '<table width="100%" class="border">';
 
@@ -511,7 +520,7 @@ if ($step == 3 && $datatoimport)
 	print "</tr>\n";
 
 	// Search available imports
-	$filearray=dol_dir_list($conf->import->dir_temp,'files',0,'','','name',SORT_DESC);
+	$filearray=dol_dir_list($conf->import->dir_temp, 'files', 0, '', '', 'name', SORT_DESC);
 	if (count($filearray) > 0)
 	{
 		$dir=$conf->import->dir_temp;
@@ -545,8 +554,7 @@ if ($step == 3 && $datatoimport)
 			// Affiche date fichier
 			print '<td align="right">'.dol_print_date(dol_filemtime($dir.'/'.$file),'dayhour').'</td>';
 			// Del button
-			print '<td align="right"><a href="'.DOL_URL_ROOT.'/document.php?action=remove_file&step=3'.$param.'&modulepart='.$modulepart.'&file='.urlencode($relativepath);
-			print '&urlsource='.urlencode($urlsource);
+			print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=delete&step=3'.$param.'&urlfile='.urlencode($relativepath);
 			print '">'.img_delete().'</a></td>';
 			// Action button
 			print '<td align="right">';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 06e0d7df71f..3c1b9e99493 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1000,7 +1000,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js"></script>'."\n";
             }
             // jQuery File Upload
-            if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD))
+            if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) || defined('REQUIRE_JQUERY_FILEUPLOAD'))
             {
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/template/tmpl.min.js"></script>'."\n";
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js"></script>'."\n";