2011-06-16 Sancho Lerena <slerena@artica.es>

* include/styles/install.css,
    include/styles/pandora.css,
    install.php: Yeeeha!, new look & feel for 4.0 version ! :-)

    * index.php: Minimal changes in session close (after the header
    render).

    * images/greyback.gif: New background for 4.0 (included the
    installer)

    * COPYING: removed bad carriage returns.

    * general/login_page.php: Small modifications to have a better
    style.

    * operation/system_alert.php,
    include/javascript/jquery.pandora.js,
    general/header.php: Implemented a "alert" icon who shows the general
    problems, instead naggin the user in each page. Incorporated the new 
    feature to warn user when he doesn't change the default password :-)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4463 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/COPYING

@@ -1,12 +1,9 @@
 GNU GENERAL PUBLIC LICENSE
-
 Version 2, June 1991
 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-Everyone is permitted to copy and distribute verbatim copies
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-of this license document, but changing it is not allowed.
 
 Preamble
 

pandora_console/ChangeLog

@@ -1,3 +1,23 @@
+2011-06-16 Sancho Lerena <slerena@artica.es>
+
+    * include/styles/install.css,
+    include/styles/pandora.css,
+    install.php: Yeeeha!, new look & feel for 4.0 version ! :-)
+
+    * index.php: Minimal changes in session close (after the header render).
+
+    * images/greyback.gif: New background for 4.0 (included the installer)
+
+    * COPYING: removed bad carriage returns.
+
+    * general/login_page.php: Small modifications to have a better style.
+
+    * operation/system_alert.php,
+    include/javascript/jquery.pandora.js,
+    general/header.php: Implemented a "alert" icon who shows the general
+    problems, instead naggin the user in each page. Incorporated the new 
+    feature to warn user when he doesn't change the default password :-)
+
 2011-06-16 Miguel de Dios  <miguel.dedios@artica.es>
 
 	Merge from the branch.

pandora_console/general/header.php

@@ -19,6 +19,28 @@ require_once ('include/functions_servers.php');
 
 
 $msg_cnt = 0;
+$alert_cnt = 0;
+$_SESSION["alert_msg"] = "";
+
+// Check permissions
+
+// Global error checking.
+
+if (!is_writable ("attachment")){
+    $alert_cnt++;
+
+    // At this first version I'm passing errors using session variables, because the error management
+    // is done by an AJAX request. Better solutions could be implemented in the future :-)
+
+    $_SESSION["alert_msg"] .= '<h3 class="error">'.__('Attachment directory is not writable by HTTP Server').'</h3>'.'<p>'.__('Please check that the web server has write rights on the {HOMEDIR}/attachment directory').'</p>';
+}
+
+// Check default password for "admin"
+$hashpass = db_get_sql ("SELECT password FROM tusuario WHERE id_user = 'admin'");
+if ($hashpass == "1da7ee7d45b96d0e1f45ee4ee23da560"){
+    $alert_cnt++;
+    $_SESSION["alert_msg"] .= '<h3 class="error">'.__('Default password for "Admin" user has not been changed.').'</h3>'.'<p>'.__('Please change the default password because is a common vulnerability reported.').'</p>';
+}
 
 ?>
 <table width="100%" cellpadding="0" cellspacing="0" style="margin:0px; padding:0px;" border="0">
@@ -48,8 +70,8 @@ $msg_cnt = 0;
 			if ($config["metaconsole"] == 0){
 				$msg_cnt = messages_get_count ($config["id_user"]);
 				if ($msg_cnt > 0) {
-					echo '<div id="dialog_messages" style="display: none"></div>';
 
+					echo '<div id="dialog_messages" style="display: none"></div>';
 					ui_require_css_file ('dialog');
 					ui_require_jquery_file ('ui.core');
 					ui_require_jquery_file ('ui.dialog');
@@ -57,16 +79,30 @@ $msg_cnt = 0;
 					html_print_image ("images/email.png", false,
 					array ("title" => __('You have %d unread message(s)', $msg_cnt), "id" => "yougotmail", "class" => "bot"));
 					echo '</a>';
+                    echo "&nbsp;";
+                    echo "&nbsp;";
 				}
 			}
