lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Perf: Function admin are moved from function to admin.lib.php

Browse Source 
Perf: Constant is not stored in database if values is empty.
This commit is contained in:
Laurent Destailleur 2008-02-01 00:09:23 +00:00
parent 53a50912b5
commit 48b0bcf284
50 changed files with 229 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/admin/adherent.php
View File

@ -30,6 +30,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("members"); $langs->load("members");

1
htdocs/admin/barcode.php
View File

@ -26,6 +26,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php");
$dir = DOL_DOCUMENT_ROOT."/includes/modules/barcode/"; $dir = DOL_DOCUMENT_ROOT."/includes/modules/barcode/";

4
htdocs/admin/boutique.php
View File

@ -19,7 +19,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -30,6 +29,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("oscommerce"); $langs->load("oscommerce");
@ -85,7 +85,7 @@ elseif ($_POST["test"])
if ($oscommercedb->connected == 1 && $oscommercedb->database_selected == 1) if ($oscommercedb->connected == 1 && $oscommercedb->database_selected == 1)
{ {
// Vérifie si bonne base par requete sur une table OSCommerce // V<EFBFBD>rifie si bonne base par requete sur une table OSCommerce
$sql ="SELECT configuration_value"; $sql ="SELECT configuration_value";
$sql.=" FROM configuration"; $sql.=" FROM configuration";
$sql.=" WHERE configuration_key='STORE_NAME'"; $sql.=" WHERE configuration_key='STORE_NAME'";

1
htdocs/admin/clicktodial.php
View File

@ -24,6 +24,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");

10
htdocs/admin/commande.php
View File

@ -21,7 +21,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -32,6 +31,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
$langs->load("admin"); $langs->load("admin");
@ -119,7 +119,7 @@ if ($_GET["action"] == 'setdoc')
if ($_GET["action"] == 'setmod') if ($_GET["action"] == 'setmod')
{ {
// \todo Verifier si module numerotation choisi peut etre activé // \todo Verifier si module numerotation choisi peut etre activ<EFBFBD>
// par appel methode canBeActivated // par appel methode canBeActivated
dolibarr_set_const($db, "COMMANDE_ADDON",$_GET["value"]); dolibarr_set_const($db, "COMMANDE_ADDON",$_GET["value"]);
@ -148,7 +148,7 @@ if ($_POST["action"] == 'set_use_customer_contact_as_recipient')
exit; exit;
} }
// défini les constantes du modèle saphir // d<EFBFBD>fini les constantes du mod<6F>le saphir
if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "COMMANDE_NUM_MATRICE",$_POST["matrice"]); if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "COMMANDE_NUM_MATRICE",$_POST["matrice"]);
if ($_POST["action"] == 'updatePrefix') dolibarr_set_const($db, "COMMANDE_NUM_PREFIX",$_POST["prefix"]); if ($_POST["action"] == 'updatePrefix') dolibarr_set_const($db, "COMMANDE_NUM_PREFIX",$_POST["prefix"]);
if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "COMMANDE_NUM_DELTA",$_POST["offset"]); if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "COMMANDE_NUM_DELTA",$_POST["offset"]);
@ -298,7 +298,7 @@ while (($file = readdir($handle))!==false)
print $module->description; print $module->description;
print "</td>\n"; print "</td>\n";
// Activé // Activ<EFBFBD>
if (in_array($name, $def)) if (in_array($name, $def))
{ {
print "<td align=\"center\">\n"; print "<td align=\"center\">\n";
@ -368,7 +368,7 @@ print "<td>&nbsp;</td>\n";
print "</tr>\n"; print "</tr>\n";
$var=true; $var=true;
// Valider la commande après cloture de la propale // Valider la commande apr<EFBFBD>s cloture de la propale
// permet de na pas passer par l'option commande provisoire // permet de na pas passer par l'option commande provisoire
$var=! $var; $var=! $var;
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';

1
htdocs/admin/company.php
View File

@ -26,6 +26,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
$langs->load("admin"); $langs->load("admin");

8
htdocs/admin/compta.php
View File

@ -17,17 +17,17 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
\file htdocs/admin/compta.php \file htdocs/admin/compta.php
\ingroup comptabilite \ingroup comptabilite
\brief Page de configuration du module comptabilité \brief Page de configuration du module comptabilit<EFBFBD>
\version $Revision$ \version $Revision$
*/ */
require('./pre.inc.php'); require('./pre.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load('admin'); $langs->load('admin');
$langs->load('compta'); $langs->load('compta');
@ -83,7 +83,7 @@ print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
// Cas du paramètre COMPTA_MODE // Cas du param<EFBFBD>tre COMPTA_MODE
print '<form action="compta.php" method="post">'; print '<form action="compta.php" method="post">';
print '<input type="hidden" name="action" value="setcomptamode">'; print '<input type="hidden" name="action" value="setcomptamode">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -100,7 +100,7 @@ print "</table>\n";
print "<br>\n"; print "<br>\n";
// Cas des autres paramètres COMPTA_* // Cas des autres param<EFBFBD>tres COMPTA_*
$sql ="SELECT rowid, name, value, type, note"; $sql ="SELECT rowid, name, value, type, note";
$sql.=" FROM llx_const"; $sql.=" FROM llx_const";
$sql.=" WHERE name like 'COMPTA_%' and name not in ('COMPTA_MODE')"; $sql.=" WHERE name like 'COMPTA_%' and name not in ('COMPTA_MODE')";

7
htdocs/admin/comptaexpert.php
View File

@ -23,11 +23,12 @@
/** /**
\file htdocs/admin/comptaexpert.php \file htdocs/admin/comptaexpert.php
\ingroup comptaexpert \ingroup comptaexpert
\brief Page de configuration du module comptabilité expert \brief Page de configuration du module comptabilit<EFBFBD> expert
\version $Revision$ \version $Revision$
*/ */
require('./pre.inc.php'); require('./pre.inc.php');
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load('admin'); $langs->load('admin');
$langs->load('compta'); $langs->load('compta');
@ -84,7 +85,7 @@ print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
// Cas du paramètre COMPTA_MODE // Cas du param<EFBFBD>tre COMPTA_MODE
print '<form action="compta.php" method="post">'; print '<form action="compta.php" method="post">';
print '<input type="hidden" name="action" value="setcomptamode">'; print '<input type="hidden" name="action" value="setcomptamode">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -101,7 +102,7 @@ print "</table>\n";
print "<br>\n"; print "<br>\n";
// Cas des autres paramètres COMPTA_* // Cas des autres param<EFBFBD>tres COMPTA_*
/* /*
$sql ="SELECT rowid, name, value, type, note"; $sql ="SELECT rowid, name, value, type, note";
$sql.=" FROM llx_const"; $sql.=" FROM llx_const";

1
htdocs/admin/confexped.php
View File

@ -25,6 +25,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("sendings"); $langs->load("sendings");

1
htdocs/admin/const.php
View File

@ -27,6 +27,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");

1
htdocs/admin/delais.php
View File

@ -27,6 +27,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("orders"); $langs->load("orders");

6
htdocs/admin/dons.php
View File

@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -26,7 +25,8 @@
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require(DOL_DOCUMENT_ROOT."/don.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/don.class.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("donations"); $langs->load("donations");
@ -187,7 +187,7 @@ while (($file = readdir($handle))!==false)
print $module->description; print $module->description;
print '</td>'; print '</td>';
// Activé // Activ<EFBFBD>
if (in_array($name, $def)) if (in_array($name, $def))
{ {
print "<td align=\"center\">\n"; print "<td align=\"center\">\n";

3
htdocs/admin/droitpret.php
View File

@ -27,6 +27,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php"); require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
$langs->load("admin"); $langs->load("admin");
@ -79,7 +80,7 @@ print "</tr>\n";
$var=true; $var=true;
$form = new Form($db); $form = new Form($db);
// Catégorie // Cat<EFBFBD>gorie
$var=!$var; $var=!$var;
print '<form action="droitpret.php" method="POST">'; print '<form action="droitpret.php" method="POST">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';

7
htdocs/admin/editeur.php
View File

@ -27,6 +27,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
@ -34,7 +35,7 @@ if (!$user->admin)
accessforbidden(); accessforbidden();
// Action activation d'un sous module du module adhérent // Action activation d'un sous module du module adh<EFBFBD>rent
if ($_POST["action"] == 'set') if ($_POST["action"] == 'set')
{ {
$name = "EDITEUR_LIVRE_FORMAT_".time(); $name = "EDITEUR_LIVRE_FORMAT_".time();
@ -45,7 +46,7 @@ if ($_POST["action"] == 'set')
} }
} }
// Action désactivation d'un sous module du module adhérent // Action d<EFBFBD>sactivation d'un sous module du module adh<64>rent
if ($_GET["action"] == 'unset') if ($_GET["action"] == 'unset')
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name LIKE 'EDITEUR_LIVRE_FORMAT_%'"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name LIKE 'EDITEUR_LIVRE_FORMAT_%'";
@ -83,7 +84,7 @@ print '<br>';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>Formats définits</td>'; print '<td>Formats d<EFBFBD>finits</td>';
print '<td align="center" width="80">'.$langs->trans("Action").'</td>'; print '<td align="center" width="80">'.$langs->trans("Action").'</td>';
print "</tr>\n"; print "</tr>\n";
$var=true; $var=true;

2
htdocs/admin/energie.php
View File

@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** \file htdocs/admin/energie.php /** \file htdocs/admin/energie.php
@ -27,6 +26,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");

5
htdocs/admin/expedition.php
View File

@ -29,6 +29,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/expedition/expedition.class.php'); require_once(DOL_DOCUMENT_ROOT.'/expedition/expedition.class.php');
$langs->load("admin"); $langs->load("admin");
@ -184,7 +185,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod')
if ($_GET["action"] == 'setmod') if ($_GET["action"] == 'setmod')
{ {
// \todo Verifier si module numerotation choisi peut etre activé // \todo Verifier si module numerotation choisi peut etre activ<EFBFBD>
// par appel methode canBeActivated // par appel methode canBeActivated
dolibarr_set_const($db, "EXPEDITION_ADDON",$_GET["module"]); dolibarr_set_const($db, "EXPEDITION_ADDON",$_GET["module"]);
@ -229,7 +230,7 @@ if ($conf->global->MAIN_SUBMODULE_LIVRAISON)
dolibarr_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); dolibarr_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
// Méthode de livraison // M<EFBFBD>thode de livraison
$mods=array(); $mods=array();
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."expedition_methode WHERE statut = 1"; $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."expedition_methode WHERE statut = 1";
$resql = $db->query($sql); $resql = $db->query($sql);

11
htdocs/admin/external_rss.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2003 Éric Seigne <erics@rycks.com> /* Copyright (C) 2003 <EFBFBD>ric Seigne <erics@rycks.com>
* Copyright (C) 2003,2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2003,2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
@ -30,6 +30,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
include_once(MAGPIERSS_PATH."rss_fetch.inc"); include_once(MAGPIERSS_PATH."rss_fetch.inc");
@ -69,7 +70,7 @@ if ($_POST["action"] == 'add' || $_POST["modify"])
if ($_POST["modify"]) if ($_POST["modify"])
{ {
// Supprime boite box_external_rss de définition des boites // Supprime boite box_external_rss de d<EFBFBD>finition des boites
$sql = "UPDATE ".MAIN_DB_PREFIX."boxes_def"; $sql = "UPDATE ".MAIN_DB_PREFIX."boxes_def";
$sql.= " SET name = '".$boxlabel."'"; $sql.= " SET name = '".$boxlabel."'";
$sql.= " WHERE file ='box_external_rss.php' AND note like '".$_POST["norss"]." %'"; $sql.= " WHERE file ='box_external_rss.php' AND note like '".$_POST["norss"]." %'";
@ -83,7 +84,7 @@ if ($_POST["action"] == 'add' || $_POST["modify"])
} }
else else
{ {
// Ajoute boite box_external_rss dans définition des boites // Ajoute boite box_external_rss dans d<EFBFBD>finition des boites
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (name, file, note)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (name, file, note)";
$sql.= " VALUES ('".$boxlabel."','box_external_rss.php','".addslashes($_POST["norss"].' ('.$_POST[$external_rss_title]).")')"; $sql.= " VALUES ('".$boxlabel."','box_external_rss.php','".addslashes($_POST["norss"].' ('.$_POST[$external_rss_title]).")')";
if (! $db->query($sql)) if (! $db->query($sql))
@ -116,7 +117,7 @@ if ($_POST["delete"])
{ {
$db->begin(); $db->begin();
// Supprime boite box_external_rss de définition des boites // Supprime boite box_external_rss de d<EFBFBD>finition des boites
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def"; $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def";
$sql.= " WHERE file ='box_external_rss.php' AND note like '".$_POST["norss"]." %'"; $sql.= " WHERE file ='box_external_rss.php' AND note like '".$_POST["norss"]." %'";
@ -247,7 +248,7 @@ if ($resql)
print "<form name=\"externalrssconfig\" action=\"external_rss.php\" method=\"post\">"; print "<form name=\"externalrssconfig\" action=\"external_rss.php\" method=\"post\">";
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print "<td colspan=\"2\">Syndication du flux numéro " . ($i+1) . "</td>"; print "<td colspan=\"2\">Syndication du flux num<EFBFBD>ro " . ($i+1) . "</td>";
print "</tr>"; print "</tr>";
$var=!$var; $var=!$var;

19
htdocs/admin/facture.php
View File

@ -29,6 +29,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/facture.class.php');
$langs->load("admin"); $langs->load("admin");
@ -124,7 +125,7 @@ if ($_GET["action"] == 'setdoc')
if ($_GET["action"] == 'setmod') if ($_GET["action"] == 'setmod')
{ {
// \todo Verifier si module numerotation choisi peut etre activé // \todo Verifier si module numerotation choisi peut etre activ<EFBFBD>
// par appel methode canBeActivated // par appel methode canBeActivated
dolibarr_set_const($db, "FACTURE_ADDON",$_GET["value"]); dolibarr_set_const($db, "FACTURE_ADDON",$_GET["value"]);
@ -172,7 +173,7 @@ if ($_GET["action"] == 'delete')
} }
} }
// défini les constantes du modèle pluton // d<EFBFBD>fini les constantes du mod<6F>le pluton
if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "FACTURE_NUM_MATRICE",$_POST["matrice"]); if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "FACTURE_NUM_MATRICE",$_POST["matrice"]);
if ($_POST["action"] == 'updatePrefixFacture') dolibarr_set_const($db, "FACTURE_NUM_PREFIX",$_POST["prefixfacture"]); if ($_POST["action"] == 'updatePrefixFacture') dolibarr_set_const($db, "FACTURE_NUM_PREFIX",$_POST["prefixfacture"]);
if ($_POST["action"] == 'updatePrefixAvoir') dolibarr_set_const($db, "AVOIR_NUM_PREFIX",$_POST["prefixavoir"]); if ($_POST["action"] == 'updatePrefixAvoir') dolibarr_set_const($db, "AVOIR_NUM_PREFIX",$_POST["prefixavoir"]);
@ -206,7 +207,7 @@ $h++;
dolibarr_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); dolibarr_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
/* /*
* Module numérotation * Module num<EFBFBD>rotation
*/ */
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -229,7 +230,7 @@ while (($file = readdir($handle))!==false)
$filebis = $file."/".$file.".modules.php"; $filebis = $file."/".$file.".modules.php";
if (is_readable($dir.$filebis)) if (is_readable($dir.$filebis))
{ {
// Chargement de la classe de numérotation // Chargement de la classe de num<EFBFBD>rotation
require_once($dir.$filebis); require_once($dir.$filebis);
$classname = "mod_facture_".$file; $classname = "mod_facture_".$file;
$module = new $classname($db); $module = new $classname($db);
@ -350,7 +351,7 @@ while (($file = readdir($handle))!==false)
print $module->description; print $module->description;
print '</td>'; print '</td>';
// Activé // Activ<EFBFBD>
if (in_array($name, $def)) if (in_array($name, $def))
{ {
print "<td align=\"center\">\n"; print "<td align=\"center\">\n";
@ -412,7 +413,7 @@ print '</table>';
/* /*
* Modes de règlement * Modes de r<EFBFBD>glement
* *
*/ */
print '<br>'; print '<br>';
@ -470,7 +471,7 @@ else
print "</td></tr>"; print "</td></tr>";
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print "<td>Proposer paiement par chèque à l'ordre et adresse de</td>"; print "<td>Proposer paiement par ch<EFBFBD>que <20> l'ordre et adresse de</td>";
print "<td>"; print "<td>";
print '<select name="chq">'; print '<select name="chq">';
print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>'; print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>';
@ -528,7 +529,7 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
print "</td></tr>\n"; print "</td></tr>\n";
print '</form>'; print '</form>';
// Active facture récurrentes // Active facture r<EFBFBD>currentes
$var=! $var; $var=! $var;
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="action" value="set_disable_repeatable">'; print '<input type="hidden" name="action" value="set_disable_repeatable">';
@ -541,7 +542,7 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
print "</td></tr>\n"; print "</td></tr>\n";
print '</form>'; print '</form>';
// Active la possibilité d'éditer/supprimer une facture validée sans paiement // Active la possibilit<EFBFBD> d'<27>diter/supprimer une facture valid<69>e sans paiement
$var=! $var; $var=! $var;
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="action" value="set_enable_editdelete">'; print '<input type="hidden" name="action" value="set_enable_editdelete">';

1
htdocs/admin/fckeditor.php
View File

@ -27,6 +27,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("fckeditor"); $langs->load("fckeditor");

11
htdocs/admin/fichinter.php
View File

@ -31,6 +31,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/fichinter/fichinter.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fichinter/fichinter.class.php');
$langs->load("admin"); $langs->load("admin");
@ -101,8 +102,8 @@ if ($_GET["action"] == 'setdoc')
if (dolibarr_set_const($db, "FICHEINTER_ADDON_PDF",$_GET["value"])) if (dolibarr_set_const($db, "FICHEINTER_ADDON_PDF",$_GET["value"]))
{ {
// La constante qui a été lue en avant du nouveau set // La constante qui a <EFBFBD>t<EFBFBD> lue en avant du nouveau set
// on passe donc par une variable pour avoir un affichage cohérent // on passe donc par une variable pour avoir un affichage coh<EFBFBD>rent
$conf->global->FICHEINTER_ADDON_PDF = $_GET["value"]; $conf->global->FICHEINTER_ADDON_PDF = $_GET["value"];
} }
@ -125,13 +126,13 @@ if ($_GET["action"] == 'setdoc')
if ($_GET["action"] == 'setmod') if ($_GET["action"] == 'setmod')
{ {
// \todo Verifier si module numerotation choisi peut etre activé // \todo Verifier si module numerotation choisi peut etre activ<EFBFBD>
// par appel methode canBeActivated // par appel methode canBeActivated
dolibarr_set_const($db, "FICHEINTER_ADDON",$_GET["value"]); dolibarr_set_const($db, "FICHEINTER_ADDON",$_GET["value"]);
} }
// défini les constantes du modèle arctic // d<EFBFBD>fini les constantes du mod<6F>le arctic
if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "FICHEINTER_NUM_MATRICE",$_POST["matrice"]); if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "FICHEINTER_NUM_MATRICE",$_POST["matrice"]);
if ($_POST["action"] == 'updatePrefix') dolibarr_set_const($db, "FICHEINTER_NUM_PREFIX",$_POST["prefix"]); if ($_POST["action"] == 'updatePrefix') dolibarr_set_const($db, "FICHEINTER_NUM_PREFIX",$_POST["prefix"]);
if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "FICHEINTER_NUM_DELTA",$_POST["offset"]); if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "FICHEINTER_NUM_DELTA",$_POST["offset"]);
@ -282,7 +283,7 @@ while (($file = readdir($handle))!==false)
print $module->description; print $module->description;
print '</td>'; print '</td>';
// Activé // Activ<EFBFBD>
if (in_array($name, $def)) if (in_array($name, $def))
{ {
print "<td align=\"center\">\n"; print "<td align=\"center\">\n";

7
htdocs/admin/fournisseur.php
View File

@ -30,6 +30,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.class.php');
require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.commande.class.php');
@ -122,7 +123,7 @@ if ($_GET["action"] == 'setdoc')
if ($_GET["action"] == 'setmod') if ($_GET["action"] == 'setmod')
{ {
// \todo Verifier si module numerotation choisi peut etre activé // \todo Verifier si module numerotation choisi peut etre activ<EFBFBD>
// par appel methode canBeActivated // par appel methode canBeActivated
dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON",$_GET["value"]); dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON",$_GET["value"]);
@ -134,7 +135,7 @@ if ($_POST["action"] == 'addcat')
$fourn->CreateCategory($user,$_POST["cat"]); $fourn->CreateCategory($user,$_POST["cat"]);
} }
// défini les constantes du modèle orchidee // d<EFBFBD>fini les constantes du mod<6F>le orchidee
if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_MATRICE",$_POST["matrice"]); if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_MATRICE",$_POST["matrice"]);
if ($_POST["action"] == 'updatePrefixCommande') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_PREFIX",$_POST["prefixcommande"]); if ($_POST["action"] == 'updatePrefixCommande') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_PREFIX",$_POST["prefixcommande"]);
if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_DELTA",$_POST["offset"]); if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_DELTA",$_POST["offset"]);
@ -283,7 +284,7 @@ while (($file = readdir($handle))!==false)
print $module->description; print $module->description;
print "</td>\n"; print "</td>\n";
// Activé // Activ<EFBFBD>
if (in_array($name, $def)) if (in_array($name, $def))
{ {
print "<td align=\"center\">\n"; print "<td align=\"center\">\n";

1
htdocs/admin/ihm.php
View File

@ -24,6 +24,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("products"); $langs->load("products");

3
htdocs/admin/ldap.php
View File

@ -31,6 +31,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
@ -255,7 +256,7 @@ if (function_exists("ldap_connect"))
if ($_GET["action"] == 'test') if ($_GET["action"] == 'test')
{ {
$ldap = new Ldap(); // Les parametres sont passés et récupérés via $conf $ldap = new Ldap(); // Les parametres sont pass<EFBFBD>s et r<>cup<75>r<EFBFBD>s via $conf
$result = $ldap->connect_bind(); $result = $ldap->connect_bind();
if ($result) if ($result)

1
htdocs/admin/ldap_contacts.php
View File

@ -31,6 +31,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php");

1
htdocs/admin/ldap_groups.php
View File

@ -31,6 +31,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user.class.php");
require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");

2
htdocs/admin/ldap_members.php
View File

@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -31,6 +30,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");

1
htdocs/admin/ldap_users.php
View File

@ -31,6 +31,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user.class.php");
require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");

1
htdocs/admin/limits.php
View File

@ -26,6 +26,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("products"); $langs->load("products");

7
htdocs/admin/livraison.php
View File

@ -28,6 +28,7 @@
\version $Id$ \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/livraison/livraison.class.php"); require_once(DOL_DOCUMENT_ROOT."/livraison/livraison.class.php");
$langs->load("admin"); $langs->load("admin");
@ -121,13 +122,13 @@ if ($_GET["action"] == 'setdoc')
if ($_GET["action"] == 'setmod') if ($_GET["action"] == 'setmod')
{ {
// \todo Verifier si module numerotation choisi peut etre activé // \todo Verifier si module numerotation choisi peut etre activ<EFBFBD>
// par appel methode canBeActivated // par appel methode canBeActivated
dolibarr_set_const($db, "LIVRAISON_ADDON",$_GET["value"]); dolibarr_set_const($db, "LIVRAISON_ADDON",$_GET["value"]);
} }
// défini les constantes du modèle saphir // d<EFBFBD>fini les constantes du mod<6F>le saphir
if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "LIVRAISON_NUM_MATRICE",$_POST["matrice"]); if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "LIVRAISON_NUM_MATRICE",$_POST["matrice"]);
if ($_POST["action"] == 'updatePrefix') dolibarr_set_const($db, "LIVRAISON_NUM_PREFIX",$_POST["prefix"]); if ($_POST["action"] == 'updatePrefix') dolibarr_set_const($db, "LIVRAISON_NUM_PREFIX",$_POST["prefix"]);
if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "LIVRAISON_NUM_DELTA",$_POST["offset"]); if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "LIVRAISON_NUM_DELTA",$_POST["offset"]);
@ -170,7 +171,7 @@ $h++;
dolibarr_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); dolibarr_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
/* /*
* Module numérotation * Module num<EFBFBD>rotation
*/ */
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';

