← Back to branch summary

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

« back to all changes in this revision

Viewing changes to frontends/php/include/classes/class.cpie.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/classes/class.cpie.php
258
258
                        }
259
259
 
260
260
                        $this->sum += $item_value;
261
 
 
262
 
                        $convertedUnit = zbx_strlen(convert_units(array(
263
 
                                'value' => $item_value,
264
 
                                'units' => $this->items[$i]['units']
265
 
                        )));
266
 
                        $strvaluelength = max($strvaluelength, $convertedUnit);
 
261
                        $strvaluelength = max($strvaluelength, zbx_strlen(convert_units($item_value, $this->items[$i]['units'])));
267
262
                }
268
263
 
269
264
                if (isset($graph_sum)) {
316
311
 
317
312
                        if (isset($data) && isset($datavalue)) {
318
313
                                $strvalue = sprintf(_('Value').': %s ('.(round($proc) != $proc? '%0.2f' : '%s').'%%)',
319
 
                                        convert_units(array(
320
 
                                        'value' => $datavalue,
321
 
                                        'units' => $this->items[$i]['units']
322
 
                                        )),
323
 
                                        $proc);
 
314
                                        convert_units($datavalue, $this->items[$i]['units']), $proc);
324
315
 
325
316
                                $str = sprintf('%s: %s [%s] ',
326
317
                                        str_pad($this->items[$i]['host'], $max_host_len, ' '),