-			?>
-			&nbsp;
-			<a class="white_bold" href="index.php?bye=bye"><?php html_print_image("images/log-out.png", false, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout')))?></a>
-		</td>
 
-		<td width="20%">
+            if ($alert_cnt > 0){
+                echo '<div id="alert_messages" style="display: none"></div>';
+                ui_require_css_file ('dialog');
+       			ui_require_jquery_file ('ui.core');
+    			ui_require_jquery_file ('ui.dialog');
+                
+    			echo '<a href="ajax.php?page=operation/system_alert" title="'.__("System alerts detected - Please fix as soon as possible").'" id="show_systemalert_dialog">'; 
+	    		html_print_image ("images/error.png", false,
+    			array ("title" => __('You have %d warning(s)', $alert_cnt), "id" => "yougotalert", "class" => "bot"));
+	    		echo '</a>';
+                echo "&nbsp;";
+                echo "&nbsp;";
+            }
+
+            echo '<a class="white_bold" href="index.php?bye=bye">';
+            html_print_image("images/log-out.png", false, array("alt" => __('Logout'), "class" => 'bot', "title" => __('Logout')));
+            echo '</a></td>';
+		    echo '<td width="20%">';
 
-<?php
 		    if ($config["metaconsole"] == 0){
 			    echo '<a class="white_bold" href="index.php?sec=estado_server&amp;sec2=operation/servers/view_server&amp;refr=60">';
 
@@ -178,6 +214,9 @@ $(document).ready (function () {
 <?php if ($msg_cnt > 0): ?>
 	$("#yougotmail").pulsate ();
 <?php endif; ?>
+<?php if ($alert_cnt > 0): ?>
+	$("#yougotalert").pulsate ();
+<?php endif; ?>
 <?php if ($config["refr"]): ?>
 	t = new Date();
 	t.setTime (t.getTime () + <?php echo $config["refr"] * 1000; ?>);

pandora_console/general/login_page.php

@@ -28,7 +28,7 @@ echo '<div class="databox" id="login">';
 
 echo '<br /><br />';
 echo '
-	<div class="databox" id="login_in">
+	<div id="login_in">
 		<form method="post" action="index.php'.$url.'">
 		<table cellpadding="4" cellspacing="1" width="420">';
 
@@ -38,7 +38,7 @@ if (isset ($login_failed)) {
 	echo '</td></tr>';
 }
 
-echo '<tr><td rowspan="3" align="left" style="border-right: solid 1px #678;">';
+echo '<tr><td rowspan="3" align="left">';
 
 if (!empty ($page) && !empty ($sec)) {
 	foreach ($_POST as $key => $value) {

pandora_console/include/javascript/jquery.pandora.js

@@ -58,4 +58,33 @@ $(document).ready (function () {
 		
 		return false;
 	});
+
+	$("a#show_systemalert_dialog").click (function () {
+		jQuery.get ("ajax.php",
+			{"page": "operation/system_alert"},
+			function (data, status) {
+				$("#alert_messages").hide ()
+					.empty ()
+					.append (data)
+					.dialog ({
+						title: $("a#show_systemalert_dialog").attr ("title"),
+						resizable: true,
+                        draggable: true,
+						modal: true,
+						overlay: {
+							opacity: 0.5,
+							background: "black"
+						},
+						bgiframe: jQuery.browser.msie,
+						width: 700,
+						height: 300
+					})
+					.show ();
+			},
+			"html"
+		);	
+		return false;
 	});
+}
+
+);

pandora_console/include/styles/install.css

@@ -18,20 +18,20 @@
 
 h1 {
 	font: bold 1em Arial, Sans-serif;
-	text-transform: uppercase;
 	font-size: 18px;
 	color: #ffffff;
+    text-align: center;
 }
 h2 {
 	font: bold 1em Arial, Sans-serif;
-	text-transform: uppercase;
+    border-bottom: solid 1px #00aa00;
-	font-size: 14px;
+	font-size: 16px;
 }
 
 div#install_container {
 	margin: 0 auto;
-	margin-top: 15px;
+	margin-top: 45px;
-	width: 600px;
+	width: 650px;
 }
 div#logo_img {
 	text-align: center;
@@ -43,14 +43,14 @@ div#wizard {
 	margin-top: 1em;
 	padding: 20px;
 	padding-left: 20px;
-	width: 600px;
+	width: 650px;
 	background-color: #fafafa;
 }
 div#install_box, div#install_img {
 	float: right;
 	padding-right: 20px;
 	margin-top: 0px;
-	width: 350px;
+	width: 400px;
 }
 div#install_img {
 	margin-bottom: 25px;
@@ -66,7 +66,7 @@ div#foot_install {
 	padding-right: 20px;
 	text-align: center;
 	background: #777;
-	width: 600px;
+	width: 650px;
 	border-left: 1px solid #999;
 	border-right: 1px solid #999;
 }
