From 6cc2ef341e310eb52b468d0be1a84d035dfb163e Mon Sep 17 00:00:00 2001
From: Laurent Giovannoni <laurent.giovannoni@maarch.org>
Date: Thu, 10 May 2012 15:51:26 +0000
Subject: [PATCH] evo: ergo + docservers
---
core/trunk/install/js/ajaxDB.js | 5 +-
core/trunk/install/js/merged_js.js | 351 ++++++++++----------
core/trunk/install/scripts/docservers.php | 1 +
core/trunk/install/view/docservers_view.php | 4 +-
core/trunk/install/view/password_view.php | 2 +-
5 files changed, 185 insertions(+), 178 deletions(-)
diff --git a/core/trunk/install/js/ajaxDB.js b/core/trunk/install/js/ajaxDB.js
index 2e45be24652..83b51355c9c 100644
--- a/core/trunk/install/js/ajaxDB.js
+++ b/core/trunk/install/js/ajaxDB.js
@@ -15,6 +15,7 @@ function ajaxDB(
strAjaxParameters += ":";
strAjaxParameters += "'";
cpt++;
+ parametersTemp[cpt] = parametersTemp[cpt].replace(/\\/gi, '/');
strAjaxParameters += parametersTemp[cpt];
strAjaxParameters += "'";
if (cpt < parametersTemp.length) {
@@ -24,7 +25,6 @@ function ajaxDB(
strAjaxParameters += "ajax:'true'";
strAjaxParameters += ", div:'"+divRetour+"'";
strAjaxParameters += '}'
-
var ajaxParameters = eval('(' + strAjaxParameters + ')');
/**********/
@@ -55,6 +55,9 @@ function ajaxDB(
if ($('.wait')) {
$('.wait').css('display','none');
}
+ if ($('#ajaxReturn_createDocservers_button')) {
+ $('#ajaxReturn_createDocservers_button').css('display', 'block');
+ }
}
});
});
diff --git a/core/trunk/install/js/merged_js.js b/core/trunk/install/js/merged_js.js
index c7c3da34f0d..78a91c8b22f 100755
--- a/core/trunk/install/js/merged_js.js
+++ b/core/trunk/install/js/merged_js.js
@@ -63,73 +63,69 @@ function ajax(
}
-/* heightOfLicenceOverflow.js */
-function heightOfLicenceOverflow()
-{
- $(document).ready(function() {
- var heightOfSection = $('#section').css('minHeight')
- var substringMax = heightOfSection.length - 2;
- var heightOfSection = heightOfSection.substring(0, substringMax);
-
- var newHeightOfLicenceOverflow = heightOfSection - 350;
-
- if ($('#licenceOverflow').height() > 0) {
- $('#licenceOverflow').height(newHeightOfLicenceOverflow+'px');
- }
- });
-}
-
-
-/* goTo.js */
-function goTo(
- link
+/* ajaxDB.js */
+function ajaxDB(
+ url,
+ parameters,
+ divRetour,
+ top
)
{
- $(document).ready(function() {
- window.top.location.href=link;
- })
-}
+ var ajaxUrl = url;
+ var parametersTemp = parameters.split('|');
-/* createDocservers.js */
-function createDocservers(
- docserverRoot
-)
-{
- $(document).ready(function() {
- var oneIsEmpty = false;
- if (docserverRoot.length < 1) {
- var oneIsEmpty = true;
+ var strAjaxParameters = '{';
+ for (cpt=0; cpt<parametersTemp.length; cpt++) {
+ strAjaxParameters += parametersTemp[cpt];
+ strAjaxParameters += ":";
+ strAjaxParameters += "'";
+ cpt++;
+ parametersTemp[cpt] = parametersTemp[cpt].replace(/\\/gi, '/');
+ strAjaxParameters += parametersTemp[cpt];
+ strAjaxParameters += "'";
+ if (cpt < parametersTemp.length) {
+ strAjaxParameters += ", ";
}
+ }
+ strAjaxParameters += "ajax:'true'";
+ strAjaxParameters += ", div:'"+divRetour+"'";
+ strAjaxParameters += '}'
+ var ajaxParameters = eval('(' + strAjaxParameters + ')');
- if (oneIsEmpty) {
- $('#ajaxReturn_createDocservers_ko').html('Vous devez choisir l\'emplacement racine de vos docservers');
- return;
- }
- $('#ajaxReturn_createDocservers_ko').html('');
+ /**********/
- ajaxDB(
- 'docservers',
- 'docserverRoot|'+docserverRoot,
- 'ajaxReturn_createDocservers',
- 'false'
- );
+ 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');
+ if ($('.wait')) {
+ $('.wait').css('display','none');
+ }
-/* checkForm.js */
-function checkLanguage(
- value
-)
-{
- $(document).ready(function() {
- if (value != 'default') {
- $('#returnCheckLanguage').css("display","none");
- } else {
- $('#returnCheckLanguage').css("display","block");
- }
+ } else {
+ retour_ko.html(data.text);
+ if ($('.wait')) {
+ $('.wait').css('display','none');
+ }
+ if ($('#ajaxReturn_createDocservers_button')) {
+ $('#ajaxReturn_createDocservers_button').css('display', 'block');
+ }
+ }
+ });
});
}
@@ -166,17 +162,55 @@ function checkCreateDB(
}
-/* checkLanguage.js */
-function checkLanguage(
- value
+/* checkDatabaseInfo.js */
+function checkDatabaseInfo(
+ databaseserver,
+ databaseserverport,
+ databaseuser,
+ databasepassword,
+ databasetype,
+ action
)
{
$(document).ready(function() {
- if (value != 'default') {
- $('#returnCheckLanguage').css("display","block");
- } else {
- $('#returnCheckLanguage').css("display","none");
+ var oneIsEmpty = false;
+ if (databaseserver.length < 1) {
+ var oneIsEmpty = true;
+ }
+ if (databaseserverport.length < 1) {
+ var oneIsEmpty = true;
+ }
+ if (databaseuser.length < 1) {
+ var oneIsEmpty = true;
}
+ if (databasepassword.length < 1) {
+ var oneIsEmpty = true;
+ }
+ if (databasetype.length < 1) {
+ var oneIsEmpty = true;
+ }
+ if (action.length < 1) {
+ var oneIsEmpty = true;
+ }
+
+ if (oneIsEmpty) {
+ $('#ajaxReturn_testConnect_ko').html('au moins un champ mal rempli');
+ return;
+ }
+ $('#ajaxReturn_testConnect_ko').html('');
+
+ ajaxDB(
+ 'database',
+ 'databaseserver|'+databaseserver
+ +'|databaseserverport|'+databaseserverport
+ +'|databaseuser|'+databaseuser
+ +'|databasepassword|'+databasepassword
+ +'|databasetype|'+databasetype
+ +'|action|'+action,
+ 'ajaxReturn_testConnect',
+ 'false'
+ );
+
});
}
@@ -203,14 +237,33 @@ function checkDataDB(
}
-/* slide.js */
-function slide(
- idDiv
+/* checkForm.js */
+function checkLanguage(
+ value
)
{
$(document).ready(function() {
- $('#'+idDiv).slideToggle('slow');
- })
+ if (value != 'default') {
+ $('#returnCheckLanguage').css("display","none");
+ } else {
+ $('#returnCheckLanguage').css("display","block");
+ }
+ });
+}
+
+
+/* checkLanguage.js */
+function checkLanguage(
+ value
+)
+{
+ $(document).ready(function() {
+ if (value != 'default') {
+ $('#returnCheckLanguage').css("display","block");
+ } else {
+ $('#returnCheckLanguage').css("display","none");
+ }
+ });
}
@@ -227,31 +280,15 @@ function checkLicence()
}
-/* checkDatabaseInfo.js */
-function checkDatabaseInfo(
- databaseserver,
- databaseserverport,
- databaseuser,
- databasepassword,
- databasetype,
+/* checkLoadDatas.js */
+function checkLoadDatas(
+ dataFilename,
action
)
{
$(document).ready(function() {
var oneIsEmpty = false;
- if (databaseserver.length < 1) {
- var oneIsEmpty = true;
- }
- if (databaseserverport.length < 1) {
- var oneIsEmpty = true;
- }
- if (databaseuser.length < 1) {
- var oneIsEmpty = true;
- }
- if (databasepassword.length < 1) {
- var oneIsEmpty = true;
- }
- if (databasetype.length < 1) {
+ if (dataFilename.length < 1) {
var oneIsEmpty = true;
}
if (action.length < 1) {
@@ -259,87 +296,74 @@ function checkDatabaseInfo(
}
if (oneIsEmpty) {
- $('#ajaxReturn_testConnect_ko').html('au moins un champ mal rempli');
+ $('#ajaxReturn_loadDatas_ko').html('Sélécionner le fichier de datas à importer');
return;
}
- $('#ajaxReturn_testConnect_ko').html('');
+ $('#ajaxReturn_loadDatas_ok').html('');
ajaxDB(
'database',
- 'databaseserver|'+databaseserver
- +'|databaseserverport|'+databaseserverport
- +'|databaseuser|'+databaseuser
- +'|databasepassword|'+databasepassword
- +'|databasetype|'+databasetype
+ 'dataFilename|'+dataFilename
+'|action|'+action,
- 'ajaxReturn_testConnect',
+ 'ajaxReturn_loadDatas',
'false'
);
-
});
}
-/* ajaxDB.js */
-function ajaxDB(
- url,
- parameters,
- divRetour,
- top
+/* createDocservers.js */
+function createDocservers(
+ docserverRoot
)
{
- var ajaxUrl = url;
-
- var parametersTemp = parameters.split('|');
+ $(document).ready(function() {
+ var oneIsEmpty = false;
+ if (docserverRoot.length < 1) {
+ var oneIsEmpty = true;
+ }
- var strAjaxParameters = '{';
- for (cpt=0; cpt<parametersTemp.length; cpt++) {
- strAjaxParameters += parametersTemp[cpt];
- strAjaxParameters += ":";
- strAjaxParameters += "'";
- cpt++;
- strAjaxParameters += parametersTemp[cpt];
- strAjaxParameters += "'";
- if (cpt < parametersTemp.length) {
- strAjaxParameters += ", ";
+ if (oneIsEmpty) {
+ $('#ajaxReturn_createDocservers_ko').html('Vous devez choisir l\'emplacement racine de vos docservers');
+ return;
}
- }
- strAjaxParameters += "ajax:'true'";
- strAjaxParameters += ", div:'"+divRetour+"'";
- strAjaxParameters += '}'
+ $('#ajaxReturn_createDocservers_ko').html('');
- var ajaxParameters = eval('(' + strAjaxParameters + ')');
+ ajaxDB(
+ 'docservers',
+ 'docserverRoot|'+docserverRoot,
+ 'ajaxReturn_createDocservers',
+ 'false'
+ );
- /**********/
+ });
+}
- 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');
- }
- /**********/
+/* goTo.js */
+function goTo(
+ link
+)
+{
+ $(document).ready(function() {
+ window.top.location.href=link;
+ })
+}
- $(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');
- if ($('.wait')) {
- $('.wait').css('display','none');
- }
- } else {
- retour_ko.html(data.text);
- if ($('.wait')) {
- $('.wait').css('display','none');
- }
- }
- });
+/* heightOfLicenceOverflow.js */
+function heightOfLicenceOverflow()
+{
+ $(document).ready(function() {
+ var heightOfSection = $('#section').css('minHeight')
+ var substringMax = heightOfSection.length - 2;
+ var heightOfSection = heightOfSection.substring(0, substringMax);
+
+ var newHeightOfLicenceOverflow = heightOfSection - 350;
+
+ if ($('#licenceOverflow').height() > 0) {
+ $('#licenceOverflow').height(newHeightOfLicenceOverflow+'px');
+ }
});
}
@@ -361,35 +385,14 @@ function minHeightOfSection()
}
-/* checkLoadDatas.js */
-function checkLoadDatas(
- dataFilename,
- action
+/* slide.js */
+function slide(
+ idDiv
)
{
$(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'
- );
- });
+ $('#'+idDiv).slideToggle('slow');
+ })
}
diff --git a/core/trunk/install/scripts/docservers.php b/core/trunk/install/scripts/docservers.php
index ea5b46e8fdd..dde9d0ef06e 100644
--- a/core/trunk/install/scripts/docservers.php
+++ b/core/trunk/install/scripts/docservers.php
@@ -1,4 +1,5 @@
<?php
+$_REQUEST['docserverRoot'] = str_replace("/", DIRECTORY_SEPARATOR, $_REQUEST['docserverRoot']);
$checkDocserverRoot = $Class_Install->checkDocserverRoot(
$_REQUEST['docserverRoot']
diff --git a/core/trunk/install/view/docservers_view.php b/core/trunk/install/view/docservers_view.php
index d8909090249..c856c098b7e 100755
--- a/core/trunk/install/view/docservers_view.php
+++ b/core/trunk/install/view/docservers_view.php
@@ -28,7 +28,7 @@
<td></td>
<td></td>
<td>
- <input type="button" onClick="createDocservers($('#docserverRoot').val());"; value="<?php echo _CREATE_DOCSERVERS; ?>"/>
+ <input type="button" id="ajaxReturn_createDocservers_button" onClick="$(this).css('display', 'none');createDocservers($('#docserverRoot').val());"; value="<?php echo _CREATE_DOCSERVERS; ?>"/>
</td>
</tr>
</table>
@@ -39,7 +39,7 @@
<br />
<div id="buttons">
<div style="float: left;" class="previousButton" id="previous">
- <a href="#" onClick="goTo('index.php?step=database');">
+ <a href="#" onClick="goTo('index.php?step=database');" style="display:none;">
<?php echo _PREVIOUS; ?>
</a>
</div>
diff --git a/core/trunk/install/view/password_view.php b/core/trunk/install/view/password_view.php
index d3ffc5f4fe0..1d6f0dd5fef 100755
--- a/core/trunk/install/view/password_view.php
+++ b/core/trunk/install/view/password_view.php
@@ -10,7 +10,7 @@
<br />
<div id="buttons">
<div style="float: left;" class="previousButton" id="previous">
- <a href="#" onClick="goTo('index.php?step=docservers');">
+ <a href="#" onClick="goTo('index.php?step=docservers');" style="display:none;">
<?php echo _PREVIOUS; ?>
</a>
</div>
--
GitLab