# https://github.com/lingej/pnp4nagios/commit/d5e04540d52238dfcb877d7116316ba1be8c1963 diff --git a/share/pnp/application/controllers/ajax.php b/share/pnp/application/controllers/ajax.php index 9e0428d..c5f89e2 100644 --- a/share/pnp/application/controllers/ajax.php +++ b/share/pnp/application/controllers/ajax.php @@ -59,7 +59,7 @@ public function basket($action=FALSE){ if($action == "list"){ $basket = $this->session->get("basket"); - if(is_array($basket) && sizeof($basket) > 0){ + if(is_array($basket) && (!empty($basket))){ foreach($basket as $item){ printf("
  • %s
    • \n", "basket_action_remove", @@ -135,7 +135,7 @@ public function basket($action=FALSE){ echo "Action $action not known"; } $basket = $this->session->get("basket"); - if(is_array($basket) && sizeof($basket) == 0){ + if(is_array($basket) && empty($basket)){ echo Kohana::lang('common.basket-empty'); }else{ echo "
    \n"; diff --git a/share/pnp/application/controllers/image.php b/share/pnp/application/controllers/image.php index b41ca83..869435c 100644 --- a/share/pnp/application/controllers/image.php +++ b/share/pnp/application/controllers/image.php @@ -47,7 +47,7 @@ public function index() $this->rrdtool->streamImage("ERROR: NOT_AUTHORIZED"); #print Kohana::debug($this->data->STRUCT); - if(sizeof($this->data->STRUCT) > 0){ + if(!empty($this->data->STRUCT)){ $image = $this->rrdtool->doImage($this->data->STRUCT[0]['RRD_CALL']); }else{ $image = FALSE; diff --git a/share/pnp/application/controllers/page.php b/share/pnp/application/controllers/page.php index 7bd877e..fcfffe8 100644 --- a/share/pnp/application/controllers/page.php +++ b/share/pnp/application/controllers/page.php @@ -58,7 +58,7 @@ public function index(){ public function basket(){ $basket = $this->session->get("basket"); - if(is_array($basket) && sizeof($basket) > 0){ + if(is_array($basket) && (!empty($basket))){ $this->data->buildBasketStruct($basket,$this->view); $this->template->page->basket_box = $this->add_view('basket_box'); $this->template->page->header->title = Kohana::lang('common.page-basket'); diff --git a/share/pnp/application/controllers/pdf.php b/share/pnp/application/controllers/pdf.php index 15f2ab4..d590859 100644 --- a/share/pnp/application/controllers/pdf.php +++ b/share/pnp/application/controllers/pdf.php @@ -202,7 +202,7 @@ public function basket(){ } $this->data->getTimeRange($this->start,$this->end,$this->view); $basket = $this->session->get("basket"); - if(is_array($basket) && sizeof($basket) > 0){ + if(is_array($basket) && (!empty($basket))){ $this->data->buildBasketStruct($basket,$this->view); } //echo Kohana::debug($this->data->STRUCT); diff --git a/share/pnp/application/helpers/rrd.php b/share/pnp/application/helpers/rrd.php index 81bb257..ea9f99b 100644 --- a/share/pnp/application/helpers/rrd.php +++ b/share/pnp/application/helpers/rrd.php @@ -207,7 +207,7 @@ public static function gprint($vname=FALSE, $cf="AVERAGE", $text="%6.2lf %s"){ if(is_array($cf)){ foreach($cf as $key => $val){ $line .= sprintf("GPRINT:%s:%s:",$vname,$val); - if($key == sizeof($cf)-1){ + if($key == count($cf)-1){ $line .= '"'.$text.' '.ucfirst(strtolower($val)).'\\l" '; }else{ $line .= '"'.$text.' '.ucfirst(strtolower($val)).'" '; @@ -234,7 +234,7 @@ public static function gprinta($vname=FALSE, $cf="AVERAGE", $text="%6.2lf %s", $ if(is_array($cf)){ foreach($cf as $key => $val){ $line .= sprintf("GPRINT:%s:%s:",$vname,$val); - if(($key == sizeof($cf)-1)and($align != "")){ + if(($key == count($cf)-1)and($align != "")){ $line .= '"'.$text.' '.ucfirst(strtolower($val)).$align.'" '; }else{ $line .= '"'.$text.' '.ucfirst(strtolower($val)).'" '; diff --git a/share/pnp/application/lib/json.php b/share/pnp/application/lib/json.php index 0cddbdd..d0e3171 100644 --- a/share/pnp/application/lib/json.php +++ b/share/pnp/application/lib/json.php @@ -375,7 +375,7 @@ function encode($var) */ // treat as a JSON object - if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) { + if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) { $properties = array_map(array($this, 'name_value'), array_keys($var), array_values($var)); diff --git a/share/pnp/application/models/auth.php b/share/pnp/application/models/auth.php index 77f28d2..11d785a 100644 --- a/share/pnp/application/models/auth.php +++ b/share/pnp/application/models/auth.php @@ -116,11 +116,7 @@ public function is_authorized($host = FALSE, $service = NULL){ $result = $this->queryLivestatus($query); } - if(sizeof($result) > 0){ - return TRUE; - }else{ - return FALSE; - } + return (!empty($result)); } diff --git a/share/pnp/application/models/config.php b/share/pnp/application/models/config.php index 44e3d12..7a6b8e0 100644 --- a/share/pnp/application/models/config.php +++ b/share/pnp/application/models/config.php @@ -68,7 +68,7 @@ public function read_config(){ $views = array(); include ($config_file); $array_b = $views; - if(sizeof($views) == 0 ){ + if(empty($views)){ $views = $array_a; } } diff --git a/share/pnp/application/models/data.php b/share/pnp/application/models/data.php index 63b0e24..74e8821 100644 --- a/share/pnp/application/models/data.php +++ b/share/pnp/application/models/data.php @@ -45,11 +45,11 @@ public function getSpecialTemplates(){ } } } - if(sizeof($templates) > 0){ + if(empty($templates)){ + return FALSE; + }else{ sort($templates); return $templates; - }else{ - return FALSE; } } @@ -97,7 +97,9 @@ public function getHosts() { throw new Kohana_User_Exception('Perfdata Dir', "Can not open $path"); } } - if(sizeof($hosts)>0){ + if(empty($hosts)){ + throw new Kohana_Exception('error.perfdata-dir-empty', $conf['rrdbase'] ); + }else{ # Obtain a list of columns foreach ($hosts as $key => $row) { $sort[$key] = $row['sort']; @@ -105,8 +107,6 @@ public function getHosts() { # Sort the data with volume descending, edition ascending # Add $data as the last parameter, to sort by the common key array_multisort($sort, SORT_ASC, $hosts); - }else{ - throw new Kohana_Exception('error.perfdata-dir-empty', $conf['rrdbase'] ); } return $hosts; } @@ -147,7 +147,7 @@ function getRawServices($hostname) { }else{ throw new Kohana_Exception('error.perfdata-dir-for-host', $path, $hostname ); } - if( is_array($services) && sizeof($services) > 0){ + if( is_array($services) && (!empty($services))){ # Obtain a list of columns foreach ($services as $key => $row) { $sort[$key] = $row['name']; @@ -205,7 +205,7 @@ function getServices($hostname) { $i++; } #print Kohana::debug($services); - if( is_array($services) && sizeof($services) > 0){ + if( is_array($services) && (!empty($services))){ # Obtain a list of columns foreach ($services as $key => $row) { $sort[$key] = $row['sort']; @@ -214,7 +214,7 @@ function getServices($hostname) { # Add $data as the last parameter, to sort by the common key array_multisort($sort, SORT_STRING, $services); } - if(is_array($host) && sizeof($host) > 0 ){ + if(is_array($host) && (!empty($host))){ array_unshift($services, $host[0]); } return $services; @@ -232,7 +232,7 @@ public function getFirstService($hostname) { break; } } - if(sizeof($srv) == 0){ + if(empty($srv)){ throw new Kohana_Exception('error.get-first-service', $hostname ); } return $srv['name']; @@ -250,7 +250,7 @@ public function getFirstHost() { break; } } - if(sizeof($host) == 0){ + if(empty($host)){ throw new Kohana_Exception('error.get-first-host'); } return $host['name']; @@ -693,7 +693,7 @@ public function getTimeRange($start=FALSE ,$end=FALSE ,$view="") { } $view=intval( pnp::clean($view) ); - if($view >= sizeof($this->config->views)){ + if($view >= count($this->config->views)){ $view = 1; } @@ -735,7 +735,7 @@ public function getTimeRange($start=FALSE ,$end=FALSE ,$view="") { $timerange['f_end'] = date($this->config->conf['date_fmt'],$end); $timerange['cmd'] = " --start $start --end $end "; $timerange['type'] = "views"; - for ($i = 0; $i < sizeof($this->config->views); $i++) { + for ($i = 0; $i < count($this->config->views); $i++) { $timerange[$i]['title'] = $this->config->views[$i]['title']; $timerange[$i]['start'] = $end - $this->config->views[$i]['start']; $timerange[$i]['f_start'] = date($this->config->conf['date_fmt'],$end - $this->config->views[$i]['start']); @@ -747,7 +747,7 @@ public function getTimeRange($start=FALSE ,$end=FALSE ,$view="") { } public function buildBasketStruct($basket,$view = NULL){ - if(is_array($basket) && sizeof($basket) > 0){ + if(is_array($basket) && (!empty($basket))){ if($view == ""){ $views = array_keys($this->config->views); }else{ @@ -757,9 +757,9 @@ public function buildBasketStruct($basket,$view = NULL){ foreach($basket as $item){ # explode host::service::source $slices = explode("::",$item); - if(sizeof($slices) == 2) + if(count($slices) == 2) $this->buildDataStruct($slices[0], $slices[1], $view); - if(sizeof($slices) == 3) + if(count($slices) == 3) $this->buildDataStruct($slices[0], $slices[1], $view, $slices[2]); } # break on custom time ranges @@ -806,12 +806,12 @@ public function buildPageStruct($page,$view){ } } #print Kohana::debug($servicelist); - if(sizeof($servicelist) > 0 ){ + if(empty($servicelist)){ + $this->ERROR = "ERROR: ". Kohana::lang('error.no-data-for-page', $page.".cfg" ); + }else{ foreach($servicelist as $s){ $this->buildDataStruct($s['host'],$s['service'],$view,$s['source']); } - }else{ - $this->ERROR = "ERROR: ". Kohana::lang('error.no-data-for-page', $page.".cfg" ); } } @@ -962,11 +962,11 @@ public function getPages() { die("Cannot open directory: $path"); } } - if(sizeof($pages)>0){ + if(empty($pages)){ + return FALSE; + }else{ natsort($pages); - }else{ - return FALSE; } return $pages; } @@ -976,10 +976,10 @@ public function getPages() { */ public function getFirstPage(){ $pages = $this->getPages(); - if(sizeof($pages) > 0 ){ - return urldecode($pages[0]); - }else{ + if(empty($pages)){ return FALSE; + }else{ + return urldecode($pages[0]); } } @@ -1093,7 +1093,7 @@ public function tplGetServices ($hostregex=FALSE, $serviceregex = ''){ } } - if(sizeof($new_hosts) == 0){ + if(empty($new_hosts)){ throw new Kohana_Exception('error.tpl-no-hosts-found', $hostregex); } @@ -1101,7 +1101,7 @@ public function tplGetServices ($hostregex=FALSE, $serviceregex = ''){ $new_services = array(); foreach($new_hosts as $host){ $services = $this->getRawServices($host); - if(sizeof($services) == 0){ + if(empty($services)){ throw new Kohana_Exception('error.tpl-no-services-found', $serviceregex); } foreach($services as $service){ @@ -1115,7 +1115,7 @@ public function tplGetServices ($hostregex=FALSE, $serviceregex = ''){ } } - if(sizeof($new_services) == 0){ + if(empty($new_services)){ throw new Kohana_Exception('error.tpl-no-services-found', $serviceregex); } diff --git a/share/pnp/application/views/basket_box.php b/share/pnp/application/views/basket_box.php index ea8a72c..2a4e0e6 100644 --- a/share/pnp/application/views/basket_box.php +++ b/share/pnp/application/views/basket_box.php @@ -6,7 +6,7 @@ echo Kohana::lang('common.basket-box-header')."
    \n"; echo "
    \n"; echo "
    \n"; -if(is_array($basket) && sizeof($basket) > 0 ){ +if(is_array($basket) && !empty($basket)){ foreach($basket as $key=>$item){ echo "
  • \n"; } } -if(is_array($basket) && sizeof($basket) > 0 ){ +if(is_array($basket) && !empty($basket)){ echo "
    \n"; echo "\n"; echo "\n"; diff --git a/share/pnp/templates.dist/pnp-runtime.php b/share/pnp/templates.dist/pnp-runtime.php index 21c4ae3..a668fdc 100644 --- a/share/pnp/templates.dist/pnp-runtime.php +++ b/share/pnp/templates.dist/pnp-runtime.php @@ -34,7 +34,7 @@ # $ds_name[2] = "Errors and updates"; $def[2] = ''; -for($i=2; $i <= sizeof($DS); $i++) { +for($i=2; $i <= count($DS); $i++) { $def[2] .= rrd::def("var$i", $RRDFILE[$i], $DS[$i] , "AVERAGE") ; $def[2] .= rrd::line1("var$i", rrd::color($i), rrd::cut(ucfirst($LABEL[$i]),12) ); $def[2] .= rrd::gprint("var$i", array('LAST', 'MAX', 'AVERAGE'), "%4.0lf$UNIT[$i]");