From d23fc2b8e516bf783f0408c3a44205952b3091ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Oct 2011 16:02:18 +0200
Subject: [PATCH] Oops. Forget to publish this. Commit again.

---
 .../adherents/admin/adherent_extrafields.php  |   2 +-
 htdocs/admin/tools/dolibarr_export.php        |  28 +-
 htdocs/admin/tools/export.php                 | 521 +++++++++++-------
 .../modules/facture/doc/pdf_crabe.modules.php |   2 +-
 .../propale/pdf_propale_azur.modules.php      |   4 +-
 htdocs/lib/files.lib.php                      |  50 +-
 htdocs/societe/admin/societe_extrafields.php  |   2 +-
 7 files changed, 397 insertions(+), 212 deletions(-)

diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 004b5b41c3d..8615877fefb 100755
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -144,7 +144,7 @@ if ($action == 'create')
 	// Label
 	print '<tr><td class="fieldrequired" required>'.$langs->trans("Label").'</td><td class="valeur"><input type="text" name="label" size="40" value="'.GETPOST('label').'"></td></tr>';
 	// Code
-	print '<tr><td class="fieldrequired" required>'.$langs->trans("AttributeCode").' ('.$langs->trans("AlphaNumOnlyCharsAndNoSpace").')</td><td class="valeur"><input type="text" name="attrname" size="10" value"'.GETPOST('attrname').'"></td></tr>';
+	print '<tr><td class="fieldrequired" required>'.$langs->trans("AttributeCode").' ('.$langs->trans("AlphaNumOnlyCharsAndNoSpace").')</td><td class="valeur"><input type="text" name="attrname" size="10" value="'.GETPOST('attrname').'"></td></tr>';
 	// Type
 	print '<tr><td class="fieldrequired" required>'.$langs->trans("Type").'</td><td class="valeur">';
     print $form->selectarray('type',$type2label,GETPOST('type'));
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 972f18530d6..bbb8b286608 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -43,13 +43,25 @@ llxHeader('','','EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad');
 ?>
 <script type="text/javascript" language="javascript">
 jQuery(document).ready(function() {
-	jQuery("#mysql_options").hide();
-	jQuery("#postgresql_options").hide();
+
+	function hideoptions () {
+		jQuery("#mysql_options").hide();
+		jQuery("#mysql_options_nobin").hide();
+		jQuery("#postgresql_options").hide();
+	}
+
+	hideoptions();
 
 	jQuery("#radio_dump_mysql").click(function() {
+		hideoptions();
 		jQuery("#mysql_options").show();
 	});
+	jQuery("#radio_dump_mysql_nobin").click(function() {
+		hideoptions();
+		jQuery("#mysql_options_nobin").show();
+	});
 	jQuery("#radio_dump_postgresql").click(function() {
+		hideoptions();
 		jQuery("#postgresql_options").show();
 	});
 });
@@ -79,7 +91,7 @@ if ($_GET["msg"])
 	name="token" value="<?php echo $_SESSION['newtoken']; ?>" /> <input
 	type="hidden" name="export_type" value="server" />
 
-<fieldset id="fieldsetexport"><!-- LDR -->
+<fieldset id="fieldsetexport">
 <?php print '<legend>'.$langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b></legend>'; ?>
 <table>
 	<tr>
@@ -94,7 +106,12 @@ if ($_GET["msg"])
 			<div class="formelementrow"><input type="radio" name="what" value="mysql" id="radio_dump_mysql" />
 			<label for="radio_dump_mysql">MySQL	Dump (mysqldump)</label>
 			</div>
