Changeset 263fbcefa4e7c9542382400747df4c4ef671996d

Timestamp:

01/28/11 18:05:31 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1296237931 +0000

git-parent:

[4fae03b83820a0c88604a1591dc30859440f6623]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1296237931 +0000

Message:

reviewed patch from Michal Taborsky to make the PHP clean under E_ALL error setting

Files:

• ui/web/htdocs/datapoint_browse_json.php (modified) (2 diffs)
• ui/web/htdocs/drawing_board.php (modified) (1 diff)
• ui/web/htdocs/json_graph_flot.php (modified) (3 diffs)
• ui/web/htdocs/template_browse_json.php (modified) (1 diff)
• ui/web/lib/Reconnoiter_DB.php (modified) (4 diffs)
• ui/web/lib/Reconnoiter_DataContainer.php (modified) (2 diffs)
• ui/web/lib/Reconnoiter_flot_Driver.php (modified) (3 diffs)

ui/web/htdocs/datapoint_browse_json.php

@@ -10 +10 @@
-$l3 = $_GET['l3'];
-$l4 = $_GET['l4'];
-$_GET['l5']
+!empty($_GET['l5'])?$_GET['l5']:false
-
-
+!empty($_REQUEST['root']) && 
-  $want = $l1;
-}
-$_REQUEST[$l1]
+!empty($_REQUEST[$l1])
-  $want = $l2;
-$_REQUEST[$l2]
+!empty($_REQUEST[$l2])
-    $want = $l3;
-$_REQUEST[$l3]
+!empty($_REQUEST[$l3])
-      $want = $l4;
-$_REQUEST[$l4]
+!empty($_REQUEST[$l4])
-        $want = $l5;
-$_REQUEST[$l5]
+!empty($_REQUEST[$l5])
-          $want = '';
-      }
@@ -41 +41 @@
-    }
-    $jitem = array('id'          => $item['id'],
-$item['ptr']
+!empty($item['ptr'])
-                                      $item[$want] . "(" . $item['ptr'] . ")" :
-                                      $item[$want],

ui/web/htdocs/drawing_board.php

@@ -2 +2 @@
-$otype = $_GET['otype'];
-$id = $_GET['id'];
-$_GET['start']
-$_GET['end']
+!empty($_GET['start'])?$_GET['start']:null
+!empty($_GET['end'])?$_GET['end']:null
-$gran = $_GET['gran'];
-

ui/web/htdocs/json_graph_flot.php

@@ -64 +64 @@
-$autounits = 0;
-foreach($graph['datapoints'] as $k => $d) {
+  if (!isset($d['math1'])) $d['math1']='';
+  if (!isset($d['math2'])) $d['math2']='';
-  if($d['metric_type'] == 'guide') {
-    $color = isset($d['color']) ? $d['color'] : '#ff0000';
+    
-    if ($guideType[$k]=='percentile') {
-    $driver->addPercentileGuide($d['name'], $d['math2'],
@@ -86 +89 @@
-    $settings['color'] = isset($d['color']) ? $d['color'] : $settings['color'];
-    if($d['hidden'] == "true") $settings['hidden'] = "true";
-$d['math1']
+!empty($d['math1'])
-    $settings['axis'] = ($d['axis'] == 'l') ? 'left' : 'right';
-    $settings['title'] = $d['name'];
@@ -106 +109 @@
-  'xaxis' => array ( 'mode' => 'time' ),
-  'yaxis' => array ( 'suffix' => $driver->autounit() . '' ),
-position
+'position'
-  'selection' => array ( 'mode' => 'x' ),
-  'shadowSize' => 0,

ui/web/htdocs/template_browse_json.php

@@ -27 +27 @@
-$template;
-
-$_REQUEST[$l1]
+!empty($_REQUEST[$l1])
-        $templateid = $_REQUEST[$l1];
-        $template = new Reconnoiter_GraphTemplate($templateid);

ui/web/lib/Reconnoiter_DB.php

@@ -341 +341 @@
-    foreach ($p as $wanted) {
-      $idx = max(ceil((count($full)-1) * ($wanted/100.0)), 0);
-$full[$idx]
+!empty($full[$idx])?$full[$idx] : null
-    }
-    return $rv;
@@ -372 +372 @@
-      if($nonnull == 1) $full[] = $sum;
-    }
-in_array('avg',$p)
+ in_array('avg',$p) && count($full) > 0 
-        $rv['avg']=array_sum($full) / count($full);     
-    }
-    if (in_array('stddev',$p) || in_array('stddev+',$p) || in_array('stddev-',$p)) {
-  
-
+
+
+
-
-                function sd($array) {
-
+
+
+
+
+
-                }
-                
@@ -388 +394 @@
-                }
-                if (in_array('stddev+', $p)) {
-empty($rv['avg'])
+ empty($rv['avg']) && count($full)>0 
-                                $avg=array_sum($full) / count($full);
-                        } else {
@@ -396 +402 @@
-                }
-                if (in_array('stddev-', $p)) {
-empty($rv['avg'])
+ empty($rv['avg']) && count($full)>0 
-                                $avg=array_sum($full) / count($full);
-                        } else {

ui/web/lib/Reconnoiter_DataContainer.php

@@ -23 +23 @@
-  protected $sets_config;
-  protected $guides;
-
+
+
-  function __construct($start, $end, $cnt, $type) {
-    $this->start = $start;
@@ -101 +102 @@
-      $this->percentile[$p] = $v;
-    }
-
+
+
-                                                array_keys($this->agg_to_calc)) as $p => $v) {
-
+
+
-    }
-    $this->units = pow(1000,floor(log($this->percentile[100], 1000)));

ui/web/lib/Reconnoiter_flot_Driver.php

@@ -41 +41 @@
-      $ds = array (
-        'reconnoiter_source_expression' => $set->expression(),
-$this->sets_config[$name]['expression']
-$this->sets_config[$name]['title']
+!empty($this->sets_config[$name]['expression']) ? $this->sets_config[$name]['expression'] : null
+!empty($this->sets_config[$name]['title'])
-        'data' => $this->graphdataset($set, $this->sets_config[$name]),
-        'yaxis' => ($this->sets_config[$name]['axis'] == 'right') ? 2 : 1,
@@ -49 +49 @@
-        'metric_name' => $m_name[1],    
-        'metric_type' => $metric_type,
-
+!empty($this->sets_config[$name]['hidden']) && 
-      );
-
+empty($this->sets_config[$name]['hidden']) || 
-      if($show_set) {
-        $ds['label'] = $ds['dataname'];
@@ -62 +62 @@
-        $opacity = isset($this->sets_config[$name]['opacity']) ?
-                     $this->sets_config[$name]['opacity'] : '0.3';
-radius
+'radius'
-      }
-      //if we have a text metric type, draw points
-      else if($metric_type == 'text'){
-radius
+'radius'
-      }
-