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

Qual: Removed deprecated code

Browse Source
This commit is contained in:
Laurent Destailleur 2009-05-08 02:39:10 +00:00
parent c1ca9e53af
commit cb996b66ce
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/core/conf.class.php
View File

@ -39,9 +39,8 @@ class Conf
/** \public */ /** \public */
//! Object with database handler //! Object with database handler
var $db; var $db;
//! To store properties found in conf file
//! Charset for HTML output and for storing data in memory var $file;
var $character_set_client='UTF-8'; // UTF-8, ISO-8859-1
var $dol_document_root; var $dol_document_root;
@ -58,6 +57,17 @@ class Conf
var $logbuffer=array(); var $logbuffer=array();
/**
* Constructor
*
* @return Conf
*/
function Conf()
{
//! Charset for HTML output and for storing data in memory
$this->file->character_set_client='UTF-8'; // UTF-8, ISO-8859-1
}
/** /**
* \brief Load setup values into conf object * \brief Load setup values into conf object
@ -140,12 +150,8 @@ class Conf
} }
$db->free($result); $db->free($result);
// On reprend parametres du fichier de config conf.php // Clean some variables
// \TODO Mettre tous les param de conf DB dans une propriete de la classe // conf->menu_top et conf->menu_left are defined in main.inc.php (according to user choice)
// Nettoyage variables des gestionnaires de menu
// conf->menu_top et conf->menu_left sont definis dans main.inc.php (selon user)
if (! $this->global->MAIN_MENU_BARRETOP) $this->global->MAIN_MENU_BARRETOP="eldy_backoffice.php"; if (! $this->global->MAIN_MENU_BARRETOP) $this->global->MAIN_MENU_BARRETOP="eldy_backoffice.php";
if (! $this->global->MAIN_MENUFRONT_BARRETOP) $this->global->MAIN_MENUFRONT_BARRETOP="eldy_backoffice.php"; if (! $this->global->MAIN_MENUFRONT_BARRETOP) $this->global->MAIN_MENUFRONT_BARRETOP="eldy_backoffice.php";
if (! $this->global->MAIN_MENU_BARRELEFT) $this->global->MAIN_MENU_BARRELEFT="eldy_backoffice.php"; if (! $this->global->MAIN_MENU_BARRELEFT) $this->global->MAIN_MENU_BARRELEFT="eldy_backoffice.php";
@ -208,10 +214,6 @@ class Conf
$this->societe->dir_logos =$rootfordata."/societe/logos"; $this->societe->dir_logos =$rootfordata."/societe/logos";
if (defined('SOCIETE_OUTPUTDIR') && SOCIETE_OUTPUTDIR) { $this->societe->dir_output=SOCIETE_OUTPUTDIR; } # Pour passer outre le rep par defaut if (defined('SOCIETE_OUTPUTDIR') && SOCIETE_OUTPUTDIR) { $this->societe->dir_output=SOCIETE_OUTPUTDIR; } # Pour passer outre le rep par defaut
// Module taxes et charges sociales
$this->tax->dir_output=$rootfordata."/taxes";
$this->tax->dir_temp =$rootfordata."/taxes/temp";
// Module don // Module don
$this->don->dir_output=$rootfordata."/dons"; $this->don->dir_output=$rootfordata."/dons";
$this->don->dir_temp =$rootfordata."/dons/temp"; $this->don->dir_temp =$rootfordata."/dons/temp";

2
htdocs/includes/modules/modTax.class.php
View File

@ -66,7 +66,7 @@ class modTax extends DolibarrModules
$this->picto='bill'; $this->picto='bill';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array("/taxes/temp"); $this->dirs = array("/tax/temp");
// Config pages // Config pages
$this->config_page_url = array("taxes.php"); $this->config_page_url = array("taxes.php");