diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php index 568b270ae23..a92266331e3 100644 --- a/htdocs/conf/conf.class.php +++ b/htdocs/conf/conf.class.php @@ -99,10 +99,10 @@ class Conf $key=$objp->name; $value=$objp->value; // Pas de stripslashes (ne s'applique pas sur lecture en base mais après POST quand get_magic_quotes_gpc()==1) if ($key) - { - define ("$key", $value); - $this->global->$key=$value; - } + { + if (! defined("$key")) define ("$key", $value); // In some cases, the constant might be already forced (Example: SYSLOG_FILE during install) + $this->global->$key=$value; + } $i++; } } diff --git a/htdocs/includes/fpdf/fpdf/fpdf.php b/htdocs/includes/fpdf/fpdf/fpdf.php index ac02e15ca0e..67ca0c3c0dc 100644 --- a/htdocs/includes/fpdf/fpdf/fpdf.php +++ b/htdocs/includes/fpdf/fpdf/fpdf.php @@ -28,7 +28,7 @@ define ("K_PATH_CACHE", $conf->fckeditor->dir_output); /** * url qui sera substituer par le K_PATH_CACHE lorsqu'une image sera intégrée au pdf */ -define ("K_PATH_URL_CACHE", $dolibarr_main_url_root."/document.php?modulepart=editor&file="); +if (defined('DOL_URL_ROOT')) define ("K_PATH_URL_CACHE", DOL_URL_ROOT."/document.php?modulepart=editor&file="); if(!class_exists('FPDF')) { diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index 25edb335a20..1398cba24af 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2005-2006 Laurent Destailleur + * Copyright (C) 2005-2007 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -433,31 +432,33 @@ class DolibarrModules - /** + /** \brief Supprime les documents \return int Nombre d'erreurs (0 si ok) - */ - function delete_docs() - { - // Créé les documents générables - if (is_array($this->docs)) - { - foreach ($this->docs as $key => $doc) - { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_generator "; - $sql .= "WHERE name= '".addslashes($doc[0])."' AND classfile='".$doc[1]."'AND class='".$doc[2]."';"; - - $result=$this->db->query($sql); - if (! $result) - { - dolibarr_syslog("DolibarrModules.class::delete_docs Error sql=".$sql." - ".$this->db->error()); - $err++; - } - - } - } - return $err; - } + */ + function delete_docs() + { + $err=0; + + // Créé les documents générables + if (is_array($this->docs)) + { + foreach ($this->docs as $key => $doc) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_generator "; + $sql .= "WHERE name= '".addslashes($doc[0])."' AND classfile='".$doc[1]."'AND class='".$doc[2]."';"; + + $result=$this->db->query($sql); + if (! $result) + { + dolibarr_syslog("DolibarrModules.class::delete_docs Error sql=".$sql." - ".$this->db->error()); + $err++; + } + + } + } + return $err; + } /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index dae2e848909..0b58bf44d54 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -18,7 +18,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 709eb1c2121..11dac0c0f93 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -73,7 +73,7 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade") // on décode le mot de passe de la base si besoin require_once(DOL_DOCUMENT_ROOT ."/lib/functions.inc.php"); - if ($dolibarr_main_db_encrypted_pass) $dolibarr_main_db_pass = dolibarr_decode($dolibarr_main_db_encrypted_pass); + if (isset($dolibarr_main_db_encrypted_pass) && $dolibarr_main_db_encrypted_pass) $dolibarr_main_db_pass = dolibarr_decode($dolibarr_main_db_encrypted_pass); $conf->db->type = $dolibarr_main_db_type; $conf->db->host = $dolibarr_main_db_host; @@ -183,7 +183,7 @@ if ($_POST["action"] == "upgrade") } -print ''; +print ''; print $langs->trans("GoToSetupArea"); print ''; diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index d4be241e924..3482f9d120d 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -19,7 +19,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** \file htdocs/install/inc.php @@ -30,6 +29,8 @@ require_once('../translate.class.php'); require_once('../lib/functions.inc.php'); +// DOL_DOCUMENT_ROOT has been defined in function.inc.php to '..' + // Correction PHP_SELF (ex pour apache via caudium) car PHP_SELF doit valoir URL relative // et non path absolu. if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"]) @@ -61,18 +62,14 @@ if (file_exists($conffile)) } if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix); - - -define('DOL_DOCUMENT_ROOT','../'); - +define('DOL_DATA_ROOT',$dolibarr_main_data_root); // Forcage du log pour les install et mises a jour $conf->syslog->enabled=1; $conf->global->SYSLOG_LEVEL=constant('LOG_DEBUG'); if (is_writable('/tmp')) define('SYSLOG_FILE','/tmp/dolibarr_install.log'); -else if ((isset($_ENV["TMP"]) && is_writable($_ENV["TMP"])) || (isset($_ENV["TEMP"]) && is_writable($_ENV["TEMP"]))) { - define('SYSLOG_FILE',($_ENV["TMP"]?$_ENV["TMP"]:$_ENV["TEMP"]).'/dolibarr_install.log'); -} +else if (isset($_ENV["TMP"]) && is_writable($_ENV["TMP"])) define('SYSLOG_FILE',$_ENV["TMP"].'/dolibarr_install.log'); +else if (isset($_ENV["TEMP"]) && is_writable($_ENV["TEMP"])) define('SYSLOG_FILE',$_ENV["TEMP"].'/dolibarr_install.log'); else define('SYSLOG_FILE','/dolibarr_install.log'); define('SYSLOG_FILE_NO_ERROR',1); @@ -120,7 +117,7 @@ function conf($dolibarr_main_document_root) $conf->db->pass = trim($dolibarr_main_db_pass); if (! isset($character_set_client) || ! $character_set_client) $character_set_client='ISO-8859-1'; $conf->character_set_client=$character_set_client; - if (! isset($dolibarr_main_db_charset) && ! $dolibarr_main_db_charset) $dolibarr_main_db_charset='latin1'; + if (! isset($dolibarr_main_db_charset) || ! $dolibarr_main_db_charset) $dolibarr_main_db_charset='latin1'; $conf->db->character_set=$dolibarr_main_db_charset; if (! isset($collation_connection) || ! $collation_connection) $collation_connection='latin1_swedish_ci'; $conf->db->collation_connection=$collation_connection; diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 58cf7a170e5..00c34a51f9d 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004-2007 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -28,8 +27,6 @@ include_once("./inc.php"); if (file_exists($conffile)) include_once($conffile); -if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; -define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix); require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php"); $grant_query=''; @@ -79,7 +76,7 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade") $error=0; // on décode le mot de passe de la base si besoin - if ($dolibarr_main_db_encrypted_pass) $dolibarr_main_db_pass = dolibarr_decode($dolibarr_main_db_encrypted_pass); + if (isset($dolibarr_main_db_encrypted_pass) && $dolibarr_main_db_encrypted_pass) $dolibarr_main_db_pass = dolibarr_decode($dolibarr_main_db_encrypted_pass); // $conf is already instancied inside inc.php $conf->db->type = $dolibarr_main_db_type; @@ -133,7 +130,6 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade") // Force l'affichage de la progression print ''.$langs->trans("PleaseBePatient").''; - ob_flush(); flush(); if ($ok) diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 6c060153921..631a6154674 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2006 Laurent Destailleur + * Copyright (C) 2005-2007 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -28,8 +27,6 @@ include_once('./inc.php'); if (file_exists($conffile)) include_once($conffile); -if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; -define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix); require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root . '/facture.class.php'); require_once($dolibarr_main_document_root . '/propal.class.php'); @@ -77,7 +74,7 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade') print ''; // on décode le mot de passe de la base si besoin - if ($dolibarr_main_db_encrypted_pass) $dolibarr_main_db_pass = dolibarr_decode($dolibarr_main_db_encrypted_pass); + if (isset($dolibarr_main_db_encrypted_pass) && $dolibarr_main_db_encrypted_pass) $dolibarr_main_db_pass = dolibarr_decode($dolibarr_main_db_encrypted_pass); // $conf is already instancied inside inc.php $conf->db->type = $dolibarr_main_db_type; @@ -106,7 +103,6 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade') } // Chargement config - define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root); $conf->setValues($db); diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 85b3c16733f..e97b9f20855 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -39,7 +39,7 @@ */ // Pour compatibilité lors de l'upgrade -if (!defined('DOL_DOCUMENT_ROOT')) +if (! defined('DOL_DOCUMENT_ROOT')) { define('DOL_DOCUMENT_ROOT', '..'); }