tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2006-11-14 Raul Mateos <raulofpandora@gmail.com> 

* include/styles/pandora.css: Change some styles.
	
	* operation/agentes/estado_agente.php, 
	operation/agentes/estado_alertas.php, 
	operation/incidents/incident.php: Clear code, change styles.
	
	* operation/events/event.php: New selection for event type. EXPERIMENTAL.
	TO DO: Add selection for groups.

	* ChangeLog: Add forgotten change.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@259 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2006-11-14 00:26:29 +00:00
parent 07a010e597
commit 28a2fdf511
6 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/ChangeLog
View File

@ -1,7 +1,25 @@
2006-11-14 Raul Mateos <raulofpandora@gmail.com>
* include/styles/pandora.css: Change some styles.
* operation/agentes/estado_agente.php,
operation/agentes/estado_alertas.php,
operation/incidents/incident.php: Clear code, change styles.
* operation/events/event.php: New selection for event type. EXPERIMENTAL.
TO DO: Add selection for groups.
2006-11-13 Raul Mateos <raulofpandora@gmail.com>
* include/config.php: Change build date to correct order.
2006-11-06 Raul Mateos <raulofpandora@gmail.com>
* index.php: Added FMS to title
* include/languages/language_es_es.php, language_en.php,
language_es_la.php, language_it.php: Remove "distributed" from title
2006-10-31 Raul Mateos <raulofpandora@gmail.com>
* operation/menu.php: Add highlighting when creating note in incidents

7
pandora_console/include/styles/pandora.css
View File

@ -73,10 +73,11 @@ td.datos_jus, td.datos2_jus {text-align: justify;}
.bg , .bgt {background-color: #4a6629;}
.bg {position:relative; height: 20px; width: 100%;}
.f10, .w155f10, #ip {font-size: 10px; text-align: center;}
.f9, .f9i, .f9b, td.f9, td.f9i, td.datosf9, td.datos2f9, td.datosf9i, td.datos2f9i .f9l20, .f9l30 {font-size: 9px;}
.f9, .f9i, .f9b, td.f9, td.f9i, td.datosf9, td.datos2f9, td.datosf9i, td.datos2f9i {font-size: 9px;}
.f9i {font-style: italic;}
.f9l20 {padding-left: 20px;}
.f9l30, .f9130t {padding-left: 30px;}
.f9l30, .f9l30t, .f9l30w17t {padding-left: 30px;}
.f9l30w17t {line-height: 17px;}
.jus {text-align: justify;}
.tit {padding-top: 3px;}
.tit, .titb {font-weight: bold; color: white; text-align: center;}
@ -104,7 +105,7 @@ td.datos_jus, td.datos2_jus {text-align: justify;}
.w135, .w135datos, .w35datos2 {width: 135px;}
.w140 {width: 140px;}
.w155, .w155f10 {width: 155px;}
.top, .bgt, .f9130t, td.datost, td.datos2t {vertical-align: top;}
.top, .bgt, .f9l30t, td.datost, td.datos2t {vertical-align: top;}
.bot, .titb, td.datosb {vertical-align: bottom;}
.w180 {width: 180px;}
.w200 {width: 200px;}

6
pandora_console/operation/agentes/estado_agente.php
View File

@ -73,9 +73,9 @@ if (comprueba_login() == 0) {
// Show only selected groups
if ($ag_group > 1)
$sql='SELECT * FROM tagente WHERE id_grupo='.$ag_group.' and disabled = 0 order by nombre';
$sql='SELECT * FROM tagente WHERE id_grupo='.$ag_group.' AND disabled = 0 ORDER BY nombre';
else
$sql='SELECT * FROM tagente WHERE disabled = 0 ORDER BY id_grupo, nombre';
$sql='SELECT * FROM tagente WHERE disabled = 0 ORDER BY id_grupo, nombre';
$result=mysql_query($sql);
if (mysql_num_rows($result)){
@ -89,7 +89,7 @@ if (comprueba_login() == 0) {
echo "<td class='f9l30'>";
echo "<img src='images/dot_red.gif'> - ".$lang_label["fired"];
echo "&nbsp;&nbsp;</td>";
echo "<td class='f9'>";
echo "<td>";
echo "<img src='images/dot_green.gif'> - ".$lang_label["not_fired"];
echo "</td></tr></table>";
echo "<br>";

2
pandora_console/operation/agentes/estado_alertas.php
View File

@ -158,7 +158,7 @@ if (comprueba_login() == 0) {
echo "<td class='f9l30'>";
echo "<img src='images/dot_red.gif'> - ".$lang_label["fired"];
echo "&nbsp;&nbsp;</td>";
echo "<td class='f9'>";
echo "<td>";
echo "<img src='images/dot_green.gif'> - ".$lang_label["not_fired"];
echo "</td></tr></table>";
echo "<br>";

74
pandora_console/operation/events/events.php
View File

@ -112,7 +112,7 @@ if (comprueba_login() == 0) {
$id_evento = $_POST["eventid".$count];
$id_group = gime_idgroup_from_idevent($id_evento);
if (give_acl($id_usuario, $id_group, "IW") ==1){
$sql2="UPDATE tevento SET estado=1, id_usuario = '".$id_usuario."' WHERE estado = 0 and id_evento = ".$id_evento;
$sql2="UPDATE tevento SET estado=1, id_usuario = '".$id_usuario."' WHERE estado = 0 AND id_evento = ".$id_evento;
$result2=mysql_query($sql2);
} else {
audit_db($id_usuario,$REMOTE_ADDR, "ACL Violation","Trying to checkout event ID".$id_evento);
@ -124,10 +124,28 @@ if (comprueba_login() == 0) {
echo "<h2>".$lang_label["events"]."</h2>";
echo "<h3>".$lang_label["event_main_view"]."<a href='help/".$help_code."/chap5.php#5' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
echo "<table><tr>";
echo "<td>";
echo "<form method='post' action='index.php?sec=eventos&sec2=operation/events/events&refr=60'>";
echo "<select name='event' onChange='javascript:this.form.submit();' class='w155'>";
// Prepare index for pagination
$event_list[]="";
$sql2="SELECT * FROM tevento ORDER BY timestamp DESC";
if (isset($_POST["event"])){
$event = entrada_limpia($_POST["event"]);
if ($event=="All")
{
$sql2="SELECT * FROM tevento ORDER BY timestamp DESC";
} else {
$sql2="SELECT * FROM tevento WHERE evento = '$event' ORDER BY timestamp DESC";
echo "<option value='".$event."'>".$event;
}
} else {
$sql2="SELECT * FROM tevento ORDER BY timestamp DESC";
}
echo "<option value='All'>".$lang_label["all"];
$result2=mysql_query($sql2);
if (mysql_num_rows($result2)){
while ($row2=mysql_fetch_array($result2)){ // Jump offset records
@ -141,17 +159,23 @@ if (comprueba_login() == 0) {
$offset=0;
$offset_counter=0;
echo "<table><tr>";
echo "<td class='f9l30'>";
$sql='SELECT DISTINCT evento FROM tevento';
$result=mysql_query($sql);
while ($row=mysql_fetch_array($result)){
echo "<option value='".$row["evento"]."'>".$row["evento"];
}
echo "</select>";
echo "</form>";
echo "<td valign='middle'><noscript><input type='submit' class='sub' value='".$lang_label["show"]."' border='0'></noscript>";
echo "<td class='f9l30w17t'>";
echo "<img src='images/dot_green.gif'> - ".$lang_label["validated_event"];
echo "<br>";
echo "<img src='images/dot_red.gif'> - ".$lang_label["not_validated_event"];
echo "</td>";
echo "<td class='f9l20'>";
echo "<td class='f9l30w17t'>";
echo "<img src='images/ok.gif'> - ".$lang_label["validate_event"];
echo "<br>";
echo "<img src='images/cancel.gif '> - ".$lang_label["delete_event"];
echo "<img src='images/cancel.gif'> - ".$lang_label["delete_event"];
echo "</td>";
echo "</tr></table>";
echo "<br>";
@ -159,30 +183,6 @@ if (comprueba_login() == 0) {
//pagination
$total_eventos = count($event_list);
pagination($total_eventos, "index.php?sec=eventos&sec2=operation/events/events", $offset);
/*
if ($total_eventos > $block_size){
// If existes more registers tha$row["id_usuario"]n i can put in a page, calculate index markers
$index_counter = ceil($total_eventos/$block_size);
for ($i = 1; $i <= $index_counter; $i++) {
$inicio_bloque = ($i * $block_size - $block_size);
$final_bloque = $i * $block_size;
if ($total_eventos < $final_bloque)
$final_bloque = $total_eventos;
echo '<a href="index.php?sec=eventos&sec2=eventos/eventos&offset='.$inicio_bloque.'">';
$inicio_bloque_fake = $inicio_bloque + 1;
if ($inicio_bloque == $offset)
echo '<b>[ '.$inicio_bloque_fake.' - '.$final_bloque.' ]</b>';
else
echo '[ '.$inicio_bloque_fake.' - '.$final_bloque.' ]';
echo '</a> ';
}
echo "<br><br>";
// if exists more registers than i can put in a page (defined by $block_size config parameter)
// get offset for index calculation
}
echo "</div>";
*/
if (isset($_GET["offset"])){
$offset=entrada_limpia($_GET["offset"]);
@ -215,7 +215,16 @@ if (comprueba_login() == 0) {
if (isset($event_list[$a])) {
$id_evento = $event_list[$a];
if ($id_evento != ""){
$sql="SELECT * FROM tevento WHERE id_evento = $id_evento";
if (isset($_POST["event"])){
$event = entrada_limpia($_POST["event"]);
if ($event=="All") {
$sql="SELECT * FROM tevento WHERE id_evento = $id_evento";
} else {
$sql="SELECT * FROM tevento WHERE evento= '$event' AND id_evento = $id_evento";
}
} else {
$sql="SELECT * FROM tevento WHERE id_evento = $id_evento";
}
$result=mysql_query($sql);
$row=mysql_fetch_array($result);
$id_group = $row["id_grupo"];
@ -267,7 +276,6 @@ if (comprueba_login() == 0) {
echo "<input class='sub' type='submit' name='deletebt' value='".$lang_label["delete"]."'>";
}
echo "</form></table>";
}
else {echo "<font class='red'>".$lang_label["no_event"]."</font>";}
}

29
pandora_console/operation/incidents/incident.php
View File

@ -44,31 +44,6 @@ if ((give_acl($id_user, 0, "IR")==1) OR (give_acl($id_user, 0, "IM")==1) or (dam
}
}
/* Pending to delete code
// Delete incidents (Actions)
if (isset($_POST["accion"])){
$id_inc = $_POST["id_inc"];
if ($_POST["accion"] == $lang_label["in_delinc"]){ // Delete Incident
$id_author_inc = give_incident_author($id_inc);
if (($_SESSION["id_usuario"] == $id_author_inc) OR dame_admin($_SESSION["id_usuario"])) {
borrar_incidencia($id_inc);
} else {
audit_db($id_author_inc,$REMOTE_ADDR,"ACL Forbidden","User ".$_SESSION["id_usuario"]." try to update incident");
echo "<h3 class='error'>".$lang_label["del_incid_no"]."</h3>";
no_permission();
}
}
}
*/
/* EXPLANATION FOR THiS PAGE:
Due to this form get data from other forms, variables are mixed in GET and POST inputs. Combo data originally comes
from POST inputs. All data from posts are translated below to GET INPUT, all posterior data process are using GET
because filter data are dynamically written to links to pass filter data between pages
*/
// Search
$busqueda="";
if (isset($_POST["texto"]) OR (isset($_GET["texto"]))){
@ -182,7 +157,7 @@ if (isset($_POST['operacion'])){
</td>
<td valign="middle"><noscript><input type="submit" class="sub" value="<?php echo $lang_label["show"] ?>" border="0"></noscript>
</td>
<td rowspan="5" class="f9130t">
<td rowspan="5" class="f9l30t">
<h3><?php echo $lang_label["status"] ?></h3>
<img src='images/dot_red.gif'> - <?php echo $lang_label["opened_inc"] ?><br>
<img src='images/dot_yellow.gif'> - <?php echo $lang_label["openedcom_inc"] ?><br>
@ -190,7 +165,7 @@ if (isset($_POST['operacion'])){
<img src='images/dot_green.gif'> - <?php echo $lang_label["closed_inc"] ?><br>
<img src='images/dot_white.gif'> - <?php echo $lang_label["exp_inc"] ?></td>
<td rowspan="5" class="f9130t">
<td rowspan="5" class="f9l30t">
<h3><?php echo $lang_label["priority"] ?></h3>
<img src='images/dot_red.gif'><img src='images/dot_red.gif'><img src='images/dot_red.gif'> - <?php echo $lang_label["very_serious"] ?><br>
<img src='images/dot_yellow.gif'><img src='images/dot_red.gif'><img src='images/dot_red.gif'> - <?php echo $lang_label["serious"] ?><br>