← Back to branch summary

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

« back to all changes in this revision

Viewing changes to frontends/php/queue.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/queue.php
43
43
        $_REQUEST["show"] = get_request("show", 0);
44
44
 
45
45
        $form = new CForm();
 
46
        $form->SetMethod('get');
 
47
        
46
48
        $cmbMode = new CComboBox("show", $_REQUEST["show"], "submit();");
47
49
        $cmbMode->AddItem(0, S_OVERVIEW);
48
50
        $cmbMode->AddItem(1, S_DETAILS);
73
75
                " and ((h.status=".HOST_STATUS_MONITORED." and h.available != ".HOST_AVAILABLE_FALSE.") ".
74
76
                " or (h.status=".HOST_STATUS_MONITORED." and h.available=".HOST_AVAILABLE_FALSE." and h.disable_until<=$now)) ".
75
77
                " and i.hostid=h.hostid and i.nextcheck<$now and i.key_ not in ('status','icmpping','icmppingsec','zabbix[log]') ".
 
78
                " and i.value_type not in (".ITEM_VALUE_TYPE_LOG.") ".
76
79
                " and h.hostid in (".get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,get_current_nodeid()).")".
 
80
//              " and h.hostid in (".get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,$ZBX_LOCALNODEID).")".
 
81
//              " and ".DBin_node('h.hostid', $ZBX_LOCALNODEID).
 
82
                " and ".DBin_node('h.hostid', get_current_nodeid()).
77
83
                " order by i.nextcheck,h.host,i.description,i.key_");
78
84
 
79
85
        $table = new CTableInfo(S_THE_QUEUE_IS_EMPTY);