Merge pull request #9245 from grandoc/new_branch_14_08_2018

Standardize code

htdocs/modulebuilder/admin/setup.php

@@ -155,5 +155,6 @@ if (GETPOST('withtab', 'alpha')) {
 
 print '<br><br>';
 
+// End of page
 llxFooter();
 $db->close();

htdocs/modulebuilder/index.php

@@ -2487,8 +2487,6 @@ elseif (! empty($module))
 
 dol_fiche_end(); // End modules
 
-
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/modulebuilder/template/mymoduleindex.php

@@ -233,6 +233,6 @@ if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read)
 
 print '</div></div></div>';
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/modulebuilder/template/myobject_agenda.php

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

htdocs/modulebuilder/template/myobject_card.php

@@ -467,7 +467,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 */
 }
 
-
 // End of page
 llxFooter();
 $db->close();

htdocs/modulebuilder/template/myobject_document.php

@@ -161,6 +161,6 @@ else
 	accessforbidden('',0,0);
 }
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/modulebuilder/template/myobject_note.php

@@ -159,6 +159,6 @@ if ($id > 0 || ! empty($ref))
 	dol_fiche_end();
 }
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/opensurvey/card.php

@@ -430,6 +430,6 @@ if ($object->allow_comments) {
 
 print '</form>';
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/opensurvey/index.php

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

htdocs/opensurvey/list.php

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

htdocs/opensurvey/wizard/choix_autre.php

@@ -161,6 +161,6 @@ print '<a name=bas></a>'."\n";
 print '<br><br><br>'."\n";
 print '</div>'."\n";
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/opensurvey/wizard/choix_date.php

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

htdocs/opensurvey/wizard/create_survey.php

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

htdocs/opensurvey/wizard/index.php

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

htdocs/paybox/admin/paybox.php

@@ -250,5 +250,6 @@ print '<br><br>';
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php';
 
+// End of page
 llxFooter();
 $db->close();

htdocs/paypal/admin/paypal.php

@@ -326,5 +326,6 @@ $token='';
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php';
 
+// End of page
 llxFooter();
 $db->close();

htdocs/printing/admin/printing.php

@@ -361,6 +361,6 @@ if ($mode == 'userconf' && $user->admin)
 
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/printing/index.php

@@ -68,6 +68,6 @@ foreach ($result as $driver)
     }
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/admin/dynamic_prices.php

@@ -357,5 +357,6 @@ if ($action == 'create_updater' || $action == 'edit_updater') {
     print '</form>';
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/admin/price_rules.php

@@ -200,6 +200,6 @@ print '<div style="text-align: center">
 	
 print '</form>';
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/admin/product.php

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

htdocs/product/admin/product_extrafields.php

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

htdocs/product/admin/product_lot_extrafields.php

@@ -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();

htdocs/product/admin/product_tools.php

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

htdocs/product/agenda.php

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

htdocs/product/card.php

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

htdocs/product/composition/card.php

@@ -657,7 +657,6 @@ if ($id > 0 || ! empty($ref))
 	}
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/document.php

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

htdocs/product/dynamic_price/editor.php

@@ -244,5 +244,6 @@ print '<script type="text/javascript">
 	}
 </script>';
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/fournisseurs.php

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

htdocs/product/index.php

@@ -397,8 +397,8 @@ if (! empty($conf->global->MAIN_SHOW_PRODUCT_ACTIVITY_TRIM))
 
 print '</div></div></div>';
 
+// End of page
 llxFooter();
-
 $db->close();
 
 

htdocs/product/inventory/card.php

@@ -409,7 +409,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	*/
 }
 
-
 // End of page
 llxFooter();
 $db->close();

htdocs/product/list.php

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

htdocs/product/note.php

@@ -115,6 +115,7 @@ if ($id > 0 || ! empty($ref))
     dol_fiche_end();
 }
 
+// End of page
 llxFooter();
 $db->close();
 

htdocs/product/popuprop.php

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

htdocs/product/price.php

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

htdocs/product/reassort.php

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

htdocs/product/reassortlot.php

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

htdocs/product/stats/card.php

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

htdocs/product/stats/commande.php

@@ -257,5 +257,6 @@ if ($id > 0 || ! empty($ref))
 	dol_print_error();
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stats/commande_fournisseur.php

