← Back to branch summary

~ko-de-r-de/zabbix/precise

« back to all changes in this revision

Viewing changes to frontends/php/include/html.inc.php

  • Committer: guntis
  • Date: 2013-08-01 06:46:25 UTC
  • Revision ID: svn-v4:f4e7fd02-d210-4e34-a1e0-d4093fb66cc2:trunk:37472
..F....... [ZBX-4986] absolute urls replaced with relative and fixed commit bugs

Show diffs side-by-side

added added

removed removed

Lines of Context:
frontends/php/include/html.inc.php
371
371
        /*
372
372
         * Name
373
373
         */
374
 
        $proxyName = '';
 
374
        $description = '';
375
375
        if ($dbHost['proxy_hostid']) {
376
376
                $proxy = get_host_by_hostid($dbHost['proxy_hostid']);
377
 
 
378
 
                $proxyName = CHtml::encode($proxy['host']).NAME_DELIMITER;
 
377
                $description .= CHtml::encode($proxy['host']).NAME_DELIMITER;
379
378
        }
380
 
 
381
 
        $name = get_node_name_by_elid($dbHost['hostid'], true, NAME_DELIMITER).$proxyName.CHtml::encode($dbHost['name']);
 
379
        $description .= CHtml::encode($dbHost['name']);
382
380
 
383
381
        if ($dbHost['status'] == HOST_STATUS_TEMPLATE) {
384
 
                $list->addItem(array(bold(_('Template').NAME_DELIMITER), new CLink($name, 'templates.php?form=update&templateid='.$dbHost['hostid'])));
 
382
                $list->addItem(array(bold(_('Template').NAME_DELIMITER), new CLink($description, 'templates.php?form=update&templateid='.$dbHost['hostid'])));
385
383
        }
386
384
        else {
387
385
                switch ($dbHost['status']) {
396
394
                                break;
397
395
                }
398
396
 
399
 
                $list->addItem(array(bold(_('Host').NAME_DELIMITER), new CLink($name, 'hosts.php?form=update&hostid='.$dbHost['hostid'])));
 
397
                $list->addItem(array(bold(_('Host').NAME_DELIMITER), new CLink($description, 'hosts.php?form=update&hostid='.$dbHost['hostid'])));
400
398
                $list->addItem($status);
401
399
                $list->addItem(getAvailabilityTable($dbHost));
402
400
        }