Merge branch 'release/v.2013.3.5'

jacoor · Dec 5, 2013 · 7d43f2f · 7d43f2f
2 parents 9541de1 + da42e94
commit 7d43f2f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/class/Exceptions_handler_lib.php b/class/Exceptions_handler_lib.php
@@ -124,7 +124,7 @@ class FileException extends  Exception
 {
 	function __construct($in_errormsg=Null,$in_errorcode=Null)
 	{
-		parent::__construct("Bład pliku:
+		parent::__construct("Błąd pliku:
 		{$in_errormsg}",$in_errorcode);
 	}
 }
diff --git a/class/displayManager.Class.php b/class/displayManager.Class.php
@@ -851,20 +851,25 @@ public function meetings(){
 	 * @return statement file contents
 	 */
 	 public function download_statement($data){
-	 	if ($data['id']){
-	 		/* id is set, logged in user should be superadmin */
-	 		$this->secure('admin');
-	 		$volunteer = $this->engine->loadVolunteers(array('id'=>$data['id']));
-	 		$volunteer = $volunteer[0];
-	 		$volunteer->getStatementFileContents(false);
-	 	}else{
-	 		/* else only currently logged in user statement is available */ 
-			$this->secure('self');
-			if (!$this->user->statement_downloaded){
-				$this->user->getStatementFileContents();
-			}else{
-				HTTP::redirect('/');
-			}
+		try {
+		 	if ($data['id']){
+		 		/* id is set, logged in user should be superadmin */
+		 		$this->secure('admin');
+		 		$volunteer = $this->engine->loadVolunteers(array('id'=>$data['id']));
+		 		$volunteer = $volunteer[0];
+		 		$volunteer->getStatementFileContents(false);
+		 	}else{
+		 		/* else only currently logged in user statement is available */ 
+				$this->secure('self');
+				if (!$this->user->statement_downloaded){
+					$this->user->getStatementFileContents();
+				}else{
+					HTTP::redirect('/');
+				}
+		 	}
+	 	}catch (FileException $e){
+	 		echo $e->getMessage();
+	 		die();
 	 	}
 	 }
 }

diff --git a/templates/volunteer_account.html b/templates/volunteer_account.html
@@ -22,7 +22,7 @@ <h3><span>Dane wolontariusza</span> {if $user->ACL_check('edit')}<a id="change_v
 			<th>Status oświadczenia:</th>
 			<td>{$volunteer->getStatementState()}</td>	
 		</tr>
-		{if $user->ACL_check('superadmin')}
+		{if $user->ACL_check('superadmin') && $volunteer->statement_file}
 			<tr>
 				<th colspan="2" class="text-left"><a href="/?action=download_statement&amp;id={$volunteer->id}">Pobierz oświadczenie wolontariusza</a></th>
 			</tr>