Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- *** /Users/amp/Downloads/pnp4nagios-0.6.12/share/pnp/application/controllers/graph.php 2011-05-18 14:50:29.000000000 +0200
- --- controllers/graph.php 2011-05-18 14:04:07.000000000 +0200
- ***************
- *** 13,20 ****
- parent::__construct();
- $this->template->graph = $this->add_view('graph');
- $this->template->zoom_header = $this->add_view('zoom_header');
- ! $this->template->zoom_header->graph_width = ($this->config->conf['graph_width'] + 140);
- ! $this->template->zoom_header->graph_height = ($this->config->conf['graph_height'] + 230);
- $this->template->graph->icon_box = $this->add_view('icon_box');
- $this->template->graph->icon_box->position = "graph";
- $this->template->graph->icon_box->xml_icon = TRUE;
- --- 13,20 ----
- parent::__construct();
- $this->template->graph = $this->add_view('graph');
- $this->template->zoom_header = $this->add_view('zoom_header');
- ! $this->template->zoom_header->graph_width = ($this->config->conf['zgraph_width'] + 140);
- ! $this->template->zoom_header->graph_height = ($this->config->conf['zgraph_height'] + 230);
- $this->template->graph->icon_box = $this->add_view('icon_box');
- $this->template->graph->icon_box->position = "graph";
- $this->template->graph->icon_box->xml_icon = TRUE;
- ***************
- *** 51,59 ****
- $this->is_authorized = $this->auth->is_authorized($this->data->MACRO['AUTH_HOSTNAME'], $this->data->MACRO['AUTH_SERVICEDESC']);
- $this->title = Kohana::lang('common.service-details') . " ". $this->host ." -> " . $this->data->MACRO['DISP_SERVICEDESC'];
- ! $this->template->graph->graph_content->graph_width = ($this->data->STRUCT[0]['GRAPH_WIDTH'] + 85);
- ! $this->template->zoom_header->graph_width = ($this->data->STRUCT[0]['GRAPH_WIDTH'] + 140);
- ! $this->template->zoom_header->graph_height = ($this->data->STRUCT[0]['GRAPH_HEIGHT'] + 230);
- // Status Box Vars
- $this->template->graph->status_box->host = $this->data->MACRO['DISP_HOSTNAME'];
- $this->template->graph->status_box->lhost = $this->data->MACRO['HOSTNAME'];
- --- 51,57 ----
- $this->is_authorized = $this->auth->is_authorized($this->data->MACRO['AUTH_HOSTNAME'], $this->data->MACRO['AUTH_SERVICEDESC']);
- $this->title = Kohana::lang('common.service-details') . " ". $this->host ." -> " . $this->data->MACRO['DISP_SERVICEDESC'];
- ! $this->template->graph->graph_content->graph_width = ($this->data->STRUCT[0]['GRAPH_WIDTH'] + 85);
- // Status Box Vars
- $this->template->graph->status_box->host = $this->data->MACRO['DISP_HOSTNAME'];
- $this->template->graph->status_box->lhost = $this->data->MACRO['HOSTNAME'];
- *** /Users/amp/Downloads/pnp4nagios-0.6.12/share/pnp/application/controllers/image.php 2011-05-18 14:50:29.000000000 +0200
- --- controllers/image.php 2011-05-18 12:33:32.000000000 +0200
- ***************
- *** 32,40 ****
- --- 32,44 ----
- if($this->input->get('w') != "" )
- $this->rrdtool->config->conf['graph_width'] = intval($this->input->get('w'));
- + if($this->input->get('graph_width') != "" )
- + $this->rrdtool->config->conf['graph_width'] = intval($this->input->get('graph_width'));
- if($this->input->get('h') != "" )
- $this->rrdtool->config->conf['graph_height'] = intval($this->input->get('h'));
- + if($this->input->get('graph_height') != "" )
- + $this->rrdtool->config->conf['graph_height'] = intval($this->input->get('graph_height'));
- $this->data->getTimeRange($this->start,$this->end,$this->view);
- *** /Users/amp/Downloads/pnp4nagios-0.6.12/share/pnp/application/controllers/zoom.php 2011-05-18 14:50:29.000000000 +0200
- --- controllers/zoom.php 2011-05-18 12:26:58.000000000 +0200
- ***************
- *** 14,21 ****
- parent::__construct();
- $this->template = $this->add_view('zoom');
- $this->tpl = $this->input->get('tpl');
- ! $this->graph_width = $this->input->get('graph_width');
- ! $this->graph_height = $this->input->get('graph_height');
- }
- public function index()
- --- 14,21 ----
- parent::__construct();
- $this->template = $this->add_view('zoom');
- $this->tpl = $this->input->get('tpl');
- ! $this->graph_width = $this->config->conf['zgraph_width'];
- ! $this->graph_height = $this->config->conf['zgraph_height'];
- }
- public function index()
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement