diff options
Diffstat (limited to 'frontends/php/include/classes')
| -rw-r--r-- | frontends/php/include/classes/ccombobox.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/classes/pie.inc.php | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/frontends/php/include/classes/ccombobox.inc.php b/frontends/php/include/classes/ccombobox.inc.php index a3100d08..c4810736 100644 --- a/frontends/php/include/classes/ccombobox.inc.php +++ b/frontends/php/include/classes/ccombobox.inc.php @@ -89,7 +89,7 @@ function AddItem($value, $caption='', $selected=NULL, $enabled='yes') { // if($enabled=='no') return; /* disable item method 1 */ - if(strtolower(get_class($value))=='ccomboitem') { + if(strtolower(get_class($value))=='ccomboitem'){ parent::AddItem($value); } else{ diff --git a/frontends/php/include/classes/pie.inc.php b/frontends/php/include/classes/pie.inc.php index 058d743d..ad92298d 100644 --- a/frontends/php/include/classes/pie.inc.php +++ b/frontends/php/include/classes/pie.inc.php @@ -102,7 +102,8 @@ function selectData(){ 'SELECT h.itemid, '. ' avg(h.value) AS avg,min(h.value) AS min, '. ' max(h.value) AS max,max(h.clock) AS clock, max(i.lastvalue) as lst '. - ' FROM history AS h LEFT JOIN items AS i ON h.itemid = i.itemid'. + ' FROM history h '. + ' LEFT JOIN items i ON h.itemid = i.itemid'. ' WHERE h.itemid='.$this->items[$i]['itemid']. ' AND h.clock>='.$from_time. ' AND h.clock<='.$to_time. @@ -112,7 +113,8 @@ function selectData(){ 'SELECT hu.itemid, '. ' avg(hu.value) AS avg,min(hu.value) AS min,'. ' max(hu.value) AS max,max(hu.clock) AS clock, max(i.lastvalue) as lst'. - ' FROM history_uint AS hu LEFT JOIN items AS i ON hu.itemid = i.itemid'. + ' FROM history_uint hu '. + ' LEFT JOIN items i ON hu.itemid = i.itemid'. ' WHERE hu.itemid='.$this->items[$i]['itemid']. ' AND hu.clock>='.$from_time. ' AND hu.clock<='.$to_time. @@ -124,7 +126,8 @@ function selectData(){ 'SELECT t.itemid, '. ' avg(t.value_avg) AS avg,min(t.value_min) AS min,'. ' max(t.value_max) AS max,max(t.clock) AS clock, max(i.lastvalue) as lst'. - ' FROM trends AS t LEFT JOIN items AS i ON t.itemid = i.itemid'. + ' FROM trends t '. + ' LEFT JOIN items i ON t.itemid = i.itemid'. ' WHERE t.itemid='.$this->items[$i]['itemid']. ' AND t.clock>='.$from_time. ' AND t.clock<='.$to_time. |