+			<?php if (! empty($conf->global->MAIN_FEATURES_LEVEL)) { ?>
+			<div class="formelementrow"><input type="radio" name="what" value="mysqlnobin" id="radio_dump_mysql_nobin" />
+			<label for="radio_dump_mysql">MySQL	Dump (php) <?php print img_warning('Backup can\'t be guaranted with this method. Prefer previous one'); ?></label>
+			</div>
 			<?php
+			}
 		}
 		else if ($db->label == 'PostgreSQL')
 		{
@@ -327,7 +344,6 @@ print "\n";
 $result=$formfile->show_documents('systemtools','backup',$conf->admin->dir_output.'/backup',$_SERVER['PHP_SELF'],0,1,'',1,0,0,54,0,'',$langs->trans("PreviousDumpFiles"));
 //if ($result) print '<br><br>';
 
-$db->close();
-
 llxFooter();
-?>
\ No newline at end of file
+
+$db->close();
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 25214f40a0c..9714c16882b 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -31,19 +31,18 @@ $file=isset($_POST['filename_template']) ? $_POST['filename_template'] : '';
 
 $langs->load("admin");
 
-if (! $user->admin)
-  accessforbidden();
+if (! $user->admin) accessforbidden();
 
 
 if ($file && ! $what)
 {
-   //print DOL_URL_ROOT.'/dolibarr_export.php';
-	header("Location: ".DOL_URL_ROOT.'/admin/tools/dolibarr_export.php?msg='.urlencode($langs->trans("ErrorFieldRequired",$langs->transnoentities("ExportMethod"))));
-/*
-	print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("ExportMethod")).'</div>';
-	print '<br>';
-*/
-	exit;
+    //print DOL_URL_ROOT.'/dolibarr_export.php';
+    header("Location: ".DOL_URL_ROOT.'/admin/tools/dolibarr_export.php?msg='.urlencode($langs->trans("ErrorFieldRequired",$langs->transnoentities("ExportMethod"))));
+    /*
+     print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("ExportMethod")).'</div>';
+     print '<br>';
+     */
+    exit;
 }
 
 
@@ -84,199 +83,223 @@ $time_start = time();
 // MYSQL
 if ($what == 'mysql')
 {
-	$cmddump=$_POST["mysqldump"];
-	if ($cmddump)
-	{
-		dolibarr_set_const($db, 'SYSTEMTOOLS_MYSQLDUMP', $cmddump,'chaine',0,'',$conf->entity);
-	}
+    $cmddump=$_POST["mysqldump"];
+    if ($cmddump)
+    {
+        dolibarr_set_const($db, 'SYSTEMTOOLS_MYSQLDUMP', $cmddump,'chaine',0,'',$conf->entity);
+    }
 
-	$outputdir  = $conf->admin->dir_output.'/backup';
-	$outputfile = $outputdir.'/'.$file;
-	// for compression format, we add extension
-	$compression=isset($_POST['compression']) ? $_POST['compression'] : 'none';
-	if ($compression == 'gz') $outputfile.='.gz';
-	if ($compression == 'bz') $outputfile.='.bz2';
-	$outputerror = $outputfile.'.err';
-	dol_mkdir($conf->admin->dir_output.'/backup');
+    $outputdir  = $conf->admin->dir_output.'/backup';
+    $outputfile = $outputdir.'/'.$file;
+    // for compression format, we add extension
+    $compression=isset($_POST['compression']) ? $_POST['compression'] : 'none';
+    if ($compression == 'gz') $outputfile.='.gz';
+    if ($compression == 'bz') $outputfile.='.bz2';
+    $outputerror = $outputfile.'.err';
+    dol_mkdir($conf->admin->dir_output.'/backup');
 
-	// Parameteres execution
-	$command=$cmddump;
-	if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+    // Parameteres execution
+    $command=$cmddump;
+    if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
 
-	//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
-	$param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
-	$param.=" -u ".$dolibarr_main_db_user;
-	if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port;
-	if (! $_POST["use_transaction"]) $param.=" -l --single-transaction";
-	if ($_POST["disable_fk"])        $param.=" -K";
-	if ($_POST["sql_compat"] && $_POST["sql_compat"] != 'NONE') $param.=" --compatible=".$_POST["sql_compat"];
-	if ($_POST["drop_database"])     $param.=" --add-drop-database";
-	if ($_POST["sql_structure"])
-	{
-		if ($_POST["drop"])			 $param.=" --add-drop-table";
-	}
-	else
-	{
-		$param.=" -t";
-	}
-	if ($_POST["sql_data"])
-	{
-		$param.=" --tables";
-		if ($_POST["showcolumns"])	$param.=" -c";
-		if ($_POST["extended_ins"])	$param.=" -e";
-		if ($_POST["delayed"])	 	$param.=" --delayed-insert";
-		if ($_POST["sql_ignore"])	$param.=" --insert-ignore";
-		if ($_POST["hexforbinary"])	$param.=" --hex-blob";
-	}
-	else
-	{
-		$param.=" -d";
-	}
-	$paramcrypted=$param;
-	$paramclear=$param;
-	if (! empty($dolibarr_main_db_pass))
-	{
-		$paramcrypted.=" -p".preg_replace('/./i','*',$dolibarr_main_db_pass);
-		$paramclear.=" -p".$dolibarr_main_db_pass;
-	}
+    //$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
+    $param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
+    $param.=" -u ".$dolibarr_main_db_user;
+    if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port;
+    if (! $_POST["use_transaction"]) $param.=" -l --single-transaction";
+    if ($_POST["disable_fk"])        $param.=" -K";
+    if ($_POST["sql_compat"] && $_POST["sql_compat"] != 'NONE') $param.=" --compatible=".$_POST["sql_compat"];
+    if ($_POST["drop_database"])     $param.=" --add-drop-database";
+    if ($_POST["sql_structure"])
+    {
+        if ($_POST["drop"])			 $param.=" --add-drop-table";
+    }
+    else
+    {
+        $param.=" -t";
+    }
+    if ($_POST["sql_data"])
+    {
+        $param.=" --tables";
+        if ($_POST["showcolumns"])	$param.=" -c";
+        if ($_POST["extended_ins"])	$param.=" -e";
+        if ($_POST["delayed"])	 	$param.=" --delayed-insert";
+        if ($_POST["sql_ignore"])	$param.=" --insert-ignore";
+        if ($_POST["hexforbinary"])	$param.=" --hex-blob";
+    }
+    else
+    {
+        $param.=" -d";
+    }
+    $paramcrypted=$param;
+    $paramclear=$param;
+    if (! empty($dolibarr_main_db_pass))
+    {
+        $paramcrypted.=" -p".preg_replace('/./i','*',$dolibarr_main_db_pass);
+        $paramclear.=" -p".$dolibarr_main_db_pass;
+    }
 
-	print '<b>'.$langs->trans("RunCommandSummary").':</b><br>'."\n";
-	print '<textarea rows="'.ROWS_2.'" cols="120">'.$command." ".$paramcrypted.'</textarea><br>'."\n";
+    print '<b>'.$langs->trans("RunCommandSummary").':</b><br>'."\n";
+    print '<textarea rows="'.ROWS_2.'" cols="120">'.$command." ".$paramcrypted.'</textarea><br>'."\n";
 
-	print '<br>';
+    print '<br>';
 
 
-	// Now run command and show result
-	print '<b>'.$langs->trans("BackupResult").':</b> ';
+    // Now run command and show result
+    print '<b>'.$langs->trans("BackupResult").':</b> ';
 
-	$errormsg='';
+    $errormsg='';
 
-	$result=dol_mkdir($outputdir);
+    $result=dol_mkdir($outputdir);
 
-	// Debut appel methode execution
-	$fullcommandcrypted=$command." ".$paramcrypted." 2>&1";
-	$fullcommandclear=$command." ".$paramclear." 2>&1";
-	if ($compression == 'none') $handle = fopen($outputfile, 'w');
-	if ($compression == 'gz')   $handle = gzopen($outputfile, 'w');
-	if ($compression == 'bz')   $handle = bzopen($outputfile, 'w');
+    // Debut appel methode execution
+    $fullcommandcrypted=$command." ".$paramcrypted." 2>&1";
+    $fullcommandclear=$command." ".$paramclear." 2>&1";
+    if ($compression == 'none') $handle = fopen($outputfile, 'w');
+    if ($compression == 'gz')   $handle = gzopen($outputfile, 'w');
+    if ($compression == 'bz')   $handle = bzopen($outputfile, 'w');
 
-	if ($handle)
-	{
-	    $ok=0;
-		dol_syslog("Run command ".$fullcommandcrypted);
-		$handlein = popen($fullcommandclear, 'r');
-		while (!feof($handlein))
-		{
-			$read = fgets($handlein);
-			fwrite($handle,$read);
-			if (preg_match('/-- Dump completed/i',$read)) $ok=1;
-		}
-		pclose($handlein);
+    if ($handle)
+    {
+        $ok=0;
+        dol_syslog("Run command ".$fullcommandcrypted);
+        $handlein = popen($fullcommandclear, 'r');
+        while (!feof($handlein))
+        {
+            $read = fgets($handlein);
+            fwrite($handle,$read);
+            if (preg_match('/-- Dump completed/i',$read)) $ok=1;
+        }
+        pclose($handlein);
 
-		if ($compression == 'none') fclose($handle);
-		if ($compression == 'gz')   gzclose($handle);
-		if ($compression == 'bz')   bzclose($handle);
+        if ($compression == 'none') fclose($handle);
+        if ($compression == 'gz')   gzclose($handle);
+        if ($compression == 'bz')   bzclose($handle);
 
-		if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-	}
-	else
-	{
-		$langs->load("errors");
-		dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-		$errormsg=$langs->trans("ErrorFailedToWriteInDir");
-	}
-	// Get errorstring
-	if ($compression == 'none') $handle = fopen($outputfile, 'r');
-	if ($compression == 'gz')   $handle = gzopen($outputfile, 'r');
-	if ($compression == 'bz')   $handle = bzopen($outputfile, 'r');
-	if ($handle)
-	{
-		// Get 2048 first chars of error message.
-		$errormsg = fgets($handle,2048);
-		// Close file
-		if ($compression == 'none') fclose($handle);
-		if ($compression == 'gz')   gzclose($handle);
-		if ($compression == 'bz')   bzclose($handle);
-		if ($ok && preg_match('/^-- MySql/i',$errormsg)) $errormsg='';	// Pas erreur
-		else
-		{
-			// Renommer fichier sortie en fichier erreur
-			//print "$outputfile -> $outputerror";
-			@dol_delete_file($outputerror,1);
-			@rename($outputfile,$outputerror);
-			// Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
-			if (! $errormsg) $errormsg=$langs->trans("ErrorFailedToRunExternalCommand");
-		}
-	}
-	// Fin execution commande
+        if (! empty($conf->global->MAIN_UMASK))
+        @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+    }
+    else
+    {
+        $langs->load("errors");
+        dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
+        $errormsg=$langs->trans("ErrorFailedToWriteInDir");
+    }
+    // Get errorstring
+    if ($compression == 'none') $handle = fopen($outputfile, 'r');
+    if ($compression == 'gz')   $handle = gzopen($outputfile, 'r');
+    if ($compression == 'bz')   $handle = bzopen($outputfile, 'r');
+    if ($handle)
+    {
+        // Get 2048 first chars of error message.
+        $errormsg = fgets($handle,2048);
+        // Close file
+        if ($compression == 'none') fclose($handle);
+        if ($compression == 'gz')   gzclose($handle);
+        if ($compression == 'bz')   bzclose($handle);
+        if ($ok && preg_match('/^-- MySql/i',$errormsg)) $errormsg='';	// Pas erreur
+        else
+        {
+            // Renommer fichier sortie en fichier erreur
+            //print "$outputfile -> $outputerror";
+            @dol_delete_file($outputerror,1);
+            @rename($outputfile,$outputerror);
+            // Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
+            if (! $errormsg) $errormsg=$langs->trans("ErrorFailedToRunExternalCommand");
+        }
+    }
+    // Fin execution commande
+}
+
+if ($what == 'mysqlnobin')
+{
+    $outputdir  = $conf->admin->dir_output.'/backup';
+    $outputfile = $outputdir.'/'.$file;
+    $outputfiletemp = $outputfile.'-TMP.sql';
+    // for compression format, we add extension
+    $compression=isset($_POST['compression']) ? $_POST['compression'] : 'none';
+    if ($compression == 'gz') $outputfile.='.gz';
+    if ($compression == 'bz') $outputfile.='.bz2';
+    $outputerror = $outputfile.'.err';
+    dol_mkdir($conf->admin->dir_output.'/backup');
+
+    if ($compression == 'gz' or $compression == 'bz')
+    {
+        backup_tables($outputfiletemp);
+        dol_compress_file($outputfiletemp, $outputfile, $compression);
+        unlink($outputfiletemp);
+    }
+    else
+    {
+        backup_tables($outputfile);
+    }
 }
 
 // POSTGRESQL
 if ($what == 'postgresql')
 {
-	$cmddump=$_POST["postgresqldump"];
-	if ($cmddump)
-	{
-		dolibarr_set_const($db, 'SYSTEMTOOLS_POSTGRESQLDUMP', $cmddump,'chaine',0,'',$conf->entity);
-	}
+    $cmddump=$_POST["postgresqldump"];
+    if ($cmddump)
+    {
+        dolibarr_set_const($db, 'SYSTEMTOOLS_POSTGRESQLDUMP', $cmddump,'chaine',0,'',$conf->entity);
+    }
 
-	$outputdir  = $conf->admin->dir_output.'/backup';
-	$outputfile = $outputdir.'/'.$file;
-	// for compression format, we add extension
-	$compression=isset($_POST['compression']) ? $_POST['compression'] : 'none';
-	if ($compression == 'gz') $outputfile.='.gz';
-	if ($compression == 'bz') $outputfile.='.bz2';
-	$outputerror = $outputfile.'.err';
-	dol_mkdir($conf->admin->dir_output.'/backup');
+    $outputdir  = $conf->admin->dir_output.'/backup';
+    $outputfile = $outputdir.'/'.$file;
+    // for compression format, we add extension
+    $compression=isset($_POST['compression']) ? $_POST['compression'] : 'none';
+    if ($compression == 'gz') $outputfile.='.gz';
+    if ($compression == 'bz') $outputfile.='.bz2';
+    $outputerror = $outputfile.'.err';
+    dol_mkdir($conf->admin->dir_output.'/backup');
 
-	// Parameteres execution
-	$command=$cmddump;
-	if (preg_match("/\s/",$command)) $command=$command=escapeshellarg($command);	// Use quotes on command
+    // Parameteres execution
+    $command=$cmddump;
+    if (preg_match("/\s/",$command)) $command=$command=escapeshellarg($command);	// Use quotes on command
 
-	//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
-	$param=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
-	$param.=" -U ".$dolibarr_main_db_user;
-	if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port;
-	if ($_POST["sql_compat"] && $_POST["sql_compat"] == 'ANSI') $param.="  --disable-dollar-quoting";
-	if ($_POST["drop_database"])     $param.=" -c -C";
-	if ($_POST["sql_structure"])
-	{
-		if ($_POST["drop"])			 $param.=" --add-drop-table";
-		if (empty($_POST["sql_data"])) $param.=" -s";
-	}
-	if ($_POST["sql_data"])
-	{
-		if (empty($_POST["sql_structure"]))	 	$param.=" -a";
-		if ($_POST["showcolumns"])	$param.=" -c";
-	}
-	$param.=' -f "'.$outputfile.'"';
-	//if ($compression == 'none')
-	if ($compression == 'gz')   $param.=' -Z 9';
-	//if ($compression == 'bz')
-	$paramcrypted=$param;
-	$paramclear=$param;
-	/*if (! empty($dolibarr_main_db_pass))
-	{
-		$paramcrypted.=" -W".preg_replace('/./i','*',$dolibarr_main_db_pass);
-		$paramclear.=" -W".$dolibarr_main_db_pass;
-	}*/
-	$paramcrypted.=" -w ".$dolibarr_main_db_name;
-	$paramclear.=" -w ".$dolibarr_main_db_name;
+    //$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
+    $param=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
+    $param.=" -U ".$dolibarr_main_db_user;
+    if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port;
+    if ($_POST["sql_compat"] && $_POST["sql_compat"] == 'ANSI') $param.="  --disable-dollar-quoting";
+    if ($_POST["drop_database"])     $param.=" -c -C";
+    if ($_POST["sql_structure"])
+    {
+        if ($_POST["drop"])			 $param.=" --add-drop-table";
+        if (empty($_POST["sql_data"])) $param.=" -s";
+    }
+    if ($_POST["sql_data"])
+    {
+        if (empty($_POST["sql_structure"]))	 	$param.=" -a";
+        if ($_POST["showcolumns"])	$param.=" -c";
+    }
+    $param.=' -f "'.$outputfile.'"';
+    //if ($compression == 'none')
+    if ($compression == 'gz')   $param.=' -Z 9';
+    //if ($compression == 'bz')
+    $paramcrypted=$param;
+    $paramclear=$param;
+    /*if (! empty($dolibarr_main_db_pass))
+     {
+     $paramcrypted.=" -W".preg_replace('/./i','*',$dolibarr_main_db_pass);
+     $paramclear.=" -W".$dolibarr_main_db_pass;
+     }*/
+    $paramcrypted.=" -w ".$dolibarr_main_db_name;
+    $paramclear.=" -w ".$dolibarr_main_db_name;
 
-	print $langs->trans("RunCommandSummaryToLaunch").':<br>'."\n";
-	print '<textarea rows="'.ROWS_3.'" cols="120">'.$command." ".$paramcrypted.'</textarea><br>'."\n";
+    print $langs->trans("RunCommandSummaryToLaunch").':<br>'."\n";
+    print '<textarea rows="'.ROWS_3.'" cols="120">'.$command." ".$paramcrypted.'</textarea><br>'."\n";
 
-	print '<br>';
+    print '<br>';
 
 
-	// Now show to ask to run command
-	print $langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user);
+    // Now show to ask to run command
+    print $langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user);
 