3
htdocs/admin/mailing.php
View File

@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -26,8 +25,8 @@
\brief Page d'administration/configuration du module mailing \brief Page d'administration/configuration du module mailing
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");

5
htdocs/admin/mails.php
View File

@ -26,6 +26,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("products"); $langs->load("products");
@ -197,7 +198,7 @@ else
print '<br>'; print '<br>';
print_titre($langs->trans("TestMailing")); print_titre($langs->trans("TestMailing"));
// Créé l'objet formulaire mail // Cr<EFBFBD><EFBFBD> l'objet formulaire mail
include_once("../html.formmail.class.php"); include_once("../html.formmail.class.php");
$formmail = new FormMail($db); $formmail = new FormMail($db);
$formmail->fromname = $conf->global->MAIN_MAIL_EMAIL_FROM; $formmail->fromname = $conf->global->MAIN_MAIL_EMAIL_FROM;
@ -215,7 +216,7 @@ else
$formmail->withcancel=1; $formmail->withcancel=1;
// Tableau des substitutions // Tableau des substitutions
$formmail->substit=$substitutionarrayfortest; $formmail->substit=$substitutionarrayfortest;
// Tableau des paramètres complémentaires du post // Tableau des param<EFBFBD>tres compl<70>mentaires du post
$formmail->param["action"]="send"; $formmail->param["action"]="send";
$formmail->param["models"]="body"; $formmail->param["models"]="body";
$formmail->param["mailid"]=$mil->id; $formmail->param["mailid"]=$mil->id;

5
htdocs/admin/mantis.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Éric Seigne <erics@rycks.com> * Copyright (C) 2003 <EFBFBD>ric Seigne <erics@rycks.com>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
@ -30,6 +30,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/mantis/mantis.class.php'); require_once(DOL_DOCUMENT_ROOT.'/mantis/mantis.class.php');
@ -88,7 +89,7 @@ elseif ($actiontest)
if ($mantis->localdb->connected == 1 && $mantis->localdb->database_selected == 1) if ($mantis->localdb->connected == 1 && $mantis->localdb->database_selected == 1)
{ {
// Vérifie si bonne base // V<EFBFBD>rifie si bonne base
$sql="SELECT value FROM mantis_config_table WHERE config_id='database_version'"; $sql="SELECT value FROM mantis_config_table WHERE config_id='database_version'";
$resql=$mantis->localdb->query($sql); $resql=$mantis->localdb->query($sql);
if ($resql) { if ($resql) {

1
htdocs/admin/menus.php
View File

@ -26,6 +26,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");

1
htdocs/admin/notification.php
View File

@ -28,6 +28,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");

3
htdocs/admin/phenix.php
View File

@ -28,6 +28,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/phenix/phenix.class.php'); require_once(DOL_DOCUMENT_ROOT.'/phenix/phenix.class.php');
@ -94,7 +95,7 @@ elseif ($actiontest)
if ($phenix->localdb->connected == 1 && $phenix->localdb->database_selected == 1) if ($phenix->localdb->connected == 1 && $phenix->localdb->database_selected == 1)
{ {
// Vérifie si bonne base // V<EFBFBD>rifie si bonne base
/* /*
$sql="SELECT cal_value FROM webcal_config WHERE cal_setting='application_name'"; $sql="SELECT cal_value FROM webcal_config WHERE cal_setting='application_name'";
$resql=$phenix->localdb->query($sql); $resql=$phenix->localdb->query($sql);

3
htdocs/admin/produit.php
View File

@ -30,6 +30,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php");
$langs->load("admin"); $langs->load("admin");
@ -259,7 +260,7 @@ print "</td>";
print '</tr>'; print '</tr>';
print '</form>'; print '</form>';
// Utilisation de l'écotaxe // Utilisation de l'<EFBFBD>cotaxe
$var=!$var; $var=!$var;
print "<form method=\"post\" action=\"produit.php\">"; print "<form method=\"post\" action=\"produit.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"useecotaxe\">"; print "<input type=\"hidden\" name=\"action\" value=\"useecotaxe\">";

9
htdocs/admin/propale.php
View File

@ -32,6 +32,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
$langs->load("admin"); $langs->load("admin");
@ -172,13 +173,13 @@ if ($_GET["action"] == 'setdoc')
if ($_GET["action"] == 'setmod') if ($_GET["action"] == 'setmod')
{ {
// \todo Verifier si module numerotation choisi peut etre activé // \todo Verifier si module numerotation choisi peut etre activ<EFBFBD>
// par appel methode canBeActivated // par appel methode canBeActivated
dolibarr_set_const($db, "PROPALE_ADDON",$_GET["value"]); dolibarr_set_const($db, "PROPALE_ADDON",$_GET["value"]);
} }
// défini les constantes du modèle saphir // d<EFBFBD>fini les constantes du mod<6F>le saphir
if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "PROPALE_NUM_MATRICE",$_POST["matrice"]); if ($_POST["action"] == 'updateMatrice') dolibarr_set_const($db, "PROPALE_NUM_MATRICE",$_POST["matrice"]);
if ($_POST["action"] == 'updatePrefix') dolibarr_set_const($db, "PROPALE_NUM_PREFIX",$_POST["prefix"]); if ($_POST["action"] == 'updatePrefix') dolibarr_set_const($db, "PROPALE_NUM_PREFIX",$_POST["prefix"]);
if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "PROPALE_NUM_DELTA",$_POST["offset"]); if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "PROPALE_NUM_DELTA",$_POST["offset"]);
@ -200,7 +201,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("PropalSetup"),$linkback,'setup');
/* /*
* Module numérotation * Module num<EFBFBD>rotation
*/ */
print "<br>"; print "<br>";
print_titre($langs->trans("ProposalsNumberingModules")); print_titre($langs->trans("ProposalsNumberingModules"));
@ -331,7 +332,7 @@ while (($file = readdir($handle))!==false)
print $module->description; print $module->description;
print '</td>'; print '</td>';
// Activé // Activ<EFBFBD>
if (in_array($name, $def)) if (in_array($name, $def))
{ {
print "<td align=\"center\">\n"; print "<td align=\"center\">\n";

1
htdocs/admin/security.php
View File

@ -27,6 +27,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("users"); $langs->load("users");
$langs->load("admin"); $langs->load("admin");

6
htdocs/admin/security_other.php
View File

@ -22,11 +22,12 @@
/** /**
\file htdocs/admin/security_other.php \file htdocs/admin/security_other.php
\ingroup setup \ingroup setup
\brief Page de configuration du module sécurité autre \brief Page de configuration du module s<EFBFBD>curit<EFBFBD> autre
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("users"); $langs->load("users");
$langs->load("admin"); $langs->load("admin");
@ -188,10 +189,11 @@ print "<tr ".$bc[$var].">";
print '<td colspan="3">'.$langs->trans("UseAvToScanUploadedFiles"); print '<td colspan="3">'.$langs->trans("UseAvToScanUploadedFiles");
if($conf->global->MAIN_USE_AVSCAN == 1) if($conf->global->MAIN_USE_AVSCAN == 1)
{ {
print ' : ';
// Clamav // Clamav
if (function_exists("cl_scanfile")) if (function_exists("cl_scanfile"))
{ {
print ' : '.cl_info(); print cl_info();
} }
} }
print '</td>'; print '</td>';

15
htdocs/admin/societe.php
View File

@ -29,6 +29,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
@ -262,20 +263,6 @@ else
print '</tr>'; print '</tr>';
print '</form>'; print '</form>';
// Faire apparaitre les dates en entier dans la liste des actions
$var=!$var;
print "<form method=\"post\" action=\"societe.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"viewfulldateactions\">";
print "<tr ".$bc[$var].">";
print '<td width="80%">'.$langs->trans("ViewFullDateActions").'</td>';
print '<td width="60" align="right">';
print $html->selectyesno("activate_viewfulldateactions",$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS,1);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td>";
print '</tr>';
print '</form>';
print '</table>'; print '</table>';
$db->close(); $db->close();

10
htdocs/admin/stock.php
View File

@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -26,6 +25,7 @@
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("stocks"); $langs->load("stocks");
@ -39,7 +39,7 @@ if (!$user->admin)
if ($_POST["action"] == 'stock_userstock') if ($_POST["action"] == 'stock_userstock')
{ {
dolibarr_set_const($db, "STOCK_USERSTOCK", $_POST["stock_userstock"]); dolibarr_set_const($db, "STOCK_USERSTOCK", $_POST["stock_userstock"]);
//On désactive l'autocréation si l'option "stock personnel" est désactivée //On d<EFBFBD>sactive l'autocr<63>ation si l'option "stock personnel" est d<>sactiv<69>e
if ($_POST["stock_userstock"] == 0) if ($_POST["stock_userstock"] == 0)
{ {
dolibarr_set_const($db, "STOCK_USERSTOCK_AUTOCREATE", 0); dolibarr_set_const($db, "STOCK_USERSTOCK_AUTOCREATE", 0);
@ -56,7 +56,7 @@ elseif ($_POST["action"] == 'stock_userstock_autocreate')
elseif ($_POST["action"] == 'stock_bill') elseif ($_POST["action"] == 'stock_bill')
{ {
dolibarr_set_const($db, "STOCK_CALCULATE_ON_BILL", $_POST["stock_bill"]); dolibarr_set_const($db, "STOCK_CALCULATE_ON_BILL", $_POST["stock_bill"]);
//Si activée on désactive la décrémentation du stock à la validation de commande et/ou à l'expédition //Si activ<EFBFBD>e on d<>sactive la d<>cr<63>mentation du stock <20> la validation de commande et/ou <20> l'exp<78>dition
if ($_POST["stock_bill"] == 1) if ($_POST["stock_bill"] == 1)
{ {
if ($conf->commande->enabled) dolibarr_set_const($db, "STOCK_CALCULATE_ON_VALIDATE_ORDER", 0); if ($conf->commande->enabled) dolibarr_set_const($db, "STOCK_CALCULATE_ON_VALIDATE_ORDER", 0);
@ -68,7 +68,7 @@ elseif ($_POST["action"] == 'stock_bill')
elseif ($_POST["action"] == 'stock_validateorder') elseif ($_POST["action"] == 'stock_validateorder')
{ {
dolibarr_set_const($db, "STOCK_CALCULATE_ON_VALIDATE_ORDER", $_POST["stock_validateorder"]); dolibarr_set_const($db, "STOCK_CALCULATE_ON_VALIDATE_ORDER", $_POST["stock_validateorder"]);
//Si activée on désactive la décrémentation du stock à la facturation et/ou à l'expédition //Si activ<EFBFBD>e on d<>sactive la d<>cr<63>mentation du stock <20> la facturation et/ou <20> l'exp<78>dition
if ($_POST["stock_validateorder"] == 1) if ($_POST["stock_validateorder"] == 1)
{ {
if ($conf->facture->enabled) dolibarr_set_const($db, "STOCK_CALCULATE_ON_BILL", 0); if ($conf->facture->enabled) dolibarr_set_const($db, "STOCK_CALCULATE_ON_BILL", 0);
@ -80,7 +80,7 @@ elseif ($_POST["action"] == 'stock_validateorder')
elseif ($_POST["action"] == 'stock_shipment') elseif ($_POST["action"] == 'stock_shipment')
{ {
dolibarr_set_const($db, "STOCK_CALCULATE_ON_SHIPMENT", $_POST["stock_shipment"]); dolibarr_set_const($db, "STOCK_CALCULATE_ON_SHIPMENT", $_POST["stock_shipment"]);
//Si activée on désactive la décrémentation du stock à la facturation et/ou à la validation de commande //Si activ<EFBFBD>e on d<>sactive la d<>cr<63>mentation du stock <20> la facturation et/ou <20> la validation de commande
if ($_POST["stock_shipment"] == 1) if ($_POST["stock_shipment"] == 1)
{ {
if ($conf->facture->enabled) dolibarr_set_const($db, "STOCK_CALCULATE_ON_BILL", 0); if ($conf->facture->enabled) dolibarr_set_const($db, "STOCK_CALCULATE_ON_BILL", 0);

5
htdocs/admin/syslog.php
View File

@ -15,17 +15,16 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\file htdocs/admin/syslog.php \file htdocs/admin/syslog.php
\ingroup syslog \ingroup syslog
\brief Page de configuration du module syslog \brief Page de configuration du module syslog
\version $Revision$ \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();

1
htdocs/admin/tools/export.php
View File

@ -23,6 +23,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php"; include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";

9
htdocs/admin/webcalendar.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Éric Seigne <erics@rycks.com> * Copyright (C) 2003 <EFBFBD>ric Seigne <erics@rycks.com>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
@ -18,18 +18,17 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\file htdocs/admin/webcalendar.php \file htdocs/admin/webcalendar.php
\ingroup webcalendar \ingroup webcalendar
\brief Page de configuration du module webcalendar \brief Page de configuration du module webcalendar
\version $Revision$ \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/webcal/webcal.class.php'); require_once(DOL_DOCUMENT_ROOT.'/webcal/webcal.class.php');
@ -95,7 +94,7 @@ elseif ($actiontest)
if ($webcal->localdb->connected == 1 && $webcal->localdb->database_selected == 1) if ($webcal->localdb->connected == 1 && $webcal->localdb->database_selected == 1)
{ {
// Vérifie si bonne base // V<EFBFBD>rifie si bonne base
$sql="SELECT cal_value FROM webcal_config WHERE cal_setting='application_name'"; $sql="SELECT cal_value FROM webcal_config WHERE cal_setting='application_name'";
$resql=$webcal->localdb->query($sql); $resql=$webcal->localdb->query($sql);
if ($resql) { if ($resql) {

15
htdocs/compta/prelevement/config.php
View File

@ -15,19 +15,18 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/ */
/** /**
\file htdocs/compta/prelevement/config.php \file htdocs/compta/prelevement/config.php
\ingroup prelevement \ingroup prelevement
\brief Page configuration des prelevements \brief Page configuration des prelevements
\version $Revision$ \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
if (!$user->rights->prelevement->bons->lire) if (!$user->rights->prelevement->bons->lire)
accessforbidden(); accessforbidden();
@ -87,7 +86,7 @@ if ($user->rights->prelevement->bons->configurer)
print '<td width="30%">Valeur Actuelle</td>'; print '<td width="30%">Valeur Actuelle</td>';
print "</tr>\n"; print "</tr>\n";
print '<tr class="pair"><td>Numéro National Emetteur</td>'; print '<tr class="pair"><td>Num<EFBFBD>ro National Emetteur</td>';
if ($user->rights->prelevement->bons->configurer) if ($user->rights->prelevement->bons->configurer)
{ {
print '<td align="left">'; print '<td align="left">';
@ -123,7 +122,7 @@ if ($user->rights->prelevement->bons->configurer)
} }
print '<td>'.PRELEVEMENT_CODE_GUICHET.'</td></tr>'; print '<td>'.PRELEVEMENT_CODE_GUICHET.'</td></tr>';
print '<tr class="pair"><td>Numéro compte</td>'; print '<tr class="pair"><td>Num<EFBFBD>ro compte</td>';
if ($user->rights->prelevement->bons->configurer) if ($user->rights->prelevement->bons->configurer)
{ {
print '<td align="left">'; print '<td align="left">';
@ -132,7 +131,7 @@ if ($user->rights->prelevement->bons->configurer)
} }
print '<td>'.PRELEVEMENT_NUMERO_COMPTE.'</td></tr>'; print '<td>'.PRELEVEMENT_NUMERO_COMPTE.'</td></tr>';
print '<tr class="impair"><td>Utilisateur responsable des prélèvements</td>'; print '<tr class="impair"><td>Utilisateur responsable des pr<EFBFBD>l<EFBFBD>vements</td>';
if ($user->rights->prelevement->bons->configurer) if ($user->rights->prelevement->bons->configurer)
{ {
print '<td align="left">'; print '<td align="left">';
@ -228,7 +227,7 @@ if ($user->rights->prelevement->bons->configurer)
print '<option value="tr">Transmission du bon</option>'; print '<option value="tr">Transmission du bon</option>';
print '<option value="em">Emission du bon</option>'; print '<option value="em">Emission du bon</option>';
print '<option value="cr">Crédit du bon</option>'; print '<option value="cr">Cr<EFBFBD>dit du bon</option>';
print '</select></td>'; print '</select></td>';
print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>'; print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';

102
htdocs/lib/admin.lib.php
View File

@ -199,5 +199,105 @@ function run_sql($sqlfile,$silent=1)
} }
return $ok; return $ok;
} }
/**
\brief Effacement d'une constante dans la base de données
\sa dolibarr_get_const, dolibarr_sel_const
\param db Handler d'accés base
\param name Nom ou rowid de la constante
\return int <0 si ko, >0 si ok
*/
function dolibarr_del_const($db, $name)
{
global $conf;
$sql = "DELETE FROM llx_const";
$sql.=" WHERE name='".addslashes($name)."' or rowid='".addslashes($name)."'";
$resql=$db->query($sql);
if ($resql)
{
$conf->global->$name='';
return 1;
}
else
{
return -1;
}
}
/**
\brief Récupére une constante depuis la base de données.
\sa dolibarr_del_const, dolibarr_set_const
\param db Handler d'accés base
\param name Nom de la constante
\return string Valeur de la constante
*/
function dolibarr_get_const($db, $name)
{
$value='';
$sql ="SELECT value";
$sql.=" FROM llx_const";
$sql.=" WHERE name = '".addslashes($name)."'";
$resql=$db->query($sql);
if ($resql)
{
$obj=$db->fetch_object($resql);
$value=$obj->value;
}
return $value;
}
/**
\brief Insertion d'une constante dans la base de données.
\sa dolibarr_del_const, dolibarr_get_const
\param db Handler d'accés base
\param name Nom de la constante
\param value Valeur de la constante
\param type Type de constante (chaine par défaut)
\param visible La constante est elle visible (0 par défaut)
\param note Explication de la constante
\return int <0 si ko, >0 si ok
*/
function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $note='')
{
global $conf;
if (! $name)
{
dolibarr_print_error("Error: Call to function dolibarr_set_const with wrong parameters", LOG_ERR);
exit;
}
$db->begin();
//dolibarr_syslog("dolibarr_set_const name=$name, value=$value");
$sql = "DELETE FROM llx_const WHERE name = '".addslashes($name)."';";
$resql=$db->query($sql);
if (strcmp($value,'')) // true if different. Must work for $value='0' or $value=0
{
$sql = "INSERT INTO llx_const(name,value,type,visible,note)";
$sql.= " VALUES ('".$name."','".addslashes($value)."','".$type."',".$visible.",'".addslashes($note)."')";
$resql=$db->query($sql);
}
if ($resql)
{
$db->commit();
$conf->global->$name=$value;
return 1;
}
else
{
$db->rollback();
return -1;
}
}
?> ?>

93
htdocs/lib/functions.inc.php
View File

@ -263,99 +263,6 @@ function dolibarr_fiche_head($links, $active='0', $title='', $notab=0)
if (! $notab) print '<div class="tabBar">'."\n\n"; if (! $notab) print '<div class="tabBar">'."\n\n";
} }
/**
\brief Récupére une constante depuis la base de données.
\see dolibarr_del_const, dolibarr_set_const
\param db Handler d'accés base
\param name Nom de la constante
\return string Valeur de la constante
*/
function dolibarr_get_const($db, $name)
{
$value='';
$sql ="SELECT value";
$sql.=" FROM llx_const";
$sql.=" WHERE name = '".addslashes($name)."'";
$resql=$db->query($sql);
if ($resql)
{
$obj=$db->fetch_object($resql);
$value=$obj->value;
}
return $value;
}
/**
\brief Insertion d'une constante dans la base de données.
\see dolibarr_del_const, dolibarr_get_const
\param db Handler d'accés base
\param name Nom de la constante
\param value Valeur de la constante
\param type Type de constante (chaine par défaut)
\param visible La constante est elle visible (0 par défaut)
\param note Explication de la constante
\return int <0 si ko, >0 si ok
*/
function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $note='')
{
global $conf;
$db->begin();
if (! $name)
{
dolibarr_print_error("Error: Call to function dolibarr_set_const with wrong parameters");
exit;
}
//dolibarr_syslog("dolibarr_set_const name=$name, value=$value");
$sql = "DELETE FROM llx_const WHERE name = '".addslashes($name)."';";
$resql=$db->query($sql);
$sql = "INSERT INTO llx_const(name,value,type,visible,note)";
$sql.= " VALUES ('$name','".addslashes($value)."','$type',$visible,'".addslashes($note)."');";
$resql=$db->query($sql);
if ($resql)
{
$db->commit();
$conf->global->$name=$value;
return 1;
}
else
{
$db->rollback();
return -1;
}
}
/**
\brief Effacement d'une constante dans la base de données
\see dolibarr_get_const, dolibarr_sel_const
\param db Handler d'accés base
\param name Nom ou rowid de la constante
\return int <0 si ko, >0 si ok
*/
function dolibarr_del_const($db, $name)
{
global $conf;
$sql = "DELETE FROM llx_const";
$sql.=" WHERE name='".addslashes($name)."' or rowid='".addslashes($name)."'";
$resql=$db->query($sql);
if ($resql)
{
$conf->global->$name='';
return 1;
}
else
{
return -1;
}
}
/** /**
\brief Sauvegarde parametrage personnel \brief Sauvegarde parametrage personnel

5
htdocs/telephonie/config/compta.php
View File

@ -27,6 +27,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
@ -46,8 +47,8 @@ if ($_GET["action"] == "set")
* *
* *
*/ */
llxHeader('','Téléphonie - Configuration'); llxHeader('','T<EFBFBD>l<EFBFBD>phonie - Configuration');
print_titre("Configuration du module de Téléphonie"); print_titre("Configuration du module de T<EFBFBD>l<EFBFBD>phonie");
print "<br>"; print "<br>";

9
htdocs/telephonie/config/index.php
View File

@ -27,6 +27,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
@ -54,8 +55,8 @@ if ($_GET["action"] == "switch")
* *
* *
*/ */
llxHeader('','Téléphonie - Configuration'); llxHeader('','T<EFBFBD>l<EFBFBD>phonie - Configuration');
print_titre("Configuration du module de Téléphonie"); print_titre("Configuration du module de T<EFBFBD>l<EFBFBD>phonie");
print "<br>"; print "<br>";
@ -123,7 +124,7 @@ print '<input type="hidden" name="nom4" value="TELEPHONIE_GROUPE_COMMERCIAUX_ID"
/* ***************************************** */ /* ***************************************** */
print '<tr class="pair"><td>Fournisseur par défaut</td><td>'; print '<tr class="pair"><td>Fournisseur par d<EFBFBD>faut</td><td>';
$ff = array(); $ff = array();
$sql = "SELECT rowid, nom FROM ".MAIN_DB_PREFIX."telephonie_fournisseur WHERE commande_active = 1 ORDER BY nom "; $sql = "SELECT rowid, nom FROM ".MAIN_DB_PREFIX."telephonie_fournisseur WHERE commande_active = 1 ORDER BY nom ";
$resql = $db->query($sql); $resql = $db->query($sql);
@ -141,7 +142,7 @@ print '</td><td><input type="submit" value="'.$langs->trans('Update').'">';
print '</td><td>TELEPHONIE_FOURNISSEUR_DEFAUT_ID</td></tr>'; print '</td><td>TELEPHONIE_FOURNISSEUR_DEFAUT_ID</td></tr>';
print '<input type="hidden" name="nom2" value="TELEPHONIE_FOURNISSEUR_DEFAUT_ID">'; print '<input type="hidden" name="nom2" value="TELEPHONIE_FOURNISSEUR_DEFAUT_ID">';
print '<tr class="pair"><td>Grille vente par défaut</td>'; print '<tr class="pair"><td>Grille vente par d<EFBFBD>faut</td>';
$gg = array(); $gg = array();
$gg[0] = "Aucune grille definie"; $gg[0] = "Aucune grille definie";

5
htdocs/telephonie/config/mail.php
View File

@ -27,6 +27,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
@ -47,8 +48,8 @@ if ($_GET["action"] == "set")
* *
* *
*/ */
llxHeader('','Téléphonie - Configuration'); llxHeader('','T<EFBFBD>l<EFBFBD>phonie - Configuration');
print_titre("Configuration du module de Téléphonie"); print_titre("Configuration du module de T<EFBFBD>l<EFBFBD>phonie");
print "<br>"; print "<br>";