From 5c730afad81047ed7e453edb03ef89c30fd2468e Mon Sep 17 00:00:00 2001 From: Esteban Sanchez Date: Mon, 18 Aug 2008 15:12:20 +0000 Subject: [PATCH] 2008-08-18 Esteban Sanchez * operation/menu.php: Fixes events submenu and link to CSV exporting. Style correction. * images/rss.png: Added to repository. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1010 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++ pandora_console/images/rss.png | Bin 0 -> 332 bytes pandora_console/operation/menu.php | 44 ++++++++++++----------------- 3 files changed, 25 insertions(+), 26 deletions(-) create mode 100644 pandora_console/images/rss.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a857615d5c..c3f2b0294d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2008-08-18 Esteban Sanchez + + * operation/menu.php: Fixes events submenu and link to CSV exporting. + Style correction. + + * images/rss.png: Added to repository. + 2008-08-12 Esteban Sanchez * godmode/db/db_purge.php: Use print_help_tip() to show help tip. diff --git a/pandora_console/images/rss.png b/pandora_console/images/rss.png new file mode 100644 index 0000000000000000000000000000000000000000..23a2c2f03bd7d1ac1f171bda0d5cb2f90c222b9e GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$3?vg*uel1O5(0ceT;J5_|5zIOtjY9Khv}0X z%|A~r+=^2Av8D3cWb6B>>hBg;d|R3E_ub?74SMgUM7${0__-nL+nx#cN-SQK>)pyV z_}-`c@5AGt6ZO9J>VECi`Pi)ewp#Pq+5P{2eEc<8@Bjb*OVULj0`1}~@Q5r1(jH*! zb~4)zBv@A9m=2`DE@L>i)Tj=~sr7Vm4B@!Wd&X0&ML~e&B8wMWw2RDyi@W~o&W_c2 zRQts^=0oUHC2PO!i+@JV`#xDA$?xL1b6nv!9v||o*;%!~HL%anCAZ;wvGtJ~e_FD( zs(t*J?939{vN1FJ_9Kp;k~uu@CvH9bS?{n`T)3U-6O(9#G`{V?9bkF VY6fo8Tmf_lgQu&X%Q~loCIGu&lS2Ri literal 0 HcmV?d00001 diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 1e3e529a26..01e87b26ea 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -18,9 +18,7 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -?> -'.__('Pandora servers').''; } - // Check access for incident if (give_acl ($config['id_user'], 0, "IR") == 1) { if (($sec2 == "operation/incidents/incident" || $sec2 == "operation/incidents/incident_detail"|| $sec2 == "operation/incidents/incident_note")) { @@ -170,38 +167,33 @@ if (give_acl ($config['id_user'], 0, "AR")) { echo ''; // Event statistics submenu - if ($sec == "eventos"){ + if ($sec == "eventos") { if($sec2 == "operation/events/event_statistics") { echo "
"; } else { echo "
"; } echo "
"; - } - - // Event RSS - if (isset($_GET["sec"]) && $_GET["sec"] == "eventos"){ - echo "
"; + + // Event RSS + echo "
"; echo "
"; - } - - // Event CSV - if (isset($_GET["sec"]) && $_GET["sec"] == "eventos"){ - echo "
"; + echo " ".__('RSS'); + echo "
"; + + // Event CSV + echo "
"; echo "
"; - } - - // Event Marquee - if (isset($_GET["sec"]) && $_GET["sec"] == "eventos"){ - echo "
"; + echo "".__('CSV File')."
"; + + // Event Marquee + echo "
"; echo "
"; } - + // Users - if(($sec2 == "operation/users/user" || $sec2 == "operation/users/user_edit" )) { + if (($sec2 == "operation/users/user" || $sec2 == "operation/users/user_edit" )) { $selected = ' menu-selected'; } else { $selected = ''; @@ -211,7 +203,7 @@ if (give_acl ($config['id_user'], 0, "AR")) { // User edit (submenu) if ($sec == "usuarios") { - if(isset($_GET["ver"]) && $_GET["ver"] == $config['id_user']) { + if (isset($_GET["ver"]) && $_GET["ver"] == $config['id_user']) { echo "
"; } else { echo "
"; @@ -219,7 +211,7 @@ if (give_acl ($config['id_user'], 0, "AR")) { echo "
"; // User statistics require UM - if (give_acl($config['id_user'], 0, "UM")==1) { + if (give_acl ($config['id_user'], 0, "UM")) { if($sec2 == "operation/users/user_statistics") { echo "
"; } else { @@ -261,7 +253,7 @@ if (give_acl ($config['id_user'], 0, "AR")) { // New message (submenu) if ($sec == "messages") { - if(isset ($_GET["nuevo_g"])) { + if (isset ($_GET["nuevo_g"])) { echo "
"; } else { echo "
";