replace html code by html5 in contact

htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php

@@ -126,7 +126,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?>
 </tr>
 
 <tr>
-	<td align="center" colspan="4"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></td>
+	<td class="center" colspan="4"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></td>
 </tr>
 
 </table><br>

htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php

@@ -149,7 +149,7 @@ echo $this->control->tpl['ajax_selectcountry'];
 </tr>
 
 <tr>
-	<td colspan="4" align="center">
+	<td colspan="4" class="center">
 	<input type="submit" class="button" name="save" value="<?php echo $langs->trans("Save"); ?>">&nbsp;
 	<input type="submit" class="button" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
 	</td>

htdocs/contact/card.php

@@ -588,7 +588,7 @@ else
 	            $rowspan=3;
 	    		if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++;
 
-	            print '<td valign="middle" align="center" rowspan="'.$rowspan.'">';
+	            print '<td class="valignmiddle center" rowspan="'.$rowspan.'">';
 		        print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a>';
 	            print '</td>';
             }

htdocs/contact/consumption.php

@@ -379,16 +379,16 @@ if ($sql_select)
     print $formother->select_month($month?$month:-1, 'month', 1, 0, 'valignmiddle');
     $formother->select_year($year?$year:-1, 'year', 1, 20, 1);
     print '</td>';
-    print '<td class="liste_titre" align="center">';
+    print '<td class="liste_titre center">';
     print '</td>';
     print '<td class="liste_titre left">';
     print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
     print '</td>';
-    print '<td class="liste_titre" align="center">';    // TODO: Add filters !
+    print '<td class="liste_titre center">';    // TODO: Add filters !
     print '</td>';
-    print '<td class="liste_titre" align="center">';
+    print '<td class="liste_titre center">';
     print '</td>';
-    print '<td class="liste_titre" align="center">';
+    print '<td class="liste_titre center">';
     print '</td>';
     print '<td class="liste_titre right">';
     $searchpicto=$form->showFilterAndCheckAddButtons(0);
@@ -399,8 +399,8 @@ if ($sql_select)
     // Titles with sort buttons
     print '<tr class="liste_titre">';
     print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'align="center" width="150"', $sortfield, $sortorder);
+    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, 'align="center"', $sortfield, $sortorder);
+    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, '', $sortfield, $sortorder, 'center ');
     print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
     print_liste_field_titre('ContactType', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
     print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
@@ -427,10 +427,10 @@ if ($sql_select)
 		print '<td class="nobordernopadding nowrap" width="100">';
 		print $documentstatic->getNomUrl(1);
 		print '</td>';
-		print '<td align="center" width="80">'.dol_print_date($db->jdate($objp->dateprint), 'day').'</td>';
+		print '<td class="center" width="80">'.dol_print_date($db->jdate($objp->dateprint), 'day').'</td>';
 
 		// Status
-		print '<td align="center">';
+		print '<td class="center">';
 		if ($type_element == 'contract')
 		{
 			print $documentstaticline->getLibStatut(2);
@@ -616,17 +616,15 @@ if ($sql_select)
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 	$db->free($resql);
-}
+} elseif (empty($type_element) || $type_element == -1) {
-elseif (empty($type_element) || $type_element == -1)
-{
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
     print '<table class="liste" width="100%">'."\n";
     // Titles with sort buttons
     print '<tr class="liste_titre">';
     print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'align="center" width="150"', $sortfield, $sortorder);
+    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'width="150"', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, 'align="center"', $sortfield, $sortorder);
+    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, '', $sortfield, $sortorder, 'center ');
     print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'left ');
     print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, '', $sortfield, $sortorder, 'right ');
     print "</tr>\n";
@@ -634,8 +632,7 @@ elseif (empty($type_element) || $type_element == -1)
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
 	print "</table>";
