Merge pull request #9172 from grandoc/new_branch_28_07_2018

standardize
This commit is contained in:
Juanjo Menent 2018-08-02 11:27:02 +02:00 committed by GitHub
commit b8efe3b239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
285 changed files with 310 additions and 315 deletions

View File

@ -406,5 +406,6 @@ if ($resql)
dol_print_error($db);
}
// End of page
llxFooter();
$db->close();

View File

@ -1004,7 +1004,7 @@ if ($id)
print '<br>';
// End of page
llxFooter();
$db->close();

View File

@ -397,6 +397,6 @@ else if ($id > 0 || $ref) {
}
}
// End of page
llxFooter();
$db->close();

View File

@ -184,6 +184,6 @@ if ($action == 'display' || $action == 'delete') {
print "</table>";
}
// End of page
llxFooter();
$db->close();

View File

@ -800,7 +800,7 @@ if ($id)
print '<br>';
// End of page
llxFooter();
$db->close();

View File

@ -190,5 +190,6 @@ print '<div class="center"><input type="submit" class="button" value="' . $langs
print '</form>';
// End of page
llxFooter();
$db->close();

View File

@ -278,5 +278,6 @@ print '<div class="center"><input type="submit" class="button" value="' . dol_es
print '</form>';
// End of page
llxFooter();
$db->close();

View File

@ -156,6 +156,6 @@ if ($result)
dol_print_error($db);
}
// End of page
llxFooter();
$db->close();

View File

@ -318,5 +318,6 @@ if ($action == 'create')
}
}
// End of page
llxFooter();
$db->close();

View File

@ -58,5 +58,6 @@ if ($id) {
print '</div>';
}
// End of page
llxFooter();
$db->close();

View File

@ -181,5 +181,6 @@ if ($result) {
print $db->error();
}
// End of page
llxFooter();
$db->close();

View File

@ -295,5 +295,6 @@ print '<br>';
print '<br>';
print '</form>';
// End of page
llxFooter();
$db->close();

View File

@ -683,7 +683,7 @@ if ($id)
print '<br>';
// End of page
llxFooter();
$db->close();

View File

@ -495,5 +495,6 @@ if ($result)
dol_print_error($db);
}
// End of page
llxFooter();
$db->close();

View File

@ -298,7 +298,8 @@ else {
print "</table>";
print '</form>';
llxFooter();
}
// End of page
llxFooter();
$db->close();

View File

@ -140,5 +140,6 @@ if ($resql) {
}
print "</table>\n";
// End of page
llxFooter();
$db->close();

View File

@ -714,5 +714,6 @@ if ($action == 'create')
dol_fiche_end();
// End of page
llxFooter();
$db->close();

View File

@ -748,6 +748,6 @@ print '</div>';
print '</form>';
// End of page
llxFooter();
$db->close();

View File

@ -421,5 +421,6 @@ print '</tr>';
print "</table>";
print '</form>';
// End of page
llxFooter();
$db->close();

View File

@ -159,5 +159,6 @@ if (! empty($id)) {
print "Error ID incorrect";
}
// End of page
llxFooter();
$db->close();

View File

@ -415,6 +415,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
}
}
// End of page
llxFooter();
$db->close();

View File

@ -400,6 +400,6 @@ if ($result) {
print $db->lasterror();
}
// End of page
llxFooter();
$db->close();

View File

@ -201,8 +201,9 @@ llxHeader('', $langs->trans("Ventilation"));
if (empty($chartaccountcode))
{
print $langs->trans("ErrorChartOfAccountSystemNotSelected");
llxFooter();
$db->close();
// End of page
llxFooter();
$db->close();
exit;
}
@ -524,5 +525,6 @@ jQuery(document).ready(function() {
});
</script>';
// End of page
llxFooter();
$db->close();

View File

@ -167,5 +167,6 @@ if (! empty($id)) {
print "Error ID incorrect";
}
// End of page
llxFooter();
$db->close();

View File

@ -345,5 +345,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
print '</div>';
}
// End of page
llxFooter();
$db->close();

