From 9a4725dd3e018298c6ddc6d76a21942cd6b333e6 Mon Sep 17 00:00:00 2001 From: slerena Date: Tue, 2 Sep 2008 16:08:11 +0000 Subject: [PATCH] 2008-09-02 Sancho Lerena * functions.php: Added function to clean SQL string. * setup/news.php: Fixed problem adding new news. * setup/link.php: Added mysql recheck to input var. * login_page.php: Removed "Welcome", added a blank line before title. * logon_failed.php: Was rending bad in IE. * footer.php: Added Firefox button and tooltip about best view in Firefox. * header.php: Old rendering was crazy in IE. New code to set render exactly equal on IE and Firefox. PLEASE DO NOT USE TABULAR phpp functions here, this is pure HTML formatting. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1069 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 19 ++++++++ pandora_console/general/footer.php | 10 +++- pandora_console/general/header.php | 57 ++++++++++++++++++++++- pandora_console/general/login_page.php | 6 ++- pandora_console/general/logon_failed.php | 10 ++-- pandora_console/godmode/setup/links.php | 3 +- pandora_console/godmode/setup/news.php | 4 +- pandora_console/images/firefox.gif | Bin 0 -> 1267 bytes pandora_console/include/functions.php | 6 +++ 9 files changed, 103 insertions(+), 12 deletions(-) create mode 100644 pandora_console/images/firefox.gif diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 912f238582..f8d1b3cf8a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,22 @@ + +2008-09-02 Sancho Lerena + + * functions.php: Added function to clean SQL string. + + * setup/news.php: Fixed problem adding new news. + + * setup/link.php: Added mysql recheck to input var. + + * login_page.php: Removed "Welcome", added a blank line before title. + + * logon_failed.php: Was rending bad in IE. + + * footer.php: Added Firefox button and tooltip about best view in Firefox. + + * header.php: Old rendering was crazy in IE. New code to set render exactly + equal on IE and Firefox. PLEASE DO NOT USE TABULAR phpp functions here, this is + pure HTML formatting. + 2008-09-02 Esteban Sanchez * extensions/update_manager/lib/*: Update Manager has its own license diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php index adf37ea546..8492d4da93 100644 --- a/pandora_console/general/footer.php +++ b/pandora_console/general/footer.php @@ -20,13 +20,19 @@ if (isset($_SERVER['REQUEST_TIME'])) { } else { $time = time(); } - + + +echo "
"; + + echo 'Pandora FMS '.$pandora_version.' - Build '.$build_version.'
'; -echo __('is an OpenSource Software Project, licensed under GPL terms').'
'; echo ''. __('Page generated at') . ' '. format_datetime ($time); if ((isset($develop_bypass)) AND ($develop_bypass == 1)) { echo ' - Saved '.format_numeric ($sql_cache["saved"]).' Queries'; } echo '
'; +echo ""; +echo "
"; + ?> diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 06966473ba..b9931ea944 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -16,9 +16,61 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -echo '
Pandora FMS
-
logo
'; +echo ""; +echo ""; +echo "
"; +// Yes, put here your corporate logo instead pandora_logo_head.png + +echo 'logo'; + +// Margin to logo + +echo ""; + +// First column +echo ""; +echo ' '.''.__('You are ').'['.$_SESSION["id_usuario"].']'; + +echo "

"; + +echo ' '. __('Logout').''; + + + +// Second column +echo "		"; +echo ' '.__('General information').''; + +echo "

"; + +echo ''; +if (check_server_status () == 0) + echo ' '.__('Server status: DOWN'); +else + echo ' '.__('System ready'); +echo ""; + + +// Third column +// Autorefresh +echo "		"; +if (get_parameter ("refr") != 0) + echo ' '. __('Autorefresh').''; +else + echo ' '.__('Autorefresh').''; + +echo "

"; + +echo ' '.__('Events').''; + +// logo + +echo "		"; +echo '
Pandora FMS
'; + +echo "
"; +/* if(!isset ($_SESSION["id_usuario"])) { echo "
"; return; @@ -58,5 +110,6 @@ $table->data[] = array ( print_table ($table); unset ($table); echo ""; +*/ ?> diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 8640e78ea6..b8fe4e16fd 100644 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -29,7 +29,7 @@ if (isset($_GET['sec'])){ } echo '
-

'.__('Welcome to Pandora FMS Web Console').'

+

