From 0ed87d60bf5105612c734787b8d2153f878d9554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no> Date: Sun, 1 Mar 2009 14:32:47 +0000 Subject: [PATCH] Add portal support to module statistics... git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1351 44740490-163a-0410-bde0-09ae8108e29a --- modules/statistics/hooks/hook_frontpage.php | 3 ++- modules/statistics/www/showstats.php | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/statistics/hooks/hook_frontpage.php b/modules/statistics/hooks/hook_frontpage.php index 61320a6e8..4b5596b4b 100644 --- a/modules/statistics/hooks/hook_frontpage.php +++ b/modules/statistics/hooks/hook_frontpage.php @@ -8,9 +8,10 @@ function statistics_hook_frontpage(&$links) { assert('is_array($links)'); assert('array_key_exists("links", $links)'); - $links['links'][] = array( + $links['links']['statistics'] = array( 'href' => SimpleSAML_Module::getModuleURL('statistics/showstats.php'), 'text' => array('en' => 'Show statistics', 'no' => 'Vis statistikk'), + 'shorttext' => array('en' => 'Statistics', 'no' => 'Statistikk'), ); } diff --git a/modules/statistics/www/showstats.php b/modules/statistics/www/showstats.php index a4fe44e13..53fc2c7ff 100644 --- a/modules/statistics/www/showstats.php +++ b/modules/statistics/www/showstats.php @@ -216,6 +216,12 @@ $dimx = $statconfig->getValue('dimension.x', 800); $dimy = $statconfig->getValue('dimension.y', 350); $grapher = new sspmod_statistics_Graph_GoogleCharts($dimx, $dimy); + +$htmlContentPre = array(); $htmlContentPost = array(); $htmlContentHead = array(); $jquery = array(); +$hookinfo = array('pre' => &$htmlContentPre, 'post' => &$htmlContentPost, 'head' => &$htmlContentHead, 'jquery' => &$jquery, 'page' => 'statistics'); +SimpleSAML_Module::callHooks('htmlinject', $hookinfo); + + $t = new SimpleSAML_XHTML_Template($config, 'statistics:statistics-tpl.php'); $t->data['header'] = 'stat'; $t->data['imgurl'] = $grapher->show($axis, $axispos, $datasets, $max); @@ -223,6 +229,10 @@ $t->data['available.rules'] = $available_rules; $t->data['available.times'] = $available_times; $t->data['available.times.prev'] = $available_times_prev; $t->data['available.times.next'] = $available_times_next; +$t->data['htmlContentPre'] = $htmlContentPre; +$t->data['htmlContentPost'] = $htmlContentPost; +$t->data['htmlContentHead'] = $htmlContentHead; +$t->data['jquery'] = $jquery; $t->data['selected.rule']= $rule; $t->data['selected.time'] = $fileslot; $t->data['debugdata'] = $debugdata; -- GitLab