-	print '<br>';
-	print '<br>';
+    print '<br>';
+    print '<br>';
 
-	$what='';
+    $what='';
 }
 
 
@@ -285,29 +308,29 @@ if ($what == 'postgresql')
 // Si on a demande une generation
 if ($what)
 {
-	if ($errormsg)
-	{
-		print '<div class="error">'.$langs->trans("Error")." : ".$errormsg.'</div>';
-//		print '<a href="'.DOL_URL_ROOT.$relativepatherr.'">'.$langs->trans("DownloadErrorFile").'</a><br>';
-		print '<br>';
-		print '<br>';
-	}
-	else
-	{
-		print '<div class="ok">';
-		print $langs->trans("BackupFileSuccessfullyCreated").'.<br>';
-		print $langs->trans("YouCanDownloadBackupFile");
-		print '</div>';
-		print '<br>';
-	}
+    if ($errormsg)
+    {
+        print '<div class="error">'.$langs->trans("Error")." : ".$errormsg.'</div>';
+        //		print '<a href="'.DOL_URL_ROOT.$relativepatherr.'">'.$langs->trans("DownloadErrorFile").'</a><br>';
+        print '<br>';
+        print '<br>';
+    }
+    else
+    {
+        print '<div class="ok">';
+        print $langs->trans("BackupFileSuccessfullyCreated").'.<br>';
+        print $langs->trans("YouCanDownloadBackupFile");
+        print '</div>';
+        print '<br>';
+    }
 }
 
 $result=$formfile->show_documents('systemtools','backup',$conf->admin->dir_output.'/backup',$_SERVER['PHP_SELF'],0,1,'',1,0,0,54,0,'',$langs->trans("PreviousDumpFiles"));
 
 if ($result == 0)
 {
-	print $langs->trans("NoBackupFileAvailable").'<br>';
-	print $langs->trans("ToBuildBackupFileClickHere",DOL_URL_ROOT.'/admin/tools/dolibarr_export.php').'<br>';
+    print $langs->trans("NoBackupFileAvailable").'<br>';
+    print $langs->trans("ToBuildBackupFileClickHere",DOL_URL_ROOT.'/admin/tools/dolibarr_export.php').'<br>';
 }
 
 print '<br>';
