summaryrefslogtreecommitdiffstats
path: root/frontends/php
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-05-15 18:53:33 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-05-15 18:53:33 +0000
commit20ff0332e4cebfb212300f3d9496f14e400a6234 (patch)
tree2e0cabe69c9bbc7ffca7d3b9783f788334f3cff2 /frontends/php
parentf11bd43692bbd9c13e94cccad81eea4a92b7b06f (diff)
downloadzabbix-20ff0332e4cebfb212300f3d9496f14e400a6234.tar.gz
zabbix-20ff0332e4cebfb212300f3d9496f14e400a6234.tar.xz
zabbix-20ff0332e4cebfb212300f3d9496f14e400a6234.zip
- change copyright to SIA Zabbix (Alexei)
- added basic support for log[*] (Alexei) - fixed processing of traps having character ':' (Alexei) - added logfiles.h and logfiles.c (Alexei) - group level start/stop monitoring (Alexei) git-svn-id: svn://svn.zabbix.com/trunk@1774 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php')
-rw-r--r--frontends/php/about.php4
-rw-r--r--frontends/php/actions.php4
-rw-r--r--frontends/php/alarms.php4
-rw-r--r--frontends/php/alerts.php4
-rw-r--r--frontends/php/audit.php4
-rw-r--r--frontends/php/chart.php4
-rw-r--r--frontends/php/chart2.php4
-rw-r--r--frontends/php/chart4.php4
-rw-r--r--frontends/php/chart5.php4
-rw-r--r--frontends/php/chart_diff.php4
-rw-r--r--frontends/php/chart_sla.php4
-rw-r--r--frontends/php/charts.php4
-rw-r--r--frontends/php/config.php4
-rw-r--r--frontends/php/graph.php4
-rw-r--r--frontends/php/graphs.php4
-rw-r--r--frontends/php/history.php6
-rw-r--r--frontends/php/hosts.php30
-rw-r--r--frontends/php/image.php4
-rw-r--r--frontends/php/include/actions.inc.php4
-rw-r--r--frontends/php/include/audit.inc.php4
-rw-r--r--frontends/php/include/classes.inc.php4
-rw-r--r--frontends/php/include/config.inc.php31
-rw-r--r--frontends/php/include/db.inc.php4
-rw-r--r--frontends/php/include/defines.inc.php4
-rw-r--r--frontends/php/include/forms.inc.php6
-rw-r--r--frontends/php/include/graphs.inc.php4
-rw-r--r--frontends/php/include/hosts.inc.php30
-rw-r--r--frontends/php/include/html.inc.php4
-rw-r--r--frontends/php/include/items.inc.php22
-rw-r--r--frontends/php/include/local_en.inc.php8
-rw-r--r--frontends/php/include/maps.inc.php4
-rw-r--r--frontends/php/include/screens.inc.php4
-rw-r--r--frontends/php/include/services.inc.php4
-rw-r--r--frontends/php/include/triggers.inc.php4
-rw-r--r--frontends/php/include/users.inc.php4
-rw-r--r--frontends/php/index.php4
-rw-r--r--frontends/php/items.php4
-rw-r--r--frontends/php/latest.php4
-rw-r--r--frontends/php/latestalarms.php4
-rw-r--r--frontends/php/map.php4
-rw-r--r--frontends/php/maps.php4
-rw-r--r--frontends/php/media.php4
-rw-r--r--frontends/php/overview.php4
-rw-r--r--frontends/php/queue.php4
-rw-r--r--frontends/php/report1.php4
-rw-r--r--frontends/php/report2.php4
-rw-r--r--frontends/php/report3.php4
-rw-r--r--frontends/php/screenconf.php4
-rw-r--r--frontends/php/screenedit.php4
-rw-r--r--frontends/php/screens.php4
-rw-r--r--frontends/php/services.php4
-rw-r--r--frontends/php/srv_status.php4
-rw-r--r--frontends/php/sysmap.php4
-rw-r--r--frontends/php/sysmaps.php4
-rw-r--r--frontends/php/tr_comments.php4
-rw-r--r--frontends/php/tr_status.php4
-rw-r--r--frontends/php/triggers.php4
-rw-r--r--frontends/php/users.php4
58 files changed, 190 insertions, 147 deletions
diff --git a/frontends/php/about.php b/frontends/php/about.php
index d401c152..b2fd48ac 100644
--- a/frontends/php/about.php
+++ b/frontends/php/about.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/actions.php b/frontends/php/actions.php
index ad633ffd..d6fc1ce0 100644
--- a/frontends/php/actions.php
+++ b/frontends/php/actions.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/alarms.php b/frontends/php/alarms.php
index 7d603f7d..95a46f0a 100644
--- a/frontends/php/alarms.php
+++ b/frontends/php/alarms.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/alerts.php b/frontends/php/alerts.php
index 010a2e54..df6e6995 100644
--- a/frontends/php/alerts.php
+++ b/frontends/php/alerts.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/audit.php b/frontends/php/audit.php
index dd5c64f3..faab3505 100644
--- a/frontends/php/audit.php
+++ b/frontends/php/audit.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/chart.php b/frontends/php/chart.php
index 099d6306..98249948 100644
--- a/frontends/php/chart.php
+++ b/frontends/php/chart.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/chart2.php b/frontends/php/chart2.php
index deba7a41..86233ac4 100644
--- a/frontends/php/chart2.php
+++ b/frontends/php/chart2.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/chart4.php b/frontends/php/chart4.php
index bc9de8d9..348cb7fc 100644
--- a/frontends/php/chart4.php
+++ b/frontends/php/chart4.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/chart5.php b/frontends/php/chart5.php
index 574a3b5b..e31fe341 100644
--- a/frontends/php/chart5.php
+++ b/frontends/php/chart5.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/chart_diff.php b/frontends/php/chart_diff.php
index 1c5db867..e3009446 100644
--- a/frontends/php/chart_diff.php
+++ b/frontends/php/chart_diff.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/chart_sla.php b/frontends/php/chart_sla.php
index 003a4c58..e1a5f109 100644
--- a/frontends/php/chart_sla.php
+++ b/frontends/php/chart_sla.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/charts.php b/frontends/php/charts.php
index 73e0ab94..38cb86a2 100644
--- a/frontends/php/charts.php
+++ b/frontends/php/charts.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/config.php b/frontends/php/config.php
index 33897e08..ba37de0c 100644
--- a/frontends/php/config.php
+++ b/frontends/php/config.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/graph.php b/frontends/php/graph.php
index 8c469957..0d83cab8 100644
--- a/frontends/php/graph.php
+++ b/frontends/php/graph.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/graphs.php b/frontends/php/graphs.php
index 16df601f..d68d80e5 100644
--- a/frontends/php/graphs.php
+++ b/frontends/php/graphs.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/history.php b/frontends/php/history.php
index 9883a610..15cf54d1 100644
--- a/frontends/php/history.php
+++ b/frontends/php/history.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@ -151,7 +151,7 @@
echo "<TABLE BORDER=0 COLS=2 ALIGN=CENTER WIDTH=100% BGCOLOR=\"#AAAAAA\" cellspacing=1 cellpadding=3>";
echo "<TR BGCOLOR=\"#CCCCCC\">";
- echo "<TD><B>".S_CLOCK."</B></TD>";
+ echo "<TD><B>".S_TIMESTAMP."</B></TD>";
echo "<TD><B>".S_VALUE."</B></TD>";
echo "</TR>";
diff --git a/frontends/php/hosts.php b/frontends/php/hosts.php
index 9af83aba..9ef49f42 100644
--- a/frontends/php/hosts.php
+++ b/frontends/php/hosts.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@ -173,6 +173,32 @@
$result=update_host_group($_GET["groupid"], $_GET["name"], $_GET["hosts"]);
show_messages($result, S_GROUP_UPDATED, _S_CANNOT_UPDATE_GROUP);
}
+ if($_GET["register"]=="start monitoring")
+ {
+ $result=DBselect("select hostid from hosts_groups where groupid=".$_GET["groupid"]);
+ while($row=DBfetch($result))
+ {
+ $res=update_host_status($row["hostid"],HOST_STATUS_MONITORED);
+ if($res)
+ {
+ add_audit(AUDIT_ACTION_UPDATE,AUDIT_RESOURCE_HOST,"New status [".HOST_STATUS_MONITORED."]");
+ }
+ }
+ show_messages(1,S_HOST_STATUS_UPDATED,S_CANNOT_UPDATE_HOST_STATUS);
+ }
+ if($_GET["register"]=="stop monitoring")
+ {
+ $result=DBselect("select hostid from hosts_groups where groupid=".$_GET["groupid"]);
+ while($row=DBfetch($result))
+ {
+ $res=update_host_status($row["hostid"],HOST_STATUS_NOT_MONITORED);
+ if($res)
+ {
+ add_audit(AUDIT_ACTION_UPDATE,AUDIT_RESOURCE_HOST,"New status [".HOST_STATUS_NOT_MONITORED."]");
+ }
+ }
+ show_messages(1,S_HOST_STATUS_UPDATED,S_CANNOT_UPDATE_HOST_STATUS);
+ }
}
?>
diff --git a/frontends/php/image.php b/frontends/php/image.php
index 335da4f2..25a3b73b 100644
--- a/frontends/php/image.php
+++ b/frontends/php/image.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php
index b808a249..d6e403a1 100644
--- a/frontends/php/include/actions.inc.php
+++ b/frontends/php/include/actions.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/include/audit.inc.php b/frontends/php/include/audit.inc.php
index 3f7a6b26..5364e121 100644
--- a/frontends/php/include/audit.inc.php
+++ b/frontends/php/include/audit.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/include/classes.inc.php b/frontends/php/include/classes.inc.php
index 1655eea0..e5ce1aaf 100644
--- a/frontends/php/include/classes.inc.php
+++ b/frontends/php/include/classes.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index a8e41003..01ac0326 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@ -1439,31 +1439,6 @@ echo "</head>";
return $exp;
}
- # Update Host status
-
- function update_host_status($hostid,$status)
- {
- if(!check_right("Host","U",0))
- {
- error("Insufficient permissions");
- return 0;
- }
-
- $sql="select status from hosts where hostid=$hostid";
- $result=DBselect($sql);
- $old_status=DBget_field($result,0,0);
- if($status != $old_status)
- {
- update_trigger_value_to_unknown_by_hostid($hostid);
- $sql="update hosts set status=$status where hostid=$hostid and status!=".HOST_STATUS_DELETED;
- return DBexecute($sql);
- }
- else
- {
- return 1;
- }
- }
-
function add_image($name,$imagetype,$files)
{
if(isset($files))
@@ -2592,7 +2567,7 @@ echo "</head>";
<p>
<table class="menu" width="100%" cellspacing=0 cellpadding=5>
<tr>
-<td class="horizontal_menu" height=24 colspan=9 align=center><b><?php echo "<a href=\"http://www.zabbix.com\" class=\"highlight\">".S_ZABBIX_VER."</a>&nbsp;".S_COPYRIGHT_BY."<a href=\"mailto:alex@gobbo.caves.lv\" class=\"highlight\">".S_ALEXEI_VLADISHEV."</a>"; ?></b></td>
+<td class="horizontal_menu" height=24 colspan=9 align=center><b><?php echo "<a href=\"http://www.zabbix.com\" class=\"highlight\">".S_ZABBIX_VER."</a>&nbsp;".S_COPYRIGHT_BY."<a href=\"mailto:alex@gobbo.caves.lv\" class=\"highlight\">".S_SIA_ZABBIX."</a>"; ?></b></td>
<td class="horizontal_menu" height=24 colspan=9 align=right><b><span class="divider">&nbsp;&nbsp;|&nbsp;&nbsp;</span><?php echo " ".S_CONNECTED_AS."&nbsp;".$USER_DETAILS["alias"];?></b></td>
</tr>
</table>
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index 694d7de1..2a9dd3da 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index f294e85c..636bd68c 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index cb5722ab..fef7db5c 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@ -607,6 +607,8 @@
{
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"update group\">";
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"delete group\" onClick=\"return Confirm('Delete selected group?');\">";
+ echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"start monitoring\">";
+ echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"stop monitoring\">";
}
echo "</form>";
show_table2_header_end();
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index 158d2ac5..7b07bdb3 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php
index f1e399f9..67a1bd8a 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/frontends/php/include/hosts.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@ -199,4 +199,30 @@
}
return $host;
}
+
+ # Update Host status
+
+ function update_host_status($hostid,$status)
+ {
+ if(!check_right("Host","U",0))
+ {
+ error("Insufficient permissions");
+ return 0;
+ }
+
+ $sql="select status,host from hosts where hostid=$hostid";
+ $result=DBselect($sql);
+ $old_status=DBget_field($result,0,0);
+ if($status != $old_status)
+ {
+ update_trigger_value_to_unknown_by_hostid($hostid);
+ $sql="update hosts set status=$status where hostid=$hostid and status!=".HOST_STATUS_DELETED;
+ info("Updated status of host ".DBget_field($result,0,1));
+ return DBexecute($sql);
+ }
+ else
+ {
+ return 1;
+ }
+ }
?>
diff --git a/frontends/php/include/html.inc.php b/frontends/php/include/html.inc.php
index 4c1b70d1..b40b10f9 100644
--- a/frontends/php/include/html.inc.php
+++ b/frontends/php/include/html.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php
index 652688f2..348f38fd 100644
--- a/frontends/php/include/items.inc.php
+++ b/frontends/php/include/items.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@ -62,6 +62,10 @@
$sql="insert into items (description,key_,hostid,delay,history,nextcheck,status,type,snmp_community,snmp_oid,value_type,trapper_hosts,snmp_port,units,multiplier,delta,snmpv3_securityname,snmpv3_securitylevel,snmpv3_authpassphrase,snmpv3_privpassphrase,formula,trends) values ('$description','$key',$hostid,$delay,$history,0,$status,$type,'$snmp_community','$snmp_oid',$value_type,'$trapper_hosts',$snmp_port,'$units',$multiplier,$delta,'$snmpv3_securityname',$snmpv3_securitylevel,'$snmpv3_authpassphrase','$snmpv3_privpassphrase','$formula',$trends)";
$result=DBexecute($sql);
+ if($result)
+ {
+ info("Added new item $key");
+ }
return DBinsert_id($result,"items","itemid");
}
@@ -115,7 +119,12 @@
$snmpv3_privpassphrase=addslashes($snmpv3_privpassphrase);
$sql="update items set description='$description',key_='$key',hostid=$hostid,delay=$delay,history=$history,nextcheck=0,status=$status,type=$type,snmp_community='$snmp_community',snmp_oid='$snmp_oid',value_type=$value_type,trapper_hosts='$trapper_hosts',snmp_port=$snmp_port,units='$units',multiplier=$multiplier,delta=$delta,snmpv3_securityname='$snmpv3_securityname',snmpv3_securitylevel=$snmpv3_securitylevel,snmpv3_authpassphrase='$snmpv3_authpassphrase',snmpv3_privpassphrase='$snmpv3_privpassphrase',formula='$formula',trends=$trends where itemid=$itemid";
- return DBexecute($sql);
+ $result=DBexecute($sql);
+ if($result)
+ {
+ info("Item $key updated");
+ }
+ return $result;
}
# Add item to hardlinked hosts
@@ -253,6 +262,11 @@
return $result;
}
$sql="delete from items where itemid=$itemid";
- return DBexecute($sql);
+ $result=DBexecute($sql);
+ if($result)
+ {
+ info("Item $key deleted");
+ }
+ return $result;
}
?>
diff --git a/frontends/php/include/local_en.inc.php b/frontends/php/include/local_en.inc.php
index bfc1b702..9bd60943 100644
--- a/frontends/php/include/local_en.inc.php
+++ b/frontends/php/include/local_en.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@ -195,7 +195,7 @@
define("S_ZABBIX_VER", "ZABBIX 1.1alpha8");
define("S_COPYRIGHT_BY", "Copyright 2001-2005 by ");
define("S_CONNECTED_AS", "Connected as");
- define("S_ALEXEI_VLADISHEV", "Alexei Vladishev");
+ define("S_SIA_ZABBIX", "SIA Zabbix");
// graph.php
define("S_CONFIGURATION_OF_GRAPH", "Configuration of graph");
@@ -237,7 +237,7 @@
define("S_VALUES_OF_LAST_HOUR", "Values of last hour");
define("S_VALUES_OF_SPECIFIED_PERIOD", "Values of specified period");
define("S_VALUES_IN_PLAIN_TEXT_FORMAT", "Values in plain text format");
- define("S_CLOCK", "Clock");
+ define("S_TIMESTAMP", "Timestamp");
// hosts.php
define("S_HOSTS", "Hosts");
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php
index 0b0a758a..08fdc2c8 100644
--- a/frontends/php/include/maps.inc.php
+++ b/frontends/php/include/maps.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php
index 688e950b..1439e45e 100644
--- a/frontends/php/include/screens.inc.php
+++ b/frontends/php/include/screens.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php
index 9c9af979..23e68379 100644
--- a/frontends/php/include/services.inc.php
+++ b/frontends/php/include/services.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 415c5cf9..f316517a 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/include/users.inc.php b/frontends/php/include/users.inc.php
index a6495424..9012f2de 100644
--- a/frontends/php/include/users.inc.php
+++ b/frontends/php/include/users.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/index.php b/frontends/php/index.php
index c1513b77..84e1ba74 100644
--- a/frontends/php/index.php
+++ b/frontends/php/index.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/items.php b/frontends/php/items.php
index 47f6e8aa..c622d845 100644
--- a/frontends/php/items.php
+++ b/frontends/php/items.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/latest.php b/frontends/php/latest.php
index b673764e..b693a645 100644
--- a/frontends/php/latest.php
+++ b/frontends/php/latest.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/latestalarms.php b/frontends/php/latestalarms.php
index b5595d8b..03cdf7a9 100644
--- a/frontends/php/latestalarms.php
+++ b/frontends/php/latestalarms.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/map.php b/frontends/php/map.php
index 6e102f41..35f930e6 100644
--- a/frontends/php/map.php
+++ b/frontends/php/map.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/maps.php b/frontends/php/maps.php
index 444daf20..236703d0 100644
--- a/frontends/php/maps.php
+++ b/frontends/php/maps.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/media.php b/frontends/php/media.php
index 56f50ae0..e68cdb41 100644
--- a/frontends/php/media.php
+++ b/frontends/php/media.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/overview.php b/frontends/php/overview.php
index 1dccf2e2..61f1a0ca 100644
--- a/frontends/php/overview.php
+++ b/frontends/php/overview.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/queue.php b/frontends/php/queue.php
index 08294e3b..7992689f 100644
--- a/frontends/php/queue.php
+++ b/frontends/php/queue.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/report1.php b/frontends/php/report1.php
index 59954535..2c192f08 100644
--- a/frontends/php/report1.php
+++ b/frontends/php/report1.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/report2.php b/frontends/php/report2.php
index 6bd5892c..6e7d47f6 100644
--- a/frontends/php/report2.php
+++ b/frontends/php/report2.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/report3.php b/frontends/php/report3.php
index 16b5546a..c0d6123a 100644
--- a/frontends/php/report3.php
+++ b/frontends/php/report3.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/screenconf.php b/frontends/php/screenconf.php
index 9a50bf84..a138a8b4 100644
--- a/frontends/php/screenconf.php
+++ b/frontends/php/screenconf.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php
index 47e9aeab..1fa1ebb3 100644
--- a/frontends/php/screenedit.php
+++ b/frontends/php/screenedit.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/screens.php b/frontends/php/screens.php
index bd3f33dd..7799a665 100644
--- a/frontends/php/screens.php
+++ b/frontends/php/screens.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/services.php b/frontends/php/services.php
index 73487f5a..3057bd88 100644
--- a/frontends/php/services.php
+++ b/frontends/php/services.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/srv_status.php b/frontends/php/srv_status.php
index fb0a391d..2df5688c 100644
--- a/frontends/php/srv_status.php
+++ b/frontends/php/srv_status.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/sysmap.php b/frontends/php/sysmap.php
index df4bc886..2fb33830 100644
--- a/frontends/php/sysmap.php
+++ b/frontends/php/sysmap.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/sysmaps.php b/frontends/php/sysmaps.php
index 7e4d9c7c..87655063 100644
--- a/frontends/php/sysmaps.php
+++ b/frontends/php/sysmaps.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/tr_comments.php b/frontends/php/tr_comments.php
index 803cba2e..86488de4 100644
--- a/frontends/php/tr_comments.php
+++ b/frontends/php/tr_comments.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/tr_status.php b/frontends/php/tr_status.php
index f5063a30..6477a550 100644
--- a/frontends/php/tr_status.php
+++ b/frontends/php/tr_status.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/triggers.php b/frontends/php/triggers.php
index 0f573e11..63b381d4 100644
--- a/frontends/php/triggers.php
+++ b/frontends/php/triggers.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
diff --git a/frontends/php/users.php b/frontends/php/users.php
index c5ff8929..bd16b2af 100644
--- a/frontends/php/users.php
+++ b/frontends/php/users.php
@@ -1,7 +1,7 @@
<?php
/*
-** Zabbix
-** Copyright (C) 2000,2001,2002,2003,2004 Alexei Vladishev
+** ZABBIX
+** Copyright (C) 2000-2005 SIA Zabbix
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by