← Back to branch summary

~ubuntu-dev/ubuntu/lucid/zabbix/lucid-201002110857

« back to all changes in this revision

Viewing changes to frontends/php/httpmon.php

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2008-06-04 09:22:37 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080604092237-zgwq7kmraj1oohoz
Tags: 1:1.4.5-1ubuntu1
https://launchpad.net/bugs/172775
* Merge from debian unstable, remaining changes: 
  + fixing missing pid directory in /var/run
* Added the same patch to debian/zabbix-server-{mysql,pgsql}.zabbix-server.init
  (LP: #172775)

Show diffs side-by-side

added added

removed removed

Lines of Context:
frontends/php/httpmon.php
58
58
                        $_REQUEST["applications"] = array();
59
59
                        $show_all_apps = 1;
60
60
                }
61
 
                elseif(!in_array($_REQUEST["applicationid"],$_REQUEST["applications"]))
 
61
                elseif(!uint_in_array($_REQUEST["applicationid"],$_REQUEST["applications"]))
62
62
                {
63
63
                        array_push($_REQUEST["applications"],$_REQUEST["applicationid"]);
64
64
                }
87
87
<?php
88
88
// Table HEADER
89
89
        $form = new CForm();
 
90
        $form->SetMethod('get');
90
91
        
91
92
        $cmbGroup = new CComboBox("groupid",$_REQUEST["groupid"],"submit();");
92
93
        $cmbGroup->AddItem(0,S_ALL_SMALL);
93
94
 
94
 
        $accessible_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_WRITE,null,null,get_current_nodeid());
 
95
        $accessible_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,get_current_nodeid());
95
96
        $accessible_groups = get_accessible_groups_by_user($USER_DETAILS,PERM_READ_LIST, null, null, get_current_nodeid());
96
97
 
97
98
        $result=DBselect('select distinct g.groupid,g.name from groups g, hosts_groups hg, hosts h, '.
146
147
 
147
148
// TABLE
148
149
        $form = new CForm();
 
150
        $form->SetMethod('get');
 
151
        
149
152
        $form->SetName('scenarios');
150
153
        $form->AddVar('hostid',$_REQUEST["hostid"]);
151
154
 
191
194
                while($httptest_data = DBfetch($db_httptests))
192
195
                {
193
196
                        ++$httptest_cnt;
194
 
                        if(!in_array($db_app["applicationid"],$_REQUEST["applications"]) && !isset($show_all_apps)) continue;
 
197
                        if(!uint_in_array($db_app["applicationid"],$_REQUEST["applications"]) && !isset($show_all_apps)) continue;
195
198
 
196
199
                        $name = array();
197
200
 
250
253
                }
251
254
                if($httptest_cnt > 0)
252
255
                {
253
 
                        if(in_array($db_app["applicationid"],$_REQUEST["applications"]) || isset($show_all_apps))
 
256
                        if(uint_in_array($db_app["applicationid"],$_REQUEST["applications"]) || isset($show_all_apps))
254
257
                                $link = new CLink(new CImg("images/general/opened.gif"),
255
258
                                        "?close=1&applicationid=".$db_app["applicationid"].
256
259
                                        url_param("groupid").url_param("hostid").url_param("applications").