← Back to branch summary

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

« back to all changes in this revision

Viewing changes to frontends/php/include/page_header.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/include/page_header.php
159
159
                                                        'sub_pages'=>array('report3.php','report7.php','chart_sla.php','chart5.php')
160
160
                                                ),
161
161
                                        array('url'=>'vtext.php'),
162
 
                                        array('url'=>'chart3.php')
 
162
                                        array('url'=>'chart3.php'),
 
163
                                        array('url'=>'popup.php')
163
164
                                        )
164
165
                                ),
165
166
                'cm'=>array(
228
229
                                                        'sub_pages'=>array('services_form.php') 
229
230
                                                ),
230
231
                                        array('url'=>'discoveryconf.php','label'=>S_DISCOVERY),
231
 
                                        array('url'=>'exp_imp.php'      ,'label'=>S_EXPORT_IMPORT),
232
 
                                        array('url'=>'popup.php')
 
232
                                        array('url'=>'exp_imp.php'      ,'label'=>S_EXPORT_IMPORT)
233
233
                                        )
234
234
                                ),
235
235
                'admin'=>array(
490
490
                $node_form = null;
491
491
                if(ZBX_DISTRIBUTED){
492
492
                        $lst_nodes = new CComboBox('switch_node', get_current_nodeid(false), 'submit()');
493
 
                        $available_nodes = get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_LIST);
494
 
 
495
 
                        $db_nodes = DBselect('SELECT * '.
496
 
                                                ' FROM nodes '.
497
 
                                                ' WHERE '.DBcondition('nodeid',$available_nodes).
498
 
                                                ' ORDER BY name ');
499
 
                        while($node_data = DBfetch($db_nodes)){
500
 
                                $lst_nodes->addItem($node_data['nodeid'],$node_data['name']);
 
493
                        
 
494
// REMOVING PARENT NODES 
 
495
                        $PAGE_NODES = get_viewed_nodes();
 
496
//------
 
497
                        foreach($PAGE_NODES['nodes'] as $id => $node){
 
498
                                $lst_nodes->addItem($node['nodeid'],$node['name']);
501
499
                        }
502
500
 
503
501
                        if($lst_nodes->ItemsCount() > 0){