← Back to branch summary

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

« back to all changes in this revision

Viewing changes to frontends/php/items.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/items.php
339
339
                $applications = get_request('applications',array());
340
340
                $delay_flex = get_request('delay_flex',array());
341
341
                $db_delay_flex = '';
342
 
                foreach($delay_flex as $val)
 
342
                foreach($delay_flex as $num => $val)
343
343
                        $db_delay_flex .= $val['delay'].'/'.$val['period'].';';
344
344
                $db_delay_flex = trim($db_delay_flex,';');
345
345
 
370
370
                                'delay_flex'            => $db_delay_flex,
371
371
                                'params'                        => get_request('params'),
372
372
                                'ipmi_sensor'           => get_request('ipmi_sensor'));
373
 
                                
 
373
 
374
374
                if(isset($_REQUEST['itemid'])){
375
375
                        DBstart();
376
376
 
644
644
                        $available_hosts = get_accessible_hosts_by_user($USER_DETAILS, PERM_READ_WRITE);
645
645
 
646
646
                        $group_itemid = $_REQUEST['group_itemid'];
647
 
 
648
 
                        DBstart();
649
 
 
650
 
                        $sql = 'SELECT h.host, i.itemid, i.key_, i.templateid '.
 
647
                
 
648
                        $sql = 'SELECT h.host, i.itemid, i.key_, i.templateid, i.type'.
651
649
                                        ' FROM items i, hosts h '.
652
650
                                        ' WHERE '.DBcondition('i.itemid',$group_itemid).
653
651
                                                ' AND h.hostid=i.hostid'.
654
652
                                                ' AND '.DBcondition('h.hostid',$available_hosts);
655
 
                        $item_res = DBselect($sql);
656
 
                        while($item = DBfetch($item_res)){
657
 
                                if($item['templateid']<>0){
 
653
                        $db_items = DBselect($sql);
 
654
                        while($item = DBfetch($db_items)) {
 
655
                                if($item['templateid'] != 0) {
658
656
                                        unset($group_itemid[$item['itemid']]);
 
657
                                        info(S_ITEM.SPACE."'".$item['host'].':'.$item['itemid']."'".SPACE.S_CANNOT_DELETE_ITEM.SPACE.'('.S_TEMPLATED_ITEM.')');
659
658
                                        continue;
660
659
                                }
661
 
 
 
660
                                elseif($item['type'] == 9) {
 
661
                                        unset($group_itemid[$item['itemid']]);
 
662
                                        info(S_ITEM.SPACE."'".$item['host'].':'.$item['itemid']."'".SPACE.S_CANNOT_DELETE_ITEM.SPACE.'('.S_WEB_ITEM.')');
 
663
                                        continue;
 
664
                                }                               
662
665
                                add_audit(AUDIT_ACTION_DELETE, AUDIT_RESOURCE_ITEM,S_ITEM.' ['.$item['key_'].'] ['.$item['itemid'].'] '.S_HOST.' ['.$item['host'].']');
663
666
                        }
664
667
 
665
 
                        $result = delete_item($group_itemid);
666
 
                        $result = DBend($result);
667
 
                        show_messages($result, S_ITEMS_DELETED, null);
 
668
                        $result = !empty($group_itemid);
 
669
                        if($result) {
 
670
                                DBstart();
 
671
                                $result = delete_item($group_itemid);
 
672
                                $result = DBend($result);
 
673
                        }
 
674
                        show_messages($result, S_ITEMS_DELETED, S_CANNOT_DELETE_ITEMS);
 
675
                        
668
676
                }
669
677
                else if($_REQUEST['group_task']==S_ACTIVATE_SELECTED){
670
678
                        global $USER_DETAILS;
773
781
        }
774
782
        
775
783
        $reset = true;
776
 
        $options = array('only_current_node');
 
784
        $options = array('only_current_node', 'not_proxy_hosts');
 
785
        $params = array();
777
786
        if($filter_enabled){
778
787
                array_push($options,'allow_all');
779
788
                $reset = false;