summaryrefslogtreecommitdiffstats
path: root/application/controllers/ResourceController.php
diff options
context:
space:
mode:
authormichael pereira2011-04-08 15:20:55 +0200
committermichael pereira2011-04-08 15:20:55 +0200
commit7067b772abaf370fb9b73c33e4b92d4dfbc5b2cf (patch)
tree6d901d595c04b9b5156b6803bfb2fbcb2785273c /application/controllers/ResourceController.php
parentkcl gefixt (diff)
parentFooter ist wieder an der Box (diff)
downloadpbs2-7067b772abaf370fb9b73c33e4b92d4dfbc5b2cf.tar.gz
pbs2-7067b772abaf370fb9b73c33e4b92d4dfbc5b2cf.tar.xz
pbs2-7067b772abaf370fb9b73c33e4b92d4dfbc5b2cf.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/controllers/ResourceController.php')
-rw-r--r--application/controllers/ResourceController.php19
1 files changed, 11 insertions, 8 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index f72a5ae..a9b2fb3 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -165,7 +165,8 @@ class ResourceController extends Zend_Controller_Action
// so getkclAction, getkernelAction, getconfigAction and getinitramfsAction
// can be called with session-identifier
-
+ $this->_helper->layout->disableLayout();
+ $this->_helper->viewRenderer->setNoRender();
$return_val =
array(
@@ -176,13 +177,15 @@ class ResourceController extends Zend_Controller_Action
'config' => $this->thisSession->getAlphasessionID()
);
- $ser = serialize($return_val);
- $this->_forward('index','bootmenu','user', array(
- 'page' => $this->page,
- 'json' => $ser
- ));
-
-
+ $result = $return_val;
+ $result2 = "<table class='json'>";
+ $result2 .= "<tr><td><b>info</b>: </td><td>".$result['info']."</td></tr>";
+ $result2 .= "<tr><td><b>kernel</b>: </td><td><a href=".$result['kernel'].">".$result['kernel']."<a></td></tr>";
+ $result2 .= "<tr><td><b>initramfs</b>: </td><td><a href=".$result['initramfs'].">".$result['initramfs']."<a></td></tr>";
+ $result2 .= "<tr><td><b>kcl</b>: </td><td><a href=".$result['kcl'].">".$result['kcl']."<a></td></tr>";
+ $result2 .= "<tr><td><b>config</b>: </td><td>".$result['config']."</td></tr>";
+ $result2 .= "</table>";
+ echo $result2;
}
private function generateURL($action, $varname, $varvalue, $filename){