@@ -315,4 +338,118 @@ print '<br>';
 $time_end = time();
 
 llxFooter();
+
+$db->close();
+
+
+
+// MYSQL NO BINARIES (only php)
+/**	Backup the db OR just a table without mysqldump binary (does not require any exec permission)
+ *	Author: David Walsh (http://davidwalsh.name/backup-mysql-database-php)
+ *	Updated and enhanced by Stephen Larroque (lrq3000) and by the many commentators from the blog
+ *
+ *	@param	string	$outputfile		Output file name
+ *	@param	string	$tables			Table name or '*' for all
+ *	@return	int						<0 if KO, >0 if OK
+ *
+ *	FIXME Must add directives to have restore working even with constraints not loaded into correct order, etc...
+ */
+function backup_tables($outputfile, $tables='*')
+{
+    global $db, $langs;
+    global $errormsg;
+
+    // Set to UTF-8
+    $db->query('SET NAMES utf8');
+    $db->query('SET CHARACTER SET utf8');
+
+    //get all of the tables
+    if ($tables == '*')
+    {
+        $tables = array();
+        $result = $db->query('SHOW FULL TABLES WHERE Table_type = \'BASE TABLE\'');
+        while($row = $db->fetch_row($result))
+        {
+            $tables[] = $row[0];
+        }
+    }
+    else
+    {
+        $tables = is_array($tables) ? $tables : explode(',',$tables);
+    }
+
+    //cycle through
+    $handle = fopen($outputfile, 'w+');
+    if (fwrite($handle, '') === FALSE)
+    {
+        $langs->load("errors");
+        dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
+        $errormsg=$langs->trans("ErrorFailedToWriteInDir");
+        return -1;
+    }
+    foreach($tables as $table)
+    {
+        $sql='SELECT * FROM '.$table;
+        $result = $db->query($sql);
+        $num_fields = $db->num_rows($result);
+
+        fwrite($handle,'DROP TABLE IF EXISTS '.$table);
+        $resqldrop=$db->query('SHOW CREATE TABLE '.$table);
+        $row2 = $db->fetch_row($resqldrop);
+        fwrite($handle,"\n\n".$row2[1].";\n\n");
+
+        while($row = $db->fetch_row($result))
+        {
+            fwrite($handle,'INSERT INTO '.$table.' VALUES(');
+            $columns = count($row);
+            for($j=0; $j<$columns; $j++)
+            {
+                $row[$j] = addslashes($row[$j]);
+                $row[$j] = preg_replace("#\n#", "\\n", $row[$j]);
+                if (isset($row[$j])) { fwrite($handle,'"'.$row[$j].'"'); } else { fwrite($handle,'""'); }
+                if (isset($row[$j]))
+                {
+                    if ($row[$j] == null)
+                    {
+                        fwrite($handle,'"null"');
+                    }
+                    else
+                    {
+                        fwrite($handle,'"'.$row[$j].'"');
+                    }
+                }
+                else
+                {
+                    fwrite($handle,'""');
+                }
+                if ($j<($num_fields-1)) { fwrite($handle,','); }
+            }
+            fwrite($handle,");\n");
+        }
+        fwrite($handle,"\n\n\n");
+    }
+
+    /* Backup Procedure structure*/
+    /*
+    $result = $db->query('SHOW PROCEDURE STATUS');
+    if ($db->num_rows($result) > 0)
+    {
+        while ($row = $db->fetch_row($result)) { $procedures[] = $row[1]; }
+        foreach($procedures as $proc)
+        {
+            fwrite($handle,"DELIMITER $$\n\n");
+            fwrite($handle,"DROP PROCEDURE IF EXISTS '$name'.'$proc'$$\n");
+            $resqlcreateproc=$db->query("SHOW CREATE PROCEDURE '$proc'");
+            $row2 = $db->fetch_row($resqlcreateproc);
+            fwrite($handle,"\n".$row2[2]."$$\n\n");
+            fwrite($handle,"DELIMITER ;\n\n");
+        }
+    }
+    */
+    /* Backup Procedure structure*/
+
+    fclose($handle);
+
+    return 1;
+}
 ?>
