diff options
| author | Simon Franz | 2011-03-16 17:13:05 +0100 |
|---|---|---|
| committer | Simon Franz | 2011-03-16 17:13:05 +0100 |
| commit | a871438d9fc411471dacccef7ae95535646f6c79 (patch) | |
| tree | 813163754e1be950b96169f2bb3951345bbd6fde /application/modules/dev/controllers/ResourceController.php | |
| parent | Benutzung von Form in Modulen nutzbar, editclient funktioniert, Mac wird gepa... (diff) | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-a871438d9fc411471dacccef7ae95535646f6c79.tar.gz pbs2-a871438d9fc411471dacccef7ae95535646f6c79.tar.xz pbs2-a871438d9fc411471dacccef7ae95535646f6c79.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/dev/controllers/ResourceController.php')
| -rw-r--r-- | application/modules/dev/controllers/ResourceController.php | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/application/modules/dev/controllers/ResourceController.php b/application/modules/dev/controllers/ResourceController.php index defab76..653b70d 100644 --- a/application/modules/dev/controllers/ResourceController.php +++ b/application/modules/dev/controllers/ResourceController.php @@ -97,14 +97,19 @@ class dev_ResourceController extends Zend_Controller_Action $bme = new Application_Model_BootMenuEntries(); $bmemapper->find($bmeID,$bme); - if($bme->getKcl() != null){ - header('Content-Type: text/html'); - $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $HTTP_USER_AGENT) == 'IE') ? 'inline' : 'attachment'; - header('Content-Disposition: ' . $content_disp . '; filename="kcl.txt"'); - header('Pragma: no-cache'); - header('Expires: 0'); - echo $bme->getKcl(); - } + header('Content-Type: text/html'); + $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $HTTP_USER_AGENT) == 'IE') ? 'inline' : 'attachment'; + header('Content-Disposition: ' . $content_disp . '; filename="kcl.txt"'); + header('Pragma: no-cache'); + header('Expires: 0'); + + if($bme->getKcl() != null) + $result = $bme->getKcl() . " " . $bme->getKclappend(); + else + $result = $bme->getKclappend(); + + echo $result; + } |