From 653f5fcbbfa57e76ff00ccfd499fac45ac36ee92 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 26 Oct 2017 18:40:12 +0200 Subject: [PATCH] Remove warning --- htdocs/install/step2.php | 2 +- htdocs/install/step4.php | 2 +- htdocs/install/step5.php | 8 ++++---- htdocs/install/upgrade.php | 8 ++++---- htdocs/install/upgrade2.php | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php index 46acb3f34a2..85c6349274c 100644 --- a/htdocs/install/step2.php +++ b/htdocs/install/step2.php @@ -43,7 +43,7 @@ error_reporting(0); // Disable all errors error_reporting($err); $action=GETPOST('action','aZ09'); -$setuplang=(GETPOST('selectlang','',3)?GETPOST('selectlang','',3):'auto'); +$setuplang=(GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):'auto'); $langs->setDefaultLang($setuplang); $langs->load("admin"); diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php index 54d985597bc..0fe8c6bbf06 100644 --- a/htdocs/install/step4.php +++ b/htdocs/install/step4.php @@ -32,7 +32,7 @@ require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php'; global $langs; -$setuplang=(GETPOST('selectlang','',3)?GETPOST('selectlang','',3):'auto'); +$setuplang=(GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):'auto'); $langs->setDefaultLang($setuplang); $langs->load("admin"); diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php index 4afe2e4a722..8a39faf526a 100644 --- a/htdocs/install/step5.php +++ b/htdocs/install/step5.php @@ -33,11 +33,11 @@ require_once $dolibarr_main_document_root . '/core/lib/security.lib.php'; // for global $langs; -$setuplang=GETPOST("selectlang",'',3)?GETPOST("selectlang",'',3):'auto'; +$setuplang=GETPOST("selectlang",'aZ09',3)?GETPOST("selectlang",'aZ09',3):'auto'; $langs->setDefaultLang($setuplang); -$versionfrom=GETPOST("versionfrom",'',3)?GETPOST("versionfrom",'',3):(empty($argv[1])?'':$argv[1]); -$versionto=GETPOST("versionto",'',3)?GETPOST("versionto",'',3):(empty($argv[2])?'':$argv[2]); -$action=GETPOST('action', 'alpha'); +$versionfrom=GETPOST("versionfrom",'alpha',3)?GETPOST("versionfrom",'alpha',3):(empty($argv[1])?'':$argv[1]); +$versionto=GETPOST("versionto",'alpha',3)?GETPOST("versionto",'alpha',3):(empty($argv[2])?'':$argv[2]); +$action=GETPOST('action','alpha'); // Define targetversion used to update MAIN_VERSION_LAST_INSTALL for first install // or MAIN_VERSION_LAST_UPGRADE for upgrade. diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index edd6463482f..1e0a94a55f8 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -56,11 +56,11 @@ error_reporting(0); error_reporting($err); -$setuplang=GETPOST("selectlang",'',3)?GETPOST("selectlang",'',3):'auto'; +$setuplang=GETPOST("selectlang",'aZ09',3)?GETPOST("selectlang",'aZ09',3):'auto'; $langs->setDefaultLang($setuplang); -$versionfrom=GETPOST("versionfrom",'',3)?GETPOST("versionfrom",'',3):(empty($argv[1])?'':$argv[1]); -$versionto=GETPOST("versionto",'',3)?GETPOST("versionto",'',3):(empty($argv[2])?'':$argv[2]); -$dirmodule=((GETPOST("dirmodule",'',3) && GETPOST("dirmodule",'',3) != 'ignoredbversion'))?GETPOST("dirmodule",'',3):((empty($argv[3]) || $argv[3] == 'ignoredbversion')?'':$argv[3]); +$versionfrom=GETPOST("versionfrom",'alpha',3)?GETPOST("versionfrom",'alpha',3):(empty($argv[1])?'':$argv[1]); +$versionto=GETPOST("versionto",'alpha',3)?GETPOST("versionto",'',3):(empty($argv[2])?'':$argv[2]); +$dirmodule=((GETPOST("dirmodule",'alpha',3) && GETPOST("dirmodule",'alpha',3) != 'ignoredbversion'))?GETPOST("dirmodule",'alpha',3):((empty($argv[3]) || $argv[3] == 'ignoredbversion')?'':$argv[3]); $ignoredbversion=(GETPOST('ignoredbversion','',3)=='ignoredbversion')?GETPOST('ignoredbversion','',3):((empty($argv[3]) || $argv[3] != 'ignoredbversion')?'':$argv[3]); $langs->load("admin"); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index d52bd5ff84c..1d82364760a 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -61,7 +61,7 @@ error_reporting(0); @set_time_limit(300); error_reporting($err); -$setuplang=GETPOST("selectlang",'alpha',3)?GETPOST("selectlang",'alpha',3):'auto'; +$setuplang=GETPOST("selectlang",'aZ09',3)?GETPOST("selectlang",'aZ09',3):'auto'; $langs->setDefaultLang($setuplang); $versionfrom=GETPOST("versionfrom",'alpha',3)?GETPOST("versionfrom",'alpha',3):(empty($argv[1])?'':$argv[1]); $versionto=GETPOST("versionto",'alpha',3)?GETPOST("versionto",'alpha',3):(empty($argv[2])?'':$argv[2]);