'.__('Pandora FMS Web Console').'


@@ -49,6 +49,8 @@ echo '
'.((strlen($addr) > 0) ? print_input_hidden("redirect",$addr,true) : '').'
-
IP: '.$REMOTE_ADDR.'
+
IP: '.$REMOTE_ADDR.' +
+ '; ?> diff --git a/pandora_console/general/logon_failed.php b/pandora_console/general/logon_failed.php index 32326c917e..0fe4b0db13 100644 --- a/pandora_console/general/logon_failed.php +++ b/pandora_console/general/logon_failed.php @@ -20,14 +20,16 @@

-
- No access -
- +

+
+
+ No access +
+

All actions, included failed login attempts are logged in Pandora FMS System logs, and these can be reviewed by each user, please report to admin any incident or malfunction.'); ?>
diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php index 891c17e1ad..372968fdf2 100644 --- a/pandora_console/godmode/setup/links.php +++ b/pandora_console/godmode/setup/links.php @@ -32,7 +32,8 @@ if (! give_acl ($config['id_user'], 0, "PM") || ! dame_admin ($config['id_user'] if (isset($_POST["create"])){ // If create $name = entrada_limpia($_POST["name"]); $link = entrada_limpia($_POST["link"]); - $sql_insert="INSERT INTO tlink (name,link) VALUES ('$name','$link') "; + $link = safe_sql_string ($link); + $sql_insert = "INSERT INTO tlink (name,link) VALUES ('$name','$link')"; $result=mysql_query($sql_insert); if (! $result) echo "

".__('There was a problem creating link')."

"; diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php index 3ad1b54e6a..273bf628e9 100644 --- a/pandora_console/godmode/setup/news.php +++ b/pandora_console/godmode/setup/news.php @@ -31,11 +31,13 @@ if (! give_acl ($config['id_user'], 0, "PM")) { if (isset ($_POST["create"])) { // If create $subject = get_parameter ("subject"); $text = get_parameter ("text"); + $text = safe_sql_string ($text); + $timestamp = $ahora = date ("Y/m/d H:i:s"); $author = $config['id_user']; $sql = "INSERT INTO tnews (subject, text, author, timestamp) VALUES ('$subject','$text', '$author', '$timestamp') "; - $result = mysql_query ($sql_insert); + $result = mysql_query ($sql); if (! $result) { echo "

".__('Not created. Error inserting data')."

"; } else { diff --git a/pandora_console/images/firefox.gif b/pandora_console/images/firefox.gif new file mode 100644 index 0000000000000000000000000000000000000000..50d88f7332dc4aff7b1c5a2f1df9d402df992662 GIT binary patch literal 1267 zcmZ?wbhEHb3}E1A_|5jt3|hGi#%T~8o8^kH*p*PhbIGbtf|;I2aXgF= ze3>NhK27R*p5m)g&G&WspRyFcDhFa97;*DRIZziVjW7d(rRzx!?Ii zf55ld0Z(V-zFJc8ZFSbfiF@B1@Bego!I?8>o;`c^?%lheuO58={{8>||B&DxB?mAB zbU=24@&W_LKZbe^8IKJM4mNWLYpL8|ac*Q}7AW~)kkry8ZeH=@MhEjTE+P9r9WtJq zmYkfd5xh#|Bs-6+HH$#b3xmQV{hInEUv5+;w{lI;ZswA$D&iB@*Wb=B((Zcb9` zn`2daWQO78hSpvg%e*T$8fUyap+CXZ>7SD2CV7S#u1pu^%>4Z9^jydOKQ)z0=BY*= zYMJ@RwMW80%;$uIk2QO*WR&LQD}O6YPM$wt`d=3iwzm|&Rv z?vA8U(eI5mJGZAlT;O>#neCqCj`tI57a7E#m)azx>aF20!Eyh-Z*M1gf3lN{u_^rU zZ{jj{vDc>8<;24F6t=VI9eI$zqkARwW|{Ci_c@i18_j3cKiC?$pm9R0qMLZdj*AT( znp+k;;?%rSdc9lQ(vd~qN**ZnxJ0X;Nt;y z)j0}JIed8|pGUiBj9f>+p&7|}3mT?|3+-eVh!We;BIu?d*uWrKBH-j& o(RSdVQ_Z)R%N?CXJ}L^k%QU(Ou&F$7U{`2)@M1AH3k!oa00-J|eE