← Back to branch summary

~kampka/ubuntu/quantal/zabbix/upstart-support

« back to all changes in this revision

Viewing changes to frontends/php/srv_status.php

  • Committer: Bazaar Package Importer
  • Author(s): Michael Ablassmeier
  • Date: 2009-06-28 19:11:29 UTC
  • mfrom: (19.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090628191129-5esmmf2h3tbff1fv
http://bugs.debian.org/528426
http://bugs.debian.org/534096
http://bugs.debian.org/520197
http://bugs.debian.org/527559
http://bugs.debian.org/527600
http://bugs.debian.org/528571
http://bugs.debian.org/529157
http://bugs.debian.org/529502
http://bugs.debian.org/532344
* New upstream release
* Merge upstream config file to template (Closes: #528426)
* Move logrotate from Depends to Suggests (Closes: #534096)
* Server should not crash anymore if postgresql transaction fails
  (Closes: #520197)
* Update fr.po (Closes: #527559)
* Update es.po (Closes: #527600)
* Update sv.po (Closes: #528571)
* Update it.po (Closes: #529157)
* Update cs.po (Closes: #529502)
* Update de.po (Closes: #532344)

Show diffs side-by-side

added added

removed removed

Lines of Context:
frontends/php/srv_status.php
60
60
//--------
61
61
?>
62
62
<?php
63
 
        if(isset($_REQUEST['serviceid']) && 
64
 
                        ($_REQUEST['serviceid']>0) && 
65
 
                        !DBfetch(DBselect('select serviceid from services where serviceid='.$_REQUEST['serviceid'])))
66
 
                {
67
 
                unset($_REQUEST['serviceid']);
68
 
        }
69
 
 
70
63
        $available_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,PERM_RES_IDS_ARRAY);
71
64
        $available_triggers = get_accessible_triggers(PERM_READ_ONLY, array(), PERM_RES_IDS_ARRAY);
72
65
 
73
 
        if(isset($_REQUEST["serviceid"]) && $_REQUEST["serviceid"] > 0){
74
 
                $sql = 'SELECT s.serviceid '.
75
 
                                        ' FROM services s '.
76
 
                                        ' WHERE (s.triggerid is NULL OR '.DBcondition('s.triggerid',$available_triggers).') '.
77
 
                                                ' AND s.serviceid='.$_REQUEST['serviceid'];
78
 
 
79
 
                if(!$service = DBfetch(DBselect($sql,1))){
80
 
                        access_deny();
 
66
        if(isset($_REQUEST['serviceid'])){
 
67
                $sql = 'SELECT DISTINCT serviceid, triggerid '.
 
68
                                ' FROM services '.
 
69
                                ' WHERE serviceid='.$_REQUEST['serviceid'];             
 
70
                if($service = DBfetch(DBselect($sql))){
 
71
                        if(isset($service['triggerid']) && !isset($available_triggers[$service['triggerid']])){
 
72
                                access_deny();
 
73
                        }
 
74
                }
 
75
                else{
 
76
                        unset($service);
81
77
                }
82
78
        }
 
79
        
83
80
        unset($_REQUEST['serviceid']);
84
81
?>
85
82
<?php
86
83
//      show_table_header(S_IT_SERVICES_BIG);
87
84
 
88
 
        if(isset($service)&&isset($_REQUEST['showgraph'])){
 
85
        if(isset($service) && isset($_REQUEST['showgraph'])){
89
86
                $table  = new CTable(null,'chart');
90
87
                $table->AddRow(new CImg('chart5.php?serviceid='.$service['serviceid'].url_param('path')));
91
88
                $table->Show();
123
120
                while($row = DBFetch($result)){
124
121
                        $row['id'] = $row['serviceid'];
125
122
                
126
 
                        (empty($row['serviceupid']))?($row['serviceupid']='0'):('');
127
 
                        (empty($row['description']))?($row['description']='None'):('');
 
123
                        if(empty($row['serviceupid'])) $row['serviceupid']='0';
 
124
                        if(empty($row['description'])) $row['description']='None';
 
125
                        
128
126
                        $row['graph'] = new CLink(S_SHOW,"srv_status.php?serviceid=".$row["serviceid"]."&showgraph=1".url_param('path'),"action");
129
127
                        
130
128
                        if(isset($row["triggerid"]) && !empty($row["triggerid"])){