From 360d697fc31d6ba93f1e45bc17c2ae20ca70b147 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 11 Nov 2016 13:45:18 +0100
Subject: [PATCH] Add missing field to store result of email sending

---
 htdocs/core/class/html.form.class.php             |  6 +++---
 htdocs/install/mysql/migration/4.0.0-5.0.0.sql    |  3 ++-
 .../install/mysql/tables/llx_mailing_cibles.sql   |  6 +++---
 htdocs/user/card.php                              |  6 +++---
 htdocs/user/document.php                          | 15 +++++++++------
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1aa2ac6705c..1297ad6c0c5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5798,10 +5798,10 @@ class Form
             if ($caneditfield)
             {
                 if ($object->photo) $ret.="<br>\n";
-                $ret.='<table class="nobordernopadding">';
-                if ($object->photo) $ret.='<tr><td align="center"><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+                $ret.='<table class="nobordernopadding centpercent">';
+                if ($object->photo) $ret.='<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
                 $ret.='<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-                $ret.='<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+                $ret.='<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"></td></tr>';
                 $ret.='</table>';
             }
 
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index faffe9e53f5..0f57378465f 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -180,6 +180,8 @@ ALTER TABLE llx_bank_account ADD COLUMN import_key      		varchar(14);
 
 ALTER TABLE llx_overwrite_trans ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
 
+ALTER TABLE llx_mailing_cibles ADD COLUMN error_text varchar(255);
+
 
 create table llx_user_employment
 (
@@ -215,4 +217,3 @@ drop table tmp_links_double;
 ALTER TABLE llx_links ADD UNIQUE INDEX uk_links (objectid,label);
 
 
-
diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql
index 72fdeca2925..f3031069220 100644
--- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql
+++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql
@@ -1,6 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2005		Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2009-2012	Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2009-2016	Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2011-2012	Regis Houssin        <regis.houssin@capnetworks.com>
 --
 -- This program is free software; you can redistribute it and/or modify
@@ -33,6 +33,6 @@ create table llx_mailing_cibles
   source_url		varchar(160),
   source_id			integer,
   source_type		varchar(16),
-  date_envoi		datetime
-  
+  date_envoi		datetime,
+  error_text		varchar(255)						-- text with error if statut is -1
 )ENGINE=innodb;
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index d2188a6a283..0cd5b077996 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1829,8 +1829,8 @@ else
             // Photo
             print '<tr>';
             print '<td>'.$langs->trans("Photo").'</td>';
-            print '<td valign="middle">';
-            print $form->showphoto('userphoto',$object,100,0,$caneditfield,'photowithmargin','small');
+            print '<td>';
+            print $form->showphoto('userphoto',$object,60,0,$caneditfield,'photowithmargin','small');
             print '</td>';
             print '</tr>';
 
@@ -2035,7 +2035,7 @@ else
             // State
             if (empty($conf->global->USER_DISABLE_STATE))
             {
-                print '<tr><td>'.fieldLabel('State','state_id').'</td><td>';
+                print '<tr><td class="tdoverflow">'.fieldLabel('State','state_id').'</td><td>';
                 print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
                 print '</td></tr>';
             }
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 36338f03e10..d1922371909 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -96,6 +96,7 @@ if ($id > 0 || ! empty($ref))
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('usercard','globalcard'));
 
+
 /*
  * Actions
  */
@@ -108,6 +109,7 @@ if (empty($reshook)) {
 	include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 }
 
+
 /*
  * View
  */
@@ -144,20 +146,21 @@ if ($object->id)
 	}
 
 
-	print '<table class="border"width="100%">';
+	print '<table class="border" width="100%">';
 
     // Login
-    print '<tr><td>'.$langs->trans("Login").'</td><td class="valeur" colspan="3">'.$object->login.'&nbsp;</td></tr>';
+    print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 
-	// Nbre fichiers
-	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	// Nbre files
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
 
 	//Total taille
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
 
 	print '</table>';
 
-	print '</div>';
+	dol_fiche_end();
+	
 
 	$modulepart = 'user';
 	$permission = $user->rights->user->user->creer;