@@ -265,5 +265,6 @@ if ($id > 0 || ! empty($ref)) {
 	dol_print_error();
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stats/contrat.php

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

htdocs/product/stats/facture.php

@@ -278,5 +278,6 @@ if ($id > 0 || ! empty($ref))
 	dol_print_error();
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stats/facture_fournisseur.php

@@ -263,5 +263,6 @@ if ($id > 0 || ! empty($ref))
 	dol_print_error();
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stats/propal.php

@@ -261,5 +261,6 @@ if ($id > 0 || ! empty($ref))
 	dol_print_error();
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stats/supplier_proposal.php

@@ -260,5 +260,6 @@ if ($id > 0 || ! empty($ref))
 	dol_print_error();
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stock/card.php

@@ -707,7 +707,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	}
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/stock/fiche-valo.php

@@ -140,5 +140,6 @@ if ($_GET["id"])
 	print "</div>";
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/product/stock/index.php

@@ -185,6 +185,6 @@ if ($resql)
 //print '</td></tr></table>';
 print '</div></div></div>';
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/stock/info.php

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

htdocs/product/stock/list.php

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

htdocs/product/stock/massstockmove.php

@@ -462,7 +462,6 @@ print '<div class="center"><input class="button" type="submit" name="valid" valu
 
 print '</form>';
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/product/stock/mouvement.php

@@ -1173,7 +1173,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete' && $id>0)
 }
 */
 
+// End of page
 llxFooter();
-
 $db->close();
 

htdocs/product/stock/product.php

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

htdocs/product/stock/productlot_card.php

@@ -416,7 +416,6 @@ if (empty($action))
 
 }
 
-
 // End of page
 llxFooter();
 $db->close();

htdocs/product/stock/productlot_list.php

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

htdocs/product/stock/replenishorders.php

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

htdocs/product/stock/valo.php

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

htdocs/product/traduction.php

@@ -354,5 +354,6 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '<br>';
 }
 
+// End of page
 llxFooter();
 $db->close();

htdocs/projet/activity/index.php

@@ -576,7 +576,6 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_S
 
 print '</div></div></div>';
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/projet/activity/perday.php

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

htdocs/projet/activity/perweek.php

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

htdocs/projet/admin/project.php

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

htdocs/projet/admin/project_extrafields.php

@@ -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();

htdocs/projet/admin/project_task_extrafields.php

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

htdocs/projet/card.php

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

htdocs/projet/comment.php

@@ -183,6 +183,6 @@ print '<br>';
 // Include comment tpl view
 include DOL_DOCUMENT_ROOT . '/core/tpl/bloc_comment.tpl.php';
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/projet/contact.php

@@ -266,6 +266,6 @@ if ($id > 0 || ! empty($ref))
 	}
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/projet/document.php

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

htdocs/projet/element.php

@@ -1181,10 +1181,8 @@ if ($conf->use_javascript_ajax)
 	print $comboenhancement;
 }
 
-
-
+// End of page
 llxFooter();
-
 $db->close();
 
 

htdocs/projet/ganttview.php

@@ -364,7 +364,6 @@ else
 	print '<div class="opacitymedium">'.$langs->trans("NoTasks").'</div>';
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/projet/index.php

@@ -318,7 +318,6 @@ if (! empty($conf->global->PROJECT_SHOW_PROJECT_LIST_ON_PROJECT_AREA))
 
 print '</div></div></div>';
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/projet/info.php

@@ -191,6 +191,6 @@ if (!empty($object->id))
     show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
 }
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/projet/list.php

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

htdocs/projet/note.php

@@ -118,6 +118,6 @@ if ($id > 0 || ! empty($ref))
 	dol_fiche_end();
 }
 
+// End of page
 llxFooter();
-
 $db->close();

htdocs/projet/stats/index.php

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

htdocs/projet/tasks.php

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

htdocs/projet/tasks/contact.php

@@ -531,7 +531,6 @@ if (is_object($hookmanager))
 	$reshook=$hookmanager->executeHooks('formContactTpl',$parameters,$object,$action);
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();

htdocs/projet/tasks/document.php

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

htdocs/projet/tasks/list.php

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

htdocs/projet/tasks/note.php

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

htdocs/projet/tasks/stats/index.php

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

htdocs/projet/tasks/task.php

@@ -626,6 +626,6 @@ if ($id > 0 || ! empty($ref))
 	}
 }
 
-
+// End of page
 llxFooter();
 $db->close();

htdocs/projet/tasks/time.php

@@ -1153,6 +1153,6 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 	}
 }
 
-
+// End of page
 llxFooter();
 $db->close();