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

Fix: Suppression de nombreux warnings en mode php error_reporting E_ALL

Browse Source
This commit is contained in:
Laurent Destailleur 2005-03-21 19:53:50 +00:00
parent b278f1adff
commit b23341e886
5 changed files with 64 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/index.php
View File

@ -80,7 +80,7 @@ print "</table>";
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>

7
htdocs/main.inc.php
View File

@ -24,7 +24,8 @@
* *
*/ */
/** \file htdocs/main.inc.php /**
\file htdocs/main.inc.php
\brief Fichier de formatage générique des ecrans Dolibarr \brief Fichier de formatage générique des ecrans Dolibarr
\version $Revision$ \version $Revision$
*/ */
@ -115,7 +116,7 @@ if (defined("MAIN_NOT_INSTALLED"))
function top_menu($head, $title="", $target="") function top_menu($head, $title="", $target="")
{ {
global $user, $conf, $langs; global $user, $conf, $langs, $db;
print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'; print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
print "\n<html>"; print "\n<html>";
@ -219,7 +220,7 @@ function top_menu($head, $title="", $target="")
function left_menu($menu_array, $help_url='', $form_search='') function left_menu($menu_array, $help_url='', $form_search='')
{ {
global $user, $conf, $langs; global $user, $conf, $langs, $db;
print '<div class="vmenuplusfiche">'."\n"; print '<div class="vmenuplusfiche">'."\n";

56
htdocs/master.inc.php
View File

@ -112,7 +112,7 @@ $user = new User($db);
// Pour utiliser une autre version de fpdf, définir la constante FPDF_PATH // Pour utiliser une autre version de fpdf, définir la constante FPDF_PATH
if (! defined(FPDF_PATH)) { define('FPDF_PATH',DOL_DOCUMENT_ROOT .'/includes/fpdf/fpdf152/'); } if (! defined('FPDF_PATH')) { define('FPDF_PATH',DOL_DOCUMENT_ROOT .'/includes/fpdf/fpdf152/'); }
define('FPDF_FONTPATH', FPDF_PATH . 'font/'); define('FPDF_FONTPATH', FPDF_PATH . 'font/');
// \todo mettre cet include uniquement sur les éléments qui manipulent du PDF // \todo mettre cet include uniquement sur les éléments qui manipulent du PDF
require_once(FPDF_PATH . "fpdf.php"); require_once(FPDF_PATH . "fpdf.php");
@ -125,7 +125,7 @@ $sql = "SELECT name, value FROM ".MAIN_DB_PREFIX."const";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$numr = $db->num_rows(); $numr = $db->num_rows($result);
$i = 0; $i = 0;
while ($i < $numr) while ($i < $numr)
@ -135,18 +135,18 @@ if ($result)
$i++; $i++;
} }
} }
$db->free($result);
/* /*
* Positionne les gestionnaires de menu * Positionne les gestionnaires de menu
*/ */
if (! defined(MAIN_MENU_BARRETOP)) if (! defined('MAIN_MENU_BARRETOP'))
{ {
define("MAIN_MENU_BARRETOP","default.php"); define('MAIN_MENU_BARRETOP',"default.php");
} }
if (! defined(MAIN_MENU_BARRELEFT)) if (! defined('MAIN_MENU_BARRELEFT'))
{ {
define("MAIN_MENU_BARRELEFT","default.php"); define('MAIN_MENU_BARRELEFT',"default.php");
} }
$conf->top_menu=MAIN_MENU_BARRETOP; $conf->top_menu=MAIN_MENU_BARRETOP;
$conf->left_menu=MAIN_MENU_BARRELEFT; $conf->left_menu=MAIN_MENU_BARRELEFT;
@ -155,9 +155,9 @@ $conf->left_menu=MAIN_MENU_BARRELEFT;
* Positionne le langage et localisation dans $conf->langage * Positionne le langage et localisation dans $conf->langage
* et charge l'objet de traduction * et charge l'objet de traduction
*/ */
if (! defined(MAIN_LANG_DEFAULT)) if (! defined('MAIN_LANG_DEFAULT'))
{ {
define(MAIN_LANG_DEFAULT,"fr_FR"); define('MAIN_LANG_DEFAULT',"fr_FR");
} }
$conf->langage=MAIN_LANG_DEFAULT; $conf->langage=MAIN_LANG_DEFAULT;
@ -178,8 +178,8 @@ $conf->users->dir_output=DOL_DATA_ROOT."/users";
* Activation des modules * Activation des modules
* et inclusion de librairies dépendantes * et inclusion de librairies dépendantes
*/ */
define(MAIN_MODULE_BOOKMARK4U,1); define('MAIN_MODULE_BOOKMARK4U',1);
if (defined("MAIN_MODULE_BOOKMARK4U")) if (defined('MAIN_MODULE_BOOKMARK4U'))
{ {
$conf->bookmark4u->enabled=MAIN_MODULE_BOOKMARK4U; $conf->bookmark4u->enabled=MAIN_MODULE_BOOKMARK4U;
} }
@ -210,7 +210,7 @@ if (defined("MAIN_MODULE_SOCIETE"))
} }
$conf->societe->dir_output=DOL_DATA_ROOT."/societe"; $conf->societe->dir_output=DOL_DATA_ROOT."/societe";
$conf->societe->dir_images=DOL_DATA_ROOT."/societe/images"; $conf->societe->dir_images=DOL_DATA_ROOT."/societe/images";
if (defined(SOCIETE_OUTPUTDIR) && SOCIETE_OUTPUTDIR) { $conf->societe->dir_output=SOCIETE_OUTPUTDIR; } # Pour passer outre le rep par défaut if (defined('SOCIETE_OUTPUTDIR') && SOCIETE_OUTPUTDIR) { $conf->societe->dir_output=SOCIETE_OUTPUTDIR; } # Pour passer outre le rep par défaut
if (defined("MAIN_MODULE_COMMERCIAL")) if (defined("MAIN_MODULE_COMMERCIAL"))
{ {
$conf->commercial->enabled=MAIN_MODULE_COMMERCIAL; $conf->commercial->enabled=MAIN_MODULE_COMMERCIAL;
@ -245,7 +245,7 @@ if (defined("MAIN_MODULE_FICHEINTER"))
} }
$conf->fichinter->dir_output=DOL_DATA_ROOT."/ficheinter"; $conf->fichinter->dir_output=DOL_DATA_ROOT."/ficheinter";
$conf->fichinter->dir_images=DOL_DATA_ROOT."/ficheinter/images"; $conf->fichinter->dir_images=DOL_DATA_ROOT."/ficheinter/images";
if (defined(FICHEINTER_OUTPUTDIR) && FICHEINTER_OUTPUTDIR) { $conf->fichinter->dir_output=FICHEINTER_OUTPUTDIR; } # Pour passer outre le rep par défaut if (defined('FICHEINTER_OUTPUTDIR') && FICHEINTER_OUTPUTDIR) { $conf->fichinter->dir_output=FICHEINTER_OUTPUTDIR; } # Pour passer outre le rep par défaut
if (defined("MAIN_MODULE_ADHERENT")) if (defined("MAIN_MODULE_ADHERENT"))
{ {
$conf->adherent->enabled=MAIN_MODULE_ADHERENT; $conf->adherent->enabled=MAIN_MODULE_ADHERENT;
@ -310,15 +310,15 @@ if (defined("MAIN_MODULE_PRELEVEMENT"))
} }
$conf->prelevement->dir_output=DOL_DATA_ROOT."/prelevement"; $conf->prelevement->dir_output=DOL_DATA_ROOT."/prelevement";
$conf->prelevement->dir_images=DOL_DATA_ROOT."/prelevement/images"; $conf->prelevement->dir_images=DOL_DATA_ROOT."/prelevement/images";
if (defined("MAIN_MODULE_WEBCALENDAR")) if (defined('MAIN_MODULE_WEBCALENDAR'))
{ {
$conf->webcal->enabled=MAIN_MODULE_WEBCALENDAR; $conf->webcal->enabled=MAIN_MODULE_WEBCALENDAR;
$conf->webcal->db->type=defined(PHPWEBCALENDAR_TYPE)?PHPWEBCALENDAR_TYPE:'mysql'; $conf->webcal->db->type=defined('PHPWEBCALENDAR_TYPE')?PHPWEBCALENDAR_TYPE:'mysql';
$conf->webcal->db->host=PHPWEBCALENDAR_HOST; $conf->webcal->db->host=defined('PHPWEBCALENDAR_HOST')?PHPWEBCALENDAR_HOST:'';
$conf->webcal->db->user=PHPWEBCALENDAR_USER; $conf->webcal->db->user=defined('PHPWEBCALENDAR_USER')?PHPWEBCALENDAR_USER:'';
$conf->webcal->db->pass=PHPWEBCALENDAR_PASS; $conf->webcal->db->pass=defined('PHPWEBCALENDAR_PASS')?PHPWEBCALENDAR_PASS:'';
$conf->webcal->db->name=PHPWEBCALENDAR_DBNAME; $conf->webcal->db->name=defined('PHPWEBCALENDAR_DBNAME')?PHPWEBCALENDAR_DBNAME:'';
$conf->webcal->syncro=PHPWEBCALENDAR_SYNCRO; $conf->webcal->syncro=defined('PHPWEBCALENDAR_SYNCRO')?PHPWEBCALENDAR_SYNCRO:'';
} }
if (defined("MAIN_MODULE_FACTURE")) if (defined("MAIN_MODULE_FACTURE"))
{ {
@ -327,7 +327,7 @@ if (defined("MAIN_MODULE_FACTURE"))
} }
$conf->facture->dir_output=DOL_DATA_ROOT."/facture"; $conf->facture->dir_output=DOL_DATA_ROOT."/facture";
$conf->facture->dir_images=DOL_DATA_ROOT."/facture/images"; $conf->facture->dir_images=DOL_DATA_ROOT."/facture/images";
if (defined(FAC_OUTPUTDIR) && FAC_OUTPUTDIR) { $conf->facture->dir_output=FAC_OUTPUTDIR; } # Pour passer outre le rep par défaut if (defined('FAC_OUTPUTDIR') && FAC_OUTPUTDIR) { $conf->facture->dir_output=FAC_OUTPUTDIR; } # Pour passer outre le rep par défaut
if (defined("MAIN_MODULE_PROPALE")) if (defined("MAIN_MODULE_PROPALE"))
{ {
$conf->propal->enabled=MAIN_MODULE_PROPALE; $conf->propal->enabled=MAIN_MODULE_PROPALE;
@ -339,7 +339,7 @@ if (defined("MAIN_MODULE_PROPALE"))
} }
$conf->propal->dir_output=DOL_DATA_ROOT."/propale"; $conf->propal->dir_output=DOL_DATA_ROOT."/propale";
$conf->propal->dir_images=DOL_DATA_ROOT."/propale/images"; $conf->propal->dir_images=DOL_DATA_ROOT."/propale/images";
if (defined(PROPALE_OUTPUTDIR) && PROPALE_OUTPUTDIR) { $conf->propal->dir_output=PROPALE_OUTPUTDIR; } # Pour passer outre le rep par défaut if (defined('PROPALE_OUTPUTDIR') && PROPALE_OUTPUTDIR) { $conf->propal->dir_output=PROPALE_OUTPUTDIR; } # Pour passer outre le rep par défaut
@ -357,7 +357,7 @@ else {
* Option du module Compta: Defini le mode de calcul des etats comptables (CA,...) * Option du module Compta: Defini le mode de calcul des etats comptables (CA,...)
*/ */
$conf->compta->mode = 'RECETTES-DEPENSES'; // Par défaut $conf->compta->mode = 'RECETTES-DEPENSES'; // Par défaut
if (defined("COMPTA_MODE") && COMPTA_MODE) { if (defined('COMPTA_MODE') && COMPTA_MODE) {
// Peut etre 'RECETTES-DEPENSES' ou 'CREANCES-DETTES' // Peut etre 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
$conf->compta->mode = COMPTA_MODE; $conf->compta->mode = COMPTA_MODE;
} }
@ -371,7 +371,7 @@ $conf->compta->tva=1;
/* /*
* Option du module Facture * Option du module Facture
*/ */
if (defined("FACTURE_TVAOPTION") && FACTURE_TVAOPTION == 'franchise') { if (defined('FACTURE_TVAOPTION') && FACTURE_TVAOPTION == 'franchise') {
$conf->defaulttx='0'; // Taux par défaut des factures clients $conf->defaulttx='0'; // Taux par défaut des factures clients
} }
else { else {
@ -381,7 +381,7 @@ else {
/* /*
* SIZE_LISTE_LIMIT : constante de taille maximale des listes * SIZE_LISTE_LIMIT : constante de taille maximale des listes
*/ */
if (defined("SIZE_LISTE_LIMIT")) if (defined('SIZE_LISTE_LIMIT'))
{ {
$conf->liste_limit=SIZE_LISTE_LIMIT; $conf->liste_limit=SIZE_LISTE_LIMIT;
} }
@ -389,12 +389,12 @@ else
{ {
$conf->liste_limit=20; $conf->liste_limit=20;
} }
if ($user->limite_liste > 0) if ($user->liste_limit > 0)
{ {
$conf->liste_limit = $user->limite_liste; $conf->liste_limit = $user->liste_limit;
} }
if (defined("MAIN_THEME")) if (defined('MAIN_THEME'))
{ {
$conf->theme=MAIN_THEME; $conf->theme=MAIN_THEME;
$conf->css = "theme/".$conf->theme."/".$conf->theme.".css"; $conf->css = "theme/".$conf->theme."/".$conf->theme.".css";

8
htdocs/translate.class.php
View File

@ -60,7 +60,7 @@ class Translate {
function Load($domain,$alt=0) function Load($domain,$alt=0)
{ {
if ($this->tab_loaded[$domain]) { return; } // Le fichier de ce domaine est deja chargé if (isset($this->tab_loaded[$domain]) && $this->tab_loaded[$domain]) { return; } // Le fichier de ce domaine est deja chargé
// Repertoire de traduction // Repertoire de traduction
$scandir = $this->dir."/".$this->defaultlang; $scandir = $this->dir."/".$this->defaultlang;
@ -82,7 +82,7 @@ class Translate {
if ($ligne[0] != "\n" && $ligne[0] != " " && $ligne[0] != "#") { if ($ligne[0] != "\n" && $ligne[0] != " " && $ligne[0] != "#") {
$tab=split('=',$ligne,2); $tab=split('=',$ligne,2);
//print "Domain=$domain, found a string for $tab[0] with value $tab[1]<br>"; //print "Domain=$domain, found a string for $tab[0] with value $tab[1]<br>";
if (! $this->tab_translate[$tab[0]]) $this->tab_translate[$tab[0]]=trim($tab[1]); if (! isset($this->tab_translate[$tab[0]])) $this->tab_translate[$tab[0]]=trim($tab[1]);
} }
} }
fclose($fp); fclose($fp);
@ -137,7 +137,7 @@ class Translate {
*/ */
function transnoentities($str, $param1='', $param2='', $param3='') { function transnoentities($str, $param1='', $param2='', $param3='') {
if ($this->tab_translate[$str]) { if (isset($this->tab_translate[$str]) && $this->tab_translate[$str]) {
// Si la traduction est disponible // Si la traduction est disponible
return sprintf($this->tab_translate[$str],$param1,$param2,$param3); return sprintf($this->tab_translate[$str],$param1,$param2,$param3);
} }
@ -188,7 +188,7 @@ class Translate {
if (! $charset) $charset="iso-8859-1"; if (! $charset) $charset="iso-8859-1";
//header("Content-Type: text/html; charset=$charset"); //header("Content-Type: text/html; charset=$charset");
$texte .= "<head>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=$charset\">\n"; $texte = "<head>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=$charset\">\n";
return $texte; return $texte;
} }

49
htdocs/user.class.php
View File

@ -78,7 +78,7 @@ class User
$this->id = $id; $this->id = $id;
// Preference utilisateur // Preference utilisateur
$this->userpreflimite_liste = 0; $this->liste_limit = 0;
$this->clicktodial_enabled = 0; $this->clicktodial_enabled = 0;
$this->all_permissions_are_loaded = 0; $this->all_permissions_are_loaded = 0;
@ -95,7 +95,7 @@ class User
function fetch($login='') function fetch($login='')
{ {
$sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.code, u.admin, u.login, u.pass, u.webcal_login, u.note"; $sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.code, u.admin, u.login, u.pass, u.webcal_login, u.note, u.fk_societe, u.fk_socpeople";
$sql .= ", ".$this->db->pdate("u.datec")." as datec, ".$this->db->pdate("u.tms")." as datem"; $sql .= ", ".$this->db->pdate("u.datec")." as datec, ".$this->db->pdate("u.tms")." as datem";
$sql .= " FROM ".MAIN_DB_PREFIX."user as u"; $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
if ($this->id) if ($this->id)
@ -133,9 +133,8 @@ class User
$this->webcal_login = $obj->webcal_login; $this->webcal_login = $obj->webcal_login;
$this->societe_id = $obj->fk_societe; $this->societe_id = $obj->fk_societe;
$this->egroupware_id = $obj->egroupware_id;
} }
$this->db->free(); $this->db->free($result);
} }
else else
@ -143,26 +142,30 @@ class User
dolibarr_print_error($this->db); dolibarr_print_error($this->db);
} }
$sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param"; if (isset($_SERVER['SCRIPT_URL'])) {
$sql .= " WHERE fk_user = ".$this->id; // \todo $_SERVER['SCRIPT_URL'] n'existe pas sous tout os/server web
$sql .= " AND page = '".$_SERVER["SCRIPT_URL"]."'"; $sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param";
$sql .= " WHERE fk_user = ".$this->id;
if ( $this->db->query($sql) ); $sql .= " AND page = '".$_SERVER['SCRIPT_URL']."'";
{
$num = $this->db->num_rows();
$i = 0;
$page_param_url = '';
$this->page_param = array();
while ($i < $num)
{
$obj = $this->db->fetch_object();
$this->page_param[$obj->param] = $obj->value;
$page_param_url .= $obj->param . "=".$obj->value."&amp;";
$i++;
}
$this->page_param_url = $page_param_url;
}
$result=$this->db->query($sql);
if ($result);
{
$num = $this->db->num_rows($result);
$i = 0;
$page_param_url = '';
$this->page_param = array();
while ($i < $num)
{
$obj = $this->db->fetch_object($result);
$this->page_param[$obj->param] = $obj->value;
$page_param_url .= $obj->param . "=".$obj->value."&amp;";
$i++;
}
$this->page_param_url = $page_param_url;
$this->db->free($result);
}
}
} }
/** /**