diff --git a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
index 9f0cd0793b0..20b605737fd 100755
--- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
@@ -297,7 +297,7 @@ class pdf_crabe extends ModelePDFFactures
 					// Total HT ligne
 					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
 					$pdf->SetXY($this->postotalht, $curY);
-					$pdf->MultiCell(26, 3, $total_excl_tax, 0, 'R', 0);
+					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 					$tvaligne=$object->lines[$i]->total_tva;
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index a426e8bf1f2..0a140d15531 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -102,7 +102,7 @@ class pdf_propale_azur extends ModelePDFPropales
 
 	/**
      *  Function to build pdf onto disk
-     *  
+     *
      *  @param		int		$object				Id of object to generate
      *  @param		object	$outputlangs		Lang output object
      *  @param		string	$srctemplatepath	Full path of source filename for generator using a template file
@@ -279,7 +279,7 @@ class pdf_propale_azur extends ModelePDFPropales
 					// Total HT ligne
 					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
 					$pdf->SetXY($this->postotalht, $curY);
-					$pdf->MultiCell(26, 4, $total_excl_tax, 0, 'R', 0);
+					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 4, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 					$tvaligne=$object->lines[$i]->total_tva;
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 5a4f96918fe..b1a237fe45e 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -605,7 +605,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 
 /**
  *  Remove a file or several files with a mask
- *  
+ *
  *  @param      file            File to delete or mask of file to delete
  *  @param      disableglob     Disable usage of glob like *
  *  @param      nophperrors     Disable all PHP output errors
@@ -659,7 +659,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$notrigger=0,$trigg
 /**
  *  Remove a directory (not recursive, so content must be empty).
  *  If directory is not empty, return false
- *  
+ *
  *  @param      dir             Directory to delete
  *  @param      nophperrors     Disable all PHP output errors
  *  @return     boolean         True if success, false if error
@@ -714,10 +714,10 @@ function dol_delete_dir_recursive($dir,$count=0,$nophperrors=0)
     return $count;
 }
 
-    
+
 /**
  *  Delete all preview files linked to object instance
- *  
+ *
  *  @param	Object	$object		Object to clean
  *  @return	int					0 if error, 1 if OK
  */