View File

@ -349,6 +349,6 @@ if ($result) {
print $db->lasterror();
}
// End of page
llxFooter();
$db->close();

View File

@ -180,8 +180,9 @@ llxHeader('', $langs->trans("ExpenseReportsVentilation"));
if (empty($chartaccountcode))
{
print $langs->trans("ErrorChartOfAccountSystemNotSelected");
llxFooter();
$db->close();
// End of page
llxFooter();
$db->close();
exit;
}
@ -422,5 +423,6 @@ jQuery(document).ready(function() {
});
</script>';
// End of page
llxFooter();
$db->close();

View File

@ -163,5 +163,6 @@ else
print $langs->trans("Module10Desc")."<br>\n";
}
// End of page
llxFooter();
$db->close();

View File

@ -162,5 +162,6 @@ if (! empty($id)) {
print "Error ID incorrect";
}
// End of page
llxFooter();
$db->close();

View File

@ -342,6 +342,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
print '</div>';
}
// End of page
llxFooter();
$db->close();

View File

@ -406,7 +406,6 @@ if ($result) {
print $db->lasterror();
}
// End of page
llxFooter();
$db->close();

View File

@ -202,8 +202,9 @@ llxHeader('', $langs->trans("SuppliersVentilation"));
if (empty($chartaccountcode))
{
print $langs->trans("ErrorChartOfAccountSystemNotSelected");
llxFooter();
$db->close();
// End of page
llxFooter();
$db->close();
exit;
}
@ -532,5 +533,6 @@ jQuery(document).ready(function() {
});
</script>';
// End of page
llxFooter();
$db->close();

View File

@ -265,7 +265,6 @@ form_constantes($constantes, 0, $helptext);
dol_fiche_end();
// End of page
llxFooter();
$db->close();

View File

@ -160,7 +160,6 @@ form_constantes($constantes, 0, $helptext);
dol_fiche_end();
// End of page
llxFooter();
$db->close();

View File

@ -113,6 +113,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
// End of page
llxFooter();
$db->close();

View File

@ -116,6 +116,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
// End of page
llxFooter();
$db->close();

View File

@ -250,7 +250,6 @@ if (! empty($conf->global->MEMBER_ENABLE_PUBLIC))
print '<a target="_blank" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.$urlwithroot.'/public/members/new.php'.$entity_qr.'</a>';
}
// End of page
llxFooter();
$db->close();

View File

@ -175,8 +175,6 @@ if ($object->id > 0)
}
}
// End of page
llxFooter();
$db->close();

View File

@ -1896,6 +1896,6 @@ else
}
}
// End of page
llxFooter();
$db->close();

View File

@ -310,6 +310,6 @@ print '<br><input class="button" type="submit" value="'.$langs->trans("BuildDoc"
print '</form>';
print '<br>';
// End of page
llxFooter();
$db->close();

View File

@ -170,6 +170,6 @@ else
print $langs->trans("ErrorRecordNotFound");
}
// End of page
llxFooter();
$db->close();

View File

@ -86,7 +86,6 @@ else
dol_print_error($db);
}
// End of page
llxFooter();
$db->close();

View File

@ -435,6 +435,6 @@ print "</div>";
print '</div></div></div>';
// End of page
llxFooter();
$db->close();

View File

@ -221,5 +221,6 @@ else
print '</table>';
// End of page
llxFooter();
$db->close();

View File

@ -827,6 +827,6 @@ print '</form>';
if ($num > $limit || $page) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit, 1);
// End of page
llxFooter();
$db->close();

View File

@ -120,6 +120,6 @@ if ($id)
}
// End of page
llxFooter();
$db->close();

View File

@ -143,7 +143,6 @@ print '</table>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

View File

@ -309,8 +309,6 @@ if ($mode)
dol_fiche_end();
// End of page
llxFooter();
$db->close();

View File

@ -229,7 +229,6 @@ print '<div style="clear:both"></div>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

View File