@@ -100,9 +100,14 @@ span.arr {
 	font-family: verdana,arial, sans;
         font-size: 8.5pt;
 }
-body {
+
-	font-family: verdana,arial, sans;
+body, td {
+    font-family: Sans, Arial, sans;
 	font-size: 9pt;
-	background-color: #fff;
+    line-height: 15px;
+}
+
+body{
+    background: url(../../images/greyback.gif);
 }
 

pandora_console/include/styles/pandora.css

@@ -31,7 +31,10 @@ svg * {
 body {
 	text-align: center;
 	background-color: #555555;
+    background-image:  url(../../images/greyback.gif);
+
 }
+
 body.pure {
 	background-color: #fff;
 }
@@ -255,7 +258,7 @@ input.datos_readonly {
 	background-color: #050505;
 }
 input.login {
-	border-color: #3f4e2f;
+	border-color: #aaa;
 	background-color: #f5f5f5;
 	margin: 2px 0 8px;
 	width: 90px;

pandora_console/index.php

@@ -219,10 +219,6 @@ if (isset ($_GET["bye"])) {
 	exit ("</html>");
 }
 
-// http://es2.php.net/manual/en/ref.session.php#64525
-// Session locking concurrency speedup!
-session_write_close (); 
-
 // Header
 if ($config["pure"] == 0) {
 	echo '<div id="container"><div id="head">';
@@ -235,16 +231,17 @@ else {
 	echo '<div id="main_pure">';
 }
 
+// http://es2.php.net/manual/en/ref.session.php#64525
+// Session locking concurrency speedup!
+session_write_close (); 
+
+
 // Main block of content
 if ($config["pure"] == 0) {
 	echo '<div id="main">';
 }
 
-// Check permissions
+
-if (!is_writable ("attachment")){
-	echo '<h3 class="error">'.__('Attachment directory is not writable by HTTP Server').'</h3>';
-	echo '<p>'.__('Please check that the web server has write rights on the {HOMEDIR}/attachment directory').'</p>';
-}
 
 // Page loader / selector
 if ($searchPage) {

pandora_console/install.php

@@ -23,12 +23,11 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
-<meta name="author" content="Sancho Lerena, Raul Mateos">
+<meta name="author" content="Pandora FMS Development Team">
-<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
+<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and many others">
 <meta name="keywords" content="pandora, fms, monitoring, network, system, GPL, software">
 <meta name="robots" content="index, follow">
 <link rel="icon" href="images/pandora.ico" type="image/ico">
-<link rel="stylesheet" href="include/styles/pandora_minimal.css" type="text/css">
 <link rel="stylesheet" href="include/styles/install.css" type="text/css">
 </head>
 
@@ -61,13 +60,14 @@ function ChangeDBAction(causer) {
 	ChangeDBDrop(window.document.step2_form.db_action);
 }
 </script>
+<body>
+<div style='height: 10px'>
 
-<body bgcolor="#555555">
 
 <?php
 
 $version = "4.0-dev";
-$build = "110111";
+$build = "110617";
 $banner = "v$version Build $build";
 
 error_reporting(0);
@@ -357,7 +357,7 @@ function print_logo_status ($step, $step_total){
 	echo "
 		<div id='logo_img'>
 			<img src='images/pandora_logo.png' border='0'><br>
-			<span style='font-size: 8px;'>$banner</span>
+			<span style='font-size: 9px;'>$banner</span>
 			<br><br>
 			<b>Install step $step of $step_total</b>
 		</div>";
@@ -369,21 +369,20 @@ function install_step1() {
 
 	echo "
 	<div id='install_container'>
-	<h1>Pandora FMS installation wizard. Step #1 of 5</h1>
+	<div id='wizard' style='height: 480px;'>
-	<div id='wizard' style='height: 490px;'>
 		<div id='install_box'>
 			<h2>Welcome to Pandora FMS installation Wizard</h2>
-			<p>This wizard helps you to quick install Pandora FMS console in your system.</p>
+			<p>This wizard helps you to quick install Pandora FMS console and main database in your system.</p>
-			<p>In four steps checks all dependencies and make your configuration 
+			<p>In four steps, this installer will check all dependencies and will create your configuration, ready to use.</p>
-			for a quick installation.</p>
+			<p>For more information, please refer to documentation.<br>
-			<p>For more information, please refer to documentation.</p>
+			<i>Pandora FMS Development Team</i></p>
-			<i>Pandora FMS Development Team</i>
 		";
 		if (file_exists("include/config.php")){
 			echo "<div class='warn'><b>Warning:</b> You already have a config.php file. 
 			Configuration and database would be overwritten if you continued.</div>";
 		}
-		echo "<table width=100%>";
+        echo "<br>";
+		echo "<table width=85%>";
 		$writable = check_writable ( "include", "Checking if ./include is writable");
 		if (file_exists("include/config.php"))
 			$writable += check_writable ( "include/config.php", "Checking if include/config.php is writable");
@@ -395,7 +394,7 @@ function install_step1() {
 		</div>";
 
 		echo "<div class='info'><b>Upgrade</b>: 
-		If you want to upgrade from Pandora FMS 2.x to 3.0 version, 
+		If you want to upgrade from Pandora FMS 3.2 to 4.0 version, 
 		please download the migration tool from our website at 
 		<a href='http://www.pandorafms.com'>PandoraFMS.com web site</a>.</div>";
 		
@@ -424,8 +423,7 @@ function install_step1() {
 function install_step1_licence() {
 	echo "
 	<div id='install_container'>
-	<h1>Pandora FMS installation wizard. Step #2 of 5</h1>
+	<div id='wizard' style='height: 500px;'>
-	<div id='wizard' style='height: 520px;'>
 		<div id='install_box'>
 			<h2>GPL2 Licence terms agreement</h2>
 			<p>Pandora FMS is an OpenSource software project licensed under the GPL2 licence. Pandora FMS includes, as well, another software also licensed under LGPL and BSD licenses. Before continue, <i>you must accept the licence terms.</i>.
@@ -439,7 +437,7 @@ function install_step1_licence() {
 	}
 	else {
 		echo "<form method=post action='install.php?step=2'>";
-		echo "<textarea name='gpl2' cols=50 rows=17>";
+		echo "<textarea name='gpl2' cols=55 rows=15>";
 		echo file_get_contents ("COPYING");
 		echo "</textarea>";
 		echo "<p>";
@@ -462,7 +460,6 @@ function install_step2() {
 
 	echo "
 	<div id='install_container'>
-	<h1>Pandora FMS console installation wizard. Step #3 of 5</h1>
 	<div id='wizard' style='min-height: 390px;'>
 		<div id='install_box'>";
 		echo "<h2>Checking software dependencies</h2>";
@@ -540,8 +537,7 @@ function install_step3() {
 
 	echo "
 	<div id='install_container'>
-	<h1>Pandora FMS console installation wizard. Step #4 of 5 </h1>
+	<div id='wizard' style='height: 635px;'>
-	<div id='wizard' style='height: 750px;'>
 		<div id='install_box'>
 			<h2>Environment and database setup</h2>
 			<p>
@@ -572,7 +568,10 @@ function install_step3() {
 	if (!$error) {
 		echo "<form method='post' name='step2_form' action='install.php?step=4'>";
 	}
-	echo "<div>DB ENGINE</div>";
+
+    echo "<table cellpadding=6 celwidth=100% border=0>";
+    echo "<tr><td>";
+	echo "DB Engine<br>";
 
 
 	if ($error) {
@@ -585,41 +584,43 @@ function install_step3() {
 		echo "<select name='engine' onChange=\"ChangeDBAction(this)\">";
 		echo $options;
 		echo "</select>";
-		echo "<div style=\"height:40px;\">Installation in <br>";
+
+        echo "<td>";
+		echo " Installation in <br>";
 		echo "<select name='db_action' onChange=\"ChangeDBDrop(this)\">";
 		echo 	"<option value='db_new'>A new Database</option>";
 		echo 	"<option value='db_exist'>An existing Database</option>";
 		echo "</select>";
-		echo "</div>";	
 	}
-	echo "		<div>DB User with privileges on DB</div>
+	echo "		<tr><td>DB User with privileges<br>
-				<input class='login' type='text' name='user' value='root'>
+				<input class='login' type='text' name='user' value='root' size=8>
                
-				<div>DB Password for this user</div>
+				<td>DB Password for this user<br>
-				<input class='login' type='password' name='pass' value=''>
+				<input class='login' type='password' name='pass' value='' size=8>
 				
-				<div>DB Hostname</div>
+				<tr><td>DB Hostname<br>
-				<input class='login' type='text' name='host' value='localhost'>
+				<input class='login' type='text' name='host' value='localhost' size=12>
 
-				<div>DB Name (pandora by default)</div>
+				<td>DB Name (pandora by default)<br>
-				<input class='login' type='text' name='dbname' value='pandora'>
+				<input class='login' type='text' name='dbname' value='pandora' size=8>
 
+                <tr><td valign=top>
+				Drop Database if exists<br>
 				<input class='login' type='checkbox' name='drop' value=1 disabled>				
-				Drop Database if exists
 
-				<div>Full path to HTTP publication directory<br>
+
-					<span class='f9b'>For example /var/www/pandora_console/. 
+				<td>Full path to HTTP publication directory<br>
-					Needed for graphs and attachments.
+					<span style='font-size: 9px'>For example /var/www/pandora_console/</span>
-					</span>
+				<br>
-				</div>
+				<input class='login' type='text' name='path' style='width: 240px;' 
-				<input class='login' type='text' name='path' style='width: 190px;' 
 				value='".dirname (__FILE__)."'>
 
-				<div>URL path to Pandora FMS Console<br>
+				<tr><td colspan=2>URL path to Pandora FMS Console<br>
-				<span class='f9b'>For example '/pandora_console'</span>
+				<span style='font-size: 9px'>For example '/pandora_console'</span>
-				</div>
+				</br>
 				<input class='login' type='text' name='url' style='width: 250px;' 
 				value='".dirname ($_SERVER["SCRIPT_NAME"])."'>
+            </table>
 				";
 	
 	if (!$error) {
@@ -682,7 +683,6 @@ function install_step4() {
 
 	echo "
 	<div id='install_container'>
-	<h1>Pandora FMS Console installation wizard. Step #5 of 5</h1>
 	<div id='wizard' style='height: 480px;'>
 		<div id='install_box'>
 			<h2>Creating database and default configuration file</h2>
@@ -1057,7 +1057,6 @@ function install_step4() {
 function install_step5() {
 	echo "
 	<div id='install_container'>
-	<h1>Pandora FMS console installation wizard. Finished</h1>
 	<div id='wizard' style='height: 300px;'>
 		<div id='install_box'>
 			<h2>Installation complete</h2>

pandora_console/operation/system_alert.php

@@ -0,0 +1,9 @@
+<?php
+
+// TODO: Poner esto resizable y dragable: http://jqueryui.com/demos/dialog
+
+echo "<div style='margin-top: 30px; width: 550px; margin-left: 50px'>";
+echo $_SESSION["alert_msg"];
+echo "</div>";
+
+?>