diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a145cb1c96..f59dc273d0 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,22 @@ +2008-06-26 Esteban Sanchez + + * images/console/background/africa.jpg, + images/console/background/asia.jpg, + images/console/background/europe.jpg, + images/console/background/north_america.jpg, + images/console/background/south_america.jpg, + images/console/background/world.jpg, + images/console/background/oceania.jpg: Resized to fit better in + Pandora default theme. + + * operation/visual_console/index.php: Delete view column and use a + link in the name instead. + + * operation/visual_console/render_view.php: Replaced id_usuario with + config variable. + + * operation/menu.php: Changed default option in reporting menu. + 2008-06-26 Esteban Sanchez * general/logon_ok.php: Use pandora functions to show last sessions. diff --git a/pandora_console/images/console/background/africa.jpg b/pandora_console/images/console/background/africa.jpg index 53d799ef89..174c9b0404 100644 Binary files a/pandora_console/images/console/background/africa.jpg and b/pandora_console/images/console/background/africa.jpg differ diff --git a/pandora_console/images/console/background/asia.jpg b/pandora_console/images/console/background/asia.jpg index 5439d4aad2..e1c08529c5 100644 Binary files a/pandora_console/images/console/background/asia.jpg and b/pandora_console/images/console/background/asia.jpg differ diff --git a/pandora_console/images/console/background/europe.jpg b/pandora_console/images/console/background/europe.jpg index 9d42bbf751..452b0f0fa9 100644 Binary files a/pandora_console/images/console/background/europe.jpg and b/pandora_console/images/console/background/europe.jpg differ diff --git a/pandora_console/images/console/background/north_america.jpg b/pandora_console/images/console/background/north_america.jpg index aa87b5d82e..6e53ba21cf 100644 Binary files a/pandora_console/images/console/background/north_america.jpg and b/pandora_console/images/console/background/north_america.jpg differ diff --git a/pandora_console/images/console/background/oceania.jpg b/pandora_console/images/console/background/oceania.jpg index 4afb335505..2ebb3af1c0 100644 Binary files a/pandora_console/images/console/background/oceania.jpg and b/pandora_console/images/console/background/oceania.jpg differ diff --git a/pandora_console/images/console/background/south_america.jpg b/pandora_console/images/console/background/south_america.jpg index 8d4af0bd0c..f51243b044 100644 Binary files a/pandora_console/images/console/background/south_america.jpg and b/pandora_console/images/console/background/south_america.jpg differ diff --git a/pandora_console/images/console/background/world.jpg b/pandora_console/images/console/background/world.jpg index 8c98f19406..7514a07083 100644 Binary files a/pandora_console/images/console/background/world.jpg and b/pandora_console/images/console/background/world.jpg differ diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 332b313051..e33bcb2aca 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -258,7 +258,8 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { } else { echo '
  • '; } - echo ''. lang_string ("reporting").'
  • '; + echo ''. + lang_string ("reporting").''; // Custom reporting if (isset($_GET["sec"]) && $_GET["sec"] == "reporting"){ diff --git a/pandora_console/operation/visual_console/index.php b/pandora_console/operation/visual_console/index.php index b2a594213e..deeb06896e 100644 --- a/pandora_console/operation/visual_console/index.php +++ b/pandora_console/operation/visual_console/index.php @@ -43,21 +43,18 @@ $table->head = array (); $table->head[0] = lang_string ('name'); $table->head[1] = lang_string ('group'); $table->head[2] = lang_string ('elements'); -$table->head[3] = lang_string ('view'); $table->align = array (); $table->align[2] = 'center'; -$table->align[3] = 'center'; foreach ($layouts as $layout) { $data = array (); - $data[0] = $layout['name']; + $data[0] = ''.$layout['name'].''; $data[1] = ' '; $data[1] .= dame_nombre_grupo ($layout["id_group"]); $data[2] = get_db_value ('COUNT(*)', 'tlayout_data', 'id_layout', $layout['id']); - $data[3] = ''; array_push ($table->data, $data); } diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php index 770466022a..e3a27543d4 100644 --- a/pandora_console/operation/visual_console/render_view.php +++ b/pandora_console/operation/visual_console/render_view.php @@ -23,8 +23,8 @@ global $REMOTE_ADDR; require ('include/functions_visual_map.php'); -if (comprueba_login() != 0) { - audit_db($config["id_user"],$REMOTE_ADDR, "ACL Violation","Trying to access graph builder"); +if (comprueba_login () != 0) { + audit_db ($config["id_user"],$REMOTE_ADDR, "ACL Violation","Trying to access graph builder"); include ("general/noaccess.php"); exit; } @@ -35,7 +35,7 @@ $refr = (int) get_parameter ('refr'); // Get input parameter for layout id // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if (! $id_layout) { - audit_db($id_usuario,$REMOTE_ADDR, "ACL Violation","Trying to access visual console without id layout"); + audit_db ($config["id_user"],$REMOTE_ADDR, "ACL Violation","Trying to access visual console without id layout"); include ("general/noaccess.php"); exit; } @@ -43,7 +43,7 @@ if (! $id_layout) { $layout = get_db_row ('tlayout', 'id', $id_layout); if (! $layout) { - audit_db($id_usuario,$REMOTE_ADDR, "ACL Violation","Trying to access visual console without id layout"); + audit_db ($config["id_user"], $REMOTE_ADDR, "ACL Violation","Trying to access visual console without id layout"); include ("general/noaccess.php"); exit; } @@ -57,10 +57,8 @@ $bheight = $layout["height"]; $pure_url = "&pure=".$config["pure"]; -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// RENDER MAP ! -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -echo "

    ".$layout_name; +// Render map +echo "

    ".$layout_name."

    "; if ($config["pure"] == 0){ echo lang_string("Full screen mode"); @@ -75,9 +73,7 @@ if ($config["pure"] == 0){ echo ""; echo ""; } - -echo ""; - +echo '
    '; if ($refr) { echo '
    '; echo '
    ';