Merge lp:~c11emian/lenasys/1171772 into lp:lenasys

[Emil Andersson]

Fixed bug #1171772 by setting default arguments and redirecting to the startpage if no other arguments are supplied.

=== modified file 'codeigniter/application/controllers/codeviewer.php'
--- codeigniter/application/controllers/codeviewer.php	2013-05-28 09:08:10 +0000
+++ codeigniter/application/controllers/codeviewer.php	2013-05-28 12:50:38 +0000
@@ -19,31 +19,29 @@
 	/**
 	* This shows the codeviewer page
 	*/
-	public function show($cid, $category, $subcategory, $example){
-		$headTagData['cssFiles'] = array('headTag', 'header', 'codeviewer');
-		$headTagData['jsFiles'] = array('ace/ace', 'header');
-	
-		$this->load->model('codeviewer/Codeviewer_model');
-
-		$editorHTML = $this->Codeviewer_model->getCode($cid, $category, $subcategory, $example);
-	
-		$this->load->model('user');
-		
-		$userInfo = array(
-			'userType' => $this->user->getUserType(),
-			'userName' => $this->user->getUserName()
-		);
-		
-		$this->load->helper('form');
-		
-		// $doc = $this->Codeviewer_model->getDoc($cid, $category, $subcategory, $example);
-
-		// This loads the view. It's stored in application/views/codeviewer/codeviewer.php
-		// Do note that application/views should not be in the first argument of view()
-		// The second argument is data to be shown in the view. "editors" => "test" would
-		// generate an $editors variable in the view containing "test"
-		$this->load->view('headTag', array('headTagData' => $headTagData));
-		$this->load->view('header', $userInfo);
-		$this->load->view('codeviewer/codeviewer', array("editors" => $editorHTML));
+	public function show($cid = null, $category = null, $subcategory = null, $example = null){
+		if(!is_null($cid) && !is_null($category) && !is_null($subcategory) && !is_null($example)){
+			$headTagData['cssFiles'] = array('headTag', 'header', 'codeviewer');
+			$headTagData['jsFiles'] = array('ace/ace', 'header');
+			$this->load->model('user');			
+			$userInfo = array(
+				'userType' => $this->user->getUserType(),
+				'userName' => $this->user->getUserName()
+			);
+			$this->load->view('headTag', array('headTagData' => $headTagData));
+			$this->load->view('header', $userInfo);
+			$this->load->model('codeviewer/Codeviewer_model');
+			$editorHTML = $this->Codeviewer_model->getCode($cid, $category, $subcategory, $example);
+			$this->load->helper('form');
+			// $doc = $this->Codeviewer_model->getDoc($cid, $category, $subcategory, $example);
+			// This loads the view. It's stored in application/views/codeviewer/codeviewer.php
+			// Do note that application/views should not be in the first argument of view()
+			// The second argument is data to be shown in the view. "editors" => "test" would
+			// generate an $editors variable in the view containing "test"
+			$this->load->view('codeviewer/codeviewer', array("editors" => $editorHTML));
+		} else {
+			/*Redirects to the startpage if no arguments are supplied.*/
+			redirect('/');
+		}
 	}
 }