From bf811ebbc847595281d1d01c2d7d217abb43a58c Mon Sep 17 00:00:00 2001 From: michael pereira Date: Tue, 15 Mar 2011 14:22:01 +0100 Subject: Ressource Ausgabe angepasst --- .../modules/dev/controllers/ResourceController.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'application/modules') diff --git a/application/modules/dev/controllers/ResourceController.php b/application/modules/dev/controllers/ResourceController.php index c292228..3bd325f 100644 --- a/application/modules/dev/controllers/ResourceController.php +++ b/application/modules/dev/controllers/ResourceController.php @@ -32,13 +32,13 @@ class dev_ResourceController extends Zend_Controller_Action header('Content-Type: application/x-gzip'); $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $HTTP_USER_AGENT) == 'IE') ? 'inline' : 'attachment'; - header('Content-Disposition: ' . $content_disp . '; filename="initramfs.tar.gz"'); + header('Content-Disposition: ' . $content_disp . '; filename="initramfs"'); header('Pragma: no-cache'); header('Expires: 0'); // create the gzipped tarfile. chdir("../resources/bootos/$bootosID/initramfs/"); - passthru( "tar cz ./"); + passthru( "cat initramfs"); } } @@ -55,6 +55,7 @@ class dev_ResourceController extends Zend_Controller_Action # print_a($result); $thisSession = $result[0]; $bootmenuentryID = $thisSession['bootmenuentryID']; + $bootmenuentry = new Application_Model_BootMenuEntries(); $bmm = new Application_Model_BootMenuEntriesMapper(); $bmm->find($bootmenuentryID,$bootmenuentry); @@ -93,13 +94,13 @@ class dev_ResourceController extends Zend_Controller_Action header('Content-Type: application/x-gzip'); $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $HTTP_USER_AGENT) == 'IE') ? 'inline' : 'attachment'; - header('Content-Disposition: ' . $content_disp . '; filename="kernel.tar.gz"'); + header('Content-Disposition: ' . $content_disp . '; filename="kernel"'); header('Pragma: no-cache'); header('Expires: 0'); // create the gzipped tarfile. chdir("../resources/bootos/$bootosID/kernel/"); - passthru( "tar cz ./"); + passthru( "cat kernel"); } } @@ -155,9 +156,9 @@ class dev_ResourceController extends Zend_Controller_Action $return_val = array( 'info' => 'This function is for debugging purpose only', - 'kernel' => $this->generateURL('getkernel', 'alpha', $_SESSION['alphasessionID']), - 'initramfs' => $this->generateURL('getinitramfs', 'alpha', $_SESSION['alphasessionID']), - 'kcl' => $this->generateURL('getkcl', 'alpha', $_SESSION['alphasessionID']), + 'kernel' => $this->generateURL('getkernel', 'alpha', $_SESSION['alphasessionID'], "kernel"), + 'initramfs' => $this->generateURL('getinitramfs', 'alpha', $_SESSION['alphasessionID'], "initramfs"), + 'kcl' => $this->generateURL('getkcl', 'alpha', $_SESSION['alphasessionID'], "kcl"), 'config' => $_SESSION['alphasessionID'] ); echo json_encode($return_val); @@ -165,15 +166,15 @@ class dev_ResourceController extends Zend_Controller_Action else{ echo json_encode( array( 'info' => 'This function is for debugging purpose only', - 'error'=>'your session is out of date') + 'error'=> 'your session is out of date') ); } } } - function generateURL($action, $varname, $varvalue){ - $path = '/resource/'. $action .'/' . $varname .'/' . $varvalue; + function generateURL($action, $varname, $varvalue, $filename){ + $path = '/resource/'. $action .'/' . $varname .'/' . $varvalue .'/file/' . $filename ; $path = "http://" . $_SERVER['SERVER_NAME'] . $path; return $path; } -- cgit v1.2.3-55-g7522