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

Qual: Remplace des require par require_once sauf pour module telephonie et pour les reuiqre("...pre.inc.php")

Browse Source
This commit is contained in:
Laurent Destailleur 2005-10-18 14:03:05 +00:00
parent 453c248397
commit 9ab2a789bd
18 changed files with 63 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/ldap.php
View File

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

3
htdocs/domain/pre.inc.php
View File

@ -17,10 +17,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
require ("../main.inc.php");
require_once("../main.inc.php");
function llxHeader($head = "") {

14
htdocs/fourn/facture/fiche.php
View File

@ -473,17 +473,19 @@ else
}
else
{
/*
*
*/
$h=0;
$head[$h][0] = "fiche.php?facid=".$fac->id;
$head[$h][1] = $langs->trans("SupplierBill").': '.$fac->ref;
$head[$h][1] = $langs->trans("Card");
$hselected = $h;
$h++;
dolibarr_fiche_head($head, $hselected);
$titre=$langs->trans("SupplierBill").': '.$fac->ref;
dolibarr_fiche_head($head, $hselected, $titre);
/*
@ -524,9 +526,9 @@ else
print "<tr><td>".$langs->trans("Author")."</td><td colspan=\"3\">$authorfullname</td>";
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$fac->LibStatut($fac->paye,$fac->statut)."</td></tr>";
print '<tr><td>'.$langs->trans("TotalHT").'</td><td align="center"><b>'.price($fac->total_ht)."</b></td>";
print '<td align="right">'.$langs->trans("VAT").'</td><td align="center">'.price($fac->total_tva)."</td></tr>";
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td colspan="3" align="center">'.price($fac->total_ttc)."</td></tr>";
print '<tr><td>'.$langs->trans("AmountHT").'</td><td><b>'.price($fac->total_ht).'</b></td><td colspan="2" align="left">'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td>'.$langs->trans("AmountVAT").'</td><td>'.price($fac->total_tva).'</td><td colspan="2" align="left">'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($fac->total_ttc).'</td><td colspan="2" align="left">'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
if (strlen($fac->note))
{
print '<tr><td>'.$langs->trans("Comments").'</td><td colspan="3">';
@ -580,7 +582,7 @@ else
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<td nowrap>".img_object($langs->trans("Payment"),"payment").' '.dolibarr_print_date($objp->dp)."</td>\n";
print '<td nowrap><a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").'</a> '.dolibarr_print_date($objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print "<td align=\"right\">".price($objp->amount)."</td><td>".$langs->trans("Currency".$conf->monnaie)."</td>\n";

8
htdocs/install/etape2.php
View File

@ -56,17 +56,17 @@ if (file_exists($conffile))
if($dolibarr_main_db_type == "mysql")
{
require ($dolibarr_main_document_root . "/lib/mysql.lib.php");
require_once($dolibarr_main_document_root . "/lib/mysql.lib.php");
$choix=1;
}
else
{
require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
require ($dolibarr_main_document_root . "/lib/grant.postgres.php");
require_once($dolibarr_main_document_root . "/lib/pgsql.lib.php");
require_once($dolibarr_main_document_root . "/lib/grant.postgres.php");
$choix=2;
}
require ($dolibarr_main_document_root . "/conf/conf.class.php");
require_once($dolibarr_main_document_root . "/conf/conf.class.php");
if ($_POST["action"] == "set")

6
htdocs/install/etape4.php
View File

@ -45,13 +45,13 @@ if (file_exists($conffile))
}
if($dolibarr_main_db_type == "mysql")
require ($dolibarr_main_document_root . "/lib/mysql.lib.php");
require_once($dolibarr_main_document_root . "/lib/mysql.lib.php");
else
require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
require_once($dolibarr_main_document_root . "/lib/pgsql.lib.php");
require ($dolibarr_main_document_root . "/conf/conf.class.php");
require_once($dolibarr_main_document_root . "/conf/conf.class.php");
print '<table cellspacing="0" cellpadding="2" width="100%">';

6
htdocs/install/etape5.php
View File

@ -44,11 +44,11 @@ if (file_exists($conffile))
if($dolibarr_main_db_type == "mysql")
require ($dolibarr_main_document_root . "/lib/mysql.lib.php");
require_once($dolibarr_main_document_root . "/lib/mysql.lib.php");
else
require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
require_once($dolibarr_main_document_root . "/lib/pgsql.lib.php");
require ($dolibarr_main_document_root . "/conf/conf.class.php");
require_once($dolibarr_main_document_root . "/conf/conf.class.php");
if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")

8
htdocs/install/upgrade.php
View File

@ -56,17 +56,17 @@ if (file_exists($conffile))
if($dolibarr_main_db_type == "mysql")
{
require ($dolibarr_main_document_root . "/lib/mysql.lib.php");
require_once($dolibarr_main_document_root . "/lib/mysql.lib.php");
$choix=1;
}
else
{
require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
require ($dolibarr_main_document_root . "/lib/grant.postgres.php");
require_once($dolibarr_main_document_root . "/lib/pgsql.lib.php");
require_once($dolibarr_main_document_root . "/lib/grant.postgres.php");
$choix=2;
}
require ($dolibarr_main_document_root . "/conf/conf.class.php");
require_once($dolibarr_main_document_root . "/conf/conf.class.php");
if (isset($_GET["action"]) && $_GET["action"] == "upgrade")

2
htdocs/public/dons/bplc.php
View File

@ -42,7 +42,7 @@ $conf->db->pass = $dolibarr_main_db_pass;
// travail avec mysql
if (! $conf->db->type) { $conf->db->type = 'mysql'; }
require (DOL_DOCUMENT_ROOT ."/lib/".$dolibarr_main_db_type.".lib.php");
require_once(DOL_DOCUMENT_ROOT ."/lib/".$dolibarr_main_db_type.".lib.php");
$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name);

14
scripts/banque/graph-solde.php
View File

@ -38,7 +38,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Recupere root dolibarr
$path=eregi_replace('graph-solde.php','',$_SERVER["PHP_SELF"]);
require ($path."../../htdocs/master.inc.php");
require_once($path."../../htdocs/master.inc.php");
// Vérifie que chemin vers JPGRAHP est connu et defini $jpgraph
if (! defined('JPGRAPH_DIR') && ! defined('JPGRAPH_PATH'))
@ -51,12 +51,12 @@ $jpgraphdir=JPGRAPH_DIR;
if (! eregi('[\\\/]$',$jpgraphdir)) $jpgraphdir.='/';
include_once ($jpgraphdir."jpgraph.php");
include_once ($jpgraphdir."jpgraph_line.php");
include_once ($jpgraphdir."jpgraph_bar.php");
include_once ($jpgraphdir."jpgraph_pie.php");
include_once ($jpgraphdir."jpgraph_error.php");
include_once ($jpgraphdir."jpgraph_canvas.php");
include_once($jpgraphdir."jpgraph.php");
include_once($jpgraphdir."jpgraph_line.php");
include_once($jpgraphdir."jpgraph_bar.php");
include_once($jpgraphdir."jpgraph_pie.php");
include_once($jpgraphdir."jpgraph_error.php");
include_once($jpgraphdir."jpgraph_canvas.php");
$error = 0;

5
scripts/dump.php
View File

@ -17,10 +17,9 @@
*
* $Id$
* $Source$
*
*
*/
require ("../htdocs/master.inc.php");
require_once("../htdocs/master.inc.php");
$fname = '/tmp/dump.sh';

6
scripts/energie/graph-line.php
View File

@ -20,13 +20,13 @@
*
*/
require ("../../htdocs/master.inc.php");
require_once("../../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/energie/EnergieCompteur.class.php");
require_once(DOL_DOCUMENT_ROOT."/energie/EnergieGroupe.class.php");
include_once (JPGRAPH_DIR."jpgraph.php");
include_once (JPGRAPH_DIR."jpgraph_line.php");
include_once(JPGRAPH_DIR."jpgraph.php");
include_once(JPGRAPH_DIR."jpgraph_line.php");
$error = 0;

15
scripts/energie/graph.php
View File

@ -17,20 +17,19 @@
*
* $Id$
* $Source$
*
*/
require ("../../htdocs/master.inc.php");
require_once("../../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/energie/EnergieCompteur.class.php");
require_once(DOL_DOCUMENT_ROOT."/energie/EnergieGroupe.class.php");
include_once (JPGRAPH_DIR."jpgraph.php");
include_once (JPGRAPH_DIR."jpgraph_line.php");
include_once (JPGRAPH_DIR."jpgraph_bar.php");
include_once (JPGRAPH_DIR."jpgraph_pie.php");
include_once (JPGRAPH_DIR."jpgraph_error.php");
include_once (JPGRAPH_DIR."jpgraph_canvas.php");
include_once(JPGRAPH_DIR."jpgraph.php");
include_once(JPGRAPH_DIR."jpgraph_line.php");
include_once(JPGRAPH_DIR."jpgraph_bar.php");
include_once(JPGRAPH_DIR."jpgraph_pie.php");
include_once(JPGRAPH_DIR."jpgraph_error.php");
include_once(JPGRAPH_DIR."jpgraph_canvas.php");
$error = 0;

8
scripts/export-mailing.php
View File

@ -20,13 +20,11 @@
*
*
* Export simple des contacts
*
*/
require ("../htdocs/master.inc.php");
require_once (DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_workbook.inc.php");
require_once (DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_worksheet.inc.php");
require_once("../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_workbook.inc.php");
require_once(DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_worksheet.inc.php");
$error = 0;

6
scripts/ldap-update-allcontact.php
View File

@ -21,9 +21,9 @@
* Mets à jour tous les contacts dans LDAP à partir de la base sql
*/
require ("../htdocs/master.inc.php");
require_once (DOL_DOCUMENT_ROOT."/contact.class.php");
require_once (DOL_DOCUMENT_ROOT."/user.class.php");
require_once("../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/user.class.php");
$error = 0;

4
scripts/lolix/candidat-desactive.php
View File

@ -32,8 +32,8 @@ if (substr($sapi_type, 0, 3) == 'cgi')
exit;
}
require ("../../htdocs/master.inc.php");
require(DOL_DOCUMENT_ROOT."/lolix/cv/cv.class.php");
require_once("../../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lolix/cv/cv.class.php");
$error = 0;

4
scripts/mailing-prepare.php
View File

@ -42,7 +42,7 @@
\brief Script pour préparer les destinataires d'un mailing
*/
require ("../htdocs/master.inc.php");
require_once("../htdocs/master.inc.php");
$error = 0;
@ -62,7 +62,7 @@ if ( $db->query($sql) )
dolibarr_syslog("mailing-prepare: mailing $row[0]");
dolibarr_syslog("mailing-prepare: mailing module $row[1]");
require DOL_DOCUMENT_ROOT.'/includes/modules/mailings/'.$row[1].'.modules.php';
require_once(DOL_DOCUMENT_ROOT.'/includes/modules/mailings/'.$row[1].'.modules.php');
$classname = "mailing_".$row[1];

9
scripts/prelevement-verif.php
View File

@ -23,12 +23,11 @@
* Script de verification des demandes de prélèvement
*
* Vérifie que les sociétés qui doivent être prélevées ont bien un RIB correct
*
*/
require ("../htdocs/master.inc.php");
require_once (DOL_DOCUMENT_ROOT."/facture.class.php");
require_once (DOL_DOCUMENT_ROOT."/societe.class.php");
require_once("../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
$error = 0;

13
scripts/prelevement.php
View File

@ -19,17 +19,14 @@
* $Id$
* $Source$
*
*
* Script de prelevement
*
*/
require ("../htdocs/master.inc.php");
require_once (DOL_DOCUMENT_ROOT."/bon-prelevement.class.php");
require_once (DOL_DOCUMENT_ROOT."/facture.class.php");
require_once (DOL_DOCUMENT_ROOT."/societe.class.php");
require_once (DOL_DOCUMENT_ROOT."/paiement.class.php");
require_once("../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/bon-prelevement.class.php");
require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
$error = 0;