@ -1108,7 +1108,6 @@ else
print $langs->trans("ErrorRecordNotFound");
}
// End of page
llxFooter();
$db->close();

View File

@ -417,7 +417,6 @@ if ($rowid && $action != 'edit')
print '</div></div></div>';
}
// End of page
llxFooter();
$db->close();

View File

@ -76,5 +76,6 @@ print '</div>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

View File

@ -381,6 +381,6 @@ else
dol_print_error($db);
}
// End of page
llxFooter();
$db->close();

View File

@ -787,7 +787,6 @@ if ($rowid > 0)
}
}
// End of page
llxFooter();
$db->close();

View File

@ -187,5 +187,6 @@ else
print '</table>';
// End of page
llxFooter();
$db->close();

View File

@ -202,6 +202,6 @@ print "</form>\n";
print "<br>";
// End of page
llxFooter();
$db->close();

View File

@ -117,6 +117,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
// End of page
llxFooter();
$db->close();

View File

@ -238,7 +238,6 @@ print '</div>';
print "</form>\n";
// End of page
llxFooter();
$db->close();

View File

@ -399,6 +399,6 @@ print '</form>';
print "<br>";
// End of page
llxFooter();
$db->close();

View File

@ -247,6 +247,6 @@ print '</form>';
print "<br>";
// End of page
llxFooter();
$db->close();

View File

@ -198,6 +198,6 @@ if (! empty($conf->use_javascript_ajax))
print '</script>';
}
// End of page
llxFooter();
$db->close();

View File

@ -432,6 +432,6 @@ print "</tr>\n";
print '</table>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

View File

@ -114,6 +114,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
// End of page
llxFooter();
$db->close();

View File

@ -405,5 +405,6 @@ if ($conf->produit->enabled)
print "<br>";
// End of page
llxFooter();
$db->close();

View File

@ -488,7 +488,6 @@ print '<div class="center"><input type="submit" class="button" value="'.$langs->
print '</form>';
print "\n".'<!-- End Other Const -->'."\n";
// End of page
llxFooter();
$db->close();

View File

@ -280,6 +280,6 @@ dol_fiche_end();
print '</form>';
// End of page
llxFooter();
$db->close();

View File

@ -140,6 +140,6 @@ if (! empty($conf->global->CLICKTODIAL_URL))
}
}
// End of page
llxFooter();
$db->close();

View File

@ -679,7 +679,6 @@ print "</td></tr>\n";
print '</table>';
// End of page
llxFooter();
$db->close();

View File

@ -1153,7 +1153,6 @@ else
print '</div>';
}
// End of page
llxFooter();
$db->close();

View File

@ -164,5 +164,6 @@ print "</table>\n";
print '<br><br><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
print '</form>';
// End of page
llxFooter();
$db->close();

View File

@ -147,5 +147,6 @@ print '</table>';
print '</div>';
// End of page
llxFooter();
$db->close();

View File

@ -314,7 +314,6 @@ if ($conf->use_javascript_ajax)
print "</form>\n";
// End of page
llxFooter();
$db->close();

View File

@ -509,7 +509,6 @@ print '</form>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

View File

@ -143,6 +143,6 @@ $message.=img_picto('','object_globe.png').' '.$langs->trans("WebDavServer",'Web
$message.='<br>';
print $message;
// End of page
llxFooter();
$db->close();

View File

@ -412,7 +412,6 @@ dol_fiche_end();
print "</form>\n";
// End of page
llxFooter();
$db->close();

View File

@ -415,5 +415,6 @@ if($action == 'edit') {
}
// End of page
llxFooter();
$db->close();

View File

@ -1735,7 +1735,7 @@ else
print '<br>';
// End of page
llxFooter();
$db->close();

View File

@ -109,5 +109,6 @@ print '</td></tr>';
print '</table>';
// End of page
llxFooter();
$db->close();

View File

@ -114,6 +114,6 @@ print "</div>";
print "</form>\n";
// End of page
llxFooter();
$db->close();

View File

@ -507,5 +507,6 @@ print '<div class="center"><input type="submit" class="button" value="'.$langs->
print '</form>';
// End of page
llxFooter();
$db->close();

View File

@ -119,6 +119,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
// End of page
llxFooter();
$db->close();

View File

@ -120,6 +120,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
// End of page
llxFooter();
$db->close();

View File

@ -513,7 +513,6 @@ print '</form>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

View File

@ -115,6 +115,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
// End of page
llxFooter();
$db->close();

View File

@ -179,6 +179,7 @@ echo '</table>';
echo '</form>';
dol_fiche_end();
llxFooter();
// End of page
llxFooter();
$db->close();

View File

@ -354,6 +354,7 @@ echo '<script type="text/javascript"> $(function() {
}); </script>';
dol_fiche_end();
llxFooter();
// End of page
llxFooter();
$db->close();

