summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authormichael pereira2011-04-01 13:56:31 +0200
committermichael pereira2011-04-01 13:56:31 +0200
commitc6ba86b7bb05519d32296e62c1bce0fd2225e90a (patch)
treeeee0a011813b3dec8e8d05f49246b37551cb7e26 /application/controllers
parentbootmenu (diff)
parentMerge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-c6ba86b7bb05519d32296e62c1bce0fd2225e90a.tar.gz
pbs2-c6ba86b7bb05519d32296e62c1bce0fd2225e90a.tar.xz
pbs2-c6ba86b7bb05519d32296e62c1bce0fd2225e90a.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/ResourceController.php2
-rw-r--r--application/controllers/StatsController.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 3b7ad2c..563a603 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -110,7 +110,7 @@ class ResourceController extends Zend_Controller_Action
header('Expires: 0');
if($bme->getKcl() != null)
- $result = $bme->getKcl() . " " . $bme->getKclappend();
+ $result = $bme->getKcl() . " alpha=" . $this->_request->getParam('alpha') . " " . $bme->getKclappend();
else
$result = $bme->getKclappend();
diff --git a/application/controllers/StatsController.php b/application/controllers/StatsController.php
index a54c528..8fc718e 100644
--- a/application/controllers/StatsController.php
+++ b/application/controllers/StatsController.php
@@ -15,6 +15,7 @@ class StatsController extends Zend_Controller_Action
if(isset($userIDsNamespace['groupID'])){
header("Content-Type: image/png");
+ header("Expires: 0");
$n = new Pbs_Graph();
$level = $this->_request->getParam('level');
@@ -22,8 +23,7 @@ class StatsController extends Zend_Controller_Action
$n->setHiglightLevel($level);
}
- $str = $n->graph($userIDsNamespace['groupID']);
- echo $str;
+ echo $n->graph($userIDsNamespace['groupID']);
}
}
}