diff options
author | Michael Neves | 2012-01-26 22:43:19 +0100 |
---|---|---|
committer | Michael Neves | 2012-01-26 22:43:19 +0100 |
commit | c45eb1aa078f9e83c8f3c6b10e591a76bfb2f3a9 (patch) | |
tree | 147005a908fc1911d7e610f5cb7f5c07bb2bda06 | |
parent | getprebootserials download check (diff) | |
download | pbs2-c45eb1aa078f9e83c8f3c6b10e591a76bfb2f3a9.tar.gz pbs2-c45eb1aa078f9e83c8f3c6b10e591a76bfb2f3a9.tar.xz pbs2-c45eb1aa078f9e83c8f3c6b10e591a76bfb2f3a9.zip |
getprebootserials download check
-rw-r--r-- | application/controllers/ResourceController.php | 3 | ||||
-rw-r--r-- | application/modules/user/controllers/BootisoController.php | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index a8fc339..d7ec03e 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -235,14 +235,13 @@ class ResourceController extends Zend_Controller_Action { header('Content-Type: text/html'); $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $_SERVER['HTTP_USER_AGENT']) == 'IE') ? 'inline' : 'attachment'; - header('Content-Disposition: ' . $content_disp . '; filename="serials.txt"'); header('Pragma: no-cache'); header('Expires: 0'); $person = $personMapper->find($member->getPersonID()); $result = "Serials available to Member: ".$person->getFirstname()." ".$person->getName()." in Group: ".$groupMapper->find($member->getGroupID())->getTitle()."\n"; - $result .= "----------------------------------------------------------------------------------------------------\n"; + $result .= "------------------------------------------------------------------------------------\n"; foreach($bootisolist as $k => $bootiso){ $preboot = $prebootMapper->findBy(array('serialnumber' => $bootiso->getSerialnumber(), 'preboottypeID' => $bootiso->getPreboottypeID())); $download = (count($preboot)!=0)?"yes":"no"; diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php index 7b2a1e0..d015b76 100644 --- a/application/modules/user/controllers/BootisoController.php +++ b/application/modules/user/controllers/BootisoController.php @@ -84,10 +84,9 @@ class user_BootisoController extends Zend_Controller_Action { $this->view->bootisolist[] = $b; } } - - $this->view->download = array(); $this->view->bootisolist = array_reverse($this->view->bootisolist); - + + $this->view->download = array(); $preboottypeMapper = new Application_Model_PreBootTypeMapper(); $prebootMapper = new Application_Model_PreBootMapper(); |