@@ -728,7 +728,7 @@ function dol_delete_preview($object)
 
     if ($object->element == 'commande') $dir = $conf->commande->dir_output;
     if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
-    
+
 	$refsan = dol_sanitizeFileName($object->ref);
 	$dir = $dir . "/" . $refsan ;
 	$file = $dir . "/" . $refsan . ".pdf.png";
@@ -766,7 +766,7 @@ function dol_delete_preview($object)
 /**
  * Get and save an upload file (for example after submitting a new file a mail form).
  * All information used are in db, conf, langs, user and _FILES.
- * 
+ *
  * @param	string	$upload_dir				Directory to store upload files
  * @param	int		$allowoverwrite			1=Allow overwrite existing file
  * @param	int		$donotupdatesession		1=Do no edit _SESSION variable
@@ -873,9 +873,11 @@ function dol_remove_file_process($filenb,$donotupdatesession=0,$donotdeletefile=
 }
 
 /**
- * 	Convert file to image
- *  @param      file        Input file name
- *  @param      ext         Extension of target file
+ * 	Convert an image file into antoher format.
+ *  This need Imagick php extension.
+ *
+ *  @param	string	$file        Input file name
+ *  @param  string	$ext         Extension of target file
  */
 function dol_convert_file($file,$ext='png')
 {
@@ -906,4 +908,34 @@ function dol_convert_file($file,$ext='png')
 	return 1;
 }
 
