From 9c11092f4625bc332b6971c63dced51629df1f14 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Sep 2012 11:15:38 +0200
Subject: [PATCH] Uniformize code

---
 htdocs/admin/commande.php | 27 +++++++++++++++------------
 htdocs/admin/facture.php  |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 16f73042b66..5cc658702bc 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -156,10 +156,12 @@ if ($action == 'setdoc')
 
 	// On active le modele
 	$type='order';
+
 	$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
 	$sql_del.= " WHERE nom = '".$db->escape($value)."'";
 	$sql_del.= " AND type = '".$type."'";
 	$sql_del.= " AND entity = ".$conf->entity;
+    dol_syslog("Delete from model table ".$sql_del);
 	$result1=$db->query($sql_del);
 
     $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
@@ -167,13 +169,15 @@ if ($action == 'setdoc')
     $sql.= ($label?"'".$db->escape($label)."'":'null').", ";
     $sql.= (! empty($scandir)?"'".$scandir."'":"null");
     $sql.= ")";
-	$result2=$db->query($sql);
+    dol_syslog("Insert into model table ".$sql);
+    $result2=$db->query($sql);
 	if ($result1 && $result2)
 	{
 		$db->commit();
 	}
 	else
 	{
+        dol_syslog("Error ".$db->lasterror(), LOG_ERR);
 		$db->rollback();
 	}
 }
@@ -227,14 +231,13 @@ if ($action == 'set_COMMANDE_FREE_TEXT')
 
 $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 
-llxHeader();
+llxHeader("",$langs->trans("OrdersSetup"));
 
 $form=new Form($db);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
-
-print "<br>";
+print '<br>';
 
 
 
@@ -246,12 +249,12 @@ print_titre($langs->trans("OrdersNumberingModules"));
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td width="100">'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
-print '<td>'.$langs->trans("Example").'</td>';
+print '<td nowrap="nowrap">'.$langs->trans("Example").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="16">'.$langs->trans("Infos").'</td>';
-print "</tr>\n";
+print '</tr>'."\n";
 
 clearstatcache();
 
@@ -398,18 +401,18 @@ foreach ($dirmodels as $reldir)
             $handle=opendir($dir);
             if (is_resource($handle))
             {
-
                 while (($file = readdir($handle))!==false)
                 {
                     $filelist[]=$file;
                 }
                 closedir($handle);
                 arsort($filelist);
-
+                
                 foreach($filelist as $file)
                 {
                     if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
                     {
+            		
                     	if (file_exists($dir.'/'.$file))
                     	{
                     		$name = substr($file, 4, dol_strlen($file) -16);
@@ -436,7 +439,7 @@ foreach ($dirmodels as $reldir)
 	                            if (in_array($name, $def))
 	                            {
 	                            	print '<td align="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
+	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
 	                            	print img_picto($langs->trans("Enabled"),'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
@@ -444,7 +447,7 @@ foreach ($dirmodels as $reldir)
 	                            else
 	                            {
 	                                print '<td align="center">'."\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
 	                                print "</td>";
 	                            }
 
@@ -456,7 +459,7 @@ foreach ($dirmodels as $reldir)
 	                            }
 	                            else
 	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
 	                            }
 	                            print '</td>';
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 46c793e0d72..3dbcbda8133 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -315,7 +315,7 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
-print '<td nowrap>'.$langs->trans("Example").'</td>';
+print '<td nowrap="nowrap">'.$langs->trans("Example").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
 print '<td align="center" width="16">'.$langs->trans("Infos").'</td>';
 print '</tr>'."\n";