diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index a4bd79e35a2..fdf993d7ae0 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Mon Jan 19 22:29:06 CET 2009
+#Tue Jan 20 00:15:44 CET 2009
eclipse.preferences.version=1
encoding//dev/initdemo/initdemo.sql=UTF-8
encoding//dev/skeletons/modMyModule.class.php=ISO-8859-1
@@ -100,6 +100,42 @@ encoding//htdocs/langs/da_DA/suppliers.lang=UTF-8
encoding//htdocs/langs/da_DA/trips.lang=UTF-8
encoding//htdocs/langs/da_DA/users.lang=UTF-8
encoding//htdocs/langs/da_DA/withdrawals.lang=UTF-8
+encoding//htdocs/langs/de_DE/admin.lang=UTF-8
+encoding//htdocs/langs/de_DE/agenda.lang=UTF-8
+encoding//htdocs/langs/de_DE/banks.lang=UTF-8
+encoding//htdocs/langs/de_DE/bills.lang=UTF-8
+encoding//htdocs/langs/de_DE/boxes.lang=UTF-8
+encoding//htdocs/langs/de_DE/categories.lang=UTF-8
+encoding//htdocs/langs/de_DE/commercial.lang=UTF-8
+encoding//htdocs/langs/de_DE/companies.lang=UTF-8
+encoding//htdocs/langs/de_DE/compta.lang=UTF-8
+encoding//htdocs/langs/de_DE/contracts.lang=UTF-8
+encoding//htdocs/langs/de_DE/deliveries.lang=UTF-8
+encoding//htdocs/langs/de_DE/dict.lang=UTF-8
+encoding//htdocs/langs/de_DE/domains.lang=UTF-8
+encoding//htdocs/langs/de_DE/donations.lang=UTF-8
+encoding//htdocs/langs/de_DE/ecm.lang=UTF-8
+encoding//htdocs/langs/de_DE/errors.lang=UTF-8
+encoding//htdocs/langs/de_DE/exports.lang=UTF-8
+encoding//htdocs/langs/de_DE/install.lang=UTF-8
+encoding//htdocs/langs/de_DE/interventions.lang=UTF-8
+encoding//htdocs/langs/de_DE/ldap.lang=UTF-8
+encoding//htdocs/langs/de_DE/mails.lang=UTF-8
+encoding//htdocs/langs/de_DE/main.lang=UTF-8
+encoding//htdocs/langs/de_DE/members.lang=UTF-8
+encoding//htdocs/langs/de_DE/orders.lang=UTF-8
+encoding//htdocs/langs/de_DE/oscommerce.lang=UTF-8
+encoding//htdocs/langs/de_DE/other.lang=UTF-8
+encoding//htdocs/langs/de_DE/products.lang=UTF-8
+encoding//htdocs/langs/de_DE/projects.lang=UTF-8
+encoding//htdocs/langs/de_DE/propal.lang=UTF-8
+encoding//htdocs/langs/de_DE/sendings.lang=UTF-8
+encoding//htdocs/langs/de_DE/shop.lang=UTF-8
+encoding//htdocs/langs/de_DE/stocks.lang=UTF-8
+encoding//htdocs/langs/de_DE/suppliers.lang=UTF-8
+encoding//htdocs/langs/de_DE/trips.lang=UTF-8
+encoding//htdocs/langs/de_DE/users.lang=UTF-8
+encoding//htdocs/langs/de_DE/withdrawals.lang=UTF-8
encoding//htdocs/langs/fi_FI/admin.lang=UTF-8
encoding//htdocs/langs/fi_FI/agenda.lang=UTF-8
encoding//htdocs/langs/fi_FI/banks.lang=UTF-8
diff --git a/dev/translation/langAutoParser.class.php b/dev/translation/langAutoParser.class.php
index 66b838ab55e..845bf99b7a1 100644
--- a/dev/translation/langAutoParser.class.php
+++ b/dev/translation/langAutoParser.class.php
@@ -48,7 +48,7 @@ class langAutoParser {
$destPath = $this->langDir.$this->destLang.self::DIR_SEPARATOR.$file;
$fileContent = file($refPath,FILE_IGNORE_NEW_LINES |
FILE_SKIP_EMPTY_LINES);
- print "Processing file " . $file . "
\n";
+ print "Processing file " . $file . ", found ".sizeof($fileContent)." records
\n";
// Check destination file presence
if ( ! file_exists( $destPath ) ){
// No file presente generate file
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index 23f3b30aecb..8c256beae95 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-2008 Laurent Destailleur
+ * Copyright (C) 2005-2009 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
@@ -127,7 +127,7 @@ class DolibarrModules
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_generator (rowid,name,classfile,class) VALUES ";
$sql .= "(".$doc[0].",'".addslashes($doc[1])."','".$doc[2]."','".$doc[3]."');";
-
+
$result=$this->db->query($sql);
if (! $result)
{
@@ -188,7 +188,7 @@ class DolibarrModules
// Supprime les liens de pages en onglets issus de modules
$err+=$this->delete_tabs();
-
+
// Supprime les boites de la liste des boites disponibles
$err+=$this->delete_boxes();
@@ -357,12 +357,13 @@ class DolibarrModules
{
$err = 0;
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules WHERE numero=".$this->numero.";";
- $this->db->query($sql_del);
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules WHERE numero=".$this->numero.";";
+ dolibarr_syslog("DolibarrModules::_dbactive sql=".$sql, LOG_DEBUG);
+ $this->db->query($sql);
- $sql ="INSERT INTO ".MAIN_DB_PREFIX."dolibarr_modules (numero,active,active_date,active_version)";
- $sql .= " VALUES (";
- $sql .= $this->numero.",1,".$this->db->idate(mktime()).",'".$this->version."')";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."dolibarr_modules (numero,active,active_date,active_version)";
+ $sql.= " VALUES (";
+ $sql.= $this->numero.",1,".$this->db->idate(mktime()).",'".$this->version."')";
dolibarr_syslog("DolibarrModules::_dbactive sql=".$sql, LOG_DEBUG);
$this->db->query($sql);
@@ -378,9 +379,9 @@ class DolibarrModules
{
$err = 0;
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules WHERE numero=".$this->numero;
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules WHERE numero=".$this->numero;
dolibarr_syslog("DolibarrModules::_dbactive sql=".$sql, LOG_DEBUG);
- $this->db->query($sql_del);
+ $this->db->query($sql);
return $err;
}
@@ -394,10 +395,11 @@ class DolibarrModules
{
$err = 0;
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$this->const_name."'";
- $this->db->query($sql_del);
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$this->const_name."'";
+ dolibarr_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG);
+ $this->db->query($sql);
- $sql ="INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible) VALUES
('".$this->const_name."','1',0)";
dolibarr_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG);
if (!$this->db->query($sql))
@@ -417,9 +419,9 @@ class DolibarrModules
{
$err = 0;
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$this->const_name."'";
- dolibarr_syslog("DolibarrModules::_unactive sql=".$sql_del);
- $this->db->query($sql_del);
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$this->const_name."'";
+ dolibarr_syslog("DolibarrModules::_unactive sql=".$sql);
+ $this->db->query($sql);
return $err;
}
@@ -437,7 +439,7 @@ class DolibarrModules
global $db,$conf;
include_once(DOL_DOCUMENT_ROOT ."/lib/admin.lib.php");
-
+
$ok = 1;
foreach($conf->dol_document_root as $dirroot)
{
@@ -445,7 +447,7 @@ class DolibarrModules
{
$dir = $dirroot.$reldir;
$ok = 0;
-
+
// Run llx_mytable.sql files
$handle=opendir($dir);
if ($handle)
@@ -459,7 +461,7 @@ class DolibarrModules
}
closedir($handle);
}
-
+
// Run llx_mytable.key.sql files
$handle=opendir($dir);
if ($handle)
@@ -473,7 +475,7 @@ class DolibarrModules
}
closedir($handle);
}
-
+
if ($error == 0)
{
$ok = 1;
@@ -484,7 +486,7 @@ class DolibarrModules
return $ok;
}
-
+
/**
* \brief Insere les boites associees au module dans llx_boxes_def
* \return int Nombre d'erreurs (0 si ok)
@@ -673,7 +675,7 @@ class DolibarrModules
function insert_tabs()
{
$err=0;
-
+
if (! empty($this->tabs))
{
$i=0;
@@ -697,7 +699,7 @@ class DolibarrModules
}
return $err;
}
-
+
/**
* \brief Insere les constantes associees au module dans llx_const
* \return int Nombre d'erreurs (0 si ok)
@@ -853,7 +855,7 @@ class DolibarrModules
function insert_menus()
{
global $user;
-
+
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
$err=0;
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 1b2285cb5bc..76c83382355 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2004 Rodolphe Quiedeville
* Copyright (C) 2004 Benoit Mortier
* Copyright (C) 2004 Sebastien DiCintio
* Copyright (C) 2007-2009 Laurent Destailleur
@@ -68,10 +68,10 @@ $charset="UTF-8"; // If not output format found in any conf file
if (! defined('DONOTLOADCONF') && file_exists($conffile))
{
$result=include_once($conffile); // Load conf file
- if ($result)
+ if ($result)
{
- if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility
-
+ if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility
+
// Remove last / or \ on directories or url value
if (! empty($dolibarr_main_document_root) && ! ereg('^[\\\/]+$',$dolibarr_main_document_root)) $dolibarr_main_document_root=ereg_replace('[\\\/]+$','',$dolibarr_main_document_root);
if (! empty($dolibarr_main_url_root) && ! ereg('^[\\\/]+$',$dolibarr_main_url_root)) $dolibarr_main_url_root=ereg_replace('[\\\/]+$','',$dolibarr_main_url_root);
@@ -100,18 +100,18 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile))
}
else
{
- $includeconferror='ErrorBadValueForDolibarrMainDocumentRoot';
+ $includeconferror='ErrorBadValueForDolibarrMainDocumentRoot';
}
}
else
{
- $includeconferror='ErrorBadFormatForConfFile';
+ $includeconferror='ErrorBadFormatForConfFile';
}
}
// Define prefix
-if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_';
+if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_';
define('MAIN_DB_PREFIX',(isset($dolibarr_main_db_prefix)?$dolibarr_main_db_prefix:''));
define('DOL_DATA_ROOT',(isset($dolibarr_main_data_root)?$dolibarr_main_data_root:''));
@@ -119,9 +119,9 @@ if (empty($conf->character_set_client)) $conf->character_set_client=$char
if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='latin1_swedish_ci';
if (empty($conf->db->user)) $conf->db->user='';
-
+
// Security check
-if (eregi('install.lock',$_SERVER["SCRIPT_FILENAME"]))
+if (eregi('install.lock',$_SERVER["SCRIPT_FILENAME"]))
{
print 'Install pages have been disabled for security reason (directory renamed with .lock).';
print '';
@@ -142,10 +142,13 @@ if (file_exists('../../install.lock'))
// 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 (! empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"])) define('SYSLOG_FILE',$_ENV["TMP"].'/dolibarr_install.log');
-else if (! empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE',$_ENV["TEMP"].'/dolibarr_install.log');
-else if (@is_writable("/")) define('SYSLOG_FILE','/dolibarr_install.log');
+if (! defined('SYSLOG_FILE')) // To avoid warning on systems with constant already defined
+{
+ if (@is_writable('/tmp')) define('SYSLOG_FILE','/tmp/dolibarr_install.log');
+ else if (! empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"])) define('SYSLOG_FILE',$_ENV["TMP"].'/dolibarr_install.log');
+ else if (! empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE',$_ENV["TEMP"].'/dolibarr_install.log');
+ else if (@is_writable("/")) define('SYSLOG_FILE','/dolibarr_install.log');
+}
define('SYSLOG_FILE_NO_ERROR',1);
@@ -208,7 +211,7 @@ function conf($dolibarr_main_document_root)
if (empty($character_set_client)) $character_set_client=$charset;
$conf->character_set_client=strtoupper($character_set_client);
- if (empty($dolibarr_main_db_charset)) $dolibarr_main_db_charset='latin1';
+ if (empty($dolibarr_main_db_charset)) $dolibarr_main_db_charset='latin1';
$conf->db->character_set=$dolibarr_main_db_charset;
if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation='latin1_swedish_ci';
$conf->db->dolibarr_main_db_collation=$dolibarr_main_db_collation;
@@ -216,12 +219,15 @@ function conf($dolibarr_main_document_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 (! empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"])) define('SYSLOG_FILE',$_ENV["TMP"].'/dolibarr_install.log');
- else if (! empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE',$_ENV["TEMP"].'/dolibarr_install.log');
- else if (@is_writable("/")) define('SYSLOG_FILE','/dolibarr_install.log');
+ if (! defined('SYSLOG_FILE')) // To avoid warning on systems with constant already defined
+ {
+ if (@is_writable('/tmp')) define('SYSLOG_FILE','/tmp/dolibarr_install.log');
+ else if (! empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"])) define('SYSLOG_FILE',$_ENV["TMP"].'/dolibarr_install.log');
+ else if (! empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE',$_ENV["TEMP"].'/dolibarr_install.log');
+ else if (@is_writable("/")) define('SYSLOG_FILE','/dolibarr_install.log');
+ }
define('SYSLOG_FILE_NO_ERROR',1);
-
+
return 1;
}
@@ -265,13 +271,13 @@ function pHeader($soutitre,$next,$action='set')
function pFooter($nonext=0,$setuplang='')
{
global $conf,$langs;
-
+
$langs->load("main");
$langs->load("admin");
-
+
print ''."\n";
print ''."\n";
-
+
if (! $nonext)
{
print '">
';
@@ -287,17 +293,17 @@ function pFooter($nonext=0,$setuplang='')
if (sizeof($conf->logbuffer))
{
print "\n";
- print "\n";
+ print "End of log output -->\n";
print "\n";
}
-
+
print ' '."\n";
print '