tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-05-17 Sergio Martin <sergio.martin@artica.es> 

* install.php: Fixed number of step mistakes
	in the install process
	Merged from 4.0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6318 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-05-17 16:05:13 +00:00
parent b7d52a2503
commit f6088d2d33
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-05-17 Sergio Martin <sergio.martin@artica.es>
* install.php: Fixed number of step mistakes
in the install process
Merged from 4.0
2012-05-17 Sergio Martin <sergio.martin@artica.es> 2012-05-17 Sergio Martin <sergio.martin@artica.es>
* include/functions_api.php: Added create_network_module_from_component * include/functions_api.php: Added create_network_module_from_component

12
pandora_console/install.php
View File

@ -398,7 +398,7 @@ function install_step1() {
echo "</div>"; echo "</div>";
print_logo_status (1, 5); print_logo_status (1,6);
echo "<div id='install_img'>"; echo "<div id='install_img'>";
if ($writable == 0) { if ($writable == 0) {
@ -443,7 +443,7 @@ function install_step1_licence() {
} }
echo "</div>"; echo "</div>";
print_logo_status (2, 5); print_logo_status (2,6);
echo "</div> echo "</div>
<div style='clear: both;height: 1px;'><!-- --></div> <div style='clear: both;height: 1px;'><!-- --></div>
@ -490,7 +490,7 @@ function install_step2() {
check_extension("oci8", "PHP Oracle extension"); check_extension("oci8", "PHP Oracle extension");
echo "</table>"; echo "</table>";
echo "</div>"; echo "</div>";
print_logo_status (3,5); print_logo_status (3,6);
echo "<div id='install_img'>"; echo "<div id='install_img'>";
if ($res > 0) { if ($res > 0) {
@ -631,7 +631,7 @@ function install_step3() {
echo " </form> echo " </form>
</div>"; </div>";
print_logo_status (4,5); print_logo_status (4,6);
echo "</div> echo "</div>
<div id='foot_install'> <div id='foot_install'>
@ -1004,7 +1004,7 @@ function install_step4() {
} }
echo "</table></div>"; echo "</table></div>";
print_logo_status(4,5); print_logo_status(5,6);
echo "<div id='install_img'>"; echo "<div id='install_img'>";
if ($everything_ok == 1) { if ($everything_ok == 1) {
@ -1070,7 +1070,7 @@ function install_step5() {
<p><br><b><a href='index.php'>Click here to access to your Pandora FMS console</a>.</b> <p><br><b><a href='index.php'>Click here to access to your Pandora FMS console</a>.</b>
</p> </p>
</div>"; </div>";
print_logo_status (5,5); print_logo_status (6,6);
echo "</div> echo "</div>
<div id='foot_install'> <div id='foot_install'>
<i>Pandora FMS is an OpenSource Software project registered at <i>Pandora FMS is an OpenSource Software project registered at