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

Removed source code from conf dir that is dedicatd to store dolibarr config file.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-03-11 18:34:46 +00:00
parent 7a6de88762
commit 55d0ad29d3
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.settings/org.eclipse.core.resources.prefs
View File

@ -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

2
htdocs/compta/index.php
View File

@ -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;

2
htdocs/conf/conf.class.php → htdocs/core/conf.class.php
View File

@ -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

38
htdocs/install/etape2.php
View File

@ -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;
@ -37,7 +37,7 @@ $ok = 0;
// Ne fonctionne que si on est pas en safe_mode. // Ne fonctionne que si on est pas en safe_mode.
$err=error_reporting(); $err=error_reporting();
error_reporting(0); error_reporting(0);
@set_time_limit(180); @set_time_limit(180);
error_reporting($err); error_reporting($err);
$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto'); $setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto');
@ -118,8 +118,8 @@ if ($_POST["action"] == "set")
if ($ok) if ($ok)
{ {
// We always choose in mysql directory (Conversion is done by driver to translate SQL syntax) // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
$dir = "../../mysql/tables/"; $dir = "../../mysql/tables/";
$ok = 0; $ok = 0;
$handle=opendir($dir); $handle=opendir($dir);
dolibarr_install_syslog("Ouverture repertoire ".$dir." handle=".$handle,LOG_DEBUG); dolibarr_install_syslog("Ouverture repertoire ".$dir." handle=".$handle,LOG_DEBUG);
@ -129,7 +129,7 @@ if ($_POST["action"] == "set")
if (eregi('\.sql$',$file) && eregi('^llx_',$file) && ! eregi('\.key\.sql$',$file)) if (eregi('\.sql$',$file) && eregi('^llx_',$file) && ! eregi('\.key\.sql$',$file))
{ {
$tablefound++; $tablefound++;
$name = substr($file, 0, strlen($file) - 4); $name = substr($file, 0, strlen($file) - 4);
$buffer = ''; $buffer = '';
$fp = fopen($dir.$file,"r"); $fp = fopen($dir.$file,"r");
@ -144,21 +144,21 @@ if ($_POST["action"] == "set")
{ {
$buf=$db->convertSQLFromMysql($buf); $buf=$db->convertSQLFromMysql($buf);
} }
$buffer .= $buf; $buffer .= $buf;
} }
} }
fclose($fp); fclose($fp);
$buffer=trim($buffer); $buffer=trim($buffer);
//print "<tr><td>Creation de la table $name/td>"; //print "<tr><td>Creation de la table $name/td>";
$requestnb++; $requestnb++;
if ($conf->character_set_client == "UTF-8") if ($conf->character_set_client == "UTF-8")
{ {
$buffer=utf8_encode($buffer); $buffer=utf8_encode($buffer);
} }
dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG); dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
if ($db->query($buffer)) if ($db->query($buffer))
{ {
@ -208,7 +208,7 @@ if ($_POST["action"] == "set")
} }
} }
/*************************************************************************************** /***************************************************************************************
* *
* Chargement fichiers tables/*.key.sql * Chargement fichiers tables/*.key.sql
@ -218,7 +218,7 @@ if ($_POST["action"] == "set")
if ($ok) if ($ok)
{ {
// We always choose in mysql directory (Conversion is done by driver to translate SQL syntax) // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
$dir = "../../mysql/tables/"; $dir = "../../mysql/tables/";
$okkeys = 0; $okkeys = 0;
$handle=opendir($dir); $handle=opendir($dir);
@ -249,14 +249,14 @@ if ($_POST["action"] == "set")
// Version qualified, delete SQL comments // Version qualified, delete SQL comments
$buf=eregi_replace('^-- V([0-9\.]+)','',$buf); $buf=eregi_replace('^-- V([0-9\.]+)','',$buf);
//print "Ligne $i qualifiee par version: ".$buf.'<br>'; //print "Ligne $i qualifiee par version: ".$buf.'<br>';
} }
} }
// Ajout ligne si non commentaire // Ajout ligne si non commentaire
if (! eregi('^--',$buf)) $buffer .= $buf; if (! eregi('^--',$buf)) $buffer .= $buf;
} }
fclose($fp); fclose($fp);
// Si plusieurs requetes, on boucle sur chaque // Si plusieurs requetes, on boucle sur chaque
$listesql=split(';',$buffer); $listesql=split(';',$buffer);
foreach ($listesql as $req) foreach ($listesql as $req)
@ -270,7 +270,7 @@ if ($_POST["action"] == "set")
{ {
$buffer=utf8_encode($buffer); $buffer=utf8_encode($buffer);
} }
dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG); dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
if ($db->query($buffer)) if ($db->query($buffer))
{ {
@ -318,8 +318,8 @@ if ($_POST["action"] == "set")
$okkeys = 1; $okkeys = 1;
} }
} }
/*************************************************************************************** /***************************************************************************************
* *
* Chargement fichier functions.sql * Chargement fichier functions.sql
@ -351,9 +351,9 @@ if ($_POST["action"] == "set")
// Si plusieurs requetes, on boucle sur chaque // Si plusieurs requetes, on boucle sur chaque
$listesql=split('§',eregi_replace(";';",";'§",$buffer)); $listesql=split('§',eregi_replace(";';",";'§",$buffer));
foreach ($listesql as $buffer) { foreach ($listesql as $buffer) {
if (trim($buffer)) { if (trim($buffer)) {
if ($db->query(trim($buffer))) if ($db->query(trim($buffer)))
{ {
$ok = 1; $ok = 1;
@ -385,7 +385,7 @@ if ($_POST["action"] == "set")
} }
} }
} }
/*************************************************************************************** /***************************************************************************************
@ -396,7 +396,7 @@ if ($_POST["action"] == "set")
if ($ok) if ($ok)
{ {
// We always choose in mysql directory (Conversion is done by driver to translate SQL syntax) // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax)
$dir = "../../mysql/data/"; $dir = "../../mysql/data/";
// Creation donnees // Creation donnees
$file = "data.sql"; $file = "data.sql";

2
htdocs/install/etape4.php
View File

@ -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");

2
htdocs/install/inc.php
View File

@ -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();

2
htdocs/master.inc.php
View File

@ -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

2
htdocs/support/inc.php
View File

@ -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();