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

Enhancement of install/upgrade process: If database version differs from programs version, the install page is automatically called.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-08-08 16:26:06 +00:00
parent 45d4abfb8d
commit b1ff004e6f
18 changed files with 128 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/admin/company.php
View File

@ -191,7 +191,8 @@ if ($_GET["action"] == 'removelogo')
* Affichage page * Affichage page
*/ */
llxHeader(); $wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
llxHeader($langs->trans("Setup"),'',$wikihelp);
$form = new Form($db); $form = new Form($db);
$formcompany = new FormCompany($db); $formcompany = new FormCompany($db);

6
htdocs/admin/index.php
View File

@ -51,16 +51,18 @@ print_fiche_titre($langs->trans("SetupArea"),'','setup');
if ($mesg) print $mesg.'<br>'; if ($mesg) print $mesg.'<br>';
print $langs->trans("SetupDescription1").'<br>'; print $langs->trans("SetupDescription1").' ';
print $langs->trans("AreaForAdminOnly").'<br>'; print $langs->trans("AreaForAdminOnly").'<br>';
print "<br>"; print "<br>";
print $langs->trans("SetupDescription2")."<br>"; print $langs->trans("SetupDescription2")."<br>";
print "<br>"; print "<br>";
print img_picto('','puce').' '.$langs->trans("SetupDescription3")."<br>"; print img_picto('','puce').' '.$langs->trans("SetupDescription3")."<br>";
//print "<br>"; print "<br>";
print img_picto('','puce').' '.$langs->trans("SetupDescription4")."<br>"; print img_picto('','puce').' '.$langs->trans("SetupDescription4")."<br>";
print "<br>"; print "<br>";
print img_picto('','puce').' '.$langs->trans("SetupDescription5")."<br>";
print "<br>";
print '<br>'; print '<br>';
print info_admin($langs->trans("OnceSetupFinishedCreateUsers")).'<br>'; print info_admin($langs->trans("OnceSetupFinishedCreateUsers")).'<br>';

3
htdocs/admin/modules.php
View File

@ -185,7 +185,8 @@ function UnActivate($value,$requiredby=1)
*/ */
$_SESSION["mode"]=$mode; $_SESSION["mode"]=$mode;
llxHeader("",""); $wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
llxHeader($langs->trans("Setup"),'',$wikihelp);
print_fiche_titre($langs->trans("ModulesSetup"),'','setup'); print_fiche_titre($langs->trans("ModulesSetup"),'','setup');

BIN
htdocs/install/background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 229 B

17
htdocs/install/check.php
View File

