Merging changes from redesign branch into popups branch

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>

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'];

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;
     }