Removed source code from conf dir that is dedicatd to store dolibarr config file.
This commit is contained in:
parent
7a6de88762
commit
55d0ad29d3
@ -1,4 +1,4 @@
|
|||||||
#Mon Mar 09 21:45:56 CET 2009
|
#Wed Mar 11 19:32:00 CET 2009
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
encoding//dev/initdemo/initdemo.sql=UTF-8
|
encoding//dev/initdemo/initdemo.sql=UTF-8
|
||||||
encoding//dev/skeletons/modMyModule.class.php=ISO-8859-1
|
encoding//dev/skeletons/modMyModule.class.php=ISO-8859-1
|
||||||
@ -33,8 +33,8 @@ encoding//htdocs/compta/facture.php=ISO-8859-1
|
|||||||
encoding//htdocs/compta/facture/stats/index.php=ISO-8859-1
|
encoding//htdocs/compta/facture/stats/index.php=ISO-8859-1
|
||||||
encoding//htdocs/compta/facture/stats/month.php=ISO-8859-1
|
encoding//htdocs/compta/facture/stats/month.php=ISO-8859-1
|
||||||
encoding//htdocs/compta/index.php=ISO-8859-1
|
encoding//htdocs/compta/index.php=ISO-8859-1
|
||||||
encoding//htdocs/conf/conf.class.php=ISO-8859-1
|
|
||||||
encoding//htdocs/contrat/fiche.php=ISO-8859-1
|
encoding//htdocs/contrat/fiche.php=ISO-8859-1
|
||||||
|
encoding//htdocs/core/conf.class.php=ISO-8859-1
|
||||||
encoding//htdocs/dolgraph.class.php=ISO-8859-1
|
encoding//htdocs/dolgraph.class.php=ISO-8859-1
|
||||||
encoding//htdocs/expedition/expedition.class.php=ISO-8859-1
|
encoding//htdocs/expedition/expedition.class.php=ISO-8859-1
|
||||||
encoding//htdocs/expedition/stats/month.php=ISO-8859-1
|
encoding//htdocs/expedition/stats/month.php=ISO-8859-1
|
||||||
|
|||||||
@ -245,7 +245,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire)
|
|||||||
$facturesupplierstatic->ref=$obj->facnumber;
|
$facturesupplierstatic->ref=$obj->facnumber;
|
||||||
$facturesupplierstatic->id=$obj->rowid;
|
$facturesupplierstatic->id=$obj->rowid;
|
||||||
$facturesupplierstatic->type=$obj->type;
|
$facturesupplierstatic->type=$obj->type;
|
||||||
print $facturesupplierstatic->getNomUrl(1,'');
|
print $facturesupplierstatic->getNomUrl(1,'',16);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '<td>';
|
print '<td>';
|
||||||
$companystatic->id=$obj->socid;
|
$companystatic->id=$obj->socid;
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/conf/conf.class.php
|
* \file htdocs/core/conf.class.php
|
||||||
* \ingroup core
|
* \ingroup core
|
||||||
* \brief Fichier de la classe de stockage de la config courante
|
* \brief Fichier de la classe de stockage de la config courante
|
||||||
* \remarks La config est stockee dans le fichier conf/conf.php
|
* \remarks La config est stockee dans le fichier conf/conf.php
|
||||||
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
include("./inc.php");
|
include("./inc.php");
|
||||||
require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php");
|
require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php");
|
||||||
require_once($dolibarr_main_document_root."/conf/conf.class.php");
|
require_once($dolibarr_main_document_root."/core/conf.class.php");
|
||||||
require_once($dolibarr_main_document_root."/lib/admin.lib.php");
|
require_once($dolibarr_main_document_root."/lib/admin.lib.php");
|
||||||
|
|
||||||
$etape = 2;
|
$etape = 2;
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
include_once("./inc.php");
|
include_once("./inc.php");
|
||||||
require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php");
|
require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php");
|
||||||
require_once($dolibarr_main_document_root."/conf/conf.class.php");
|
require_once($dolibarr_main_document_root."/core/conf.class.php");
|
||||||
require_once($dolibarr_main_document_root."/lib/admin.lib.php");
|
require_once($dolibarr_main_document_root."/lib/admin.lib.php");
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -200,7 +200,7 @@ function conf($dolibarr_main_document_root)
|
|||||||
global $dolibarr_main_db_pass;
|
global $dolibarr_main_db_pass;
|
||||||
global $character_set_client;
|
global $character_set_client;
|
||||||
|
|
||||||
$return=include_once($dolibarr_main_document_root."/conf/conf.class.php");
|
$return=include_once($dolibarr_main_document_root."/core/conf.class.php");
|
||||||
if (! $return) return -1;
|
if (! $return) return -1;
|
||||||
|
|
||||||
$conf=new Conf();
|
$conf=new Conf();
|
||||||
|
|||||||
@ -110,7 +110,7 @@ if (! empty($dolibarr_main_db_encrypted_pass))
|
|||||||
}
|
}
|
||||||
//print memory_get_usage();
|
//print memory_get_usage();
|
||||||
|
|
||||||
require_once(DOL_DOCUMENT_ROOT."/conf/conf.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/conf.class.php");
|
||||||
|
|
||||||
$conf = new Conf();
|
$conf = new Conf();
|
||||||
// Identifiant propres au serveur base de donnee
|
// Identifiant propres au serveur base de donnee
|
||||||
|
|||||||
@ -161,7 +161,7 @@ function conf($dolibarr_main_document_root)
|
|||||||
global $dolibarr_main_db_pass;
|
global $dolibarr_main_db_pass;
|
||||||
global $character_set_client;
|
global $character_set_client;
|
||||||
|
|
||||||
$return=include_once($dolibarr_main_document_root."/conf/conf.class.php");
|
$return=include_once($dolibarr_main_document_root."/core/conf.class.php");
|
||||||
if (! $return) return -1;
|
if (! $return) return -1;
|
||||||
|
|
||||||
$conf=new Conf();
|
$conf=new Conf();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user