From d2891eb1c813a607c8f278cd4e35d4b708cbbf2d Mon Sep 17 00:00:00 2001 From: Esteban Sanchez Date: Mon, 4 Aug 2008 08:15:16 +0000 Subject: [PATCH] =?UTF-8?q?2008-08-04=20=20Esteban=20S=C3=A1nchez=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * AUTHORS: Added myself. * include/functions_extensions.php: Added to repository. Implements extensions functions. Extensions are some kind of plugins to the console to add functionallity in a modular way. More work and documentation is needed. * godmode/reporting/reporting_builder.php, include/functions.php, operation/agentes/networkmap.php, operation/agentes/ver_agente.php: Style correction. * include/functions_db.php: Added load_lang_file() to load the languages file (useful in extensions l10n). Style correction. * index.php: Load extensions and call them in cases. * godmode/menu.php, operation/menu.php: Style correction, code cleanup. Added extension menu and submenus. Use of CSS more efficient. * include/config_process.php: Added extensions support. * extensions/, extensions/hello.php: Added to repository, extensions dir and example. * include/functions.php: Style correction. * include/styles/op.css: Cleanup and rewritten the CSS hell it was before. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@997 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/AUTHORS | 1 + pandora_console/ChangeLog | 32 + pandora_console/extensions/hello.php | 16 + pandora_console/godmode/menu.php | 553 +++++++++--------- .../godmode/reporting/reporting_builder.php | 9 +- pandora_console/include/config_process.php | 69 +-- pandora_console/include/functions.php | 11 +- pandora_console/include/functions_db.php | 48 +- .../include/functions_extensions.php | 124 ++++ pandora_console/include/styles/op.css | 74 +-- pandora_console/index.php | 30 +- .../operation/agentes/networkmap.php | 4 +- .../operation/agentes/ver_agente.php | 12 +- pandora_console/operation/menu.php | 251 ++++---- 14 files changed, 732 insertions(+), 502 deletions(-) create mode 100644 pandora_console/extensions/hello.php create mode 100644 pandora_console/include/functions_extensions.php diff --git a/pandora_console/AUTHORS b/pandora_console/AUTHORS index 17ce7bc5a9..b60222fd8d 100644 --- a/pandora_console/AUTHORS +++ b/pandora_console/AUTHORS @@ -2,6 +2,7 @@ Sancho Lerena Esteban Sanchez Jorge Gonzalez Raul Mateos +Esteban Sanchez Ramon Novoa See full list of contributors on: diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index fd9edd0427..a07d8a7d5d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,34 @@ +2008-08-04 Esteban Sánchez + + * AUTHORS: Added myself. + + * include/functions_extensions.php: Added to repository. Implements + extensions functions. Extensions are some kind of plugins to the + console to add functionallity in a modular way. More work and + documentation is needed. + + * godmode/reporting/reporting_builder.php, include/functions.php, + operation/agentes/networkmap.php, operation/agentes/ver_agente.php: + Style correction. + + * include/functions_db.php: Added load_lang_file() to load the + languages file (useful in extensions l10n). Style correction. + + * index.php: Load extensions and call them in cases. + + * godmode/menu.php, operation/menu.php: Style correction, code + cleanup. Added extension menu and submenus. Use of CSS more efficient. + + * include/config_process.php: Added extensions support. + + * extensions/, extensions/hello.php: Added to repository, extensions + dir and example. + + * include/functions.php: Style correction. + + * include/styles/op.css: Cleanup and rewritten the CSS hell it was + before. + 2008-08-01 Manuel Arostegui * include/help/en/help_plugin_definition.php: Language corrections. @@ -161,6 +192,7 @@ * view_server.php: Fixed problem with lastupdate render. This was using and incorrect function to render data. +>>>>>>> .r996 2008-07-21 Evi Vanoost * include/functions_reporting.php: Last commit forgot a semicolon. Fixed. diff --git a/pandora_console/extensions/hello.php b/pandora_console/extensions/hello.php new file mode 100644 index 0000000000..21a0962ba8 --- /dev/null +++ b/pandora_console/extensions/hello.php @@ -0,0 +1,16 @@ + diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 86663e46cf..64e205c5b8 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -16,275 +16,302 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -if (comprueba_login() == 0){ - $id_user = $_SESSION["id_usuario"]; - if ( (give_acl($id_user, 0, "LM")==1) OR (give_acl($id_user, 0, "AW")==1 ) OR (give_acl($id_user, 0, "PM")==1) OR (give_acl($id_user, 0, "DM")==1) OR (give_acl($id_user, 0, "UM")==1 )){ +if (comprueba_login ()) { + return; +} +if ((! give_acl ($config['id_user'], 0, "LM")) && (! give_acl ($config['id_user'], 0, "AW")) && (! give_acl ($config['id_user'], 0, "PM")) && (! give_acl ($config['id_user'], 0, "DM")) && (! give_acl ($config['id_user'], 0, "UM"))) { + return; +} ?>
:: ::