diff --git a/core/trunk/install/class/Class_Install.php b/core/trunk/install/class/Class_Install.php
index 0a40d85e522b46d74c7a0f648939d29ea9a33a6f..8a37ee2d9a50507ee5412dd027b8ca62cc386a66 100755
--- a/core/trunk/install/class/Class_Install.php
+++ b/core/trunk/install/class/Class_Install.php
@@ -225,28 +225,46 @@ class Install extends functions
$databaseserverport,
$databaseuser,
$databasepassword,
- $databasename,
$databasetype
)
{
-
-
$connect = 'host='.$databaseserver . ' ';
$connect .= 'port='.$databaseserverport . ' ';
$connect .= 'user='.$databaseuser . ' ';
$connect .= 'password='.$databasepassword;
- if (!pg_connect($connect)) {
+ if (!@pg_connect($connect)) {
+ return false;
+ exit;
+ }
+
+ pg_close();
+
+ return true;
+ }
+
+ public function createDatabase(
+ $databasename
+ )
+ {
+
+ $connect = 'host='.$_SESSION['config']['databaseserver'] . ' ';
+ $connect .= 'port='.$_SESSION['config']['databaseserverport'] . ' ';
+ $connect .= 'user='.$_SESSION['config']['databaseuser'] . ' ';
+ $connect .= 'password='.$_SESSION['config']['databasepassword'];
+
+
+ if (!@pg_connect($connect)) {
return false;
exit;
}
- $sqlCreateDatabase = "CREATE DATABASE ".$databasename;
+ $sqlCreateDatabase = 'CREATE DATABASE "'.$databasename.'"';
$sqlCreateDatabase .= " WITH TEMPLATE template0";
$sqlCreateDatabase .= " ENCODING = 'UTF8'";
- $execute = pg_query($sqlCreateDatabase);
+ $execute = @pg_query($sqlCreateDatabase);
if (!$execute) {
return false;
exit;
@@ -261,12 +279,39 @@ class Install extends functions
exit;
}
-
if (!$this->executeSQLScript('structure.sql')) {
return false;
exit;
}
+ return true;
+ }
+
+ public function getDataList()
+ {
+ $sqlList = array();
+ foreach(glob('data*.sql') as $fileSqlPath) {
+ $sqlFile = str_replace('.sql', '', end(explode('/', $fileSqlPath)));
+ array_push($sqlList, $sqlFile);
+ }
+
+ return $sqlList;
+ }
+
+ public function createData(
+ $dataFile
+ )
+ {
+ $db = new dbquery();
+ $db->connect();
+ if (!$db) {
+ return false;
+ exit;
+ }
+ if (!$this->executeSQLScript($dataFile)) {
+ return false;
+ exit;
+ }
return true;
}
diff --git a/core/trunk/install/controller/database_controller.php b/core/trunk/install/controller/database_controller.php
index 2a6da1f9a6ec699f733dcc3abb4118dc2c494b36..c3210fdd077f96453e21f389814f59ed024e8ec7 100755
--- a/core/trunk/install/controller/database_controller.php
+++ b/core/trunk/install/controller/database_controller.php
@@ -5,6 +5,9 @@
$shortTitle = _DATABASE;
$longTitle = _DATABASE;
+ //ALLOWED SQL
+ $listSql = $Class_Install->getDataList();
+
//PROGRESS
$stepNb = 5;
$stepNbTotal = 8;
diff --git a/core/trunk/install/js/ajax.js b/core/trunk/install/js/ajax.js
index f850fcda9a399f3efeb7e90c44f58dc6278d3057..d753a22a59b0402d1a170bed11b2301a68103411 100755
--- a/core/trunk/install/js/ajax.js
+++ b/core/trunk/install/js/ajax.js
@@ -30,9 +30,11 @@ function ajax(
/**********/
if (top == 'true') {
- var retour = window.top.$('#'+divRetour);
+ var retour_ok = window.top.$('#'+divRetour+'_ok');
+ var retour_ko = window.top.$('#'+divRetour+'_ko');
} else {
- var retour = $('#'+divRetour);
+ var retour_ok = $('#'+divRetour+'_ok');
+ var retour_ko = $('#'+divRetour+'_ko');
}
/**********/
@@ -40,9 +42,11 @@ function ajax(
$(document).ready( function() {
$.getJSON('ajax.php?script='+ajaxUrl, ajaxParameters, function(data){
if (data.status == 1) {
- retour.html(data.text);
+ retour_ok.html(data.text);
+ retour_ko.html('');
+ slide(divRetour);
} else {
- retour.html(data.text);
+ retour_ko.html(data.text);
}
});
});
diff --git a/core/trunk/install/js/ajaxDB.js b/core/trunk/install/js/ajaxDB.js
new file mode 100644
index 0000000000000000000000000000000000000000..142d8daa22cdbe3dc20df7870d65582b6b9dbbf3
--- /dev/null
+++ b/core/trunk/install/js/ajaxDB.js
@@ -0,0 +1,54 @@
+function ajaxDB(
+ url,
+ parameters,
+ divRetour,
+ top
+)
+{
+ var ajaxUrl = url;
+
+ var parametersTemp = parameters.split('|');
+
+ var strAjaxParameters = '{';
+ for (cpt=0; cpt<parametersTemp.length; cpt++) {
+ strAjaxParameters += parametersTemp[cpt];
+ strAjaxParameters += ":";
+ strAjaxParameters += "'";
+ cpt++;
+ strAjaxParameters += parametersTemp[cpt];
+ strAjaxParameters += "'";
+ if (cpt < parametersTemp.length) {
+ strAjaxParameters += ", ";
+ }
+ }
+ strAjaxParameters += "ajax:'true'";
+ strAjaxParameters += ", div:'"+divRetour+"'";
+ strAjaxParameters += '}'
+
+ var ajaxParameters = eval('(' + strAjaxParameters + ')');
+
+ /**********/
+
+ if (top == 'true') {
+ var retour_ok = window.top.$('#'+divRetour+'_ok');
+ var retour_ko = window.top.$('#'+divRetour+'_ko');
+ } else {
+ var retour_ok = $('#'+divRetour+'_ok');
+ var retour_ko = $('#'+divRetour+'_ko');
+ }
+
+ /**********/
+
+ $(document).ready( function() {
+ $.getJSON('ajax.php?script='+ajaxUrl, ajaxParameters, function(data){
+ if (data.status == 1) {
+ retour_ok.html(data.text);
+ retour_ko.html('');
+ slide(divRetour);
+ $('.'+divRetour).slideToggle('slow');
+ } else {
+ retour_ko.html(data.text);
+ }
+ });
+ });
+}
diff --git a/core/trunk/install/js/checkCreateDB.js b/core/trunk/install/js/checkCreateDB.js
new file mode 100644
index 0000000000000000000000000000000000000000..26c4cfc663bfafaa55e112f7fa647d8a769111f9
--- /dev/null
+++ b/core/trunk/install/js/checkCreateDB.js
@@ -0,0 +1,29 @@
+function checkCreateDB(
+ databasename,
+ action
+)
+{
+ $(document).ready(function() {
+ var oneIsEmpty = false;
+ if (databasename.length < 1) {
+ var oneIsEmpty = true;
+ }
+ if (action.length < 1) {
+ var oneIsEmpty = true;
+ }
+
+ if (oneIsEmpty) {
+ $('#ajaxReturn_createDB_ko').html('Choisissez un nom pour la base de donnée');
+ return;
+ }
+ $('#ajaxReturn_createDB_ko').html('');
+
+ ajaxDB(
+ 'database',
+ 'databasename|'+databasename
+ +'|action|'+action,
+ 'ajaxReturn_createDB',
+ 'false'
+ );
+ });
+}
diff --git a/core/trunk/install/js/checkDataDB.js b/core/trunk/install/js/checkDataDB.js
new file mode 100644
index 0000000000000000000000000000000000000000..a356005d0bd407c0350b8679370497f196a6c97c
--- /dev/null
+++ b/core/trunk/install/js/checkDataDB.js
@@ -0,0 +1,19 @@
+function checkDataDB(
+ value
+)
+{
+ $(document).ready(function() {
+ if (value != 'default') {
+ if (value == 'data') {
+ $('#returnCheckDataClassic').css("display","block");
+ $('#returnCheckDataMlb').css("display","none");
+ } else if (value == 'data_mlb') {
+ $('#returnCheckDataClassic').css("display","none");
+ $('#returnCheckDataMlb').css("display","block");
+ }
+ } else {
+ $('#returnCheckDataClassic').css("display","none");
+ $('#returnCheckDataMlb').css("display","none");
+ }
+ });
+}
diff --git a/core/trunk/install/js/checkDatabaseInfo.js b/core/trunk/install/js/checkDatabaseInfo.js
index f9799b1aa181cc4882429e7ae1737aa14d2a1831..fe0c1d9289152977b0b3dfe393ceae417a8b49c6 100644
--- a/core/trunk/install/js/checkDatabaseInfo.js
+++ b/core/trunk/install/js/checkDatabaseInfo.js
@@ -3,8 +3,8 @@ function checkDatabaseInfo(
databaseserverport,
databaseuser,
databasepassword,
- databasename,
- databasetype
+ databasetype,
+ action
)
{
$(document).ready(function() {
@@ -21,28 +21,28 @@ function checkDatabaseInfo(
if (databasepassword.length < 1) {
var oneIsEmpty = true;
}
- if (databasename.length < 1) {
+ if (databasetype.length < 1) {
var oneIsEmpty = true;
}
- if (databasetype.length < 1) {
+ if (action.length < 1) {
var oneIsEmpty = true;
}
if (oneIsEmpty) {
- $('#returnCheckDatabaseInfo').html('au moins un champ mal rempli');
+ $('#ajaxReturn_testConnect_ko').html('au moins un champ mal rempli');
return;
}
- $('#returnCheckDatabaseInfo').html('');
+ $('#ajaxReturn_testConnect_ko').html('');
- ajax(
+ ajaxDB(
'database',
'databaseserver|'+databaseserver
+'|databaseserverport|'+databaseserverport
+'|databaseuser|'+databaseuser
+'|databasepassword|'+databasepassword
- +'|databasename|'+databasename
- +'|databasetype|'+databasetype,
- 'returnCheckDatabaseInfo',
+ +'|databasetype|'+databasetype
+ +'|action|'+action,
+ 'ajaxReturn_testConnect',
'false'
);
diff --git a/core/trunk/install/js/checkLoadDatas.js b/core/trunk/install/js/checkLoadDatas.js
new file mode 100644
index 0000000000000000000000000000000000000000..f6cfa354d793ce7c75487ed69b93c3935d325ef4
--- /dev/null
+++ b/core/trunk/install/js/checkLoadDatas.js
@@ -0,0 +1,29 @@
+function checkLoadDatas(
+ dataFilename,
+ action
+)
+{
+ $(document).ready(function() {
+ var oneIsEmpty = false;
+ if (dataFilename.length < 1) {
+ var oneIsEmpty = true;
+ }
+ if (action.length < 1) {
+ var oneIsEmpty = true;
+ }
+
+ if (oneIsEmpty) {
+ $('#ajaxReturn_loadDatas_ko').html('Sélécionner le fichier de datas à importer');
+ return;
+ }
+ $('#ajaxReturn_loadDatas_ok').html('');
+
+ ajaxDB(
+ 'database',
+ 'dataFilename|'+dataFilename
+ +'|action|'+action,
+ 'ajaxReturn_loadDatas',
+ 'false'
+ );
+ });
+}
diff --git a/core/trunk/install/js/merged_js.js b/core/trunk/install/js/merged_js.js
index 866a99edb5a1f04d2c02183429c090611a623ad5..9945134763b0bb08599e259104d7e06a53e950c8 100755
--- a/core/trunk/install/js/merged_js.js
+++ b/core/trunk/install/js/merged_js.js
@@ -40,9 +40,11 @@ function ajax(
/**********/
if (top == 'true') {
- var retour = window.top.$('#'+divRetour);
+ var retour_ok = window.top.$('#'+divRetour+'_ok');
+ var retour_ko = window.top.$('#'+divRetour+'_ko');
} else {
- var retour = $('#'+divRetour);
+ var retour_ok = $('#'+divRetour+'_ok');
+ var retour_ko = $('#'+divRetour+'_ko');
}
/**********/
@@ -50,9 +52,11 @@ function ajax(
$(document).ready( function() {
$.getJSON('ajax.php?script='+ajaxUrl, ajaxParameters, function(data){
if (data.status == 1) {
- retour.html(data.text);
+ retour_ok.html(data.text);
+ retour_ko.html('');
+ slide(divRetour);
} else {
- retour.html(data.text);
+ retour_ko.html(data.text);
}
});
});
@@ -102,6 +106,38 @@ function checkLanguage(
}
+/* checkCreateDB.js */
+function checkCreateDB(
+ databasename,
+ action
+)
+{
+ $(document).ready(function() {
+ var oneIsEmpty = false;
+ if (databasename.length < 1) {
+ var oneIsEmpty = true;
+ }
+ if (action.length < 1) {
+ var oneIsEmpty = true;
+ }
+
+ if (oneIsEmpty) {
+ $('#ajaxReturn_createDB_ko').html('Choisissez un nom pour la base de donnée');
+ return;
+ }
+ $('#ajaxReturn_createDB_ko').html('');
+
+ ajaxDB(
+ 'database',
+ 'databasename|'+databasename
+ +'|action|'+action,
+ 'ajaxReturn_createDB',
+ 'false'
+ );
+ });
+}
+
+
/* checkLanguage.js */
function checkLanguage(
value
@@ -117,6 +153,28 @@ function checkLanguage(
}
+/* checkDataDB.js */
+function checkDataDB(
+ value
+)
+{
+ $(document).ready(function() {
+ if (value != 'default') {
+ if (value == 'data') {
+ $('#returnCheckDataClassic').css("display","block");
+ $('#returnCheckDataMlb').css("display","none");
+ } else if (value == 'data_mlb') {
+ $('#returnCheckDataClassic').css("display","none");
+ $('#returnCheckDataMlb').css("display","block");
+ }
+ } else {
+ $('#returnCheckDataClassic').css("display","none");
+ $('#returnCheckDataMlb').css("display","none");
+ }
+ });
+}
+
+
/* slide.js */
function slide(
idDiv
@@ -147,8 +205,8 @@ function checkDatabaseInfo(
databaseserverport,
databaseuser,
databasepassword,
- databasename,
- databasetype
+ databasetype,
+ action
)
{
$(document).ready(function() {
@@ -165,28 +223,28 @@ function checkDatabaseInfo(
if (databasepassword.length < 1) {
var oneIsEmpty = true;
}
- if (databasename.length < 1) {
+ if (databasetype.length < 1) {
var oneIsEmpty = true;
}
- if (databasetype.length < 1) {
+ if (action.length < 1) {
var oneIsEmpty = true;
}
if (oneIsEmpty) {
- $('#returnCheckDatabaseInfo').html('au moins un champ mal rempli');
+ $('#ajaxReturn_testConnect_ko').html('au moins un champ mal rempli');
return;
}
- $('#returnCheckDatabaseInfo').html('');
+ $('#ajaxReturn_testConnect_ko').html('');
- ajax(
+ ajaxDB(
'database',
'databaseserver|'+databaseserver
+'|databaseserverport|'+databaseserverport
+'|databaseuser|'+databaseuser
+'|databasepassword|'+databasepassword
- +'|databasename|'+databasename
- +'|databasetype|'+databasetype,
- 'returnCheckDatabaseInfo',
+ +'|databasetype|'+databasetype
+ +'|action|'+action,
+ 'ajaxReturn_testConnect',
'false'
);
@@ -194,6 +252,63 @@ function checkDatabaseInfo(
}
+/* ajaxDB.js */
+function ajaxDB(
+ url,
+ parameters,
+ divRetour,
+ top
+)
+{
+ var ajaxUrl = url;
+
+ var parametersTemp = parameters.split('|');
+
+ var strAjaxParameters = '{';
+ for (cpt=0; cpt<parametersTemp.length; cpt++) {
+ strAjaxParameters += parametersTemp[cpt];
+ strAjaxParameters += ":";
+ strAjaxParameters += "'";
+ cpt++;
+ strAjaxParameters += parametersTemp[cpt];
+ strAjaxParameters += "'";
+ if (cpt < parametersTemp.length) {
+ strAjaxParameters += ", ";
+ }
+ }
+ strAjaxParameters += "ajax:'true'";
+ strAjaxParameters += ", div:'"+divRetour+"'";
+ strAjaxParameters += '}'
+
+ var ajaxParameters = eval('(' + strAjaxParameters + ')');
+
+ /**********/
+
+ if (top == 'true') {
+ var retour_ok = window.top.$('#'+divRetour+'_ok');
+ var retour_ko = window.top.$('#'+divRetour+'_ko');
+ } else {
+ var retour_ok = $('#'+divRetour+'_ok');
+ var retour_ko = $('#'+divRetour+'_ko');
+ }
+
+ /**********/
+
+ $(document).ready( function() {
+ $.getJSON('ajax.php?script='+ajaxUrl, ajaxParameters, function(data){
+ if (data.status == 1) {
+ retour_ok.html(data.text);
+ retour_ko.html('');
+ slide(divRetour);
+ $('.'+divRetour).slideToggle('slow');
+ } else {
+ retour_ko.html(data.text);
+ }
+ });
+ });
+}
+
+
/* minHeightOfSection.js */
function minHeightOfSection()
{
@@ -211,3 +326,35 @@ function minHeightOfSection()
}
+/* checkLoadDatas.js */
+function checkLoadDatas(
+ dataFilename,
+ action
+)
+{
+ $(document).ready(function() {
+ var oneIsEmpty = false;
+ if (dataFilename.length < 1) {
+ var oneIsEmpty = true;
+ }
+ if (action.length < 1) {
+ var oneIsEmpty = true;
+ }
+
+ if (oneIsEmpty) {
+ $('#ajaxReturn_loadDatas_ko').html('Sélécionner le fichier de datas à importer');
+ return;
+ }
+ $('#ajaxReturn_loadDatas_ok').html('');
+
+ ajaxDB(
+ 'database',
+ 'dataFilename|'+dataFilename
+ +'|action|'+action,
+ 'ajaxReturn_loadDatas',
+ 'false'
+ );
+ });
+}
+
+
diff --git a/core/trunk/install/scripts/database.php b/core/trunk/install/scripts/database.php
index c50d83611990614ee93dffe5e71138e212f1c196..aa40b8b4cad16e786f701989ddc810405771fbc7 100644
--- a/core/trunk/install/scripts/database.php
+++ b/core/trunk/install/scripts/database.php
@@ -1,36 +1,83 @@
<?php
+if ($_REQUEST['action'] == 'testConnect') {
+ $_SESSION['config']['databaseserver'] = $_REQUEST['databaseserver'];
+ $_SESSION['config']['databaseserverport'] = $_REQUEST['databaseserverport'];
+ $_SESSION['config']['databaseuser'] = $_REQUEST['databaseuser'];
+ $_SESSION['config']['databasepassword'] = $_REQUEST['databasepassword'];
+ $_SESSION['config']['databasetype'] = $_REQUEST['databasetype'];
+
+ $checkDatabaseParameters = $Class_Install->checkDatabaseParameters(
+ $_REQUEST['databaseserver'],
+ $_REQUEST['databaseserverport'],
+ $_REQUEST['databaseuser'],
+ $_REQUEST['databasepassword'],
+ $_REQUEST['databasetype']
+ );
+
+ if (!$checkDatabaseParameters) {
+ $return['status'] = 0;
+ $return['text'] = 'Informations de connexion invalides';
+
+ $jsonReturn = json_encode($return);
+
+ echo $jsonReturn;
+ exit;
+ }
-$_SESSION['config']['databaseserver'] = $_REQUEST['databaseserver'];
-$_SESSION['config']['databaseserverport'] = $_REQUEST['databaseserverport'];
-$_SESSION['config']['databaseuser'] = $_REQUEST['databaseuser'];
-$_SESSION['config']['databasepassword'] = $_REQUEST['databasepassword'];
-$_SESSION['config']['databasename'] = $_REQUEST['databasename'];
-$_SESSION['config']['databasetype'] = $_REQUEST['databasetype'];
-
-$checkDatabaseParameters = $Class_Install->checkDatabaseParameters(
- $_REQUEST['databaseserver'],
- $_REQUEST['databaseserverport'],
- $_REQUEST['databaseuser'],
- $_REQUEST['databasepassword'],
- $_REQUEST['databasename'],
- $_REQUEST['databasetype']
-);
-
-if (!$checkDatabaseParameters) {
$return['status'] = 1;
- $return['text'] = 'CheckDatabaseParameters fail';
+ $return['text'] = '';
$jsonReturn = json_encode($return);
echo $jsonReturn;
exit;
-}
+} elseif ($_REQUEST['action'] == 'createdatabase') {
+
+ $_SESSION['config']['databasename'] = $_REQUEST['databasename'];
+
+ $createDatabase = $Class_Install->createDatabase(
+ $_REQUEST['databasename']
+ );
+
+ if (!$createDatabase) {
+ $return['status'] = 0;
+ $return['text'] = 'Impossible de créer la base de données, essayer un autre nom';
+
+ $jsonReturn = json_encode($return);
+
+ echo $jsonReturn;
+ exit;
+ }
+
+ $return['status'] = 1;
+ $return['text'] = '';
+
+ $jsonReturn = json_encode($return);
+
+ echo $jsonReturn;
+ exit;
+} elseif ($_REQUEST['action'] == 'loadDatas') {
-$return['status'] = 1;
-$return['text'] = 'checkDatabaseParameters OK';
+ $loadDatas = $Class_Install->createData(
+ $_REQUEST['dataFilename'].'.sql'
+ );
-$jsonReturn = json_encode($return);
+ if (!$loadDatas) {
+ $return['status'] = 0;
+ $return['text'] = 'Impossible d\'importer les datas';
-echo $jsonReturn;
-exit;
+ $jsonReturn = json_encode($return);
+
+ echo $jsonReturn;
+ exit;
+ }
+
+ $return['status'] = 1;
+ $return['text'] = '';
+
+ $jsonReturn = json_encode($return);
+
+ echo $jsonReturn;
+ exit;
+}
diff --git a/core/trunk/install/view/database_view.php b/core/trunk/install/view/database_view.php
index 8d26c6bc06419338db4df510da067a06b26d6a74..1ea35094e7c9a5bfb5e24a1d8555a459380883fc 100755
--- a/core/trunk/install/view/database_view.php
+++ b/core/trunk/install/view/database_view.php
@@ -1,118 +1,213 @@
-<div class="blockWrapper">
- <div class="titleBlock">
- <h2 onClick="slide('database');" style="cursor: pointer;">
- <?php echo _DATABASE; ?>
- </h2>
+<div class="ajaxReturn_testConnect">
+ <div class="blockWrapper">
+ <div class="titleBlock">
+ <h2 onClick="slide('database');" style="cursor: pointer;">
+ <!-- <?php echo _DATABASE; ?>--> Informations de connexion
+ </h2>
+ </div>
+ <div class="contentBlock" id="database">
+ <p>
+ <form>
+ <table>
+ <tr>
+ <td>
+ <?php echo _DATABASESERVER; ?>
+ </td>
+ <td>
+ :
+ </td>
+ <td>
+ <input type="text" id="databaseserver" name="databaseserver"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <?php echo _DATABASESERVERPORT; ?>
+ </td>
+ <td>
+ :
+ </td>
+ <td>
+ <input type="text" id="databaseserverport" name="databaseserverport"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <?php echo _DATABASEUSER; ?>
+ </td>
+ <td>
+ :
+ </td>
+ <td>
+ <input type="text" id="databaseuser" name="databaseuser"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <?php echo _DATABASEPASSWORD; ?>
+ </td>
+ <td>
+ :
+ </td>
+ <td>
+ <input type="password" id="databasepassword" name="databasepassword"/>
+ </td>
+ </tr>
+ <tr style="display: none;">
+ <td>
+ <?php echo _DATABASETYPE; ?>
+ </td>
+ <td>
+ :
+ </td>
+ <td>
+ <input type="hidden" id="databasetype" name="databasetype" value="POSTGRESQL"/>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td>
+ <input
+ type="button"
+ value="tester"
+ onClick="
+ checkDatabaseInfo(
+ $('#databaseserver').val(),
+ $('#databaseserverport').val(),
+ $('#databaseuser').val(),
+ $('#databasepassword').val(),
+ $('#databasetype').val(),
+ 'testConnect'
+ );
+ "
+ />
+ </td>
+ </tr>
+ </table>
+ </form>
+ <br />
+ <div id="ajaxReturn_testConnect_ko"></div>
+ </p>
+ </div>
+ </div>
+</div>
+<br />
+<div class="ajaxReturn_createDB">
+ <div class="blockWrapper" id="ajaxReturn_testConnect" style="display: none;">
+ <div class="titleBlock">
+ <h2 onClick="slide('createdatabase');" style="cursor: pointer;">
+ <!--<?php echo _DATABASE; ?>-->Création de la base de données
+ </h2>
+ </div>
+ <div class="contentBlock" id="createdatabase">
+ <p>
+ <div id="ajaxReturn_testConnect_ok"></div>
+ <form>
+ <table>
+ <tr>
+ <td>
+ <?php echo _DATABASENAME; ?>
+ </td>
+ <td>
+ :
+ </td>
+ <td>
+ <input type="text" name="databasename" id="databasename" />
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td>
+ <input type="button" onclick="checkCreateDB($('#databasename').val(), 'createdatabase');" value="Créer la base" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ <br />
+ <div id="ajaxReturn_createDB_ko"></div>
+ </p>
+ </div>
+ </div>
+</div>
+<br />
+<div class="ajaxReturn_loadDatas">
+ <div class="blockWrapper" id="ajaxReturn_createDB" style="display: none;">
+ <div class="titleBlock">
+ <h2 onClick="slide('database');" style="cursor: pointer;">
+ <!--<?php echo _DATABASE; ?>-->Choix des datas
+ </h2>
+ </div>
+ <div class="contentBlock">
+ <p>
+ <div id="ajaxReturn_createDB_ok"></div>
+ <form>
+ <table>
+ <tr>
+ <td>
+ Datas
+ </td>
+ <td>
+ :
+ </td>
+ <td>
+ <select onChange="checkDataDB($(this).val());" id="dataFilename">
+ <option value="default"><?php echo _CHOOSE; ?></option>
+ <?php
+ for($i=0; $i<count($listSql);$i++) {
+ echo '<option ';
+ echo 'value="'.$listSql[$i].'"';
+ echo '>';
+ echo $listSql[$i];
+ echo '</option>';
+ }
+ ?>
+ </select>
+ </td>
+ <td id="returnCheckDataClassic" style="display: none;">
+ ORIENTÉ ARCHIVAGE
+ </td>
+ <td id="returnCheckDataMlb" style="display: none;">
+ ORIENTÉ COURRIER
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td>
+ <input type="button" onclick="checkLoadDatas($('#dataFilename').val(), 'loadDatas');" value="Charger les datas" />
+ </td>
+ <td></td>
+ </tr>
+ </table>
+ </form>
+ <br />
+ <div id="ajaxReturn_loadDatas_ko"></div>
+ </p>
+ </div>
</div>
- <div class="contentBlock" id="database">
+</div>
+<br />
+<div class="blockWrapper">
+ <div class="contentBlock">
<p>
- <form>
- <table>
- <tr>
- <td colspan="3" id="returnCheckDatabaseInfo">
-
- </td>
- </tr>
- <tr>
- <td>
-
- </td>
- </tr>
- <tr>
- <td>
- <?php echo _DATABASESERVER; ?>
- </td>
- <td>
- :
- </td>
- <td>
- <input type="text" id="databaseserver" name="databaseserver"/>
- </td>
- </tr>
- <tr>
- <td>
- <?php echo _DATABASESERVERPORT; ?>
- </td>
- <td>
- :
- </td>
- <td>
- <input type="text" id="databaseserverport" name="databaseserverport"/>
- </td>
- </tr>
- <tr>
- <td>
- <?php echo _DATABASEUSER; ?>
- </td>
- <td>
- :
- </td>
- <td>
- <input type="text" id="databaseuser" name="databaseuser"/>
- </td>
- </tr>
- <tr>
- <td>
- <?php echo _DATABASEPASSWORD; ?>
- </td>
- <td>
- :
- </td>
- <td>
- <input type="password" id="databasepassword" name="databasepassword"/>
- </td>
- </tr>
- <tr>
- <td>
- <?php echo _DATABASENAME; ?>
- </td>
- <td>
- :
- </td>
- <td>
- <input type="text" id="databasename" name="databasename"/>
- </td>
- </tr>
- <tr style="display: none;">
- <td>
- <?php echo _DATABASETYPE; ?>
- </td>
- <td>
- :
- </td>
- <td>
- <input type="hidden" id="databasetype" name="databasetype" value="POSTGRESQL"/>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td> </td>
- <td> </td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- <td>
- <input
- type="button"
- value="tester"
- onClick="
- checkDatabaseInfo(
- $('#databaseserver').val(),
- $('#databaseserverport').val(),
- $('#databaseuser').val(),
- $('#databasepassword').val(),
- $('#databasename').val(),
- $('#databasetype').val()
- );
- "
- />
- </td>
- </tr>
- </table>
- </form>
- <br />
- <br />
<div id="buttons">
<div style="float: left;" class="previousButton" id="previous">
<a href="#" onClick="goTo('index.php?step=prerequisites');">
@@ -120,7 +215,7 @@
</a>
</div>
<div style="float: right;" class="nextButton" id="next">
- <a href="#" onClick="goTo('index.php?step=docservers');">
+ <a href="#" onClick="goTo('index.php?step=docservers');" id="ajaxReturn_loadDatas" style=" display: none;">
<?php echo _NEXT; ?>
</a>
</div>