-}
+} else {
-else {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
     print '<table class="liste" width="100%">'."\n";

htdocs/contact/list.php

@@ -688,7 +688,9 @@ if (! empty($arrayfields['p.zip']['checked']))                 print_liste_field
 if (! empty($arrayfields['p.town']['checked']))                print_liste_field_titre($arrayfields['p.town']['label'], $_SERVER["PHP_SELF"], "p.town", $begin, $param, '', $sortfield, $sortorder);
 //if (! empty($arrayfields['state.nom']['checked']))           print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
 //if (! empty($arrayfields['region.nom']['checked']))          print_liste_field_titre($arrayfields['region.nom']['label'],$_SERVER["PHP_SELF"],"region.nom","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['country.code_iso']['checked']))      print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "co.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
+if (! empty($arrayfields['country.code_iso']['checked'])) {
+    print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "co.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 if (! empty($arrayfields['p.phone']['checked']))               print_liste_field_titre($arrayfields['p.phone']['label'], $_SERVER["PHP_SELF"], "p.phone", $begin, $param, '', $sortfield, $sortorder);
 if (! empty($arrayfields['p.phone_perso']['checked']))         print_liste_field_titre($arrayfields['p.phone_perso']['label'], $_SERVER["PHP_SELF"], "p.phone_perso", $begin, $param, '', $sortfield, $sortorder);
 if (! empty($arrayfields['p.phone_mobile']['checked']))        print_liste_field_titre($arrayfields['p.phone_mobile']['label'], $_SERVER["PHP_SELF"], "p.phone_mobile", $begin, $param, '', $sortfield, $sortorder);
@@ -702,14 +704,27 @@ if (! empty($arrayfields['p.priv']['checked']))                print_liste_field
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
+$parameters = array(
+    'arrayfields'=>$arrayfields,
+    'param'=>$param,
+    'sortfield'=>$sortfield,
+    'sortorder'=>$sortorder,
+);
 $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (! empty($arrayfields['p.datec']['checked']))      print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+if (! empty($arrayfields['p.datec']['checked'])) {
-if (! empty($arrayfields['p.tms']['checked']))        print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+    print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (! empty($arrayfields['p.statut']['checked']))     print_liste_field_titre($arrayfields['p.statut']['label'], $_SERVER["PHP_SELF"], "p.statut", "", $param, '', $sortfield, $sortorder, 'center ');
+}
-if (! empty($arrayfields['p.import_key']['checked'])) print_liste_field_titre($arrayfields['p.import_key']['label'], $_SERVER["PHP_SELF"], "p.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+if (! empty($arrayfields['p.tms']['checked'])) {
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+    print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (! empty($arrayfields['p.statut']['checked'])) {
+    print_liste_field_titre($arrayfields['p.statut']['label'], $_SERVER["PHP_SELF"], "p.statut", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (! empty($arrayfields['p.import_key']['checked'])) {
+    print_liste_field_titre($arrayfields['p.import_key']['label'], $_SERVER["PHP_SELF"], "p.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
 
 

htdocs/contact/perso.php

@@ -157,13 +157,13 @@ if ($action == 'edit')
     print '</td>';
 
     // Photo
-    print '<td align="center" class="hideonsmartphone" valign="middle" rowspan="6">';
+    print '<td class="center hideonsmartphone valignmiddle" rowspan="6">';
     print $form->showphoto('contact', $object)."\n";
     if ($object->photo) print "<br>\n";
 
     print '<table class="nobordernopadding">';
 
-    if ($object->photo) print '<tr><td align="center"><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+    if ($object->photo) print '<tr><td class="center"><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
     print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
     print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
     print '</table>';

htdocs/core/lib/functions2.lib.php

@@ -2023,24 +2023,24 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 function getElementProperties($element_type)
 {
     // Parse element/subelement (ex: project_task)
-    $module = $element = $subelement = $element_type;
+    $module = $element_type;
+    $element =  $element_type;
+    $subelement = $element_type;
 
     // If we ask an resource form external module (instead of default path)
-    if (preg_match('/^([^@]+)@([^@]+)$/i', $element_type, $regs))
+    if (preg_match('/^([^@]+)@([^@]+)$/i', $element_type, $regs)) {
-    {
         $element = $subelement = $regs[1];
         $module = $regs[2];
     }
 
     //print '<br>1. element : '.$element.' - module : '.$module .'<br>';
-    if ( preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
+    if ( preg_match('/^([^_]+)_([^_]+)/i', $element, $regs)) {
-    {
         $module = $element = $regs[1];
         $subelement = $regs[2];
     }
 
     // For compat
-    if($element_type == "action") {
+    if ($element_type == "action") {
         $classpath = 'comm/action/class';
         $subelement = 'Actioncomm';
         $module = 'agenda';
@@ -2049,13 +2049,13 @@ function getElementProperties($element_type)
     // To work with non standard path
     if ($element_type == 'facture' || $element_type == 'invoice') {
         $classpath = 'compta/facture/class';
-        $module='facture';
+        $module ='facture';
-        $subelement='facture';
+        $subelement = 'facture';
     }
     if ($element_type == 'commande' || $element_type == 'order') {
         $classpath = 'commande/class';
-        $module='commande';
+        $module = 'commande';
-        $subelement='commande';
+        $subelement = 'commande';
     }
     if ($element_type == 'propal')  {
         $classpath = 'comm/propal/class';
@@ -2142,8 +2142,7 @@ function getElementProperties($element_type)
  */
 function fetchObjectByElement($element_id, $element_type, $element_ref = '')
 {
-    global $conf;
+    global $conf, $db;
-	global $db,$conf;
 
     $element_prop = getElementProperties($element_type);
     if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled)

htdocs/datapolicy/admin/setup.php

@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    datapolicy/admin/setup.php
+ * \file    htdocs/datapolicy/admin/setup.php
  * \ingroup datapolicy
  * \brief   datapolicy setup page.
  */
@@ -25,7 +25,6 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
 require_once '../lib/datapolicy.lib.php';
-//require_once "../class/myclass.class.php";
 
 // Translations
 $langs->load('admin');
@@ -61,22 +60,22 @@ $arrayofparameters=array(
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-if (DOL_VERSION < '7' && $action == 'update') {
+// if (DOL_VERSION < '7' && $action == 'update') {
-    foreach ($arrayofparameters as $k => $v) {
+//     foreach ($arrayofparameters as $k => $v) {
-        $res = dolibarr_set_const($db, $k, GETPOST($k), 'chaine', 0, '', $conf->entity);
+//         $res = dolibarr_set_const($db, $k, GETPOST($k), 'chaine', 0, '', $conf->entity);
-        if (! $res > 0) $error++;
+//         if (! $res > 0) $error++;
-    }
+//     }
-    if (! $error)
+//     if (! $error)
-    {
+//     {
-        $db->commit();
+//         $db->commit();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+//         if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
+//     }
-    else
+//     else
-    {
+//     {
-        $db->rollback();
+//         $db->rollback();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+//         if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
-    }
+//     }
-}
+// }
 
 
 $arrayofparameters=array(
@@ -169,9 +168,7 @@ if ($action == 'edit')
 
     print '</form>';
     print '<br>';
-}
+} else {
-else
-{
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 

htdocs/datapolicy/class/datapolicycron.class.php

@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    datapolicy/class/datapolicycron.class.php
+ * \file    htdocs/datapolicy/class/datapolicycron.class.php
  * \ingroup datapolicy
  * \brief   Example hook overload.
  */

htdocs/datapolicy/lib/datapolicy.lib.php

@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2018 Nicolas ZABOURI   <info@inovea-conseil.com>
+ * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.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
@@ -16,7 +17,7 @@
  */
 
 /**
- * \file    datapolicy/lib/datapolicy.lib.php
+ * \file    htdocs/datapolicy/lib/datapolicy.lib.php
  * \ingroup datapolicy
  * \brief   Library files with common functions for datapolicy
  */
@@ -35,14 +36,13 @@ function datapolicyAdminPrepareHead()
     $h = 0;
     $head = array();
 
-	$head[$h][0] = dol_buildpath("/datapolicy/admin/setup.php", 1);
+    $head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setup.php";
     $head[$h][1] = $langs->trans("Deletion");
     $head[$h][2] = 'settings';
     $h++;
 
-	if (! empty($conf->global->DATAPOLICIES_ENABLE_EMAILS))
+    if (! empty($conf->global->DATAPOLICIES_ENABLE_EMAILS)) {
-	{
+        $head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setupmail.php";
-		$head[$h][0] = dol_buildpath("/datapolicy/admin/setupmail.php", 1);
         $head[$h][1] = $langs->trans("DATAPOLICIESMail");
         $head[$h][2] = 'settings';
         $h++;

htdocs/datapolicy/mailing.php

@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.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
@@ -16,22 +17,22 @@
  */
 
 /**
- * \file    datapolicy/mailing.php
+ * \file    htdocs/datapolicy/mailing.php
  * \ingroup datapolicy
  * \brief   datapolicy mailing page.
  */
 
 require '../../main.inc.php';
-dol_include_once('/contact/class/contact.class.php');
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-dol_include_once('/datapolicy/class/datapolicy.class.php');
+require_once DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
 
 $idcontact = GETPOST('idc');
 
-if(!empty($idcontact)){
+if (!empty($idcontact)) {
     $contact = new Contact($db);
     $contact->fetch($idcontact);
     DataPolicy::sendMailDataPolicyContact($contact);
-}else{
+} else {
 
     $contacts = new DataPolicy($db);
     $contacts->getAllContactNotInformed();

htdocs/datapolicy/public/index.php

@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    datapolicy/admin/setup.php
+ * \file    htdocs/datapolicy/admin/setup.php
  * \ingroup datapolicy
  * \brief   datapolicy setup page.
  */
@@ -30,11 +30,11 @@ if (!defined('NOREQUIREMENU'))
     define('NOREQUIREMENU', '1');
 
 require '../../main.inc.php';
-dol_include_once('/contact/class/contact.class.php');
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-dol_include_once('/societe/class/societe.class.php');
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-dol_include_once('/adherents/class/adherent.class.php');
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-dol_include_once('/user/class/user.class.php');
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-dol_include_once('/datapolicy/class/datapolicy.class.php');
+require_once DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
 
 $idc = GETPOST('c', 'int');
 $ids = GETPOST('s', 'int');

htdocs/product/stock/movement_list.php

@@ -933,7 +933,7 @@ if ($resql)
     if (! empty($arrayfields['e.ref']['checked'])) {
         // We are on a specific warehouse card, no filter on other should be possible
         print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
-
+    }
     if (! empty($arrayfields['m.fk_user_author']['checked'])) {
         print_liste_field_titre($arrayfields['m.fk_user_author']['label'], $_SERVER["PHP_SELF"], "m.fk_user_author", "", $param, "", $sortfield, $sortorder);
     }

htdocs/variants/combinations.php

@@ -763,7 +763,7 @@ if (! empty($id) || ! empty($ref))
 				<td class="liste_titre center"><?php echo $langs->trans('OnBuy') ?></td>
 				<td class="liste_titre"></td>
         		<?php
-        		print '<td class="liste_titre" align="middle">';
+        		print '<td class="liste_titre center">';
         		$searchpicto=$form->showCheckAddButtons('checkforselect', 1);
         		print $searchpicto;
         		print '</td>';
@@ -802,7 +802,7 @@ if (! empty($id) || ! empty($ref))
     					<a class="paddingleft paddingright" href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=delete&valueid='.$currcomb->id, 2) ?>"><?php echo img_delete() ?></a>
     				</td>
     				<?php
-    				print '<td class="nowrap" align="center">';
+    				print '<td class="nowrap center">';
     				if ($productCombinations || $massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
     				{
     				    $selected=0;