@ -48,16 +48,15 @@ dolibarr_install_syslog("check: Dolibarr install/upgrade process started");
* View * View
*/ */
pHeader($langs->trans("DolibarrWelcome"),""); // Etape suivante = license pHeader('',""); // Etape suivante = license
print '<center>'; print '<center>';
print '<img src="../theme/dolibarr_logo.png" alt="Dolibarr logo"><br>'; print '<img src="../theme/dolibarr_logo.png" alt="Dolibarr logo"><br>';
print DOL_VERSION.'<br><br>'; print DOL_VERSION.'<br><br>';
print '</center>'; print '</center>';
print "<br>\n";
//print "<br>\n";
print $langs->trans("InstallEasy")."<br><br>\n"; //print $langs->trans("InstallEasy")."<br><br>\n";
print '<b>'.$langs->trans("MiscellanousChecks")."</b>:<br>\n"; print '<b>'.$langs->trans("MiscellanousChecks")."</b>:<br>\n";
@ -293,14 +292,15 @@ else
# Show title # Show title
if (! empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) if (! empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
{ {
print $langs->trans("VersionLastUpgrade").": ".$conf->global->MAIN_VERSION_LAST_UPGRADE.'<br>'; print $langs->trans("VersionLastUpgrade").': <b><font class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</font></b><br>';
print $langs->trans("VersionProgram").": ".DOL_VERSION; print $langs->trans("VersionProgram").': <b><font class="ok">'.DOL_VERSION.'</font></b>';
//print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired")); //print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired"));
print '<br>'; print '<br>';
print '<br>'; print '<br>';
} }
else print "<br />\n"; else print "<br />\n";
print $langs->trans("InstallEasy")." ";
print $langs->trans("ChooseYourSetupMode"); print $langs->trans("ChooseYourSetupMode");
print '<table width="100%" cellspacing="1" cellpadding="4" border="1">'; print '<table width="100%" cellspacing="1" cellpadding="4" border="1">';
@ -325,6 +325,7 @@ else
# Show upgrade lines # Show upgrade lines
$allowupgrade=true; $allowupgrade=true;
if (defined("MAIN_NOT_INSTALLED")) $allowupgrade=false;
$migrationscript=array( //array('from'=>'2.0.0', 'to'=>'2.1.0'), $migrationscript=array( //array('from'=>'2.0.0', 'to'=>'2.1.0'),
//array('from'=>'2.1.0', 'to'=>'2.2.0'), //array('from'=>'2.1.0', 'to'=>'2.2.0'),
array('from'=>'2.2.0', 'to'=>'2.4.0'), array('from'=>'2.2.0', 'to'=>'2.4.0'),
@ -352,11 +353,11 @@ else
// If last upgrade was an alpha or beta, we increase target version to 1 to select this one. // If last upgrade was an alpha or beta, we increase target version to 1 to select this one.
if (isset($conf->global->MAIN_VERSION_LAST_UPGRADE) && eregi('beta|alpha',$conf->global->MAIN_VERSION_LAST_UPGRADE)) $dolibarrversiontoarray[2]=(isset($dolibarrversiontoarray[2]) ? ($dolibarrversiontoarray[2]+1) : 1); if (isset($conf->global->MAIN_VERSION_LAST_UPGRADE) && eregi('beta|alpha',$conf->global->MAIN_VERSION_LAST_UPGRADE)) $dolibarrversiontoarray[2]=(isset($dolibarrversiontoarray[2]) ? ($dolibarrversiontoarray[2]+1) : 1);
// Now we check if this is the first qualified choice // Now we check if this is the first qualified choice
if (empty($foundrecommandedchoice) && versioncompare($dolibarrversiontoarray,$dolibarrlastupgradeversionarray) > 0) if ($allowupgrade && empty($foundrecommandedchoice) && versioncompare($dolibarrversiontoarray,$dolibarrlastupgradeversionarray) > 0)
{ {
print '<br>'; print '<br>';
//print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE); //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
print '<center><div class="warning">'.$langs->trans("InstallChoiceSuggested").'</div></center>'; print '<center><div class="ok">'.$langs->trans("InstallChoiceSuggested").'</div></center>';
// <img src="../theme/eldy/img/tick.png" alt="Ok"> '; // <img src="../theme/eldy/img/tick.png" alt="Ok"> ';
$foundrecommandedchoice=1; // To show only once $foundrecommandedchoice=1; // To show only once
} }

60
htdocs/install/default.css
View File

@ -1,4 +1,5 @@
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2009 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -20,28 +21,29 @@
body { body {
font-size:13px; font-size:13px;
font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
background-color: #F4F4F4; background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
/* background-color: #F4F4F4; */
margin-left: 20px; margin-left: 20px;
margin-right: 20px; margin-right: 20px;
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px; margin-bottom: 10px;
}
div.titre {
padding: 5px 5px 5px 5px;
margin: 0em 0em 0em 0em;
} }
span.titre { span.titre {
font-size: 1.1em; font-size: 1.1em;
font-weight: bold; font-weight: bold;
background: #dcdcd3; background: #FFFFFF;
color: #4965B3; color: #4965B3;
border: 1px solid #8CACBB; border: 1px solid #8CACBB;
padding: 5px 5px 5px 5px; padding: 5px 5px 5px 5px;
margin: 0em 0em 0em 0em; margin: 0em 0em 0em 0em;
} }
div.titre {
padding: 5px 5px 5px 5px;
margin: 0em 0em 0em 0em;
}
div.soustitre { div.soustitre {
font-size: 15px; font-size: 15px;
font-weight: bold; font-weight: bold;
@ -62,54 +64,57 @@ inputdisabled
} }
table.main { table.main {
background: #dcdcd3; background: #F0F0F0 url(background.png) repeat-x;
text-align: left; text-align: left;
border: 1px solid #8CACBB; border: 1px solid #8CACBB;
color: #000000;
} }
table.main-inside { table.main-inside {
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
margin-bottom: 20px; margin-bottom: 10px;
margin-top: 10px; margin-top: 10px;
color: #000000;
} }
/* OK */
div.ok { div.ok {
color: #114466; color: #114466;
} }
font.ok {
color: #114466;
}
/* Warning */
div.warning { div.warning {
color: #777711; color: #777711;
} }
font.warning {
color: #777711;
}
/* Error */
div.error { div.error {
color: #550000; font-weight: bold; color: #550000; font-weight: bold;
padding: 0.2em 0.2em 0.2em 0.2em; padding: 0.2em 0.2em 0.2em 0.2em;
margin: 0.5em 0em 0.5em 0em; margin: 0.5em 0em 0.5em 0em;
border: 1px solid #6C7C8B; border: 1px solid #6C7C8B;
} }
font.error { font.error {
color: #550000; color: #550000; font-weight: bold;
} }
/* Next button */
div.barrebottom { div.barrebottom {
text-align: right; text-align: right;
margin-top: 10px; margin-top: 10px;
padding-top: 10px; padding-top: 5px;
padding-bottom: 10px; padding-bottom: 5px;
padding-right: 10px; padding-right: 10px;
} }
div.footer {
background-color: #dcdff4;
font-size: 10px;
border-top: solid black 1px;
padding-left: 5px;
text-align: center;
}
div.header { div.header {
background-color: #dcdff4; background-color: #dcdff4;
border-bottom: solid black 1px; border-bottom: solid black 1px;
@ -117,10 +122,6 @@ padding-left: 5px;
text-align: center; text-align: center;
} }
div.footer p {
margin: 0px;
}
a:link,a:visited,a:active { a:link,a:visited,a:active {
text-decoration:none; text-decoration:none;
} }
@ -139,7 +140,8 @@ color:black;
font-size: 13px; font-size: 13px;
} }
div.main-inside h2 { h3 {
margin-top: 10px;
font-size:18px; font-size:18px;
font-weight: bold; font-weight: bold;
color: #4965B3; color: #4965B3;
@ -153,16 +155,16 @@ tr.bg2 {
background-color: #B5C5C5; background-color: #B5C5C5;
} }
/* Class for parameters key and value */
td.label { td.label {
background: #dcdcd3;
color: #5945A3; color: #5945A3;
padding: 5px 5px 5px 5px; padding: 5px 5px 5px 5px;
margin: 0em 0em 0em 0em; margin: 0em 0em 0em 0em;
border-bottom: 1px solid #8CACBB; border-bottom: 1px solid #8CACBB;
} }
/* Class for parameters example */
td.comment { td.comment {
background: #dcdcd3;
color: black; color: black;
padding: 5px 5px 5px 5px; padding: 5px 5px 5px 5px;
margin: 0em 0em 0em 0em; margin: 0em 0em 0em 0em;

8
htdocs/install/etape0.php
View File

@ -18,10 +18,10 @@
*/ */
/** /**
\file htdocs/install/etape0.php * \file htdocs/install/etape0.php
\ingroup install * \ingroup install
\brief Permet d'afficher et de confirmer le charset par rapport aux informations précédentes -> sélection suite à connexion' * \brief Permet d'afficher et de confirmer le charset par rapport aux informations précédentes -> sélection suite à connexion'
\version $Id$ * \version $Id$
*/ */
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php

8
htdocs/install/etape5.php
View File

@ -242,15 +242,15 @@ if ($_POST["action"] == "upgrade")
if ($_POST["action"] == "upgrade") if ($_POST["action"] == "upgrade")
{ {
print '<a href="'.$dolibarr_main_url_root .'/index.php?mainmenu=home'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">'; print '<center><a href="'.$dolibarr_main_url_root .'/index.php?mainmenu=home'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
print $langs->trans("GoToDolibarr"); print $langs->trans("GoToDolibarr");
print '</a>'; print '</a></center>';
} }
else else
{ {
print '<a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">'; print '<center><a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
print $langs->trans("GoToSetupArea"); print $langs->trans("GoToSetupArea");
print '</a>'; print '</a></center>';
} }

4
htdocs/install/fileconf.php
View File

@ -66,7 +66,7 @@ if (! empty($force_install_message_doliwamp))
<tr> <tr>
<td colspan="3" class="label" align="center"><h3> <td colspan="3" class="label" align="center"><h3>
<?php echo $langs->trans("Main"); ?> <?php echo $langs->trans("WebServer"); ?>
</h3></td></tr> </h3></td></tr>
<tr> <tr>
@ -314,7 +314,7 @@ while (($file = readdir($handle))!==false)
</td> </td>
</tr> </tr>
<tr class="bg1"> <tr>
<td class="label" valign="top"> <td class="label" valign="top">
<b><?php echo $langs->trans("Login"); ?></b> <b><?php echo $langs->trans("Login"); ?></b>
</td> </td>

BIN
htdocs/install/headbg.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

8
htdocs/install/upgrade.php
View File

@ -65,7 +65,7 @@ if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initial
* View * View
*/ */
pHeader($langs->trans("DatabaseMigration"),"upgrade2","upgrade"); pHeader('',"upgrade2","upgrade");
$actiondone=0; $actiondone=0;
@ -74,7 +74,7 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade" || $_GET["action"]
{ {
$actiondone=1; $actiondone=1;
print '<h3>'.$langs->trans("DatabaseMigration").'<h3>'; print '<h3>'.$langs->trans("DatabaseMigration").'</h3>';
if ($_GET["action"] != "repair" && ! $versionfrom && ! $versionto) if ($_GET["action"] != "repair" && ! $versionfrom && ! $versionto)
{ {
@ -103,7 +103,7 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade" || $_GET["action"]
$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
if ($db->connected == 1) if ($db->connected == 1)
{ {
print "<tr><td nowrap>"; print '<tr><td nowrap="nowrap">';
print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>"; print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection")." : $dolibarr_main_db_host ".$langs->transnoentities("OK")); dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection")." : $dolibarr_main_db_host ".$langs->transnoentities("OK"));
$ok = 1; $ok = 1;
@ -119,7 +119,7 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade" || $_GET["action"]
{ {
if($db->database_selected == 1) if($db->database_selected == 1)
{ {
print "<tr><td nowrap>"; print '<tr><td nowrap="nowrap">';
print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>"; print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
dolibarr_install_syslog("upgrade: Database connection successfull : $dolibarr_main_db_name"); dolibarr_install_syslog("upgrade: Database connection successfull : $dolibarr_main_db_name");
$ok=1; $ok=1;

2
htdocs/install/upgrade2.php
View File

@ -65,7 +65,7 @@ dolibarr_install_syslog("upgrade2: Entering upgrade2.php page");
if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized",LOG_ERR); if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized",LOG_ERR);
pHeader($langs->trans('DataMigration'),'etape5','upgrade'); pHeader('','etape5','upgrade');
if (isset($_POST['action']) && $_POST['action'] == 'upgrade') if (isset($_POST['action']) && $_POST['action'] == 'upgrade')

7
htdocs/langs/en_US/admin.lang
View File

@ -597,7 +597,7 @@ SummarySystem=System information summary
SummaryConst=List of all Dolibarr setup parameters SummaryConst=List of all Dolibarr setup parameters
SystemUpdate=System update SystemUpdate=System update
SystemSuccessfulyUpdate=Your system has been updated successfuly SystemSuccessfulyUpdate=Your system has been updated successfuly
MenuCompanySetup=Company/Fundation MenuCompanySetup=Company/Foundation
MenuNewUser=New user MenuNewUser=New user
MenuTopManager=Top menu manager MenuTopManager=Top menu manager
MenuLeftManager=Left menu manager MenuLeftManager=Left menu manager
@ -647,8 +647,9 @@ DelaysOfToleranceMembers=Tolerance delay (in days) before alert on delayed adher
DelaysOfToleranceChequesToDeposit=Tolerance delay (in days) before alert for cheques deposit to do DelaysOfToleranceChequesToDeposit=Tolerance delay (in days) before alert for cheques deposit to do
SetupDescription1=All parameters available in the setup area allow you to setup Dolibarr before starting using it. SetupDescription1=All parameters available in the setup area allow you to setup Dolibarr before starting using it.
SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page: SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page:
SetupDescription3=<b>Company/fundation</b> setup is required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country). SetupDescription3=Parameters in menu <b>Setup -> Company/foundation</b> are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country).
SetupDescription4=<b>Modules</b> setup is required because Dolibarr is not a simple ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in Dolibarr menu. SetupDescription4=Parameters in menu <b>Setup -> Modules</b> are required because Dolibarr is not a fixed ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in menus.
SetupDescription5=Other menu entries manage optionnal parameters.
EventsSetup=Setup for events logs EventsSetup=Setup for events logs
LogEvents=Security audit events LogEvents=Security audit events
Audit=Audit Audit=Audit

2
htdocs/langs/en_US/install.lang
View File

@ -1,6 +1,6 @@
# Dolibarr language file - en_US - install # Dolibarr language file - en_US - install
CHARSET=UTF-8 CHARSET=UTF-8
InstallEasy=We tried to make the Dolibarr setup as easy as possible. Just follow the instructions step by step. InstallEasy=Just follow the instructions step by step.
MiscellanousChecks=Prerequisites check MiscellanousChecks=Prerequisites check
DolibarrWelcome=Welcome to Dolibarr DolibarrWelcome=Welcome to Dolibarr
ConfFileExists=Configuration file <b>%s</b> exists. ConfFileExists=Configuration file <b>%s</b> exists.

5
htdocs/langs/fr_FR/admin.lang
View File

@ -647,8 +647,9 @@ DelaysOfToleranceMembers = Tolérance de retard avant alerte (en jours) sur coti
DelaysOfToleranceChequesToDeposit = Tolérance de retard avant alerte (en jours) sur chèques à déposer DelaysOfToleranceChequesToDeposit = Tolérance de retard avant alerte (en jours) sur chèques à déposer
SetupDescription1 = Toutes les options de l'espace configuration sont des options permettant de configurer Dolibarr avant de commencer son utilisation. SetupDescription1 = Toutes les options de l'espace configuration sont des options permettant de configurer Dolibarr avant de commencer son utilisation.
SetupDescription2 = Les 2 étapes indispensables de configuration sont les 2 premières dans le menu gauche, à savoir, la configuration de la société/institution et la configuration des modules: SetupDescription2 = Les 2 étapes indispensables de configuration sont les 2 premières dans le menu gauche, à savoir, la configuration de la société/institution et la configuration des modules:
SetupDescription3 = La configuration <b>Société/institution</b> à gérer est requise car les informations saisies sont utilisées dans la plupart des écrans, en affichage, ou pour modifier le comportement de Dolibarr (comme par exemple des fonctions qui dépendent de votre pays). SetupDescription3 = Les données du menu <b>Configuration -> Société/institution</b> sont requises car les informations saisies sont utilisées dans la plupart des écrans, en affichage, ou pour modifier le comportement de Dolibarr (comme par exemple des fonctions qui dépendent de votre pays).
SetupDescription4 = La configuration <b>Modules</b> est indispensable car Dolibarr n'est pas un ERP/CRM monolithique mais un ensemble de modules tous plus ou moins indépendant. C'est après avoir activé les modules qui vous intéressent que vous verrez apparaitre les fonctionnalités dans les menus de Dolibarr. SetupDescription4 = Les données du menu <b>Configuration -> Modules</b> sont indispensables car Dolibarr ERP/CRM est constitué d'un ensemble de modules tous plus ou moins indépendant. C'est après avoir activé les modules qui vous intéressent que vous verrez apparaitre les fonctionnalités dans les menus.
SetupDescription5 = Les autres entrées de configuration gèrent des paramètres facultatifs.
EventsSetup = Configuration du traçage des évenements EventsSetup = Configuration du traçage des évenements
LogEvents = Evènements d'audit de sécurité LogEvents = Evènements d'audit de sécurité
Audit = Audit Audit = Audit

2
htdocs/langs/fr_FR/install.lang
View File

@ -1,6 +1,6 @@
# Dolibarr language file - fr_FR - install # Dolibarr language file - fr_FR - install
CHARSET=UTF-8 CHARSET=UTF-8
InstallEasy=Nous avons fait en sorte que l'installation soit le plus simple possible, vous n'avez qu'à suivre les étapes une à une. InstallEasy=Veuillez suivre les étapes une à une.
MiscellanousChecks=Vérification de prérequis MiscellanousChecks=Vérification de prérequis
DolibarrWelcome=Bienvenue sur Dolibarr DolibarrWelcome=Bienvenue sur Dolibarr
ConfFileExists=Le fichier de configuration <b>%s</b> existe. ConfFileExists=Le fichier de configuration <b>%s</b> existe.

37
htdocs/main.inc.php
View File

@ -139,7 +139,7 @@ if ($conf->file->main_force_https)
{ {
$newurl=eregi_replace('^http:','https:',$_SERVER["SCRIPT_URI"]); $newurl=eregi_replace('^http:','https:',$_SERVER["SCRIPT_URI"]);
dol_syslog("dolibarr_main_force_https is on, we make a redirect to ".$newurl); dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
header("Location: ".$newurl); header("Location: ".$newurl);
exit; exit;
} }
@ -155,7 +155,7 @@ if ($conf->file->main_force_https)
$newurl='https://'.$domaineport.$_SERVER["REQUEST_URI"]; $newurl='https://'.$domaineport.$_SERVER["REQUEST_URI"];
//print 'eee'.$newurl; exit; //print 'eee'.$newurl; exit;
dol_syslog("dolibarr_main_force_https is on, we make a redirect to ".$newurl); dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
header("Location: ".$newurl); header("Location: ".$newurl);
exit; exit;
} }
@ -169,6 +169,27 @@ if (! defined('NOREQUIREHTML')) require_once(DOL_DOCUMENT_ROOT ."/html.form.clas
if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php'); // Need 20ko memory if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php'); // Need 20ko memory
//stopwithmem(); //stopwithmem();
// If install or upgrade process not done or not completely finished, we call the install page.
if (! empty($conf->global->MAIN_NOT_INSTALLED) || ! empty($conf->global->MAIN_NOT_UPGRADED))
{
dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
Header("Location: ".DOL_URL_ROOT."/install/index.php");
exit;
}
// If an upgrade process is required, we call the install page.
if (! empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
{
require_once(DOL_DOCUMENT_ROOT ."/lib/admin.lib.php");
$dolibarrversionlastupgrade=split('[\.-]',$conf->global->MAIN_VERSION_LAST_UPGRADE);
$dolibarrversionprogram=split('[\.-]',DOL_VERSION);
if (versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade) > 0) // Programs have a version higher than database
{
dol_syslog("main.inc: database version ".$conf->global->MAIN_VERSION_LAST_UPGRADE." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
Header("Location: ".DOL_URL_ROOT."/install/index.php");
exit;
}
}
// Creation d'un jeton contre les failles CSRF // Creation d'un jeton contre les failles CSRF
if (! defined('NOTOKENRENEWAL')) if (! defined('NOTOKENRENEWAL'))
{ {
@ -599,12 +620,12 @@ if (sizeof($conf->need_smarty) > 0)
// Tentative de hacking ? // Tentative de hacking ?
if (! $user->login) accessforbidden(); if (! $user->login) accessforbidden();
// Verifie si user actif // Check if user is active
if ($user->statut < 1) if ($user->statut < 1)
{ {
// Si non actif, on delogue le user // Si non actif, on delogue le user
$langs->load("other"); $langs->load("other");
dol_syslog ("Authentification ko car login desactive"); dol_syslog ("Authentification ko as login is disbaled");
accessforbidden($langs->trans("ErrorLoginDisabled")); accessforbidden($langs->trans("ErrorLoginDisabled"));
exit; exit;
} }
@ -615,14 +636,6 @@ dol_syslog("Access to ".$_SERVER["PHP_SELF"],LOG_INFO);
// For backward compatibility // For backward compatibility
if (! defined('MAIN_INFO_SOCIETE_PAYS')) define('MAIN_INFO_SOCIETE_PAYS','1'); if (! defined('MAIN_INFO_SOCIETE_PAYS')) define('MAIN_INFO_SOCIETE_PAYS','1');
// If install not finished, we start again.
if (defined("MAIN_NOT_INSTALLED"))
{
Header("Location: ".DOL_URL_ROOT."/install/index.php");
exit;
}
// On charge les fichiers lang principaux // On charge les fichiers lang principaux
$langs->load("main"); $langs->load("main");
$langs->load("dict"); $langs->load("dict");

35
htdocs/support/default.css
View File

@ -44,7 +44,6 @@ margin: 0em 0em 0em 0em;
border: 1px solid #AAAAAA; border: 1px solid #AAAAAA;
} }
div.soustitre { div.soustitre {
font-size: 15px; font-size: 15px;
font-weight: bold; font-weight: bold;
@ -70,13 +69,6 @@ text-align: left;
border: 1px solid #8CACBB; border: 1px solid #8CACBB;
} }
table.main-inside {
padding-left: 10px;
padding-right: 10px;
margin-bottom: 20px;
margin-top: 10px;
}
div.ok { div.ok {
color: #114466; color: #114466;
} }
@ -96,23 +88,6 @@ font.error {
color: #550000; color: #550000;
} }
div.barrebottom {
text-align: right;
margin-top: 10px;
padding-top: 10px;
padding-bottom: 10px;
padding-right: 10px;
}
div.footer {
background-color: #dcdff4;
font-size: 10px;
border-top: solid black 1px;
padding-left: 5px;
text-align: center;
}
div.header { div.header {
background-color: #dcdff4; background-color: #dcdff4;
border-bottom: solid black 1px; border-bottom: solid black 1px;
@ -120,10 +95,6 @@ padding-left: 5px;
text-align: center; text-align: center;
} }
div.footer p {
margin: 0px;
}
a:link,a:visited,a:active { a:link,a:visited,a:active {
color: #2266DD; color: #2266DD;
text-decoration:none; text-decoration:none;
@ -138,12 +109,6 @@ text-decoration:none;
} }
div.comment {
text-decoration:none;
color:black;
font-size: 13px;
}
div.main-inside h2 { div.main-inside h2 {
font-size:18px; font-size:18px;
font-weight: bold; font-weight: bold;