+
+/**
+ * Compress a file
+ *
+ * @param string	$inputfile		Source file name
+ * @param string	$outputfile		Target file name
+ * @param string	$mode			'gz' or 'bz'
+ */
+function dol_compress_file($inputfile, $outputfile, $mode="gz")
+{
+    try
+    {
+        $data = implode("", file($inputfile));
+        if ($mode == 'gz') $compressdata = gzencode($data, 9);
+        elseif ($mode == 'bz') $compressdata = bzcompress($data, 9);
+
+        $fp = fopen($outputfile, "w");
+        fwrite($fp, $compressdata);
+        fclose($fp);
+    }
+    catch (Exception $e)
+    {
+        global $langs, $errormsg;
+        $langs->load("errors");
+        dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
+        $errormsg=$langs->trans("ErrorFailedToWriteInDir");
+        return -1;
+    }
+}
+
 ?>
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index 4f1f131ba5c..7f092bf3781 100755
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -144,7 +144,7 @@ if ($action == 'create')
     // Label
     print '<tr><td class="fieldrequired" required>'.$langs->trans("Label").'</td><td class="valeur"><input type="text" name="label" size="40" value="'.GETPOST('label').'"></td></tr>';
     // Code
-    print '<tr><td class="fieldrequired" required>'.$langs->trans("AttributeCode").' ('.$langs->trans("AlphaNumOnlyCharsAndNoSpace").')</td><td class="valeur"><input type="text" name="attrname" size="10" value"'.GETPOST('attrname').'"></td></tr>';
+    print '<tr><td class="fieldrequired" required>'.$langs->trans("AttributeCode").' ('.$langs->trans("AlphaNumOnlyCharsAndNoSpace").')</td><td class="valeur"><input type="text" name="attrname" size="10" value="'.GETPOST('attrname').'"></td></tr>';
     // Type
     print '<tr><td class="fieldrequired" required>'.$langs->trans("Type").'</td><td class="valeur">';
     print $form->selectarray('type',$type2label,GETPOST('type'));