From 0e52a25064414b9640c57a843aa34a54656d5e4d Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Thu, 30 Jul 2009 22:06:28 +0000
Subject: [PATCH] Merging changes from redesign branch into popups branch
---
.../modules/courses/views/scripts/view/course-files.phtml | 8 ++++----
.../modules/requests/controllers/ViewController.php | 8 ++++----
application/modules/requests/models/RequestModel.php | 3 +--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/application/modules/courses/views/scripts/view/course-files.phtml b/application/modules/courses/views/scripts/view/course-files.phtml
index 83dde7df..be60cfbf 100644
--- a/application/modules/courses/views/scripts/view/course-files.phtml
+++ b/application/modules/courses/views/scripts/view/course-files.phtml
@@ -14,7 +14,7 @@
<?php if ($syllabus['file']) { ?>
<a href="<?php echo $this->baseUrl(); ?>/requests/view/get-file/fileId/<?php echo $syllabus['file']; ?>">
<?php } else { ?>
- <a href="<?php echo $this->baseUrl(); ?>/requests/view/get-file/fileId/session/id/<?php echo $key; ?>">
+ <a href="<?php echo $this->baseUrl(); ?>/requests/view/get-file/fileId/<?php echo $key; ?>/session/<?php echo $this->id; ?>">
<?php } ?>
<?php echo $syllabus['title']; ?>
</a>
@@ -30,7 +30,7 @@
<?php if ($crosslistMemo['file']) { ?>
<a href="<?php echo $this->baseUrl(); ?>/requests/view/get-file/fileId/<?php echo $crosslistMemo['file']; ?>">
<?php } else { ?>
- <a href="<?php echo $this->baseUrl(); ?>/requests/view/get-file/fileId/session/id/<?php echo $key; ?>">
+ <a href="<?php echo $this->baseUrl(); ?>/requests/view/get-file/fileId/<?php echo $key; ?>/session/<?php echo $this->id; ?>">
<?php } ?>
<?php echo $crosslistMemo['title']; ?>
</a>
@@ -46,7 +46,7 @@
<?php if ($ISNarrative['file']) { ?>
<a href="<?php echo $this->baseUrl(); ?>/requests/view/get-file/fileId/<?php echo $ISNarrative['file']; ?>">
<?php } else { ?>
- <a href="<?php echo $this->baseUrl(); ?>/requests/view/get-file/fileId/session/id/<?php echo $key; ?>">
+ <a href="<?php echo $this->baseUrl(); ?>/requests/view/get-file/fileId/<?php echo $key; ?>/session/<?php echo $this->id; ?>">
<?php } ?>
<?php echo $ISNarrative['title']; ?>
</a>
@@ -62,7 +62,7 @@
<?php if ($additionalDocumentation['file']) { ?>
<a href="<?php echo $this->baseUrl(); ?>/requests/view/get-file/fileId/<?php echo $additionalDocumentation['file']; ?>">
<?php } else { ?>
- <a href="<?php echo $this->baseUrl(); ?>/requests/view/get-file/fileId/session/id/<?php echo $key; ?>">
+ <a href="<?php echo $this->baseUrl(); ?>/requests/view/get-file/fileId/<?php echo $key; ?>/session/<?php echo $this->id; ?>">
<?php } ?>
<?php echo $additionalDocumentation['title']; ?>
</a>
diff --git a/application/modules/requests/controllers/ViewController.php b/application/modules/requests/controllers/ViewController.php
index a1db4a34..8e206c10 100644
--- a/application/modules/requests/controllers/ViewController.php
+++ b/application/modules/requests/controllers/ViewController.php
@@ -41,12 +41,12 @@ class Requests_ViewController extends App_Controller_Action
public function getFileAction()
{
+ $in = $this->_getAllParams();
$fileId = $this->getRequest()->getParam('fileId');
- if ($fileId == 'session') {
- $id = $this->getRequest()->getParam('id');
- $session = new Zend_Session_Namespace('Edit Request');
+ if ($in['session']) {
+ $session = new Zend_Session_Namespace('Edit Request ' . $in['session']);
$request = $session->request;
- $file = $request->getFileById($id);
+ $file = $request->getFileById($fileId);
$data = $file['data'];
$title = $file['title'];
$mimeType = $file['mimeType'];
diff --git a/application/modules/requests/models/RequestModel.php b/application/modules/requests/models/RequestModel.php
index f837d276..66a39a75 100644
--- a/application/modules/requests/models/RequestModel.php
+++ b/application/modules/requests/models/RequestModel.php
@@ -683,8 +683,7 @@ class Requests_RequestModel extends Unl_Model
if (!file_exists($path)) {
@mkdir($path, 0755, true);
}
- //$data = @file_get_contents($path . DIRECTORY_SEPARATOR . $hash);
- $data = '';
+ $data = @file_get_contents($path . DIRECTORY_SEPARATOR . $hash);
return $data;
}
--
GitLab