From b1bb1df4acdd70dac5cb51ec9e09f03fbb08e557 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 30 Jul 2011 10:23:24 +0000 Subject: [PATCH] Fix: Code could not works for debian packages --- build/makepack-dolibarr.pl | 11 +++----- htdocs/admin/system/constall.php | 5 ++-- htdocs/filefunc.inc.php | 13 ++++++++-- htdocs/index.php | 7 +++--- htdocs/install/check.php | 6 ++--- htdocs/install/etape0.php | 6 ++--- htdocs/install/etape1.php | 7 ++---- htdocs/install/etape2.php | 6 ++--- htdocs/install/etape4.php | 6 ++--- htdocs/install/etape5.php | 16 +++++++----- htdocs/install/fileconf.php | 43 +++++++++++++------------------- htdocs/install/licence.php | 6 ++--- htdocs/main.inc.php | 5 ++-- htdocs/master.inc.php | 5 ++-- 14 files changed, 67 insertions(+), 75 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f191d88c7f9..5dcf81d3a85 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.121 2011/07/28 23:05:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.122 2011/07/30 10:23:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.121 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.122 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -263,6 +263,7 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.zip`; $ret=`rm -f $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; @@ -291,11 +292,6 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`; @@ -306,6 +302,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index f478b65e3a8..a07b28bd2cf 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/admin/system/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $ + * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ */ require("../../main.inc.php"); diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index c7e0858fe09..13a97bf54b3 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -28,7 +28,7 @@ * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.19 2011/07/21 22:11:30 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -61,8 +61,17 @@ error_reporting(E_ALL ^ E_NOTICE); //error_reporting(E_ALL); +$conffiletoshowshort = "conf.php"; +# Define localization of conf file +$conffile = "conf/conf.php"; +$conffiletoshow = "htdocs/conf/conf.php"; +# For debian like systems +#$conffile = "/etc/dolibarr/conf.php"; +#$conffiletoshow = "/etc/dolibarr/conf.php"; + + // Include configuration -$result=@include_once("conf/conf.php"); +$result=@include_once($conffile); if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session { header("Location: install/index.php"); diff --git a/htdocs/index.php b/htdocs/index.php index f027e94a35a..5998094d362 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -14,13 +14,14 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.200 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -573,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/31 23:19:05 $ - $Revision: 1.200 $'); +llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 3724ef23d95..374ebd4ebbf 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: check.php,v 1.85 2011/07/30 10:23:25 eldy Exp $ */ include_once("./inc.php"); @@ -39,9 +39,7 @@ $langs->load("install"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin=''; -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("Dolibarr install/upgrade process started"); diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 20ef1080e85..f11fdb322b7 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -22,7 +22,7 @@ * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape0.php,v 1.40 2011/07/30 10:23:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php @@ -49,9 +49,7 @@ $passroot=isset($_POST["db_pass_root"])?$_POST["db_pass_root"]:""; $main_dir=isset($_POST["main_dir"])?trim($_POST["main_dir"]):''; // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("--- etape0: Entering etape0.php page"); diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 5d7fca530f2..d430b8731df 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -24,7 +24,7 @@ * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: etape1.php,v 1.134 2011/07/30 10:23:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php @@ -39,9 +39,7 @@ $langs->load("admin"); $langs->load("install"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("--- etape1: Entering etape1.php page"); @@ -528,7 +526,6 @@ function write_conf_file($conffile) global $dolibarr_main_url_root,$dolibarr_main_document_root,$dolibarr_main_data_root,$dolibarr_main_db_host; global $dolibarr_main_db_port,$dolibarr_main_db_name,$dolibarr_main_db_user,$dolibarr_main_db_pass; global $dolibarr_main_db_type,$dolibarr_main_db_character_set,$dolibarr_main_db_collation,$dolibarr_main_authentication; - global $conffile,$conffiletoshow,$conffiletoshowshort; $error=0; diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index d7df4ac6929..e29a0b49221 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -21,7 +21,7 @@ * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape2.php,v 1.104 2011/07/30 10:23:25 eldy Exp $ */ include("./inc.php"); @@ -54,9 +54,7 @@ if ($dolibarr_main_db_type == "pgsql") $choix=2; if ($dolibarr_main_db_type == "mssql") $choix=3; // Init "forced values" to nothing. "forced values" are used after a Doliwamp install wizard. -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("--- etape2: Entering etape2.php page"); diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 9a0dd0fcc43..80a2cf5f51d 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -23,7 +23,7 @@ * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: etape4.php,v 1.36 2011/07/30 10:23:25 eldy Exp $ */ @@ -41,9 +41,7 @@ $langs->load("install"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. if (! isset($force_install_dolibarrlogin)) $force_install_dolibarrlogin=''; -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("--- etape4: Entering etape4.php page"); diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0037190af06..af4df81ae1a 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -24,7 +24,7 @@ * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ + * \version $Id: etape5.php,v 1.103 2011/07/30 10:23:25 eldy Exp $ */ include_once("./inc.php"); @@ -63,9 +63,12 @@ if (! isset($force_install_databasepass)) $force_install_databasepass=''; if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin=''; if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=''; if (! isset($force_install_lockinstall)) $force_install_lockinstall=''; -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +$usedoliwamp=false; +if (file_exists("./install.forced.php")) +{ + $usedoliwamp=true; + include_once("./install.forced.php"); +} dolibarr_install_syslog("--- etape5: Entering etape5.php page", LOG_INFO); @@ -102,7 +105,6 @@ if ($action == "set") */ pHeader($langs->trans("SetupEnd"),"etape5"); -print '
'; // Test if we can run a first install process if (! GETPOST("versionfrom") && ! GETPOST("versionto") && ! is_writable($conffile)) @@ -206,7 +208,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action)) if (! $resql) dol_print_error($db,'Error in setup program'); $conf->global->MAIN_VERSION_LAST_INSTALL=$targetversion; - if ($useforcedwizard) + if ($usedoliwamp) { dolibarr_install_syslog('install/etape5.php set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG); $resql=$db->query("DELETE FROM llx_const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'"); @@ -315,6 +317,7 @@ if ($action == "set") if (! empty($force_install_lockinstall)) { // Install is finished, we create the lock file + $lockfile="../../install.lock"; $fp = @fopen($lockfile, "w"); if ($fp) { @@ -364,6 +367,7 @@ elseif (preg_match('/upgrade/i',$action)) if (! empty($force_install_lockinstall)) { // Upgrade is finished, we create the lock file + $lockfile="../../install.lock"; $fp = @fopen($lockfile, "w"); if ($fp) { diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 6d19b01e197..6448a678189 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -25,7 +25,7 @@ * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $ + * \version $Id: fileconf.php,v 1.92 2011/07/30 10:23:25 eldy Exp $ */ include_once("./inc.php"); @@ -39,8 +39,8 @@ $langs->load("install"); $langs->load("errors"); // You can force preselected values of the config step of Dolibarr by adding a file -// install.forced.php into directory htdocs/install (This is the case with some wizard -// installer like DoliWamp, DoliMamp or DoliBuntu). +// install.forced.php into directory htdocs/install (This is the case with some installer +// lile DoliWamp, DoliMamp or DoliBuntu. // We first init "forced values" to nothing. if (! isset($force_install_noedit)) $force_install_noedit=''; if (! isset($force_install_type)) $force_install_type=''; @@ -53,9 +53,7 @@ if (! isset($force_install_databasepass)) $force_install_databasepass=''; if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin=''; if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=''; // Now we load forced value from install.forced.php file. -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("Fileconf: Entering fileconf.php page"); @@ -161,10 +159,7 @@ if (! empty($force_install_message)) } ?> - '; - print ''; - ?> + name="main_data_dir"> trans("WithNoSlashAtTheEnd")."
"; @@ -172,7 +167,7 @@ if (! empty($force_install_message)) print $langs->trans("Examples").":
"; ?>
    -
  • /var/lib/dolibarr/documents
    • +
  • /var/dolibarr_documents
  • C:/My Documents/dolibarr/
@@ -210,10 +205,7 @@ if (empty($dolibarr_main_url_root)) trans("URLRoot"); ?> - '; - print ''; - ?> + value=""> trans("Examples").":
"; ?>
    @@ -312,9 +304,9 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t if ($force_install_noedit && $force_install_type) print ''; print ''; + print '  '; - ?> + ?> trans("DatabaseType"); ?> @@ -347,7 +339,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("DatabaseName"); ?> - trans("DatabaseName"); ?> @@ -366,7 +358,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("Login"); ?> - trans("AdminLogin"); ?> @@ -374,7 +366,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("Password"); ?> - trans("AdminPassword"); ?> @@ -383,7 +375,8 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("CreateUser"); ?> - > trans("CheckToCreateUser"); ?> @@ -400,7 +393,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("Login"); ?> -
    trans("DatabaseRootLoginDescription"); ?> @@ -411,7 +404,8 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t trans("Password"); ?> -
    trans("KeepEmptyIfNoPassword"); ?> @@ -442,9 +436,6 @@ jQuery(document).ready(function() { jQuery("#db_create_user").click(function() { init_needroot(); }); - - jQuery("#db_pass").focus(); - }); function checkDatabaseName(databasename) { diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index c786f91346c..97810705926 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -21,7 +21,7 @@ * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $ + * \version $Id: licence.php,v 1.19 2011/07/30 10:23:25 eldy Exp $ */ include_once("./inc.php"); @@ -33,9 +33,7 @@ $langs->setDefaultLang($setuplang); $langs->load("install"); // Init "forced values" to nothing. "forced values" are used after an doliwamp install wizard. -$useforcedwizard=false; -if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); } -else if (file_exists("/etc/dolibarr/install.forced.php")) { $useforcedwizard=include_once("/etc/dolibarr/install.forced.php"); } +if (file_exists("./install.forced.php")) include_once("./install.forced.php"); dolibarr_install_syslog("Licence: Entering licence.php page"); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1bdeb9562e6..49b67f9349a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -18,14 +18,15 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.756 2011/07/31 23:19:05 eldy Exp $ + * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 1d5b4951490..03ef2767e40 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -21,7 +21,8 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /** @@ -29,7 +30,7 @@ * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) * This script reads the conf file, init $lang, $db and and empty $user - * \version $Id: master.inc.php,v 1.351 2011/07/31 23:19:04 eldy Exp $ + * \version $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $ */