From 8a732c348923e8a04d0144ed12affcef58777948 Mon Sep 17 00:00:00 2001
From: Laurent Giovannoni <laurent.giovannoni@maarch.org>
Date: Sat, 20 Jun 2015 19:41:14 +0000
Subject: [PATCH] FIX #2482
---
core/trunk/core/class/class_core_tools.php | 26 ++---
core/trunk/install/view/database_view.php | 40 ++++----
core/trunk/install/view/docservers_view.php | 14 +--
core/trunk/install/view/error_view.php | 4 +-
core/trunk/install/view/includes/header.php | 2 +-
core/trunk/install/view/language_view.php | 4 +-
core/trunk/install/view/licence_view.php | 10 +-
core/trunk/install/view/password_view.php | 16 ++--
.../trunk/install/view/prerequisites_view.php | 94 +++++++++----------
core/trunk/install/view/principal_view.php | 12 +--
core/trunk/install/view/resume_view.php | 8 +-
core/trunk/install/view/smtp_view.php | 34 +++----
core/trunk/install/view/welcome_view.php | 8 +-
13 files changed, 136 insertions(+), 136 deletions(-)
diff --git a/core/trunk/core/class/class_core_tools.php b/core/trunk/core/class/class_core_tools.php
index 0db0475953d..4da7ca8a5bc 100644
--- a/core/trunk/core/class/class_core_tools.php
+++ b/core/trunk/core/class/class_core_tools.php
@@ -1433,7 +1433,7 @@ class core_tools extends functions
$tmp = constant($tmp);
}
?>
- <input type="button" name="<?php echo $appServices[$i]['id'];?>" value="<?php echo $tmp;?>" onclick="window.open('<?php echo $_SESSION['config']['businessappurl'].'index.php?display=true&page='.$appServices[$i]['servicepage']; ?>', '<?php echo $appServices[$i]['id'];?>','width=<?php echo $appServices[$i]['whereamiused'][$k]['width'];?>,height=<?php echo $appServices[$i]['whereamiused'][$k]['height'];?>,scrollbars=yes,resizable=yes' );" class="button" /><br/>
+ <input type="button" name="<?php echo $appServices[$i]['id'];?>" value="<?php echo $tmp;?>" onclick="window.open('<?php echo $_SESSION['config']['businessappurl'].'index.php?display=true&page='.$appServices[$i]['servicepage'];?>', '<?php echo $appServices[$i]['id'];?>','width=<?php echo $appServices[$i]['whereamiused'][$k]['width'];?>,height=<?php echo $appServices[$i]['whereamiused'][$k]['height'];?>,scrollbars=yes,resizable=yes' );" class="button" /><br/>
<?php
} else if ($appServices[$i]['whereamiused'][$k]['nature'] == "include"
&& isset($_SESSION['user']['services'][$appServices[$i]['id']])
@@ -1488,7 +1488,7 @@ class core_tools extends functions
/*<?xml version="1.0" encoding="UTF-8"?>*/
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $_SESSION['config']['lang']; ?>" lang="<?php echo $_SESSION['config']['lang']; ?>">
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $_SESSION['config']['lang'];?>" lang="<?php echo $_SESSION['config']['lang'];?>">
<?php
}
@@ -1535,14 +1535,14 @@ class core_tools extends functions
{
?>
<link rel="stylesheet" href="<?php echo $_SESSION['config']['businessappurl']
- . 'css/font-awesome/css/font-awesome.css'; ?>" media="screen" />
+ . 'css/font-awesome/css/font-awesome.css';?>" media="screen" />
<link rel="stylesheet" href="<?php echo $_SESSION['config']['businessappurl']
- . 'css/font-awesome/css/font-maarch.css'; ?>" media="screen" />
- <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'merged_css.php'; ?>" media="screen" />
- <!--[if lt IE 7.0]> <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'merged_css.php?ie'; ?>" media="screen" /> <![endif]-->
- <!--[if gte IE 7.0]> <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'merged_css.php?ie7'; ?>" media="screen" /> <![endif]-->
- <!--[if IE 8.0]> <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'merged_css.php?ie8'; ?>" media="screen" /> <![endif]-->
- <!--[if gte IE 9.0]> <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'merged_css.php?ie9'; ?>" media="screen" /> <![endif]-->
+ . 'css/font-awesome/css/font-maarch.css';?>" media="screen" />
+ <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'merged_css.php';?>" media="screen" />
+ <!--[if lt IE 7.0]> <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'merged_css.php?ie';?>" media="screen" /> <![endif]-->
+ <!--[if gte IE 7.0]> <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'merged_css.php?ie7';?>" media="screen" /> <![endif]-->
+ <!--[if IE 8.0]> <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'merged_css.php?ie8';?>" media="screen" /> <![endif]-->
+ <!--[if gte IE 9.0]> <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'merged_css.php?ie9';?>" media="screen" /> <![endif]-->
<?php
}
@@ -2280,10 +2280,10 @@ class core_tools extends functions
{
?>
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
- <!--<link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'smartphone/css/style.css'; ?>" media="screen" />-->
- <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'smartphone/css/iui-panel-list.css'; ?>" media="screen" />
- <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'smartphone/js/iui/iui.css'; ?>" media="screen" />
- <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'smartphone/js/iui/t/maarch/maarch-theme.css'; ?>" media="screen" />
+ <!--<link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'smartphone/css/style.css';?>" media="screen" />-->
+ <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'smartphone/css/iui-panel-list.css';?>" media="screen" />
+ <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'smartphone/js/iui/iui.css';?>" media="screen" />
+ <link rel="stylesheet" type="text/css" href="<?php echo $_SESSION['config']['businessappurl'].'smartphone/js/iui/t/maarch/maarch-theme.css';?>" media="screen" />
<?php
}
}
diff --git a/core/trunk/install/view/database_view.php b/core/trunk/install/view/database_view.php
index 01fe602bcb2..9efe8dab496 100755
--- a/core/trunk/install/view/database_view.php
+++ b/core/trunk/install/view/database_view.php
@@ -60,7 +60,7 @@
}
if (oneIsEmpty) {
- $('#ajaxReturn_testConnect_ko').html('<?php echo _ONE_FIELD_EMPTY; ?>');
+ $('#ajaxReturn_testConnect_ko').html('<?php echo _ONE_FIELD_EMPTY;?>');
return;
}
$('.wait').css('display','block');
@@ -96,7 +96,7 @@
}
if (oneIsEmpty) {
- $('#ajaxReturn_createDB_ko').html('<?php echo _CHOOSE_A_NAME_FOR_DB; ?>');
+ $('#ajaxReturn_createDB_ko').html('<?php echo _CHOOSE_A_NAME_FOR_DB;?>');
$('.wait').css('display','none');
return;
}
@@ -141,7 +141,7 @@
}
if (oneIsEmpty) {
- $('#ajaxReturn_loadDatas_ko').html('<?php echo _CHOOSE_DATASET_TO_IMPORT; ?>');
+ $('#ajaxReturn_loadDatas_ko').html('<?php echo _CHOOSE_DATASET_TO_IMPORT;?>');
return;
}
$('.wait').css('display','block');
@@ -161,19 +161,19 @@
<div class="blockWrapper">
<div class="titleBlock">
<h2 onClick="slide('database');" style="cursor: pointer;">
- <?php echo _DATABASE_INFOS; ?>
+ <?php echo _DATABASE_INFOS;?>
</h2>
</div>
<div class="contentBlock" id="database">
<p>
<h6>
- <?php echo _DATABASE_EXP; ?>
+ <?php echo _DATABASE_EXP;?>
</h6>
<form>
<table>
<tr>
<td>
- <?php echo _DATABASESERVER; ?>
+ <?php echo _DATABASESERVER;?>
</td>
<td>
:
@@ -184,7 +184,7 @@
</tr>
<tr>
<td>
- <?php echo _DATABASESERVERPORT; ?>
+ <?php echo _DATABASESERVERPORT;?>
</td>
<td>
:
@@ -195,7 +195,7 @@
</tr>
<tr>
<td>
- <?php echo _DATABASEUSER; ?>
+ <?php echo _DATABASEUSER;?>
</td>
<td>
:
@@ -206,7 +206,7 @@
</tr>
<tr>
<td>
- <?php echo _DATABASEPASSWORD; ?>
+ <?php echo _DATABASEPASSWORD;?>
</td>
<td>
:
@@ -217,7 +217,7 @@
</tr>
<tr style="display: none;">
<td>
- <?php echo _DATABASETYPE; ?>
+ <?php echo _DATABASETYPE;?>
</td>
<td>
:
@@ -237,7 +237,7 @@
<td>
<input
type="button"
- name="Submit" value="<?php echo _SUBMIT; ?>"
+ name="Submit" value="<?php echo _SUBMIT;?>"
onClick="
checkDatabaseInfo(
$('#databaseserver').val(),
@@ -266,20 +266,20 @@
<div class="blockWrapper" id="ajaxReturn_testConnect" style="display: none;">
<div class="titleBlock">
<h2 onClick="slide('createdatabase');" style="cursor: pointer;">
- <?php echo _DATABASE_CREATE; ?>
+ <?php echo _DATABASE_CREATE;?>
</h2>
</div>
<div class="contentBlock" id="createdatabase">
<p>
<h6>
- <?php echo _DATABASE_ADD_INF; ?>
+ <?php echo _DATABASE_ADD_INF;?>
</h6>
<div id="ajaxReturn_testConnect_ok"></div>
<form>
<table>
<tr>
<td>
- <?php echo _DATABASENAME; ?>
+ <?php echo _DATABASENAME;?>
</td>
<td>
:
@@ -315,27 +315,27 @@
<div class="blockWrapper" id="ajaxReturn_createDB" style="display: none;">
<div class="titleBlock">
<h2 onClick="slide('database');" style="cursor: pointer;">
- <?php echo _DATASET_CHOICE; ?>
+ <?php echo _DATASET_CHOICE;?>
</h2>
</div>
<div class="contentBlock">
<p>
<h6>
- <?php echo _DATASET_EXP; ?>
+ <?php echo _DATASET_EXP;?>
</h6>
<div id="ajaxReturn_createDB_ok"></div>
<form>
<table>
<tr>
<td>
- <?php echo _DATASET; ?>
+ <?php echo _DATASET;?>
</td>
<td>
:
</td>
<td>
<select onChange="checkDataDB($(this).val());" id="dataFilename">
- <option value="default"><?php echo _CHOOSE; ?></option>
+ <option value="default"><?php echo _CHOOSE;?></option>
<?php
for($i=0; $i<count($listSql);$i++) {
echo '<option ';
@@ -386,12 +386,12 @@
<div id="buttons">
<div style="float: left;" class="previousButton" id="previous">
<a href="#" onClick="goTo('index.php?step=prerequisites');" style="display: none;">
- <?php echo _PREVIOUS; ?>
+ <?php echo _PREVIOUS;?>
</a>
</div>
<div style="float: right;" class="nextButton" id="next">
<a href="#" onClick="goTo('index.php?step=docservers');" id="ajaxReturn_loadDatas" style=" display: none;">
- <?php echo _NEXT; ?>
+ <?php echo _NEXT;?>
</a>
</div>
</div>
diff --git a/core/trunk/install/view/docservers_view.php b/core/trunk/install/view/docservers_view.php
index 5e59bcfaddc..d56e500cfe7 100755
--- a/core/trunk/install/view/docservers_view.php
+++ b/core/trunk/install/view/docservers_view.php
@@ -40,7 +40,7 @@
}
if (oneIsEmpty) {
- $('#ajaxReturn_createDocservers_ko').html('<?php echo _MUST_CHOOSE_DOCSERVERS_ROOT; ?>');
+ $('#ajaxReturn_createDocservers_ko').html('<?php echo _MUST_CHOOSE_DOCSERVERS_ROOT;?>');
$('#ajaxReturn_createDocservers_button').css('display', 'block');
return;
}
@@ -59,19 +59,19 @@
<div class="blockWrapper">
<div class="titleBlock">
<h2 onClick="slide('docservers');" style="cursor: pointer;">
- <?php echo _DOCSERVERS; ?>
+ <?php echo _DOCSERVERS;?>
</h2>
</div>
<div class="contentBlock" id="docservers">
<p>
<h6>
- <?php echo _DOCSERVERS_EXP; ?>
+ <?php echo _DOCSERVERS_EXP;?>
</h6>
<form>
<table>
<tr>
<td>
- <?php echo _DOCSERVER_ROOT; ?>
+ <?php echo _DOCSERVER_ROOT;?>
</td>
<td>
:
@@ -89,7 +89,7 @@
<td></td>
<td></td>
<td>
- <input type="button" id="ajaxReturn_createDocservers_button" onClick="$(this).css('display', 'none');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>
@@ -106,12 +106,12 @@
<div id="buttons">
<div style="float: left;" class="previousButton" id="previous">
<a href="#" onClick="goTo('index.php?step=database');" style="display:none;">
- <?php echo _PREVIOUS; ?>
+ <?php echo _PREVIOUS;?>
</a>
</div>
<div style="float: right;" class="nextButton" id="next">
<a href="#" onClick="goTo('index.php?step=smtp');" id="ajaxReturn_createDocservers" style=" display: none;">
- <?php echo _NEXT; ?>
+ <?php echo _NEXT;?>
</a>
</div>
</div>
diff --git a/core/trunk/install/view/error_view.php b/core/trunk/install/view/error_view.php
index 061c56a2b18..34421854ec0 100755
--- a/core/trunk/install/view/error_view.php
+++ b/core/trunk/install/view/error_view.php
@@ -31,12 +31,12 @@
<div class="blockWrapper">
<div class="titleBlock">
<h2 onClick="slide('infosError');" style="cursor: pointer;">
- <?php echo _ERROR; ?>
+ <?php echo _ERROR;?>
</h2>
</div>
<div class="contentBlock" id="infosError">
<p>
- <?php echo $infosError; ?>
+ <?php echo $infosError;?>
</p>
</div>
</div>
diff --git a/core/trunk/install/view/includes/header.php b/core/trunk/install/view/includes/header.php
index a504a236866..50c6d032201 100755
--- a/core/trunk/install/view/includes/header.php
+++ b/core/trunk/install/view/includes/header.php
@@ -30,7 +30,7 @@
?>
<div class="headerName">
<h2>
- <?php echo $shortTitle; ?>
+ <?php echo $shortTitle;?>
</h2>
</div>
<div class="logo">
diff --git a/core/trunk/install/view/language_view.php b/core/trunk/install/view/language_view.php
index 23e9f40a6f7..983f7f33191 100755
--- a/core/trunk/install/view/language_view.php
+++ b/core/trunk/install/view/language_view.php
@@ -31,7 +31,7 @@
<div class="blockWrapper">
<div class="titleBlock">
<h2 onClick="slide('chooseLanguage');" style="cursor: pointer;">
- <?php echo _CHOOSE_LANGUAGE; ?>
+ <?php echo _CHOOSE_LANGUAGE;?>
</h2>
</div>
<div class="contentBlock" id="chooseLanguage">
@@ -63,7 +63,7 @@
<div style="float: right;" class="nextButton" id="next">
<span id="returnCheckLanguage" style="display: none;">
<a href="#" onClick="$('form').submit();">
- <?php echo _NEXT; ?>
+ <?php echo _NEXT;?>
</a>
</span>
</div>
diff --git a/core/trunk/install/view/licence_view.php b/core/trunk/install/view/licence_view.php
index 18a6dc90373..ae36096a9df 100755
--- a/core/trunk/install/view/licence_view.php
+++ b/core/trunk/install/view/licence_view.php
@@ -31,7 +31,7 @@
<div class="blockWrapper">
<div class="titleBlock">
<h2 onClick="slide('licence');" style="cursor: pointer;">
- <?php echo _LICENCE; ?>
+ <?php echo _LICENCE;?>
</h2>
</div>
<div class="contentBlock" id="licence">
@@ -39,7 +39,7 @@
<div align="center">
<div id="licenceOverflow" style="min-height: 131px; width: 880px; overflow: auto; background-color: rgba(255, 255, 255, 0.6);">
<br />
- <?php echo $txtLicence; ?>
+ <?php echo $txtLicence;?>
<br />
</div>
</div>
@@ -53,7 +53,7 @@
<div align="center">
<input type="checkbox" id="checkboxLicence" onChange="checkLicence();"/>
<label for="checkboxLicence">
- <?php echo _OK_WITH_LICENCE; ?>
+ <?php echo _OK_WITH_LICENCE;?>
</label>
</div>
</p>
@@ -66,13 +66,13 @@
<div id="buttons">
<div style="float: left;" class="previousButton" id="previous">
<a href="#" onClick="goTo('index.php?step=welcome');">
- <?php echo _PREVIOUS; ?>
+ <?php echo _PREVIOUS;?>
</a>
</div>
<div style="float: right;" class="nextButton" id="next">
<span id="returnCheckLicence" style="display: none;">
<a href="#" onClick="goTo('index.php?step=prerequisites');">
- <?php echo _NEXT; ?>
+ <?php echo _NEXT;?>
</a>
</span>
</div>
diff --git a/core/trunk/install/view/password_view.php b/core/trunk/install/view/password_view.php
index 0758f7d9892..7ab5dbc1aeb 100755
--- a/core/trunk/install/view/password_view.php
+++ b/core/trunk/install/view/password_view.php
@@ -45,7 +45,7 @@
if (oneIsEmpty) {
$('#okAdminPass').css('display','none');
- $('#koAdminPass').html('<?php echo _FILL_ALL_PASSWORD_FIELDS; ?>');
+ $('#koAdminPass').html('<?php echo _FILL_ALL_PASSWORD_FIELDS;?>');
return;
}
@@ -53,7 +53,7 @@
if (newSuperadminPass != newSuperadminPassTwo) {
$('#okAdminPass').css('display','none');
- $('#koAdminPass').html('<?php echo _PASSWORDS_ARE_DIFFERENTS; ?>');
+ $('#koAdminPass').html('<?php echo _PASSWORDS_ARE_DIFFERENTS;?>');
return;
}
@@ -66,19 +66,19 @@
<div class="blockWrapper">
<div class="titleBlock">
<h2 onClick="slide('password');" style="cursor: pointer;">
- <?php echo _PASSWORD; ?>
+ <?php echo _PASSWORD;?>
</h2>
</div>
<div class="contentBlock" id="password">
<p>
<h6>
- <?php echo _PASSWORD_EXP; ?>
+ <?php echo _PASSWORD_EXP;?>
</h6>
<form action="scripts/password.php" method="post">
<table>
<tr>
<td>
- <?php echo _NEW_ADMIN_PASS; ?>
+ <?php echo _NEW_ADMIN_PASS;?>
</td>
<td>
:
@@ -89,7 +89,7 @@
</tr>
<tr>
<td>
- <?php echo _NEW_ADMIN_PASS_AGAIN; ?>
+ <?php echo _NEW_ADMIN_PASS_AGAIN;?>
</td>
<td>
:
@@ -116,12 +116,12 @@
<div id="buttons">
<div style="float: left;" class="previousButton" id="previous">
<a href="#" onClick="goTo('index.php?step=docservers');" style="display:none;">
- <?php echo _PREVIOUS; ?>
+ <?php echo _PREVIOUS;?>
</a>
</div>
<div style="float: right;" class="nextButton" id="next">
<a href="#" onClick="$('form').submit();" id="okAdminPass" style="display: none;">
- <?php echo _NEXT; ?>
+ <?php echo _NEXT;?>
</a>
</div>
</div>
diff --git a/core/trunk/install/view/prerequisites_view.php b/core/trunk/install/view/prerequisites_view.php
index 20f5e96be24..d0b16f80112 100755
--- a/core/trunk/install/view/prerequisites_view.php
+++ b/core/trunk/install/view/prerequisites_view.php
@@ -31,24 +31,24 @@
<div class="blockWrapper">
<div class="titleBlock">
<h2 onClick="slide('prerequisites');" style="cursor: pointer;">
- <?php echo _PREREQUISITES; ?>
+ <?php echo _PREREQUISITES;?>
</h2>
</div>
<div class="contentBlock" id="prerequisites">
<p>
<h6>
- <div id="titleLink"><?php echo _PREREQUISITES_EXP; ?></div>
+ <div id="titleLink"><?php echo _PREREQUISITES_EXP;?></div>
<br/>
- <img src="img/green_light.png" width="10px"/><?php echo _ACTIVATED; ?>
- <img src="img/orange_light.png" width="10px"/><?php echo _OPTIONNAL; ?>
- <img src="img/red_light.png" width="10px"/><?php echo _NOT_ACTIVATED; ?>
+ <img src="img/green_light.png" width="10px"/><?php echo _ACTIVATED;?>
+ <img src="img/orange_light.png" width="10px"/><?php echo _OPTIONNAL;?>
+ <img src="img/red_light.png" width="10px"/><?php echo _NOT_ACTIVATED;?>
</h6>
<table>
<tr>
<td colspan="2">
<h2>
- <?php echo _GENERAL; ?>
+ <?php echo _GENERAL;?>
</h2>
</td>
</tr>
@@ -56,20 +56,20 @@
<td class="voyantPrerequisites">
<?php echo $Class_Install->checkPrerequisites(
$Class_Install->isPhpVersion()
- ); ?>
+ );?>
</td>
<td>
- <?php echo _PHP_VERSION . ' -> ' . PHP_VERSION; ?>
+ <?php echo _PHP_VERSION . ' -> ' . PHP_VERSION;?>
</td>
</tr>
<tr>
<td class="voyantPrerequisites">
<?php echo $Class_Install->checkPrerequisites(
$Class_Install->isMaarchPathWritable()
- ); ?>
+ );?>
</td>
<td>
- <?php echo _MAARCH_PATH_RIGHTS; ?>
+ <?php echo _MAARCH_PATH_RIGHTS;?>
</td>
</tr>
<tr>
@@ -93,10 +93,10 @@
$Class_Install->isPhpRequirements(
'pgsql'
)
- ); ?>
+ );?>
</td>
<td>
- <?php echo _PGSQL; ?>
+ <?php echo _PGSQL;?>
</td>
</tr>
<tr>
@@ -105,10 +105,10 @@
$Class_Install->isPhpRequirements(
'gd'
)
- ); ?>
+ );?>
</td>
<td>
- <?php echo _GD; ?>
+ <?php echo _GD;?>
</td>
</tr>
<tr>
@@ -118,10 +118,10 @@
'svn'
),
true
- ); ?>
+ );?>
</td>
<td>
- <?php echo _SVN; ?>
+ <?php echo _SVN;?>
</td>
</tr>
<tr>
@@ -131,10 +131,10 @@
'imap'
),
true
- ); ?>
+ );?>
</td>
<td>
- <?php echo _IMAP; ?>
+ <?php echo _IMAP;?>
</td>
</tr>
<tr>
@@ -143,10 +143,10 @@
$Class_Install->isPhpRequirements(
'mbstring'
)
- ); ?>
+ );?>
</td>
<td>
- <?php echo _MBSTRING; ?>
+ <?php echo _MBSTRING;?>
</td>
</tr>
<tr>
@@ -155,10 +155,10 @@
$Class_Install->isPhpRequirements(
'xsl'
)
- ); ?>
+ );?>
</td>
<td>
- <?php echo _XSL; ?>
+ <?php echo _XSL;?>
</td>
</tr>
<tr>
@@ -167,10 +167,10 @@
$Class_Install->isPhpRequirements(
'gettext'
), true
- ); ?>
+ );?>
</td>
<td>
- <?php echo _GETTEXT; ?>
+ <?php echo _GETTEXT;?>
</td>
</tr>
<tr>
@@ -179,10 +179,10 @@
$Class_Install->isPhpRequirements(
'xmlrpc'
), true
- ); ?>
+ );?>
</td>
<td>
- <?php echo _XMLRPC; ?>
+ <?php echo _XMLRPC;?>
</td>
</tr>
<!--<tr>
@@ -191,10 +191,10 @@
$Class_Install->isPhpRequirements(
'imagick'
), false
- ); ?>
+ );?>
</td>
<td>
- <?php echo _IMAGICK; ?>
+ <?php echo _IMAGICK;?>
</td>
</tr>-->
@@ -205,10 +205,10 @@
$Class_Install->isPhpRequirements(
'fileinfo'
)
- ); ?>
+ );?>
</td>
<td>
- <?php echo _FILEINFO; ?>
+ <?php echo _FILEINFO;?>
</td>
</tr>
<?php } ?>
@@ -232,10 +232,10 @@
$Class_Install->isPearRequirements(
'System.php'
)
- ); ?>
+ );?>
</td>
<td>
- <?php echo _PEAR; ?>
+ <?php echo _PEAR;?>
</td>
</tr>
<tr>
@@ -244,10 +244,10 @@
$Class_Install->isPearRequirements(
'MIME/Type.php'
)
- ); ?>
+ );?>
</td>
<td>
- <?php echo _MIMETYPE; ?>
+ <?php echo _MIMETYPE;?>
</td>
</tr>
<tr>
@@ -257,10 +257,10 @@
'Maarch_CLITools/FileHandler.php'
),
true
- ); ?>
+ );?>
</td>
<td>
- <?php echo _CLITOOLS; ?>
+ <?php echo _CLITOOLS;?>
</td>
</tr>
<tr>
@@ -270,10 +270,10 @@
'SOAP/Disco.php'
),
true
- ); ?>
+ );?>
</td>
<td>
- <?php echo 'SOAP'; ?>
+ <?php echo 'SOAP';?>
</td>
</tr>
<tr>
@@ -295,40 +295,40 @@
<td class="voyantPrerequisites">
<?php echo $Class_Install->checkPrerequisites(
$Class_Install->isIniErrorRepportingRequirements()
- , true); ?>
+ , true);?>
</td>
<td>
- <?php echo _ERROR_REPORTING; ?>
+ <?php echo _ERROR_REPORTING;?>
</td>
</tr>
<tr>
<td class="voyantPrerequisites">
<?php echo $Class_Install->checkPrerequisites(
$Class_Install->isIniDisplayErrorRequirements()
- ); ?>
+ );?>
</td>
<td>
- <?php echo _DISPLAY_ERRORS; ?>
+ <?php echo _DISPLAY_ERRORS;?>
</td>
</tr>
<tr>
<td class="voyantPrerequisites">
<?php echo $Class_Install->checkPrerequisites(
$Class_Install->isIniShortOpenTagRequirements()
- ); ?>
+ );?>
</td>
<td>
- <?php echo _SHORT_OPEN_TAGS; ?>
+ <?php echo _SHORT_OPEN_TAGS;?>
</td>
</tr>
<tr>
<td class="voyantPrerequisites">
<?php echo $Class_Install->checkPrerequisites(
$Class_Install->isIniMagicQuotesGpcRequirements()
- ); ?>
+ );?>
</td>
<td>
- <?php echo _MAGIC_QUOTES_GPC; ?>
+ <?php echo _MAGIC_QUOTES_GPC;?>
</td>
</tr>
</table>
@@ -342,7 +342,7 @@
<div id="buttons">
<div style="float: left;" class="previousButton" id="previous">
<a href="#" onClick="goTo('index.php?step=licence');">
- <?php echo _PREVIOUS; ?>
+ <?php echo _PREVIOUS;?>
</a>
</div>
<div style="float: right;" class="nextButton" id="next">
diff --git a/core/trunk/install/view/principal_view.php b/core/trunk/install/view/principal_view.php
index 2efdb6c868b..35005310f4f 100755
--- a/core/trunk/install/view/principal_view.php
+++ b/core/trunk/install/view/principal_view.php
@@ -32,8 +32,8 @@
<html>
<head>
<meta charset="UTF-8">
- <meta http-equiv="Content-Language" content="<?php echo $Class_Install->getActualLang(); ?>" />
- <title>Maarch > <?php echo $longTitle; ?></title>
+ <meta http-equiv="Content-Language" content="<?php echo $Class_Install->getActualLang();?>" />
+ <title>Maarch > <?php echo $longTitle;?></title>
<link rel="stylesheet" href="css/merged_css.css" />
<script src="js/merged_js.js"></script>
</head>
@@ -42,19 +42,19 @@
<div align="center">
<div id="fullWrapper" class="fullWrapper">
<header id="header">
- <?php include('install/view/includes/header.php'); ?>
+ <?php include('install/view/includes/header.php');?>
</header>
<div class="line"></div>
<section id="section">
<br />
- <?php include('install/view/includes/progress.php'); ?>
+ <?php include('install/view/includes/progress.php');?>
<br />
- <?php include('install/view/'.$view.'_view.php'); ?>
+ <?php include('install/view/'.$view.'_view.php');?>
<br />
</section>
<!-- <div class="line"></div> -->
<!-- <footer id="footer">
- <?php include('install/view/includes/footer.php'); ?>
+ <?php include('install/view/includes/footer.php');?>
</footer> -->
</div>
</div>
diff --git a/core/trunk/install/view/resume_view.php b/core/trunk/install/view/resume_view.php
index 19c5a31a253..85316709c1b 100755
--- a/core/trunk/install/view/resume_view.php
+++ b/core/trunk/install/view/resume_view.php
@@ -31,12 +31,12 @@
<div class="blockWrapper">
<div class="titleBlock">
<h2 onClick="slide('resume');" style="cursor: pointer;">
- <?php echo _RESUME; ?>
+ <?php echo _RESUME;?>
</h2>
</div>
<div class="contentBlock" id="resume">
<p>
- <?php echo _INSTALL_SUCCESS; ?><br />
+ <?php echo _INSTALL_SUCCESS;?><br />
<br />
<div align="center">
<div class="fb-like" data-href="http://www.facebook.com/pages/Maarch/53918706268" data-send="true" data-width="850" data-show-faces="true"></div>
@@ -51,12 +51,12 @@
<div id="buttons">
<div style="float: left;" class="previousButton" id="previous">
<a href="#" onClick="goTo('index.php?step=password');">
- <?php echo _PREVIOUS; ?>
+ <?php echo _PREVIOUS;?>
</a>
</div>
<div style="float: right;" class="nextButton" id="start">
<a href="#" onClick="goTo('final.php');">
- <?php echo _START_MEP_1_3; ?>
+ <?php echo _START_MEP_1_3;?>
</a>
</div>
</div>
diff --git a/core/trunk/install/view/smtp_view.php b/core/trunk/install/view/smtp_view.php
index e85110a0472..34e05e71a48 100755
--- a/core/trunk/install/view/smtp_view.php
+++ b/core/trunk/install/view/smtp_view.php
@@ -59,7 +59,7 @@
}
if (oneIsEmpty) {
- $('#ajaxReturn_testConnect_ko').html('<?php echo _ONE_FIELD_EMPTY; ?>');
+ $('#ajaxReturn_testConnect_ko').html('<?php echo _ONE_FIELD_EMPTY;?>');
return;
}
$('.wait').css('display','block');
@@ -88,19 +88,19 @@
<div class="blockWrapper">
<div class="titleBlock">
<h2 onClick="slide('configNotificationSendmail');" style="cursor: pointer;">
- <?php echo _SMTP_INFO; ?>
+ <?php echo _SMTP_INFO;?>
</h2>
</div>
<div class="contentBlock" id="docservers">
<p>
<h6>
- <?php echo _SMTP_EXP; ?>
+ <?php echo _SMTP_EXP;?>
</h6>
<form>
<table>
<tr>
<td>
- <?php echo _SMTP_HOST; ?>
+ <?php echo _SMTP_HOST;?>
</td>
<td>
:
@@ -110,32 +110,32 @@
</td>
</tr>
<tr>
- <td><?php echo _SMTP_TYPE; ?></td>
+ <td><?php echo _SMTP_TYPE;?></td>
<td>:</td>
<td><input type="text" name="smtpType" id="smtpType" value="smtp"/></td>
</tr>
<tr>
- <td><?php echo _SMTP_PORT; ?></td>
+ <td><?php echo _SMTP_PORT;?></td>
<td>:</td>
<td><input type="text" name="smtpPort" id="smtpPort" value="25"/></td>
</tr>
<tr>
- <td><?php echo _SMTP_USER; ?></td>
+ <td><?php echo _SMTP_USER;?></td>
<td>:</td>
<td><input type="text" name="smtpUser" id="smtpUser" value="notif@yourdomain.com"/></td>
</tr>
<tr>
- <td><?php echo _SMTP_PASSWORD; ?></td>
+ <td><?php echo _SMTP_PASSWORD;?></td>
<td>:</td>
<td><input type="text" name="smtpPassword" id="smtpPassword" value="password"/></td>
</tr>
<!--tr>
- <td><?php echo _SMTP_AUTH; ?></td>
+ <td><?php echo _SMTP_AUTH;?></td>
<td>:</td>
<td><input type="text" name="smtpAuth" id="smtpAuth" value="true or false"/></td>
</tr-->
<tr>
- <td><?php echo _SMTP_AUTH; ?></td>
+ <td><?php echo _SMTP_AUTH;?></td>
<td>:</td>
<td>
<SELECT name="smtpAuth" id="smtpAuth">
@@ -145,22 +145,22 @@
</td>
</tr>
<!--tr>
- <td><?php echo _SMTP_CHARSET; ?></td>
+ <td><?php echo _SMTP_CHARSET;?></td>
<td>:</td>
<td><input type="text" name="smtpCharset" id="smtpCharset" value="utf-8"/></td>
</tr-->
<!--tr>
- <td><?php echo _SMTP_SECURE; ?></td>
+ <td><?php echo _SMTP_SECURE;?></td>
<td>:</td>
<td><input type="text" name="smtpSecure" id="smtpSecure" value="tls or ssl"/></td>
</tr-->
<!--tr>
- <td><?php echo _SMTP_MAILFROM; ?></td>
+ <td><?php echo _SMTP_MAILFROM;?></td>
<td>:</td>
<td><input type="text" name="smtpMailFrom" id="smtpMailFrom" value="notifications@maarch.fr"/></td>
</tr-->
<tr>
- <td><?php echo _SMTP_MAILTO; ?></td>
+ <td><?php echo _SMTP_MAILTO;?></td>
<td>:</td>
<td><input type="text" name="smtpMailTo" id="smtpMailTo" value="votreAdresse@domain.com"/></td>
</tr>
@@ -175,7 +175,7 @@
$('#smtpUser').val(),
$('#smtpPassword').val(),
$('#smtpAuth').val(),
- $('#smtpMailTo').val())"; value="<?php echo _VERIF_SMTP; ?>"/>
+ $('#smtpMailTo').val())"; value="<?php echo _VERIF_SMTP;?>"/>
</td>
</tr>
</table>
@@ -192,12 +192,12 @@
<div id="buttons">
<div style="float: left;" class="previousButton" id="previous">
<a href="#" onClick="goTo('index.php?step=docservers');" style="display:none;">
- <?php echo _PREVIOUS; ?>
+ <?php echo _PREVIOUS;?>
</a>
</div>
<div style="float: right;" class="nextButton" id="next">
<a href="#" onClick="goTo('index.php?step=password');" id="ajaxReturn_testConnect" style=" display: none;">
- <?php echo _NEXT; ?>
+ <?php echo _NEXT;?>
</a>
</div>
</div>
diff --git a/core/trunk/install/view/welcome_view.php b/core/trunk/install/view/welcome_view.php
index aacd30e3a37..1d98f1ad757 100755
--- a/core/trunk/install/view/welcome_view.php
+++ b/core/trunk/install/view/welcome_view.php
@@ -31,12 +31,12 @@
<div class="blockWrapper">
<div class="titleBlock">
<h2 onClick="slide('welcome');" style="cursor: pointer;">
- <?php echo _WELCOME; ?>
+ <?php echo _WELCOME;?>
</h2>
</div>
<div class="contentBlock" id="welcome">
<p>
- <?php echo _DESC; ?>
+ <?php echo _DESC;?>
</p>
</div>
</div>
@@ -47,12 +47,12 @@
<div id="buttons">
<div style="float: left;" class="previousButton" id="previous">
<a href="#" onClick="goTo('index.php?step=language');">
- <?php echo _PREVIOUS; ?>
+ <?php echo _PREVIOUS;?>
</a>
</div>
<div style="float: right;" class="nextButton" id="next">
<a href="#" onClick="goTo('index.php?step=licence');">
- <?php echo _NEXT; ?>
+ <?php echo _NEXT;?>
</a>
</div>
</div>
--
GitLab