From 689736f288253fdbaff816910317f5c532a583fe Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Thu, 18 Nov 2010 15:47:59 +0300 Subject: [PATCH 3/4] Disable PDF generation This patch allows to completely disable generation of PDF files via any means. It used to support WITHOUT_PDF knob of FreeBSD port. Signed-off-by: Eygene Ryabinkin --- share/pnp/application/controllers/pdf.php | 4 ++++ share/pnp/application/models/rrdtool.php | 1 + share/pnp/application/views/icon_box.php | 9 --------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/share/pnp/application/controllers/pdf.php b/share/pnp/application/controllers/pdf.php index 330e341..6ff172c 100644 --- a/share/pnp/application/controllers/pdf.php +++ b/share/pnp/application/controllers/pdf.php @@ -10,6 +10,7 @@ class Pdf_Controller extends System_Controller { public function __construct(){ parent::__construct(); + exit; $this->use_bg = 0; $this->bg = $this->config->conf['background_pdf']; @@ -30,6 +31,7 @@ class Pdf_Controller extends System_Controller { } public function index(){ + exit; $this->tpl = $this->input->get('tpl'); $this->view = ""; @@ -137,6 +139,7 @@ class Pdf_Controller extends System_Controller { } public function page($page){ + exit; $this->start = $this->input->get('start'); $this->end = $this->input->get('end'); $this->view = ""; @@ -199,6 +202,7 @@ class Pdf_Controller extends System_Controller { } public function basket(){ + exit; $this->start = $this->input->get('start'); $this->end = $this->input->get('end'); $this->view = ""; diff --git a/share/pnp/application/models/rrdtool.php b/share/pnp/application/models/rrdtool.php index 308ab77..344478c 100644 --- a/share/pnp/application/models/rrdtool.php +++ b/share/pnp/application/models/rrdtool.php @@ -79,6 +79,7 @@ class Rrdtool_Model extends System_Model $width = 0; $height = 0; if ($out == 'PDF'){ + exit; if($conf['pdf_graph_opt']){ $command .= $conf['pdf_graph_opt']; } diff --git a/share/pnp/application/views/icon_box.php b/share/pnp/application/views/icon_box.php index 7ce5301..838b474 100644 --- a/share/pnp/application/views/icon_box.php +++ b/share/pnp/application/views/icon_box.php @@ -9,15 +9,6 @@ $qsa = pnp::addToUri(array('start' => $this->start,'end' => $this->end, 'view' if($this->config->conf['use_calendar']){ echo ""; } -if($this->config->conf['use_fpdf'] == 1 && ( $position == "graph" || $position == "special") ){ - echo "\n"; -} -if($this->config->conf['use_fpdf'] == 1 && $position == "basket"){ - echo "\n"; -} -if($this->config->conf['use_fpdf'] == 1 && $position == "page"){ - echo "page.$qsa."\">\n"; -} if($this->config->conf['show_xml_icon'] == 1 && $position == "graph"){ $qsa = pnp::addToUri(array(), False); echo "\n"; -- 1.7.3.2