admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev7109'

Browse source
This commit is contained in:
Dany De Bontridder 2019-09-08 19:23:07 +02:00
commit aafa43f9f2
14 changed files with 72 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

23
html/install.php
View file

@ -73,6 +73,9 @@ session_start();
color: inherit;
}
</style>
<?php
?>
</head>
<body>
<p align="center">
@ -129,6 +132,13 @@ if ( ! isset($_GET['lang'])){
require_once '../include/constant.php';
include_once NOALYSS_INCLUDE.'/lib/ac_common.php';
include_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
include_once '../lib/function_javascript.php';
load_all_script();
echo '<div id="info_div"></div>';
if ( $_GET['lang'] == "en_US.utf8" || $_GET['lang']=='fr_FR.utf8')
{
$_SESSION['g_lang']=$_GET['lang'];
@ -137,8 +147,11 @@ if ( $_GET['lang'] == "en_US.utf8" || $_GET['lang']=='fr_FR.utf8')
?>
<script type="text/javascript" charset="utf-8" language="javascript" src="js/infobulle.js">
</script>
<?php
include_once NOALYSS_INCLUDE.'/lib/message_script.php';
?>
<script>
var content=new Array();
content[200]="<?php echo _("Indiquez ici le répertoire où les documents temporaires peuvent être sauvés exemple c:/temp, /tmp")?>";
content[201]="<?php echo _("Désactiver le changement de langue (requis pour MacOSX)")?>";
content[202]="<?php echo _("Le chemin vers le repertoire contenant psql, pg_dump...")?>";
@ -202,9 +215,9 @@ if (isset($_POST['save_config'])) {
require_once NOALYSS_INCLUDE.'/lib/config_file.php';
// Try to connect , if it doesn't work that do not create the config file
if ($multi=="N") {
$cnx = new Database_Core($db_user, $db_password,'template1', $db_host, $db_port);
$cnx = new DatabaseCore($db_user, $db_password,'template1', $db_host, $db_port);
}else {
$cnx = new Database_Core($db_user, $db_password,$db_name, $db_host, $db_port);
$cnx = new DatabaseCore($db_user, $db_password,$db_name, $db_host, $db_port);
}
// -----
// If conx successfull save the file or display it
@ -213,7 +226,7 @@ if (isset($_POST['save_config'])) {
echo '<h1>'._('Important').'</h1>';
echo '<h2 class="warning">',_("Voici l'utilisateur et mot de passe de l'utilisateur administrateur de Noalyss , il a tous les droits et a accès à tout."
. " Connectez-vous avec ses identifiants et changer le mot de passe dans préférence (en haut à droit)"),
"</h2>";
"</h2>";
echo '<p style="font-size:120%">'._('Utilisateur administrateur'),' ','<span style="color:red"> ',$cadmin,'</span>','</p>';
echo '<p style="font-size:120%">',_('Mot de passe'),'<span style="color:red"> phpcompta </span>','</p>';
// Create the db
@ -476,7 +489,7 @@ if ( $flag == 0 ) {
if ( ! isset($_POST['go']) ) {
?>
<span style="text-align: center">
<FORM METHOD="post" action="install.php?lang=<?php echo $_GET['lang']?>">
<FORM METHOD="post" action="install.php?lang=<?php echo $_GET['lang']?>" onsubmit="waiting_box();return true;">
<input type="submit" class="button" name="go" value="<?php echo _("Commencer la mise à jour ou l'installation");?>">
</form>
</span>