lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2018-04-12 19:13:06 +02:00
parent 4b38cf5329
commit 664f57a5f0
7 changed files with 67 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/fileconf.php
View File

@ -24,7 +24,7 @@
/** /**
* \file htdocs/install/fileconf.php * \file htdocs/install/fileconf.php
* \ingroup install * \ingroup install
* \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page step1)
*/ */
include_once 'inc.php'; include_once 'inc.php';

39
htdocs/install/step1.php
View File

@ -32,8 +32,8 @@ include 'inc.php';
global $langs; global $langs;
$action=GETPOST('action','alpha'); $action=GETPOST('action','aZ09')?GETPOST('action','aZ09'):(empty($argv[1])?'':$argv[1]);
$setuplang=(GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):'auto'); $setuplang=GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):(empty($argv[2])?'auto':$argv[2]);
$langs->setDefaultLang($setuplang); $langs->setDefaultLang($setuplang);
$langs->load("admin"); $langs->load("admin");
@ -41,24 +41,24 @@ $langs->load("install");
$langs->load("errors"); $langs->load("errors");
// Dolibarr pages directory // Dolibarr pages directory
$main_dir = GETPOST('main_dir'); $main_dir = GETPOST('main_dir')?GETPOST('main_dir'):(empty($argv[3])?'':$argv[3]);
// Directory for generated documents (invoices, orders, ecm, etc...) // Directory for generated documents (invoices, orders, ecm, etc...)
$main_data_dir = GETPOST('main_data_dir') ? GETPOST('main_data_dir') : $main_dir . '/documents'; $main_data_dir = GETPOST('main_data_dir') ? GETPOST('main_data_dir') : (empty($argv[4])? ($main_dir . '/documents') :$argv[4]);
// Dolibarr root URL // Dolibarr root URL
$main_url = GETPOST('main_url'); $main_url = GETPOST('main_url')?GETPOST('main_url'):(empty($argv[5])?'':$argv[5]);
// Database login informations // Database login informations
$userroot=GETPOST('db_user_root'); $userroot=GETPOST('db_user_root')?GETPOST('db_user_root'):(empty($argv[6])?'':$argv[6]);
$passroot=GETPOST('db_pass_root'); $passroot=GETPOST('db_pass_root')?GETPOST('db_pass_root'):(empty($argv[7])?'':$argv[7]);
// Database server // Database server
$db_type=GETPOST('db_type','alpha'); $db_type=GETPOST('db_type','alpha')?GETPOST('db_type','alpha'):(empty($argv[8])?'':$argv[8]);
$db_host=GETPOST('db_host','alpha'); $db_host=GETPOST('db_host','alpha')?GETPOST('db_host','alpha'):(empty($argv[9])?'':$argv[9]);
$db_name=GETPOST('db_name','alpha'); $db_name=GETPOST('db_name','alpha')?GETPOST('db_name','alpha'):(empty($argv[10])?'':$argv[10]);
$db_user=GETPOST('db_user','alpha'); $db_user=GETPOST('db_user','alpha')?GETPOST('db_user','alpha'):(empty($argv[11])?'':$argv[11]);
$db_pass=GETPOST('db_pass'); $db_pass=GETPOST('db_pass')?GETPOST('db_pass'):(empty($argv[12])?'':$argv[12]);
$db_port=GETPOST('db_port','int'); $db_port=GETPOST('db_port','int')?GETPOST('db_port','int'):(empty($argv[13])?'':$argv[13]);
$db_prefix=GETPOST('db_prefix','alpha'); $db_prefix=GETPOST('db_prefix','alpha')?GETPOST('db_prefix','alpha'):(empty($argv[14])?'':$argv[14]);
$db_create_database = GETPOST('db_create_database','none'); $db_create_database = GETPOST('db_create_database','none')?GETPOST('db_create_database','none'):(empty($argv[15])?'':$argv[15]);
$db_create_user = GETPOST('db_create_user','none'); $db_create_user = GETPOST('db_create_user','none')?GETPOST('db_create_user','none'):(empty($argv[16])?'':$argv[16]);
// Force https // Force https
$main_force_https = ((GETPOST("main_force_https",'alpha') && (GETPOST("main_force_https",'alpha') == "on" || GETPOST("main_force_https",'alpha') == 1)) ? '1' : '0'); $main_force_https = ((GETPOST("main_force_https",'alpha') && (GETPOST("main_force_https",'alpha') == "on" || GETPOST("main_force_https",'alpha') == 1)) ? '1' : '0');
// Use alternative directory // Use alternative directory
@ -800,10 +800,17 @@ function jsinfo()
<?php <?php
$ret=0;
if ($error && isset($argv[1])) $ret=1;
dolibarr_install_syslog("Exit ".$ret);
dolibarr_install_syslog("--- step1: end"); dolibarr_install_syslog("--- step1: end");
pFooter($error?1:0,$setuplang,'jsinfo',1); pFooter($error?1:0,$setuplang,'jsinfo',1);
// Return code if ran from command line
if ($ret) exit($ret);
/** /**
* Create main file. No particular permissions are set by installer. * Create main file. No particular permissions are set by installer.

13
htdocs/install/step2.php
View File

@ -42,8 +42,8 @@ error_reporting(0); // Disable all errors
@set_time_limit(900); // Need 900 on some OS like Windows 7/64 @set_time_limit(900); // Need 900 on some OS like Windows 7/64
error_reporting($err); error_reporting($err);
$action=GETPOST('action','aZ09'); $action=GETPOST('action','aZ09')?GETPOST('action','aZ09'):(empty($argv[1])?'':$argv[1]);
$setuplang=(GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):'auto'); $setuplang=GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):(empty($argv[2])?'auto':$argv[2];
$langs->setDefaultLang($setuplang); $langs->setDefaultLang($setuplang);
$langs->load("admin"); $langs->load("admin");
@ -622,8 +622,17 @@ else
print 'Parameter action=set not defined'; print 'Parameter action=set not defined';
} }
$ret=0;
if (!$ok && isset($argv[1])) $ret=1;
dolibarr_install_syslog("Exit ".$ret);
dolibarr_install_syslog("--- step2: end"); dolibarr_install_syslog("--- step2: end");
pFooter($ok?0:1,$setuplang); pFooter($ok?0:1,$setuplang);
if (isset($db) && is_object($db)) $db->close(); if (isset($db) && is_object($db)) $db->close();
// Return code if ran from command line
if ($ret) exit($ret);

20
htdocs/install/step4.php
View File

@ -32,7 +32,7 @@ require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
global $langs; global $langs;
$setuplang=(GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):'auto'); $setuplang=GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):(empty($argv[1])?'auto':$argv[1]);
$langs->setDefaultLang($setuplang); $langs->setDefaultLang($setuplang);
$langs->load("admin"); $langs->load("admin");
@ -49,7 +49,7 @@ if (@file_exists($forcedfile)) {
dolibarr_install_syslog("--- step4: entering step4.php page"); dolibarr_install_syslog("--- step4: entering step4.php page");
$err=0; $error=0;
$ok = 0; $ok = 0;
@ -92,7 +92,7 @@ if ($db->ok)
{ {
print '<br>'; print '<br>';
print '<div class="error">'.$langs->trans("PasswordsMismatch").'</div>'; print '<div class="error">'.$langs->trans("PasswordsMismatch").'</div>';
$err=0; // We show button $error=0; // We show button
} }
if (isset($_GET["error"]) && $_GET["error"] == 2) if (isset($_GET["error"]) && $_GET["error"] == 2)
@ -101,20 +101,28 @@ if ($db->ok)
print '<div class="error">'; print '<div class="error">';
print $langs->trans("PleaseTypePassword"); print $langs->trans("PleaseTypePassword");
print '</div>'; print '</div>';
$err=0; // We show button $error=0; // We show button
} }
if (isset($_GET["error"]) && $_GET["error"] == 3) if (isset($_GET["error"]) && $_GET["error"] == 3)
{ {
print '<br>'; print '<br>';
print '<div class="error">'.$langs->trans("PleaseTypeALogin").'</div>'; print '<div class="error">'.$langs->trans("PleaseTypeALogin").'</div>';
$err=0; // We show button $error=0; // We show button
} }
} }
$ret=0;
if ($error && isset($argv[1])) $ret=1;
dolibarr_install_syslog("Exit ".$ret);
dolibarr_install_syslog("--- step4: end"); dolibarr_install_syslog("--- step4: end");
pFooter($err,$setuplang); pFooter($error,$setuplang);
$db->close(); $db->close();
// Return code if ran from command line
if ($ret) exit($ret);

22
htdocs/install/step5.php
View File

@ -33,11 +33,11 @@ require_once $dolibarr_main_document_root . '/core/lib/security.lib.php'; // for
global $langs; global $langs;
$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]); $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]); $versionto=GETPOST("versionto",'alpha',3)?GETPOST("versionto",'alpha',3):(empty($argv[2])?'':$argv[2]);
$action=GETPOST('action','alpha'); $setuplang=GETPOST('selectlang','aZ09',3)?GETPOST('selectlang','aZ09',3):(empty($argv[3])?'auto':$argv[3]);
$langs->setDefaultLang($setuplang);
$action=GETPOST('action','alpha')?GETPOST('action','alpha'):(empty($argv[4])?'auto':$argv[4]);
// Define targetversion used to update MAIN_VERSION_LAST_INSTALL for first install // Define targetversion used to update MAIN_VERSION_LAST_INSTALL for first install
// or MAIN_VERSION_LAST_UPGRADE for upgrade. // or MAIN_VERSION_LAST_UPGRADE for upgrade.
@ -55,9 +55,9 @@ if (! empty($action) && preg_match('/upgrade/i', $action)) // If it's an old upg
$langs->load("admin"); $langs->load("admin");
$langs->load("install"); $langs->load("install");
$login = GETPOST('login', 'alpha'); $login = GETPOST('login', 'alpha')?GETPOST('login', 'alpha'):(empty($argv[5])?'':$argv[5]);
$pass = GETPOST('pass', 'alpha'); $pass = GETPOST('pass', 'alpha')?GETPOST('pass', 'alpha'):(empty($argv[6])?'':$argv[6]);
$pass_verif = GETPOST('pass_verif', 'alpha'); $pass_verif = GETPOST('pass_verif', 'alpha')?GETPOST('pass_verif', 'alpha'):(empty($argv[7])?'':$argv[7]);
$success=0; $success=0;
@ -77,6 +77,8 @@ if (@file_exists($forcedfile)) {
dolibarr_install_syslog("--- step5: entering step5.php page"); dolibarr_install_syslog("--- step5: entering step5.php page");
$error=0;
/* /*
* Actions * Actions
@ -461,6 +463,14 @@ else
clearstatcache(); clearstatcache();
$ret=0;
if ($error && isset($argv[1])) $ret=1;
dolibarr_install_syslog("Exit ".$ret);
dolibarr_install_syslog("--- step5: Dolibarr setup finished"); dolibarr_install_syslog("--- step5: Dolibarr setup finished");
pFooter(1,$setuplang); pFooter(1,$setuplang);
// Return code if ran from command line
if ($ret) exit($ret);

2
htdocs/install/upgrade.php
View File

@ -420,7 +420,7 @@ if (empty($actiondone))
$ret=0; $ret=0;
if (! $ok && isset($argv[1])) $ret=1; if (! $ok && isset($argv[1])) $ret=1;
dol_syslog("Exit ".$ret); dolibarr_install_syslog("Exit ".$ret);
dolibarr_install_syslog("--- upgrade: end ".((! $ok && empty($_GET["ignoreerrors"])) || $dirmodule)); dolibarr_install_syslog("--- upgrade: end ".((! $ok && empty($_GET["ignoreerrors"])) || $dirmodule));
$nonext = (! $ok && empty($_GET["ignoreerrors"]))?2:0; $nonext = (! $ok && empty($_GET["ignoreerrors"]))?2:0;

2
htdocs/install/upgrade2.php
View File

@ -525,7 +525,7 @@ else
$ret=0; $ret=0;
if ($error && isset($argv[1])) $ret=1; if ($error && isset($argv[1])) $ret=1;
dol_syslog("Exit ".$ret); dolibarr_install_syslog("Exit ".$ret);
dolibarr_install_syslog("--- upgrade2: end"); dolibarr_install_syslog("--- upgrade2: end");
pFooter($error?2:0,$setuplang); pFooter($error?2:0,$setuplang);