View File

@ -6,7 +6,7 @@
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011-2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2015 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011-2018 Philippe Grand <philippe.grand@atoo-net.com>
*
* 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
@ -32,9 +32,7 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
// Load translation files required by the page
$langs->loadLangs(array('admin', 'exports'));
$langs->load('other');
$langs->loadLangs(array('admin', 'exports', 'other'));
if (! $user->admin)
accessforbidden();
@ -73,7 +71,7 @@ dol_fiche_head(
// Setup page goes here
$form=new Form($db);
$var=false;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("ExportModel").'</td>'."\n";
@ -82,8 +80,7 @@ print '<td align="center" width="100"></td>'."\n";
// Example with a yes / no select
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<tr class="oddeven">';
print '<td>'.$langs->trans("set_EXPORTS_SHARE_MODELS").'</td>';
print '<td align="center" width="20">&nbsp;</td>';
print '<td align="center" width="100">';
@ -94,9 +91,8 @@ echo ajax_constantonoff('EXPORTS_SHARE_MODELS');
print '</form>';
print '</td></tr>';
print '</table>';
// End of page
llxFooter();
$db->close();

View File

@ -325,6 +325,6 @@ else
dol_print_error($db);
}
// End of page
llxFooter();
$db->close();

View File

@ -782,7 +782,6 @@ print '</table>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

View File

@ -234,6 +234,6 @@ else
*/
}
// End of page
llxFooter();
$db->close();

View File

@ -6,7 +6,7 @@
* Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2017 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011-2018 Philippe Grand <philippe.grand@atoo-net.com>
*
* 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
@ -560,7 +560,6 @@ print "</td></tr>\n";
print '</form>';
//Use draft Watermark
print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print "<input type=\"hidden\" name=\"action\" value=\"set_FICHINTER_DRAFT_WATERMARK\">";
@ -635,12 +634,10 @@ print '</td>';
print '</tr>';
print '</form>';
print '</table>';
print '<br>';
// End of page
llxFooter();
$db->close();

View File

@ -153,6 +153,6 @@ if ($geoip)
$geoip->close();
}
// End of page
llxFooter();
$db->close();

View File

@ -517,5 +517,6 @@ print '</form>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

View File

@ -578,6 +578,6 @@ else // Show
print '</div>';
}
// End of page
llxFooter();
$db->close();

View File

@ -114,7 +114,6 @@ if (empty($reshook))
print '<div class="center"><div class="logo_setup"></div></div>';
}
// End of page
llxFooter();
$db->close();

View File

@ -340,5 +340,6 @@ if (function_exists("ldap_connect"))
}
}
// End of page
llxFooter();
$db->close();

View File

@ -318,6 +318,7 @@ if (function_exists("ldap_connect"))
}
}
// End of page
llxFooter();
$db->close();

View File

@ -251,5 +251,6 @@ if (function_exists("ldap_connect"))
}
}
// End of page
llxFooter();
$db->close();

View File

@ -442,7 +442,6 @@ if (function_exists("ldap_connect"))
}
// End of page
llxFooter();
$db->close();

View File

@ -241,5 +241,6 @@ if (function_exists("ldap_connect"))
}
}
// End of page
llxFooter();
$db->close();

Some files were not shown because too many files have changed in this diff Show More