2013-04-22 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora.css include/functions_ui.php include/functions_db.php index.php images/splash_bg.png images/pandora_login.png images/login_background.jpg images/pandora_tinylogo.png images/input_user.png images/input_lock.png images/pandora_login_enterprise.png general/error_emptyconfig.php general/error_perms.php general/error_authconfig.php general/login_page.php general/error_noconfig.php general/logoff.php general/error_install.php general/error_dbconfig.php general/error_screen.php: Change the login appearence unifyng code of login, logout and error screens * pandoradb.sql pandoradb.postgreSQL.sql pandoradb.oracle.sql extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql godmode/users/configure_user.php operation/users/user_edit.php: Added new options in user configuration to metaconsole agents editor and more meta options. Avoid to show useless options when metaconsole is enabled git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8024 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo
parent
a1c708597e
commit
d7331a8c4d
|
|
@ -1,3 +1,39 @@
|
|||
2013-04-22 Sergio Martin <sergio.martin@artica.es>
|
||||
|
||||
* include/styles/pandora.css
|
||||
include/functions_ui.php
|
||||
include/functions_db.php
|
||||
index.php
|
||||
images/splash_bg.png
|
||||
images/pandora_login.png
|
||||
images/login_background.jpg
|
||||
images/pandora_tinylogo.png
|
||||
images/input_user.png
|
||||
images/input_lock.png
|
||||
images/pandora_login_enterprise.png
|
||||
general/error_emptyconfig.php
|
||||
general/error_perms.php
|
||||
general/error_authconfig.php
|
||||
general/login_page.php
|
||||
general/error_noconfig.php
|
||||
general/logoff.php
|
||||
general/error_install.php
|
||||
general/error_dbconfig.php
|
||||
general/error_screen.php: Change the login appearence
|
||||
unifyng code of login, logout and error screens
|
||||
|
||||
* pandoradb.sql
|
||||
pandoradb.postgreSQL.sql
|
||||
pandoradb.oracle.sql
|
||||
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
|
||||
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
|
||||
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
|
||||
godmode/users/configure_user.php
|
||||
operation/users/user_edit.php: Added new options in user
|
||||
configuration to metaconsole agents editor and more meta
|
||||
options. Avoid to show useless options when metaconsole
|
||||
is enabled
|
||||
|
||||
2013-04-20 Junichi Satoh <junichi@rworks.jp>
|
||||
|
||||
* include/help/ja/help_alert-matches.php: Updated help.
|
||||
|
|
|
|||
|
|
@ -449,6 +449,13 @@ ALTER TABLE `talert_snmp` ADD COLUMN `al_field8` text;
|
|||
ALTER TABLE `talert_snmp` ADD COLUMN `al_field9` text;
|
||||
ALTER TABLE `talert_snmp` ADD COLUMN `al_field10` text;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Add metaconsole fields to user table (17/04/13)
|
||||
-- ---------------------------------------------------------------------
|
||||
ALTER TABLE `tusuario` ADD COLUMN `metaconsole_agents_manager` tinyint(1) unsigned NOT NULL default 0;
|
||||
ALTER TABLE `tusuario` ADD COLUMN `metaconsole_assigned_server` int(10) unsigned NOT NULL default 0;
|
||||
ALTER TABLE `tusuario` ADD COLUMN `metaconsole_access_node` tinyint(1) unsigned NOT NULL default 0;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- ---------------------------------------------------------------------
|
||||
-- DATA
|
||||
|
|
|
|||
|
|
@ -478,6 +478,14 @@ ALTER TABLE talert_snmp ADD COLUMN (al_field8 CLOB NOT NULL default '');
|
|||
ALTER TABLE talert_snmp ADD COLUMN (al_field9 CLOB NOT NULL default '');
|
||||
ALTER TABLE talert_snmp ADD COLUMN (al_field10 CLOB NOT NULL default '');
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Add metaconsole fields to user table (17/04/13)
|
||||
-- ---------------------------------------------------------------------
|
||||
ALTER TABLE tusuario ADD COLUMN (metaconsole_agents_manager NUMBER(10, 0) default 0 NOT NULL);
|
||||
ALTER TABLE tusuario ADD COLUMN (metaconsole_assigned_server NUMBER(10, 0) default 0 NOT NULL);
|
||||
ALTER TABLE tusuario ADD COLUMN (metaconsole_access_node NUMBER(10, 0) default 0 NOT NULL);
|
||||
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- ---------------------------------------------------------------------
|
||||
-- DATA
|
||||
|
|
|
|||
|
|
@ -469,6 +469,13 @@ ALTER TABLE "talert_snmp" ADD COLUMN "al_field8" TEXT;
|
|||
ALTER TABLE "talert_snmp" ADD COLUMN "al_field9" TEXT;
|
||||
ALTER TABLE "talert_snmp" ADD COLUMN "al_field10" TEXT;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Add metaconsole fields to user table (17/04/13)
|
||||
-- ---------------------------------------------------------------------
|
||||
ALTER TABLE "tusuario" ADD COLUMN "metaconsole_agents_manager" SMALLINT DEFAULT 0;
|
||||
ALTER TABLE "tusuario" ADD COLUMN "metaconsole_assigned_server" INTEGER NOT NULL default 0;
|
||||
ALTER TABLE "tusuario" ADD COLUMN "metaconsole_access_node" SMALLINT DEFAULT 0;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- ---------------------------------------------------------------------
|
||||
-- DATA
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
<?php
|
||||
|
||||
// Pandora FMS - http://pandorafms.com
|
||||
// ==================================================
|
||||
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
|
||||
// Please see http://pandorafms.org for full contribution list
|
||||
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; version 2
|
||||
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>Pandora FMS - The Flexible Monitoring System - Console error</title>
|
||||
<meta http-equiv="expires" content="0">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf8">
|
||||
<meta name="resource-type" content="document">
|
||||
<meta name="distribution" content="global">
|
||||
<meta name="author" content="Sancho Lerena">
|
||||
<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
|
||||
<meta name="keywords" content="pandora, monitoring, 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.css" type="text/css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
||||
|
||||
<img src="images/login_background.jpg" id="login_body">
|
||||
<div class="databox_error" id="login">
|
||||
<br>
|
||||
<h1 id="log">Problem with Pandora FMS database</h1>
|
||||
<br>
|
||||
<div style="width: 440px; margin: 0 auto auto;">
|
||||
<table cellpadding="4" cellspacing="1" width="440">
|
||||
<tr><td align="left">
|
||||
<a href="index.php"><img src="images/pandora_login.png" border="0" height="100px" alt="Pandora FMS"></a>
|
||||
</td><td valign="bottom">
|
||||
Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file.<i><br/><br/>
|
||||
Probably your database, hostname, user or password values are incorrect or
|
||||
the database server is not running.</i><br /><br /><span style='line-height: 18px' class="error">
|
||||
<b>DB ERROR:</b>
|
||||
<?php
|
||||
echo db_get_last_error();
|
||||
?></span>
|
||||
</div>
|
||||
<div class="msg">
|
||||
If you have modified auth system, this problem could be because Pandora cannot override authorization variables from the config database. Remove them from your database by executing:<br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>
|
||||
</div>
|
||||
</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="bottom_logo">
|
||||
<img src='images/bottom_logo.png' "alt" = "logo" "border" = "0">
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
<?php
|
||||
|
||||
// Pandora FMS - http://pandorafms.com
|
||||
// ==================================================
|
||||
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
|
||||
// Please see http://pandorafms.org for full contribution list
|
||||
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; version 2
|
||||
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>Pandora FMS - The Flexible Monitoring System - Console Error</title>
|
||||
<meta http-equiv="expires" content="0">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf8">
|
||||
<meta name="resource-type" content="document">
|
||||
<meta name="distribution" content="global">
|
||||
<meta name="author" content="Sancho Lerena">
|
||||
<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
|
||||
<meta name="keywords" content="pandora, monitoring, 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.css" type="text/css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
||||
<img src="images/login_background.jpg" id="login_body">
|
||||
<div class="databox_logout" id="login">
|
||||
<br>
|
||||
<h1 id="log">Problem with Pandora FMS database</h1>
|
||||
<br>
|
||||
<div style="width: 440px; margin: 0 auto auto;">
|
||||
<table cellpadding="4" cellspacing="1" width="440">
|
||||
<tr><td align="left">
|
||||
<a href="index.php"><img src="images/pandora_login.png" border="0" height="100px" alt="Pandora FMS"></a>
|
||||
</td><td valign="bottom">
|
||||
Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file.<i><br><br>
|
||||
Probably one or more of your user, database or hostname values are incorrect or
|
||||
the database server is not running.</i><br /><br /><span class="error">
|
||||
<b>DB ERROR:</b><?php echo db_get_last_error(); ?></span>
|
||||
<br>
|
||||
</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="bottom_logo">
|
||||
<img src='images/bottom_logo.png' "alt" = "logo" "border" = "0">
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
<?php
|
||||
|
||||
// Pandora FMS - http://pandorafms.com
|
||||
// ==================================================
|
||||
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
|
||||
// Please see http://pandorafms.org for full contribution list
|
||||
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; version 2
|
||||
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>Pandora FMS - The Flexible Monitoring System - Console error</title>
|
||||
<meta http-equiv="expires" content="0">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf8">
|
||||
<meta name="resource-type" content="document">
|
||||
<meta name="distribution" content="global">
|
||||
<meta name="author" content="Sancho Lerena">
|
||||
<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
|
||||
<meta name="keywords" content="pandora, monitoring, 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.css" type="text/css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<img src="images/login_background.jpg" id="login_body">
|
||||
<div class="databox_error" id="login">
|
||||
<br>
|
||||
<h1 id="log">Empty configuration table</h1>
|
||||
<br>
|
||||
<div style="width: 440px; margin: 0 auto auto;">
|
||||
<table cellpadding="4" cellspacing="1" width="440">
|
||||
<tr><td align="left">
|
||||
<a href="index.php"><img src= <?php echo '"'.$relative_link . 'images/pandora_login.png"' ?> border="0" height="100px" alt="Pandora FMS"></a>
|
||||
</td><td valign="bottom">
|
||||
<br><br>
|
||||
Cannot load configuration variables from database. Please check your database setup in the
|
||||
<b>include/config.php</b> file.<i><br><br>
|
||||
Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date.
|
||||
<br><br>Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
|
||||
permissions and HTTP server cannot read it. Please read documentation to fix this problem.</i>
|
||||
</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="bottom_logo">
|
||||
<img src='images/bottom_logo.png' "alt" = "logo" "border" = "0">
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
<?php
|
||||
|
||||
// Pandora FMS - http://pandorafms.com
|
||||
// ==================================================
|
||||
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
|
||||
// Please see http://pandorafms.org for full contribution list
|
||||
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; version 2
|
||||
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>Pandora FMS - The Flexible Monitoring System - Console error</title>
|
||||
<meta http-equiv="expires" content="0">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf8">
|
||||
<meta name="resource-type" content="document">
|
||||
<meta name="distribution" content="global">
|
||||
<meta name="author" content="Sancho Lerena">
|
||||
<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
|
||||
<meta name="keywords" content="pandora, monitoring, system, GPL, software">
|
||||
<meta name="robots" content="index, follow">
|
||||
<link rel="icon" href= <?php echo '"images/pandora.ico"' ?> type="image/ico">
|
||||
<link rel="stylesheet" href= <?php echo '"include/styles/pandora.css"' ?> type="text/css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
||||
<img src="images/login_background.jpg" id="login_body">
|
||||
<div class="databox_logout" id="login">
|
||||
<br>
|
||||
<h1 id="log">No configuration file found</h1>
|
||||
<br>
|
||||
<div style="width: 440px; margin: 0 auto auto;">
|
||||
<table cellpadding="4" cellspacing="1" width="440">
|
||||
<tr><td align="left">
|
||||
<a href="index.php"><img src= <?php echo '"images/pandora_login.png"' ?> border="0" height="100px" alt="Pandora FMS"></a>
|
||||
</td><td valign="bottom">
|
||||
<br><br>Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
|
||||
permissions and HTTP server cannot read it. Please read documentation to fix this problem.
|
||||
<div class="msg">
|
||||
You may try to run the <b><?php
|
||||
if (file_exists('install.php'))
|
||||
echo '<a href="install.php">installation wizard</a>';
|
||||
else
|
||||
echo 'installation wizard'; ?></b> to create one.
|
||||
</div>
|
||||
</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="bottom_logo">
|
||||
<img src='images/bottom_logo.png' "alt" = "logo" "border" = "0">
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
<?php
|
||||
|
||||
// Pandora FMS - http://pandorafms.com
|
||||
// ==================================================
|
||||
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
|
||||
// Please see http://pandorafms.org for full contribution list
|
||||
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; version 2
|
||||
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>Pandora FMS - The Flexible Monitoring System - Console error</title>
|
||||
<meta http-equiv="expires" content="0">
|
||||
<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">
|
||||
<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
|
||||
<meta name="keywords" content="pandora, monitoring, system, GPL, software">
|
||||
<meta name="robots" content="index, follow">
|
||||
<link rel="icon" href= <?php echo '"images/pandora.ico"' ?> type="image/ico">
|
||||
<link rel="stylesheet" href= <?php echo '"include/styles/pandora.css"' ?> type="text/css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<img src="images/login_background.jpg" id="login_body">
|
||||
<div class="databox_logout" id="login">
|
||||
<br>
|
||||
<h1 id="log"> Bad permission for include/config.php</h1>
|
||||
<br>
|
||||
<div style="width: 440px; margin: 0 auto auto;">
|
||||
<table cellpadding="4" cellspacing="1" width="440">
|
||||
<tr><td align="left">
|
||||
<a href="index.php"><img src= <?php echo '"images/pandora_login.png"' ?> border="0" height="100px" alt="Pandora FMS"></a>
|
||||
</td><td valign="bottom">
|
||||
<br>
|
||||
For security reasons, <i>config.php</i> must have restrictive permissions, and "other" users
|
||||
should not read it or write to it. It should be written only for owner
|
||||
(usually www-data or http daemon user), normal operation is not possible until you change
|
||||
permissions for <i>include/config.php</i> file. Please do it, it's for your security.
|
||||
</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="bottom_logo">
|
||||
<img src='images/bottom_logo.png' "alt" = "logo" "border" = "0">
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -15,12 +15,13 @@
|
|||
// GNU General Public License for more details.
|
||||
|
||||
?>
|
||||
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>Pandora FMS - The Flexible Monitoring System - Console Error</title>
|
||||
<title>Pandora FMS - The Flexible Monitoring System - Console error</title>
|
||||
<meta http-equiv="expires" content="0">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf8">
|
||||
<meta name="resource-type" content="document">
|
||||
<meta name="distribution" content="global">
|
||||
<meta name="author" content="Sancho Lerena">
|
||||
|
|
@ -29,32 +30,15 @@
|
|||
<meta name="robots" content="index, follow">
|
||||
<link rel="icon" href="images/pandora.ico" type="image/ico">
|
||||
<link rel="stylesheet" href="include/styles/pandora.css" type="text/css">
|
||||
<link rel="stylesheet" href="include/styles/jquery-ui-1.10.0.custom.css" type="text/css">
|
||||
</head>
|
||||
<body>
|
||||
<?php
|
||||
|
||||
<img src="images/login_background.jpg" id="login_body">
|
||||
<div class="databox_logout" id="login">
|
||||
<br>
|
||||
<h1 id="log">Installer active</h1>
|
||||
<br>
|
||||
<div style="width: 440px; margin: 0 auto auto;">
|
||||
<table cellpadding="4" cellspacing="1" width="440">
|
||||
<tr><td align="left">
|
||||
<a href="index.php"><img src="images/pandora_login.png" border="0" height="100px" alt="Pandora FMS"></a>
|
||||
</td><td valign="bottom">
|
||||
For security reasons, normal operation is not possible until you delete installer file.
|
||||
Please delete the <i>./install.php</i> file before running Pandora FMS Console.
|
||||
</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="bottom_logo">
|
||||
<img src='images/bottom_logo.png' "alt" = "logo" "border" = "0">
|
||||
</div>
|
||||
// At this point, $login_screen is setted with the error type desired
|
||||
|
||||
require('login_page.php');
|
||||
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -14,6 +14,39 @@
|
|||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
if(isset($config["homedir"])) {
|
||||
$homedir = $config["homedir"] . '/';
|
||||
}
|
||||
else {
|
||||
$homedir = '';
|
||||
}
|
||||
|
||||
include_once($homedir . 'include/functions_ui.php');
|
||||
include_once($homedir . 'include/functions.php');
|
||||
include_once($homedir . 'include/functions_html.php');
|
||||
|
||||
if(!isset($login_screen)) {
|
||||
$login_screen = 'login';
|
||||
}
|
||||
|
||||
switch($login_screen) {
|
||||
case 'login':
|
||||
$logo_link = 'http://www.pandorafms.com';
|
||||
$logo_title = __('Go to Pandora FMS Website');
|
||||
break;
|
||||
case 'logout':
|
||||
$logo_link = 'index.php';
|
||||
$logo_title = __('Go to Login');
|
||||
break;
|
||||
default:
|
||||
error_reporting(0);
|
||||
$error_info = ui_get_error($login_screen);
|
||||
$logo_link = 'index.php';
|
||||
$logo_title = __('Refresh');
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
$url = '?login=1';
|
||||
//These variables come from index.php
|
||||
if (!empty ($page) && !empty ($sec)) {
|
||||
|
|
@ -21,65 +54,84 @@ if (!empty ($page) && !empty ($sec)) {
|
|||
$url .= '&'.safe_url_extraclean($key).'='.safe_url_extraclean($value);
|
||||
}
|
||||
}
|
||||
echo '<img src="' . ui_get_full_url('images/login_background.jpg') . '" id="login_body">';
|
||||
|
||||
echo '<div id="login_body"></div>';
|
||||
echo '<div id="login_outer">';
|
||||
echo '<div class="databox_login" id="login">';
|
||||
echo '<div id="login_inner">';
|
||||
|
||||
// echo "<h1>Put here your custom welcome message</h1>";
|
||||
|
||||
//echo '<br /><br /><br />';
|
||||
echo '
|
||||
<div id="login_in">
|
||||
<form method="post" action="' . ui_get_full_url('index.php'.$url) . '">';
|
||||
|
||||
//TODO: Put branding in variables (external file) or database
|
||||
/* CUSTOM BRANDING STARTS HERE */
|
||||
//TODO: Put branding in variables (external file) or database
|
||||
/* CUSTOM BRANDING STARTS HERE */
|
||||
|
||||
// Replace the following with your own URL and logo.
|
||||
// A mashup of the Pandora FMS logo and your companies highly preferred
|
||||
echo ' <a href="http://pandorafms.org" title="Go to pandorafms.org...">';
|
||||
if (defined ('PANDORA_ENTERPRISE')) {
|
||||
html_print_image ("images/pandora_login_enterprise.png", false, array ("alt" => "logo", "border" => 0));
|
||||
}
|
||||
else {
|
||||
html_print_image ("images/pandora_login.png", false, array ("alt" => "logo", "border" => 0));
|
||||
}
|
||||
echo '</a>';
|
||||
|
||||
// This prints the current pandora console version.
|
||||
// For stable/live function it might be wise to comment it out
|
||||
|
||||
/* CUSTOM BRANDING ENDS HERE */
|
||||
|
||||
|
||||
echo '<div style="text-align: center; height: 5px !important;"> </div>';
|
||||
|
||||
if (!empty ($page) && !empty ($sec)) {
|
||||
foreach ($_POST as $key => $value) {
|
||||
html_print_input_hidden ($key, $value);
|
||||
// Replace the following with your own URL and logo.
|
||||
// A mashup of the Pandora FMS logo and your companies highly preferred
|
||||
echo '<a href="' . $logo_link . '">';
|
||||
if (defined ('PANDORA_ENTERPRISE')) {
|
||||
html_print_image ($config['homeurl'] . "/images/pandora_login_enterprise.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
|
||||
}
|
||||
}
|
||||
else {
|
||||
html_print_image ($config['homeurl'] . "/images/pandora_login.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
|
||||
}
|
||||
echo '</a>';
|
||||
|
||||
echo '<br />'.html_print_input_text_extended ("nick", '', "nick", '', '', '' , false, '', 'class="login"', true).
|
||||
'<br>
|
||||
<br />'.html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false, '', 'class="login"', true, true).
|
||||
'<br>';
|
||||
echo '<div style="float: right; margin-top: -70px; margin-right: 25px">';
|
||||
html_print_input_image ("Login", "images/login_botton.png", 'Login');
|
||||
echo '</div>';
|
||||
// This prints the current pandora console version.
|
||||
// For stable/live function it might be wise to comment it out
|
||||
|
||||
/* CUSTOM BRANDING ENDS HERE */
|
||||
|
||||
|
||||
echo '<div style="text-align: center; height: 5px !important;"> </div>';
|
||||
|
||||
echo '<br />';
|
||||
|
||||
switch($login_screen) {
|
||||
case 'login':
|
||||
if (!empty ($page) && !empty ($sec)) {
|
||||
foreach ($_POST as $key => $value) {
|
||||
html_print_input_hidden ($key, $value);
|
||||
}
|
||||
}
|
||||
echo '<div class="login_nick">';
|
||||
html_print_input_text_extended ("nick", '', "nick", '', '', '' , false, '', 'class="login login_user"');
|
||||
echo '</div>';
|
||||
echo '<div class="login_pass">';
|
||||
html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false, '', 'class="login login_password"', false, true);
|
||||
echo '</div>';
|
||||
echo '<div class="login_button">';
|
||||
html_print_submit_button(__("Log-in"), "login", false, 'class="sub next"');
|
||||
echo '</div>';
|
||||
break;
|
||||
case 'logout':
|
||||
echo '<h1 id="log_title">' . __('Logged out') . '</h1>';
|
||||
echo '<p class="log_in">';
|
||||
echo __('Your session is over. Please close your browser window to close this Pandora session.').'<br /><br />';
|
||||
echo '</p>';
|
||||
break;
|
||||
default:
|
||||
if(isset($error_info)) {
|
||||
echo '<h1 id="log_title">' . $error_info['title'] . '</h1>';
|
||||
echo '<div id="error_buttons">';
|
||||
echo '<a href="index.php">' . html_print_image($config['homeurl'] . '/images/refresh.png', true, array('title' => __('Refresh')), false, true) . '</a>';
|
||||
echo '<a href="javascript: modal_alert_critical()">' . html_print_image($config['homeurl'] . '/images/help.png', true, array('title' => __('View details')), false, true) . '</a>';
|
||||
echo '</div>';
|
||||
echo '<div id="log_msg">';
|
||||
echo $error_info['message'];
|
||||
echo '</div>';
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
echo '<div id="ver_num">' . $pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
|
||||
|
||||
echo '</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
echo '<div id="bottom_logo">';
|
||||
if (defined('PANDORA_ENTERPRISE'))
|
||||
echo html_print_image('images/bottom_logo_enterprise.png', true, array ("alt" => "logo", "border" => 0));
|
||||
else
|
||||
echo html_print_image('images/bottom_logo.png', true, array ("alt" => "logo", "border" => 0));
|
||||
echo '</div>';
|
||||
echo '<div id="ver_num">' . $pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
|
||||
|
||||
|
||||
if (isset ($login_failed)) {
|
||||
echo '<div id="login_failed" title="Login failed" style="">';
|
||||
|
|
@ -201,12 +253,48 @@ ui_require_jquery_file('jquery-ui-1.10.0.custom');
|
|||
<![endif]-->
|
||||
<?php
|
||||
}
|
||||
|
||||
// Hidden div to forced title
|
||||
html_print_div(array('id' => 'forced_title_layer', 'class' => 'forced_title_layer', 'hidden' => true));
|
||||
|
||||
html_print_div(array('id' => 'modal_alert', 'hidden' => true));
|
||||
?>
|
||||
|
||||
|
||||
<script type="text/javascript" src="include/javascript/jquery-1.9.0.js"></script>
|
||||
<script type="text/javascript" src="include/javascript/jquery.pandora.js"></script>
|
||||
<script type="text/javascript" src="include/javascript/jquery.jquery-ui-1.10.0.custom.js"></script>
|
||||
<script type="text/javascript" language="javascript">
|
||||
/* <![CDATA[ */
|
||||
|
||||
function modal_alert_critical() {
|
||||
$("#modal_alert").hide ()
|
||||
.empty ()
|
||||
.append ($('#log_msg').html())
|
||||
.dialog ({
|
||||
title: $('#log_title').html(),
|
||||
resizable: true,
|
||||
draggable: false,
|
||||
modal: true,
|
||||
overlay: {
|
||||
opacity: 0.5,
|
||||
background: "black"
|
||||
},
|
||||
width: 500,
|
||||
height: 300
|
||||
})
|
||||
.show ();
|
||||
}
|
||||
<?php
|
||||
switch($login_screen) {
|
||||
case 'error_authconfig':
|
||||
case 'error_emptyconfig':
|
||||
?>
|
||||
// Auto popup
|
||||
//modal_alert_critical();
|
||||
<?php
|
||||
break;
|
||||
default:
|
||||
?>
|
||||
$(document).ready (function () {
|
||||
// IE9- modal warning window
|
||||
$(function() {
|
||||
|
|
@ -245,5 +333,9 @@ ui_require_jquery_file('jquery-ui-1.10.0.custom');
|
|||
});
|
||||
|
||||
$('#nick').focus();
|
||||
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
/* ]]> */
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -14,36 +14,6 @@
|
|||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
ui_require_css_file ('jquery-ui-1.10.0.custom');
|
||||
ui_require_jquery_file('jquery-ui-1.10.0.custom');
|
||||
$login_screen = 'logout';
|
||||
|
||||
?>
|
||||
<img src="images/login_background.jpg" id="login_body">
|
||||
<div class="databox_logout" id="login">
|
||||
<br>
|
||||
<h1 id="log"><?php echo __('Logged out'); ?></h1>
|
||||
<br>
|
||||
<div style="width: 400px; margin: 0 auto auto;">
|
||||
<table cellpadding="4" cellspacing="1" width="400">
|
||||
<tr><td align="left">
|
||||
<?php
|
||||
echo '<a href="index.php">';
|
||||
if (defined ('PANDORA_ENTERPRISE')){
|
||||
html_print_image ("images/pandora_login_enterprise.png", false, array ("alt" => "logo", "border" => 0));
|
||||
}
|
||||
else {
|
||||
html_print_image ("images/pandora_login.png", false, array ("alt" => "logo", "border" => 0));
|
||||
}
|
||||
|
||||
//html_print_image ("images/pandora_login.png", false, array ("alt" => "logo", "border" => 0));
|
||||
//echo '</a> '.$pandora_version;
|
||||
?>
|
||||
</td><td valign="bottom">
|
||||
<?php echo __('Your session is over. Please close your browser window to close this Pandora session.').'<br /><br />'; ?>
|
||||
</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
</div>
|
||||
<div id="ver_num"><?php echo $pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') ?></div>
|
||||
require('login_page.php');
|
||||
|
|
|
|||
|
|
@ -22,6 +22,11 @@ include_once($config['homedir'] . "/include/functions_profile.php");
|
|||
include_once($config['homedir'] . '/include/functions_users.php');
|
||||
include_once ($config['homedir'] . '/include/functions_groups.php');
|
||||
|
||||
$meta = false;
|
||||
if(enterprise_installed() && defined("METACONSOLE")) {
|
||||
$meta = true;
|
||||
}
|
||||
|
||||
$isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
|
||||
|
||||
//Add the columns for the enterprise Pandora edition.
|
||||
|
|
@ -61,7 +66,7 @@ if (!check_referer()) {
|
|||
$tab = get_parameter('tab', 'user');
|
||||
|
||||
// Header
|
||||
if (defined('METACONSOLE')) {
|
||||
if ($meta) {
|
||||
|
||||
user_meta_print_header();
|
||||
$sec = 'advanced';
|
||||
|
|
@ -366,6 +371,7 @@ if ($delete_profile) {
|
|||
__('Could not be deleted'));
|
||||
}
|
||||
|
||||
$table->id = 'user_configuration_table';
|
||||
$table->width = '98%';
|
||||
$table->data = array ();
|
||||
$table->colspan = array ();
|
||||
|
|
@ -439,11 +445,13 @@ else {
|
|||
$id_usr = $id;
|
||||
}
|
||||
|
||||
// User only can change skins if has more than one group
|
||||
if (count($usr_groups) > 1) {
|
||||
if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
|
||||
$table->data[10][0] = __('Skin');
|
||||
$table->data[10][1] = skins_print_select($id_usr,'skin', $user_info['id_skin'], '', __('None'), 0, true);
|
||||
if(!$meta) {
|
||||
// User only can change skins if has more than one group
|
||||
if (count($usr_groups) > 1) {
|
||||
if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
|
||||
$table->data[10][0] = __('Skin');
|
||||
$table->data[10][1] = skins_print_select($id_usr,'skin', $user_info['id_skin'], '', __('None'), 0, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -474,6 +482,35 @@ $table->data[13][0] = __('Not Login');
|
|||
$table->data[13][0] .= ui_print_help_tip(__('The user with not login set only can access to API.'), true);
|
||||
$table->data[13][1] = html_print_checkbox('not_login', 1, $user_info["not_login"], true);
|
||||
|
||||
if($meta) {
|
||||
enterprise_include('include/functions_metaconsole.php');
|
||||
$data = array();
|
||||
$data[0] = __('Enable agents managment');
|
||||
$data[1] = html_print_checkbox('metaconsole_agents_manager', 1, $user_info["metaconsole_agents_manager"], true);
|
||||
$table->rowclass[] = '';
|
||||
$table->rowstyle[] = 'font-weight: bold;';
|
||||
$table->data['metaconsole_agents_manager'] = $data;
|
||||
|
||||
$data = array();
|
||||
$data[0] = __('Assigned node'). ui_print_help_tip(__('Server where the agents managed of this user will be placed'), true);
|
||||
$servers = metaconsole_get_servers();
|
||||
$servers_for_select = array();
|
||||
foreach($servers as $server) {
|
||||
$servers_for_select[$server['id']] = $server['server_name'];
|
||||
}
|
||||
$data[1] = html_print_select($servers_for_select, 'metaconsole_assigned_server', $user_info["metaconsole_assigned_server"], '', '', -1, true, false, false);
|
||||
$table->rowclass[] = '';
|
||||
$table->rowstyle[] = 'font-weight: bold;';
|
||||
$table->data['metaconsole_assigned_server'] = $data;
|
||||
|
||||
$data = array();
|
||||
$data[0] = __('Enable node access'). ui_print_help_tip(__('With this option enabled, the user will can access to nodes console'), true);
|
||||
$data[2] = html_print_checkbox('metaconsole_access_node', 1, $user_info["metaconsole_access_node"], true);
|
||||
$table->rowclass[] = '';
|
||||
$table->rowstyle[] = '';
|
||||
$table->data['metaconsole_access_node'] = $data;
|
||||
}
|
||||
|
||||
echo '<form method="post" autocomplete="off">';
|
||||
|
||||
html_print_table ($table);
|
||||
|
|
@ -592,3 +629,24 @@ array_push ($table->data, $data);
|
|||
html_print_table ($table);
|
||||
unset ($table);
|
||||
?>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* <![CDATA[ */
|
||||
$(document).ready (function () {
|
||||
$('input:radio[name="is_admin"]').change(function() {
|
||||
if($('#radiobtn0002').prop('checked')) {
|
||||
$('#user_configuration_table-metaconsole_agents_manager').show();
|
||||
$('#user_configuration_table-metaconsole_assigned_server').show();
|
||||
$('#user_configuration_table-metaconsole_access_node').show();
|
||||
}
|
||||
else {
|
||||
$('#user_configuration_table-metaconsole_agents_manager').hide();
|
||||
$('#user_configuration_table-metaconsole_assigned_server').hide();
|
||||
$('#user_configuration_table-metaconsole_access_node').hide();
|
||||
}
|
||||
});
|
||||
|
||||
$('input:radio[name="is_admin"]').trigger('change');
|
||||
});
|
||||
/* ]]> */
|
||||
</script>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 49 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 5.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 5.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 221 B |
|
|
@ -64,7 +64,8 @@ function db_connect($host = null, $db = null, $user = null, $pass = null, $port
|
|||
// Something went wrong
|
||||
if ($return === false) {
|
||||
if ($critical) {
|
||||
include ($config["homedir"]."/general/error_authconfig.php");
|
||||
$login_screen = 'error_authconfig';
|
||||
require($config['homeurl'] . '/general/error_screen.php');
|
||||
exit;
|
||||
}
|
||||
else if ($error == 0) {
|
||||
|
|
|
|||
|
|
@ -19,13 +19,15 @@
|
|||
* @subpackage UI
|
||||
*/
|
||||
|
||||
require_once($config['homedir'] . '/include/functions_agents.php');
|
||||
require_once($config['homedir'] . '/include/functions_modules.php');
|
||||
require_once($config['homedir'] . '/include/functions.php');
|
||||
require_once($config['homedir'] . '/include/functions_groups.php');
|
||||
require_once($config['homedir'] . '/include/functions_users.php');
|
||||
require_once($config['homedir'] . '/include/functions_html.php');
|
||||
|
||||
// Check to avoid error when load this library in error screen situations
|
||||
if(isset($config['homedir'])) {
|
||||
require_once($config['homedir'] . '/include/functions_agents.php');
|
||||
require_once($config['homedir'] . '/include/functions_modules.php');
|
||||
require_once($config['homedir'] . '/include/functions.php');
|
||||
require_once($config['homedir'] . '/include/functions_groups.php');
|
||||
require_once($config['homedir'] . '/include/functions_users.php');
|
||||
require_once($config['homedir'] . '/include/functions_html.php');
|
||||
}
|
||||
|
||||
/**
|
||||
* Truncate a text to num chars (pass as parameter) and if flag show tooltip is
|
||||
|
|
@ -3198,4 +3200,69 @@ function ui_print_agent_autocomplete_input($parameters) {
|
|||
echo $html;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Return error strings (title and message) for each error code
|
||||
*
|
||||
* @param string error code
|
||||
*/
|
||||
function ui_get_error ($error_code) {
|
||||
switch($error_code) {
|
||||
case 'error_authconfig':
|
||||
case 'error_dbconfig':
|
||||
$title = __('Problem with Pandora FMS database');
|
||||
$message = __('Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file.<i><br/><br/>
|
||||
Probably your database, hostname, user or password values are incorrect or
|
||||
the database server is not running.').'<br /><br />';
|
||||
$message .= '<span class="red">';
|
||||
$message .= '<b>' . __('DB ERROR') . ':</b><br>';
|
||||
$message .= db_get_last_error();
|
||||
$message .= '</span>';
|
||||
|
||||
if($error_code == 'error_authconfig') {
|
||||
$message .= '<br/><br/>';
|
||||
$message .= __('If you have modified auth system, this problem could be because Pandora cannot override authorization variables from the config database. Remove them from your database by executing:<br><pre>DELETE FROM tconfig WHERE token = "auth";</pre>');
|
||||
}
|
||||
break;
|
||||
case 'error_emptyconfig':
|
||||
$title = __('Empty configuration table');
|
||||
$message = __('Cannot load configuration variables from database. Please check your database setup in the
|
||||
<b>include/config.php</b> file.<i><br><br>
|
||||
Most likely your database schema has been created but there are is no data in it, you have a problem with the database access credentials or your schema is out of date.
|
||||
<br><br>Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
|
||||
permissions and HTTP server cannot read it. Please read documentation to fix this problem.</i>').'<br /><br />';
|
||||
break;
|
||||
case 'error_noconfig':
|
||||
$title = __('No configuration file found');
|
||||
$message = __('Pandora FMS Console cannot find <i>include/config.php</i> or this file has invalid
|
||||
permissions and HTTP server cannot read it. Please read documentation to fix this problem.').'<br /><br />';
|
||||
if (file_exists('install.php')) {
|
||||
$link_start = '<a href="install.php">';
|
||||
$link_end = '</a>';
|
||||
}
|
||||
else {
|
||||
$link_start = '';
|
||||
$link_end = '';
|
||||
}
|
||||
|
||||
$message .= sprintf(__('You may try to run the %s<b>installation wizard</b>%s to create one.'), $link_start, $link_end);
|
||||
break;
|
||||
case 'error_install':
|
||||
$title = __('Installer active');
|
||||
$message = __('For security reasons, normal operation is not possible until you delete installer file.
|
||||
Please delete the <i>./install.php</i> file before running Pandora FMS Console.');
|
||||
break;
|
||||
case 'error_perms':
|
||||
$title = __('Bad permission for include/config.php');
|
||||
$message = __('For security reasons, <i>config.php</i> must have restrictive permissions, and "other" users
|
||||
should not read it or write to it. It should be written only for owner
|
||||
(usually www-data or http daemon user), normal operation is not possible until you change
|
||||
permissions for <i>include/config.php</i> file. Please do it, it is for your security.');
|
||||
break;
|
||||
}
|
||||
|
||||
return array('title' => $title, 'message' => $message);
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -53,6 +53,12 @@ div#page {
|
|||
top: 0;
|
||||
left: 0;
|
||||
z-index: -999;
|
||||
|
||||
background-image: url('../../images/login_background.jpg');
|
||||
background-size: cover;
|
||||
-moz-background-size: cover;
|
||||
-webkit-background-size: cover;
|
||||
-o-background-size: cover;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 1024px) { /* Specific to this particular image */
|
||||
|
|
@ -152,10 +158,23 @@ a.white {
|
|||
p.center {
|
||||
text-align: center;
|
||||
}
|
||||
h1#log {
|
||||
h1#log_title {
|
||||
font-size: 18px;
|
||||
margin-bottom: 0px;
|
||||
color: #000;
|
||||
color: #CCC;
|
||||
}
|
||||
div#log_msg {
|
||||
display:none;
|
||||
}
|
||||
div#error_buttons {
|
||||
margin-top: 20px;
|
||||
}
|
||||
div#error_buttons a{
|
||||
margin: 14px;
|
||||
}
|
||||
p.log_in {
|
||||
color: #CCC;
|
||||
padding: 0px 10px;
|
||||
}
|
||||
h1#log_f {
|
||||
color: #c00;
|
||||
|
|
@ -163,9 +182,6 @@ h1#log_f {
|
|||
padding-bottom: 3px;
|
||||
}
|
||||
div#login {
|
||||
margin: 0 auto;
|
||||
padding-top: 63px;
|
||||
width: 657px;
|
||||
border-left: solid 1px #000;
|
||||
border-top: solid 1px #000;
|
||||
border-bottom: solid 2px #000;
|
||||
|
|
@ -173,8 +189,36 @@ div#login {
|
|||
font-size: 12px !important;
|
||||
}
|
||||
div#login_in, #login_f {
|
||||
margin: 0 auto 0 140px;
|
||||
width: 400px;
|
||||
/*margin: 0 auto 0 140px;
|
||||
width: 400px;*/
|
||||
}
|
||||
|
||||
/* Style for login form */
|
||||
.databox_login, .databox_logout {
|
||||
border: none !important;
|
||||
background-color: #888888;
|
||||
padding: 8px;
|
||||
border-radius: 11px;
|
||||
height: 300px;
|
||||
}
|
||||
|
||||
#login_inner {
|
||||
background: url('../../images/splash_bg.png') #111;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border-radius: 11px;
|
||||
overflow: hidden;
|
||||
}
|
||||
#login_outer {
|
||||
-moz-box-shadow: 0px 0px 8px #ffffff;
|
||||
-webkit-box-shadow: 0px 0px 18px #ffffff;
|
||||
box-shadow: 0px 0px 18px rgba(200, 200, 200, 0.2);
|
||||
padding: 3px;
|
||||
border-radius: 11px;
|
||||
width: 250px !important;
|
||||
height: 300px;
|
||||
margin: 50px auto;
|
||||
background: transparent;
|
||||
}
|
||||
div#error_login {
|
||||
#margin: 0 auto;
|
||||
|
|
@ -260,11 +304,11 @@ div#main_help {
|
|||
width: 100%;
|
||||
padding-left: 0px;
|
||||
padding-top: 0px;
|
||||
background-color: #fefefe;
|
||||
background-image: url(../../images/backgrounds/background4.jpg);
|
||||
background-color: #ffffff;
|
||||
margin-top: 0px;
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
div#menu {
|
||||
width: 165px;
|
||||
|
|
@ -300,17 +344,43 @@ div#foot {
|
|||
height: 70px;
|
||||
margin: 0 auto 0 44%;
|
||||
overflow: hidden;
|
||||
position: fixed;
|
||||
position: fixed;
|
||||
display: none;
|
||||
}
|
||||
|
||||
IMG.login_logo {
|
||||
border: 0px;
|
||||
width: 150px;
|
||||
margin-top: 15px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
input.login:focus {
|
||||
outline-width: 0;
|
||||
-moz-box-shadow: 0px 0px 3px 2px #7fbe41;
|
||||
-webkit-box-shadow: 0px 0px 3px 2px #7fbe41;
|
||||
box-shadow: 0px 0px 3px 2px #7fbe41;
|
||||
}
|
||||
|
||||
DIV.login_button {
|
||||
text-align:right;
|
||||
width: 144px;
|
||||
margin: 18px auto;
|
||||
}
|
||||
|
||||
DIV.login_nick {
|
||||
|
||||
}
|
||||
|
||||
DIV.login_pass {
|
||||
margin-top: 21px;
|
||||
}
|
||||
|
||||
#ver_num {
|
||||
bottom: 0;
|
||||
height: 20px;
|
||||
right: 0;
|
||||
padding-right: 20px;
|
||||
overflow: hidden;
|
||||
position: fixed;
|
||||
color: #696969
|
||||
position: relative;
|
||||
color: #696969;
|
||||
font-size: xx-small;
|
||||
margin-top: 32px;
|
||||
}
|
||||
label {
|
||||
display: block;
|
||||
|
|
@ -335,11 +405,13 @@ input.datos_readonly {
|
|||
input.login {
|
||||
border: 0px none;
|
||||
background-color: #ebebeb !important;
|
||||
margin: 0px 0 8px 20px;
|
||||
margin: 0px auto;
|
||||
width: 135px;
|
||||
height: 18px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* FF hack for login inputs */
|
||||
@-moz-document url-prefix() {
|
||||
input.login{
|
||||
|
|
@ -404,6 +476,22 @@ input.cancel, input.default, input.filter, input.pdf {
|
|||
|
||||
}
|
||||
|
||||
input.login_user {
|
||||
/* Browser without multibackground support */
|
||||
background: #efefef url(../../images/input_user.png) no-repeat 7px 1px !important;
|
||||
padding-left: 32px;
|
||||
width: 106px;
|
||||
color: #222;
|
||||
}
|
||||
|
||||
input.login_password {
|
||||
/* Browser without multibackground support */
|
||||
background: #efefef url(../../images/input_lock.png) no-repeat 7px 1px !important;
|
||||
padding-left: 32px;
|
||||
width: 106px;
|
||||
color: #222;
|
||||
}
|
||||
|
||||
input.next {
|
||||
/* Browser without multibackground support */
|
||||
background: #efefef url(../../images/input_go.png) no-repeat 90% 3px !important;
|
||||
|
|
@ -1395,26 +1483,15 @@ table.databox_grid td {
|
|||
table.alternate tr:nth-child(odd) td{
|
||||
background-color: #e4e5e4;
|
||||
}
|
||||
/* Style for login form */
|
||||
.databox_login {
|
||||
#margin-top: 100px !important;
|
||||
width: 657px !important;
|
||||
height: 400px;
|
||||
#margin-bottom: 5px;
|
||||
#margin-top: 5px;
|
||||
#margin-left: 0px;
|
||||
border: none !important;
|
||||
background-color: #fafafa;
|
||||
background: url(../../images/splash_pandora.png) no-repeat;
|
||||
}
|
||||
/* Style for login form */
|
||||
|
||||
/* Style for login form
|
||||
.databox_logout {
|
||||
width: 657px !important;
|
||||
height: 400px;
|
||||
border: none !important;
|
||||
background-color: #fafafa;
|
||||
background: url(../../images/splash_logout.png) no-repeat;
|
||||
}
|
||||
}*/
|
||||
|
||||
.databox_error {
|
||||
width: 657px !important;
|
||||
|
|
@ -2376,6 +2453,7 @@ a.tip {
|
|||
a.tip>img {
|
||||
vertical-align: top !important;
|
||||
margin-left: 2px;
|
||||
margin-right: 2px;
|
||||
}
|
||||
|
||||
input.search_input {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,8 @@ if ($develop_bypass != 1) {
|
|||
// If no config file, automatically try to install
|
||||
if (! file_exists ("include/config.php")) {
|
||||
if (! file_exists ("install.php")) {
|
||||
include ("general/error_noconfig.php");
|
||||
$login_screen = 'error_noconfig';
|
||||
require('general/error_screen.php');
|
||||
exit;
|
||||
}
|
||||
else {
|
||||
|
|
@ -35,26 +36,30 @@ if ($develop_bypass != 1) {
|
|||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
if (filesize("include/config.php") == 0) {
|
||||
include ("install.php");
|
||||
exit;
|
||||
}
|
||||
// Check for installer presence
|
||||
if (file_exists ("install.php")) {
|
||||
include "general/error_install.php";
|
||||
$login_screen = 'error_install';
|
||||
require('general/error_screen.php');
|
||||
exit;
|
||||
}
|
||||
// Check perms for config.php
|
||||
if ((substr (sprintf ('%o', fileperms('include/config.php')), -4) != "0600") &&
|
||||
(substr (sprintf ('%o', fileperms('include/config.php')), -4) != "0660") &&
|
||||
(substr (sprintf ('%o', fileperms('include/config.php')), -4) != "0640")) {
|
||||
include "general/error_perms.php";
|
||||
$login_screen = 'error_perms';
|
||||
require('general/error_screen.php');
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
if ((! file_exists ("include/config.php")) || (! is_readable ("include/config.php"))) {
|
||||
include ("general/error_noconfig.php");
|
||||
$login_screen = 'error_noconfig';
|
||||
require('general/error_screen.php');
|
||||
exit;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,11 @@ include_once($config['homedir'] . '/include/functions_users.php');
|
|||
include_once ($config['homedir'] . '/include/functions_groups.php');
|
||||
include_once ($config['homedir'] . '/include/functions_visual_map.php');
|
||||
|
||||
$meta = false;
|
||||
if(enterprise_installed() && defined("METACONSOLE")) {
|
||||
$meta = true;
|
||||
}
|
||||
|
||||
$id = get_parameter_get ("id", $config["id_user"]); // ID given as parameter
|
||||
$status = get_parameter ("status", -1); // Flag to print action status message
|
||||
|
||||
|
|
@ -69,7 +74,7 @@ if (is_ajax ()){
|
|||
}
|
||||
|
||||
// Header
|
||||
if(enterprise_installed() && defined("METACONSOLE")) {
|
||||
if($meta) {
|
||||
user_meta_print_header();
|
||||
$url = 'index.php?sec=advanced&sec2=advanced/users_setup&tab=user_edit';
|
||||
}
|
||||
|
|
@ -278,36 +283,37 @@ else
|
|||
$usr_groups = (users_get_groups($config['id_user'], 'AR', $display_all_group));
|
||||
$id_usr = $config['id_user'];
|
||||
|
||||
$data = array();
|
||||
$data[0] = __('Shortcut bar') . ui_print_help_tip(__('This will activate a shortcut bar with alerts, events, messages... information'), true);
|
||||
$data[1] = __('Home screen'). ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true);
|
||||
// User only can change skins if has more than one group
|
||||
if (count($usr_groups) > 1) {
|
||||
$data[2] = __('Skin');
|
||||
}
|
||||
else {
|
||||
$data[2] = '';
|
||||
}
|
||||
$table->rowclass[] = '';
|
||||
$table->rowstyle[] = 'font-weight: bold;';
|
||||
$table->data[] = $data;
|
||||
if(!$meta) {
|
||||
$data = array();
|
||||
$data[0] = __('Shortcut bar') . ui_print_help_tip(__('This will activate a shortcut bar with alerts, events, messages... information'), true);
|
||||
$data[1] = __('Home screen'). ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true);
|
||||
// User only can change skins if has more than one group
|
||||
if (count($usr_groups) > 1) {
|
||||
$data[2] = __('Skin');
|
||||
}
|
||||
else {
|
||||
$data[2] = '';
|
||||
}
|
||||
$table->rowclass[] = '';
|
||||
$table->rowstyle[] = 'font-weight: bold;';
|
||||
$table->data[] = $data;
|
||||
|
||||
$data = array();
|
||||
$data[0] = html_print_checkbox('shortcut_bar', 1, $user_info["shortcut"], true);
|
||||
$values = array ('Default' =>__('Default'), 'Dashboard'=>__('Dashboard'), 'Visual console'=>__('Visual console'), 'Event list'=>__('Event list'),
|
||||
'Group view'=>__('Group view'), 'Tactical view'=>__('Tactical view'), 'Alert detail' => __('Alert detail'), 'Other'=>__('Other'));
|
||||
$data[1] = html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false);
|
||||
// User only can change skins if has more than one group
|
||||
if (count($usr_groups) > 1) {
|
||||
$data[2] = skins_print_select($id_usr,'skin', $user_info['id_skin'], '', __('None'), 0, true);
|
||||
$data = array();
|
||||
$data[0] = html_print_checkbox('shortcut_bar', 1, $user_info["shortcut"], true);
|
||||
$values = array ('Default' =>__('Default'), 'Dashboard'=>__('Dashboard'), 'Visual console'=>__('Visual console'), 'Event list'=>__('Event list'),
|
||||
'Group view'=>__('Group view'), 'Tactical view'=>__('Tactical view'), 'Alert detail' => __('Alert detail'), 'Other'=>__('Other'));
|
||||
$data[1] = html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false);
|
||||
// User only can change skins if has more than one group
|
||||
if (count($usr_groups) > 1) {
|
||||
$data[2] = skins_print_select($id_usr,'skin', $user_info['id_skin'], '', __('None'), 0, true);
|
||||
}
|
||||
else {
|
||||
$data[2] = '';
|
||||
}
|
||||
$table->rowclass[] = '';
|
||||
$table->rowstyle[] = '';
|
||||
$table->data[] = $data;
|
||||
}
|
||||
else {
|
||||
$data[2] = '';
|
||||
}
|
||||
$table->rowclass[] = '';
|
||||
$table->rowstyle[] = '';
|
||||
$table->data[] = $data;
|
||||
|
||||
|
||||
$data = array();
|
||||
$data[0] = __('Comments');
|
||||
|
|
|
|||
|
|
@ -242,6 +242,9 @@ CREATE TABLE tagente_modulo (
|
|||
warning_instructions CLOB default '',
|
||||
unknown_instructions CLOB default '',
|
||||
quiet NUMBER(5, 0) default 0 NOT NULL,
|
||||
critical_instructions VARCHAR2(255) default '',
|
||||
warning_instructions VARCHAR2(255) default '',
|
||||
unknown_instructions VARCHAR2(255) default '',
|
||||
critical_inverse NUMBER(1, 0) default 0 NOT NULL,
|
||||
warning_inverse NUMBER(1, 0) default 0 NOT NULL,
|
||||
id_category NUMBER(10, 0) default 0 NOT NULL,
|
||||
|
|
@ -939,6 +942,9 @@ CREATE TABLE tusuario (
|
|||
login_blocked NUMBER(5,0) default 0 NOT NULL,
|
||||
metaconsole_access VARCHAR2(100) default 'basic' NOT NULL,
|
||||
not_login NUMBER(5,0) default 0 NOT NULL,
|
||||
metaconsole_agents_manager NUMBER(10, 0) default 0 NOT NULL,
|
||||
metaconsole_assigned_server NUMBER(10, 0) default 0 NOT NULL,
|
||||
metaconsole_access_node NUMBER(10, 0) default 0 NOT NULL,
|
||||
CONSTRAINT t_usuario_metaconsole_access_cons CHECK (metaconsole_access IN ('basic','advanced'))
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -831,6 +831,9 @@ CREATE TABLE "tusuario" (
|
|||
"failed_attempt" INTEGER NOT NULL DEFAULT 0,
|
||||
"login_blocked" SMALLINT NOT NULL default 0,
|
||||
"not_login" SMALLINT NOT NULL default 0,
|
||||
"metaconsole_agents_manager" SMALLINT DEFAULT 0,
|
||||
"metaconsole_assigned_server" INTEGER NOT NULL default 0,
|
||||
"metaconsole_access_node" SMALLINT DEFAULT 0,
|
||||
"metaconsole_access" type_tusuario_metaconsole_access default 'basic'
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -900,6 +900,9 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
|
|||
`login_blocked` tinyint(1) unsigned NOT NULL default 0,
|
||||
`metaconsole_access` enum('basic','advanced') default 'basic',
|
||||
`not_login` tinyint(1) unsigned NOT NULL DEFAULT 0,
|
||||
`metaconsole_agents_manager` tinyint(1) unsigned NOT NULL default 0,
|
||||
`metaconsole_assigned_server` int(10) unsigned NOT NULL default 0,
|
||||
`metaconsole_access_node` tinyint(1) unsigned NOT NULL default 0,
|
||||
UNIQUE KEY `id_user` (`id_user`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue