Changeset 6731
- Timestamp:
- 10/06/08 15:28:58 (2 months ago)
- Location:
- trunk/centreon/www/include
- Files:
-
- 5 modified
-
configuration/configObject/host/DB-Func.php (modified) (3 diffs)
-
configuration/configObject/service/DB-Func.php (modified) (4 diffs)
-
options/configurationChangelog/DB-Func.php (modified) (2 diffs)
-
options/configurationChangelog/viewLogs.ihtml (modified) (4 diffs)
-
options/configurationChangelog/viewLogs.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/centreon/www/include/configuration/configObject/host/DB-Func.php
r6721 r6731 665 665 $fields["host_notifOpts"] = ""; 666 666 if (isset($ret["host_notifOpts"])) 667 $fields["host_notifOpts"] = implode(",", $ret["host_notifOpts"]);667 $fields["host_notifOpts"] = implode(",", array_keys($ret["host_notifOpts"])); 668 668 $fields["host_notifications_enabled"] = $ret["host_notifications_enabled"]["host_notifications_enabled"]; 669 669 $fields["host_first_notification_delay"] = $ret["host_first_notification_delay"]; 670 670 $fields["host_stalOpts"] = ""; 671 671 if (isset($ret["host_stalOpts"])) 672 $fields["host_stalOpts"] = implode(",", $ret["host_stalOpts"]);672 $fields["host_stalOpts"] = implode(",", array_keys($ret["host_stalOpts"])); 673 673 $fields["host_snmp_community"] = htmlentities($ret["host_snmp_community"], ENT_QUOTES); 674 674 $fields["host_snmp_version"] = htmlentities($ret["host_snmp_version"], ENT_QUOTES); … … 1076 1076 $fields["host_notifOpts"] = ""; 1077 1077 if (isset($ret["host_notifOpts"])) 1078 $fields["host_notifOpts"] = implode(",", $ret["host_notifOpts"]);1078 $fields["host_notifOpts"] = implode(",", array_keys($ret["host_notifOpts"])); 1079 1079 $fields["host_notifications_enabled"] = $ret["host_notifications_enabled"]["host_notifications_enabled"]; 1080 1080 $fields["host_first_notification_delay"] = $ret["host_first_notification_delay"]; 1081 1081 $fields["host_stalOpts"] = ""; 1082 1082 if (isset($ret["host_stalOpts"])) 1083 $fields["host_stalOpts"] = implode(",", $ret["host_stalOpts"]);1083 $fields["host_stalOpts"] = implode(",", array_keys($ret["host_stalOpts"])); 1084 1084 $fields["host_snmp_community"] = htmlentities($ret["host_snmp_community"], ENT_QUOTES); 1085 1085 $fields["host_snmp_version"] = htmlentities($ret["host_snmp_version"], ENT_QUOTES); … … 1249 1249 if (isset($ret["host_notifOpts"]) && $ret["host_notifOpts"] != NULL) { 1250 1250 $rq .= "host_notification_options = '".implode(",", array_keys($ret["host_notifOpts"]))."', "; 1251 $fields["host_notif ication_options"] = implode(",", array_keys($ret["host_notifOpts"]));1251 $fields["host_notifOpts"] = implode(",", array_keys($ret["host_notifOpts"])); 1252 1252 } 1253 1253 if (isset($ret["host_notifications_enabled"]["host_notifications_enabled"])) { -
trunk/centreon/www/include/configuration/configObject/service/DB-Func.php
r6721 r6731 593 593 $fields["service_notifOpts"] = ""; 594 594 if (isset($ret["service_notifOpts"])) 595 $fields["service_notifOpts"] = implode(",", $ret["service_notifOpts"]);595 $fields["service_notifOpts"] = implode(",", array_keys($ret["service_notifOpts"])); 596 596 $fields["service_notifications_enabled"] = $fields["service_notifications_enabled"]["service_notifications_enabled"]; 597 597 $fields["service_stalOpts"] = ""; 598 598 if (isset($ret["service_stalOpts"])) 599 $fields["service_stalOpts"] = implode(",", $ret["service_stalOpts"]);599 $fields["service_stalOpts"] = implode(",", array_keys($ret["service_stalOpts"])); 600 600 $fields["service_comment"] = htmlentities($ret["service_comment"], ENT_QUOTES); 601 601 $fields["command_command_id_arg"] = htmlentities($ret["command_command_id_arg"], ENT_QUOTES); … … 822 822 $fields["service_notifOpts"] = ""; 823 823 if (isset($ret["service_notifOpts"])) 824 $fields["service_notifOpts"] = implode(",", $ret["service_notifOpts"]);824 $fields["service_notifOpts"] = implode(",", array_keys($ret["service_notifOpts"])); 825 825 $fields["service_notifications_enabled"] = $fields["service_notifications_enabled"]["service_notifications_enabled"]; 826 826 $fields["service_stalOpts"] = ""; 827 827 if (isset($ret["service_stalOpts"])) 828 $fields["service_stalOpts"] = implode(",", $ret["service_stalOpts"]);828 $fields["service_stalOpts"] = implode(",", array_keys($ret["service_stalOpts"])); 829 829 $fields["service_comment"] = htmlentities($ret["service_comment"], ENT_QUOTES); 830 830 $fields["command_command_id_arg"] = htmlentities($ret["command_command_id_arg"], ENT_QUOTES); … … 989 989 if (isset($ret["service_notifOpts"]) && $ret["service_notifOpts"] != NULL) { 990 990 $rq .= "service_notification_options = '".implode(",", array_keys($ret["service_notifOpts"]))."', "; 991 $fields["service_notifOpts"] = implode(",", $ret["service_notifOpts"]);991 $fields["service_notifOpts"] = implode(",", array_keys($ret["service_notifOpts"])); 992 992 } 993 993 if (isset($ret["service_notifications_enabled"]["service_notifications_enabled"])) { … … 997 997 if (isset($ret["service_stalOpts"]) && $ret["service_stalOpts"] != NULL) { 998 998 $rq .= "service_stalking_options = '".implode(",", array_keys($ret["service_stalOpts"]))."', "; 999 $fields["service_stalOpts"] = implode(",", $ret["service_stalOpts"]);999 $fields["service_stalOpts"] = implode(",", array_keys($ret["service_stalOpts"])); 1000 1000 } 1001 1001 if (isset($ret["service_comment"]) && $ret["service_comment"] != NULL) { -
trunk/centreon/www/include/options/configurationChangelog/DB-Func.php
r6726 r6731 75 75 while ($field =& $DBRESULT2->fetchRow()) { 76 76 if (($row["action_type"] == "a" || $row["action_type"] == "c") && (!$first_ref_flag || $first_ref_flag == $field["action_log_id"])) { 77 $ref[$j]["action_log_id"] = $field["action_log_id"]; 78 $ref[$j]["field_name"] = $field["field_name"]; 79 $ref[$j]["field_value"] = $field["field_value"]; 77 $ref[$field["field_name"]] = $field["field_value"]; 80 78 $first_ref_flag = $field["action_log_id"]; 81 79 … … 88 86 else { 89 87 foreach ($ref as $key => $value) { 90 if ( ($field["field_name"] == $value["field_name"]) && ($field["field_value"] != $value["field_value"])) {91 $list_modifications[$i]["field_value_before"] = $value["field_value"];88 if (!isset($ref[$field["field_name"]])) { 89 $list_modifications[$i]["field_value_before"] = ""; 92 90 $list_modifications[$i]["action_log_id"] = $field["action_log_id"]; 93 91 $list_modifications[$i]["field_name"] = $field["field_name"]; 94 92 $list_modifications[$i]["field_value_after"] = $field["field_value"]; 95 $ref[$key]["field_value"] = $field["field_value"]; 93 $ref[$field["field_name"]] = $field["field_value"]; 94 } 95 else if (($field["field_name"] == $key) && ($field["field_value"] != $value)) { 96 $list_modifications[$i]["field_value_before"] = $value; 97 $list_modifications[$i]["action_log_id"] = $field["action_log_id"]; 98 $list_modifications[$i]["field_name"] = $field["field_name"]; 99 $list_modifications[$i]["field_value_after"] = $field["field_value"]; 100 $ref[$key] = $field["field_value"]; 96 101 } 97 102 } -
trunk/centreon/www/include/options/configurationChangelog/viewLogs.ihtml
r6726 r6731 3 3 <tr class="ToolbarTR"> 4 4 <td class="Toolbar_TDSelectAction_Top" width="300"><span class="consol_button">{$objTypeLabel} {$form.o1.html}</span></td> 5 <td class="Toolbar_TDSelectAction_Top" width=" 300"><span class="consol_button">{$objNameLabel} {$form.o2.html}</span></td>6 < td><input type="submit" name="logs" value="Apply" /></td>5 <td class="Toolbar_TDSelectAction_Top" width="auto"><span class="consol_button">{$objNameLabel} {$form.o2.html}</span></td> 6 <!--<td><input type="submit" name="logs" value="Apply" /></td>--> 7 7 </tr> 8 8 </table> 9 9 {if $display_flag} 10 <br>{$objName}11 <br>12 10 <table class="ListTable"> 13 11 <tr class="ListHeader"> … … 15 13 <td class="ListColHeaderCenter" style="white-space:nowrap;">{$contact_name}</td> 16 14 <td class="ListColHeaderCenter" style="white-space:nowrap;">{$type}</td> 17 <td class="ListColHeaderCenter" style="white-space:nowrap;">{$logs} </td>15 <td class="ListColHeaderCenter" style="white-space:nowrap;">{$logs}{$objName}</td> 18 16 </tr> 17 {assign var='classStyle' value='list_two'} 18 {assign var='firstFlag' value=1} 19 19 {foreach item=list from=$action} 20 <tr class="Logs"> 20 {if $classStyle == 'list_two'} 21 {assign var='classStyle' value='list_one'} 22 {else} 23 {assign var='classStyle' value='list_two'} 24 {/if} 25 <tr class={$classStyle}> 21 26 <td class="ListColCenter">{$list.action_log_date}</td> 22 27 <td class="ListColCenter">{$list.log_contact_id}</td> … … 25 30 {if $list.action_type == "Create" || $list.action_type == "Change" || $list.action_type == "Massive change"} 26 31 <table class="ListTable" 32 {if $firstFlag} 33 {assign var='firstFlag' value=0} 27 34 <tr class="ListHeader"> 28 35 <td class="ListColHeaderCenter" style="white-space:nowrap;">{$field_name}</td> … … 30 37 <td class="ListColHeaderCenter" style="white-space:nowrap;">{$after}</td> 31 38 </tr> 39 {/if} 32 40 {assign var='cpt' value=0} 33 41 {foreach item=modif from=$modification} 34 42 {if $modif.action_log_id == $list.action_log_id} 35 43 <tr> 36 <td class="ListColCenter" >44 <td class="ListColCenter" width="250"> 37 45 {if $modif.action_log_id == $list.action_log_id} 38 46 {$modif.field_name} 39 47 {/if} 40 48 </td> 41 <td class="ListColCenter" >49 <td class="ListColCenter" width="100"> 42 50 {if $modif.action_log_id == $list.action_log_id} 43 51 {$modif.field_value_before} 44 52 {/if} 45 53 </td> 46 <td class="ListColCenter" >54 <td class="ListColCenter" width="100"> 47 55 {if $modif.action_log_id == $list.action_log_id} 48 56 {$modif.field_value_after} -
trunk/centreon/www/include/options/configurationChangelog/viewLogs.php
r6726 r6731 56 56 $tpl->assign("before", _("Before")); 57 57 $tpl->assign("after", _("After")); 58 $tpl->assign("logs", _("Logs "));58 $tpl->assign("logs", _("Logs for ")); 59 59 $tpl->assign("objTypeLabel", _("Object type:")); 60 60 $tpl->assign("objNameLabel", _("Object name:")); … … 80 80 $object_type_tab[8] = "servicegroup"; 81 81 $object_type_tab[9] = "snmp traps"; 82 $object_type_tab[10] = "escalation s";82 $object_type_tab[10] = "escalation"; 83 83 $object_type_tab[11] = "host dependency"; 84 84 $object_type_tab[12] = "hostgroup dependency";
