From fcf3ec3f0e56924a67095646bea140c5db7d2cb2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Jun 2019 14:01:02 +0200 Subject: [PATCH 1/8] Fix software is uncountable noun --- build/exe/doliwamp/Languages/MyEnglish.isl | 2 +- build/exe/doliwamp/doliwamp.iss | 2 +- build/exe/doliwamp/httpd.conf.install | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/exe/doliwamp/Languages/MyEnglish.isl b/build/exe/doliwamp/Languages/MyEnglish.isl index 18068087804..b066a5f87f6 100644 --- a/build/exe/doliwamp/Languages/MyEnglish.isl +++ b/build/exe/doliwamp/Languages/MyEnglish.isl @@ -11,7 +11,7 @@ LaunchProgram=Launch %1 AssocFileExtension=&Associate %1 with the %2 file extension AssocingFileExtension=Associating %1 with the %2 file extension... -YouWillInstallDoliWamp=You will install or upgrade DoliWamp (so Dolibarr + all required third party softwares like Apache, Mysql and PHP) on your computer. +YouWillInstallDoliWamp=You will install or upgrade DoliWamp (so Dolibarr + all required third party software like Apache, Mysql and PHP) on your computer. ThisAssistantInstallOrUpgrade=WARNING: Using an ERP CRM installed on a local computer can be dangerous: if your computer break down, you can lose all your data. Do this if you are ready to manage backup yourself seriously. If not, use an installation in Saas instead (see https://saas.dolibarr.org). IfYouHaveTechnicalKnowledge=Moreover, if you have technical knowledges and want to manage your Apache, Mysql and PHP yourself, you should not use this assistant and make a manual installation of Dolibarr on your existing server with Apache, Mysql and PHP. ButIfYouLook=But if you look for an automatic setup on your local computer, you''re on the good way... diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 587f2584dbe..93f515d3440 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -31,7 +31,7 @@ AppPublisher=NLTechno AppPublisherURL=https://www.nltechno.com AppSupportURL=https://www.dolibarr.org AppUpdatesURL=https://www.dolibarr.org -AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares. +AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql software. AppCopyright=Copyright (C) 2008-2019 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre) DefaultDirName=c:\dolibarr DefaultGroupName=Dolibarr diff --git a/build/exe/doliwamp/httpd.conf.install b/build/exe/doliwamp/httpd.conf.install index b2b3a9a8118..a23a994f670 100644 --- a/build/exe/doliwamp/httpd.conf.install +++ b/build/exe/doliwamp/httpd.conf.install @@ -772,5 +772,5 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key" # -# Declare alias for Dolibarr, PHPMyAdmin and other softwares +# Declare alias for Dolibarr, PHPMyAdmin and other software Include "WAMPROOT/alias/*.conf" From b31297b712d2fdb2ce1d6ea1a8e3a0fd1d2a37a1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Jun 2019 14:45:36 +0200 Subject: [PATCH 2/8] Add comment for microsoft edge --- build/exe/doliwamp/rundoliadmin.bat.install | 1 + build/exe/doliwamp/rundolihelp.bat.install | 1 + build/exe/doliwamp/rundoliwamp.bat.install | 2 ++ 3 files changed, 4 insertions(+) diff --git a/build/exe/doliwamp/rundoliadmin.bat.install b/build/exe/doliwamp/rundoliadmin.bat.install index dcd113f4ab5..c5186c7d1e7 100644 --- a/build/exe/doliwamp/rundoliadmin.bat.install +++ b/build/exe/doliwamp/rundoliadmin.bat.install @@ -4,3 +4,4 @@ REM ---------------------------- REM Go to admin center page start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/ +REM FOR EDGE start microsoft-edge:"http://localhost:WAMPAPACHEPORT/" \ No newline at end of file diff --git a/build/exe/doliwamp/rundolihelp.bat.install b/build/exe/doliwamp/rundolihelp.bat.install index eed5346de9f..c1c4a7c3d27 100644 --- a/build/exe/doliwamp/rundolihelp.bat.install +++ b/build/exe/doliwamp/rundolihelp.bat.install @@ -5,3 +5,4 @@ REM --------------------------- REM Go to help center page echo Please wait... start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/support/ +REM FOR EDGE start microsoft-edge:"http://localhost:WAMPAPACHEPORT/dolibarr/support/" \ No newline at end of file diff --git a/build/exe/doliwamp/rundoliwamp.bat.install b/build/exe/doliwamp/rundoliwamp.bat.install index c576c5d240b..9470717d661 100644 --- a/build/exe/doliwamp/rundoliwamp.bat.install +++ b/build/exe/doliwamp/rundoliwamp.bat.install @@ -4,6 +4,8 @@ REM --------------- REM If no lock file, we call install process IF NOT EXIST dolibarr_documents\install.lock start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/install/ +REM FOR EDGE IF NOT EXIST dolibarr_documents\install.lock start microsoft-edge:"http://localhost:WAMPAPACHEPORT/dolibarr/install/" REM If lock file exists, we call home page IF EXIST dolibarr_documents\install.lock start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/ +REM FOR EDGE IF EXIST dolibarr_documents\install.lock start microsoft-edge:"http://localhost:WAMPAPACHEPORT/dolibarr/" From a992690c4386e5dd7494b8c78589e25758845d47 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Jun 2019 14:49:51 +0200 Subject: [PATCH 3/8] Fix missing php-intl --- build/exe/doliwamp/php.ini.install | 1 + 1 file changed, 1 insertion(+) diff --git a/build/exe/doliwamp/php.ini.install b/build/exe/doliwamp/php.ini.install index 46e4dc685b7..928e967f184 100644 --- a/build/exe/doliwamp/php.ini.install +++ b/build/exe/doliwamp/php.ini.install @@ -665,6 +665,7 @@ extension=php_gd2.dll ;extension=php_ifx.dll ;extension=php_imap.dll ;extension=php_interbase.dll +extension=php_intl.dll extension=php_ldap.dll extension=php_mbstring.dll ;extension=php_mcrypt.dll From 8f5b575b194501dd6f295ae5576f007fab9ed93e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Jun 2019 16:19:26 +0200 Subject: [PATCH 4/8] Fix missing php-intl is not blocking (not working on windows) --- build/exe/doliwamp/php.ini.install | 2 ++ htdocs/core/lib/functions.lib.php | 2 +- htdocs/install/check.php | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build/exe/doliwamp/php.ini.install b/build/exe/doliwamp/php.ini.install index 928e967f184..04191a71f5a 100644 --- a/build/exe/doliwamp/php.ini.install +++ b/build/exe/doliwamp/php.ini.install @@ -653,6 +653,8 @@ default_socket_timeout = 60 ; extension folders as well as the separate PECL DLL download (PHP 5). ; Be sure to appropriately set the extension_dir directive. +; If an extension does not load, run "deplister.exe php_xxx.dll" to get list of dependency dll missing. + extension=php_bz2.dll extension=php_curl.dll ;extension=php_dba.dll diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7341bc0c2cb..c930dbf172a 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -7037,7 +7037,7 @@ function getLanguageCodeFromCountryCode($countrycode) $buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode); if (in_array($buildprimarykeytotest, $locales)) return strtolower($countrycode).'_'.strtoupper($countrycode); - if (function_exists('locale_get_primary_language')) // Need extension php-intl + if (function_exists('locale_get_primary_language') && function_exists('locale_get_region')) // Need extension php-intl { foreach ($locales as $locale) { diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 55331634aff..0b98183904a 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -127,7 +127,7 @@ if (! function_exists("imagecreate")) { $langs->load("errors"); print 'Error '.$langs->trans("ErrorPHPDoesNotSupportGD")."
\n"; - // $checksok=0; // If image ko, just warning. So check must still be 1 (otherwise no way to install) + // $checksok=0; // If ko, just warning. So check must still be 1 (otherwise no way to install) } else { @@ -140,7 +140,7 @@ if (! function_exists("curl_init")) { $langs->load("errors"); print 'Error '.$langs->trans("ErrorPHPDoesNotSupportCurl")."
\n"; - // $checksok=0; // If image ko, just warning. So check must still be 1 (otherwise no way to install) + // $checksok=0; // If ko, just warning. So check must still be 1 (otherwise no way to install) } else { @@ -153,7 +153,7 @@ if (! function_exists("utf8_encode")) { $langs->load("errors"); print 'Error '.$langs->trans("ErrorPHPDoesNotSupportUTF8")."
\n"; - // $checksok=0; // If image ko, just warning. So check must still be 1 (otherwise no way to install) + // $checksok=0; // If ko, just warning. So check must still be 1 (otherwise no way to install) } else { @@ -162,11 +162,11 @@ else // Check if UTF8 supported -if (! function_exists("locale_get_primary_language")) +if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region")) { $langs->load("errors"); print 'Error '.$langs->trans("ErrorPHPDoesNotSupportIntl")."
\n"; - // $checksok=0; // If image ko, just warning. So check must still be 1 (otherwise no way to install) + // $checksok=0; // If ko, just warning. So check must still be 1 (otherwise no way to install) } else { From 46ced373be59380f1706e6a48f3065be2b02ea71 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Jun 2019 23:52:28 +0200 Subject: [PATCH 5/8] Fix for doliwamp --- build/exe/doliwamp/install.forced.php.install | 1 + htdocs/install/check.php | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/build/exe/doliwamp/install.forced.php.install b/build/exe/doliwamp/install.forced.php.install index 5b186c17268..c59b373a7a0 100644 --- a/build/exe/doliwamp/install.forced.php.install +++ b/build/exe/doliwamp/install.forced.php.install @@ -5,6 +5,7 @@ // during install process to be used. // // +$force_install_type='doliwamp'; $force_install_noedit=2; // 1=To block vars specific to distrib, 2 to block all technical parameters $force_install_message='KeepDefaultValuesWamp'; $force_install_main_data_root='WAMPROOT/dolibarr_documents'; diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 0b98183904a..9d6d9adbc16 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -161,18 +161,20 @@ else } -// Check if UTF8 supported -if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region")) +// Check if intl methods are supported +if (empty($force_install_type) || $force_install_type != 'doliwamp') { - $langs->load("errors"); - print 'Error '.$langs->trans("ErrorPHPDoesNotSupportIntl")."
\n"; - // $checksok=0; // If ko, just warning. So check must still be 1 (otherwise no way to install) + if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region")) + { + $langs->load("errors"); + print 'Error '.$langs->trans("ErrorPHPDoesNotSupportIntl")."
\n"; + // $checksok=0; // If ko, just warning. So check must still be 1 (otherwise no way to install) + } + else + { + print 'Ok '.$langs->trans("PHPSupportIntl")."
\n"; + } } -else -{ - print 'Ok '.$langs->trans("PHPSupportIntl")."
\n"; -} - // Check memory From 511b21ca9c94d2820b953117dffa0a0f23a8f171 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Jul 2019 00:22:28 +0200 Subject: [PATCH 6/8] Fix for doliwamp --- build/exe/doliwamp/httpd.conf.install | 2 +- htdocs/install/check.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/exe/doliwamp/httpd.conf.install b/build/exe/doliwamp/httpd.conf.install index a23a994f670..40cc9a2f5c6 100644 --- a/build/exe/doliwamp/httpd.conf.install +++ b/build/exe/doliwamp/httpd.conf.install @@ -150,7 +150,7 @@ Require local # e-mailed. This address appears on some server-generated pages, such # as error documents. e.g. admin@your-domain.com # -ServerAdmin webmaster@localhost +ServerAdmin doliwamp@localhost # # ServerName gives the name and port that the server uses to identify itself. diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9d6d9adbc16..43645f402ed 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -162,7 +162,7 @@ else // Check if intl methods are supported -if (empty($force_install_type) || $force_install_type != 'doliwamp') +if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@localhost') { if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region")) { From 0259cde0daac2dfaa9243a73f6b496e9aa01eef9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Jul 2019 13:26:45 +0200 Subject: [PATCH 7/8] Typo --- build/exe/doliwamp/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/exe/doliwamp/README.md b/build/exe/doliwamp/README.md index ca3aaa6aece..8e6f4744438 100644 --- a/build/exe/doliwamp/README.md +++ b/build/exe/doliwamp/README.md @@ -1,7 +1,7 @@ # DOLIWAMP, THE DOLIBARR INSTALLER FOR WINDOWS DoliWamp is a special all in one package installer for Windows (Dolibarr+Mysql+Apache+PHP). -It's a dedicated Dolibarr version for Windows newbies with no technical knowledge. This package will install or upgrade Dolibarr but also and all prerequisites like the web server, and the database in one autoinstall process. +It's a dedicated Dolibarr version for Windows newbies with no technical knowledge. This package will install or upgrade Dolibarr but also all prerequisites like the web server, and the database in one auto-install process. If you have technical knowledge in web administration and plan to share your server instance (Apache, Mysql or PHP) with other projects than Dolibarr or want to use Dolibarr other components (PostgreSQL), you should not use this assistant and make a manual installation of Dolibarr on your existing server by downloading the standard package (.tgz or .zip file). From 3abaecfd77db1839ee851097c0024097ed8ba389 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Jul 2019 13:27:18 +0200 Subject: [PATCH 8/8] Prepare 8.0.7 --- htdocs/filefunc.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index fbc1f52cac7..5a71e94c2d4 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -31,7 +31,7 @@ */ if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr'); -if (! defined('DOL_VERSION')) define('DOL_VERSION','8.0.6'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c +if (! defined('DOL_VERSION')) define('DOL_VERSION','8.0.7'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c if (! defined('EURO')) define('EURO',chr(128));