restructure application classes

agents/toplevel/BinaryAgent.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class BinaryAgent extends \hhu\z\ToplevelAgent
+	class BinaryAgent extends \hhu\z\agents\ToplevelAgent
 	{
 		
 		

agents/toplevel/HtmlAgent.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class HtmlAgent extends \hhu\z\ToplevelAgent
+	class HtmlAgent extends \hhu\z\agents\ToplevelAgent
 	{
 		
 		

app/agents/QuesttypeAgent.inc

@@ -9,7 +9,7 @@
 	 * @link	https://bitbucket.org/coderkun/the-legend-of-z
 	 */
 	
-	namespace hhu\z;
+	namespace hhu\z\agents;
 	
 	
 	/**
@@ -107,6 +107,23 @@
 		}
 		
 		
+		/**
+		 * Determine the classname for the given Agent name.
+		 * 
+		 * @static
+		 * @param	string	$agentName	Agent name to get classname of
+		 * @param	string	$agentType	Agent type of given Agent name
+		 * @return	string			Classname for the Agent name
+		 */
+		/*private static function getClassName($agentName, $agentType)
+		{
+			$className = ClassLoader::concatClassNames($agentName, 'agent');
+			
+			
+			return \nre\configs\AppConfig::$app['namespace']."agents\\$agentType\\$className";
+		}*/
+		
+		
 		/**
 		 * Load the class of a QuesttypeAgent.
 		 * 
@@ -256,10 +273,10 @@
 			
 			
 			// Load Controller
-			\hhu\z\QuesttypeController::load($controllerName);
+			\hhu\z\controllers\QuesttypeController::load($controllerName);
 			
 			// Construct Controller
-			$this->controller = QuesttypeController::factory($controllerName, $toplevelAgentName, $action, $this);
+			$this->controller = \hhu\z\controllers\QuesttypeController::factory($controllerName, $toplevelAgentName, $action, $this);
 		}
 		
 	}

app/agents/ToplevelAgent.inc

@@ -9,7 +9,7 @@
 	 * @link	https://bitbucket.org/coderkun/the-legend-of-z
 	 */
 	
-	namespace hhu\z;
+	namespace hhu\z\agents;
 	
 	
 	/**

app/controllers/QuesttypeController.inc

@@ -9,7 +9,7 @@
 	 * @link	https://bitbucket.org/coderkun/the-legend-of-z
 	 */
 	
-	namespace hhu\z;
+	namespace hhu\z\controllers;
 	
 	
 	/**
@@ -273,11 +273,11 @@
 			$model = \nre\core\ClassLoader::stripClassType(\nre\core\ClassLoader::stripClassType(\nre\core\ClassLoader::stripNamespace(get_class($this))));
 			
 			// Load class
-			QuesttypeModel::load($model);
+			\hhu\z\models\QuesttypeModel::load($model);
 			
 			// Construct Model
 			$modelName = ucfirst(strtolower($model));
-			$this->$modelName = QuesttypeModel::factory($model);
+			$this->$modelName = \hhu\z\models\QuesttypeModel::factory($model);
 		}
 		
 		
@@ -300,7 +300,7 @@
 			
 			
 			// Load view
-			$this->view = QuesttypeView::loadAndFactory($layoutName, $controllerName, $action);
+			$this->view = \hhu\z\views\QuesttypeView::loadAndFactory($layoutName, $controllerName, $action);
 		}
 		
 	}

app/models/QuesttypeModel.inc

@@ -9,7 +9,7 @@
 	 * @link	https://bitbucket.org/coderkun/the-legend-of-z
 	 */
 	
-	namespace hhu\z;
+	namespace hhu\z\models;
 	
 	
 	/**

app/views/QuesttypeView.inc

@@ -9,7 +9,7 @@
 	 * @link	https://bitbucket.org/coderkun/the-legend-of-z
 	 */
 	
-	namespace hhu\z;
+	namespace hhu\z\views;
 	
 	
 	/**

controllers/QuestsController.inc

@@ -43,7 +43,7 @@
 		 * @var array
 		 */
 		public $seminaryPermissions = array(
-			'index'		=> array('admin', 'moderator', 'user'),
+			'index'		=> array('admin', 'moderator'),
 			'quest'		=> array('admin', 'moderator', 'user'),
 			'submissions'	=> array('admin', 'moderator'),
 			'submission'	=> array('admin', 'moderator'),
@@ -813,11 +813,11 @@
 		private function loadQuesttypeAgent($questtypeClassname, $request, $response)
 		{
 			// Load Agent
-			\hhu\z\QuesttypeAgent::load($questtypeClassname);
+			\hhu\z\agents\QuesttypeAgent::load($questtypeClassname);
 			
 			
 			// Construct and return Agent
-			return \hhu\z\QuesttypeAgent::factory($questtypeClassname, $request, $response);
+			return \hhu\z\agents\QuesttypeAgent::factory($questtypeClassname, $request, $response);
 		}
 		
 		

questtypes/bossfight/BossfightQuesttypeAgent.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class BossfightQuesttypeAgent extends \hhu\z\QuesttypeAgent
+	class BossfightQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
 	{
 	}
 

questtypes/bossfight/BossfightQuesttypeController.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class BossfightQuesttypeController extends \hhu\z\QuesttypeController
+	class BossfightQuesttypeController extends \hhu\z\controllers\QuesttypeController
 	{
 		/**
 		 * Required models

questtypes/bossfight/BossfightQuesttypeModel.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class BossfightQuesttypeModel extends \hhu\z\QuesttypeModel
+	class BossfightQuesttypeModel extends \hhu\z\models\QuesttypeModel
 	{
 		
 		

questtypes/choiceinput/ChoiceinputQuesttypeAgent.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class ChoiceinputQuesttypeAgent extends \hhu\z\QuesttypeAgent
+	class ChoiceinputQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
 	{
 	}
 

questtypes/choiceinput/ChoiceinputQuesttypeController.inc

@@ -18,7 +18,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class ChoiceinputQuesttypeController extends \hhu\z\QuesttypeController
+	class ChoiceinputQuesttypeController extends \hhu\z\controllers\QuesttypeController
 	{
 		
 		

questtypes/choiceinput/ChoiceinputQuesttypeModel.inc

@@ -18,7 +18,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class ChoiceinputQuesttypeModel extends \hhu\z\QuesttypeModel
+	class ChoiceinputQuesttypeModel extends \hhu\z\models\QuesttypeModel
 	{
 		
 		

questtypes/crossword/CrosswordQuesttypeAgent.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class CrosswordQuesttypeAgent extends \hhu\z\QuesttypeAgent
+	class CrosswordQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
 	{
 	}
 

questtypes/crossword/CrosswordQuesttypeController.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class CrosswordQuesttypeController extends \hhu\z\QuesttypeController
+	class CrosswordQuesttypeController extends \hhu\z\controllers\QuesttypeController
 	{
 		
 		

questtypes/crossword/CrosswordQuesttypeModel.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class CrosswordQuesttypeModel extends \hhu\z\QuesttypeModel
+	class CrosswordQuesttypeModel extends \hhu\z\models\QuesttypeModel
 	{
 		
 		

questtypes/dragndrop/DragndropQuesttypeAgent.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class DragndropQuesttypeAgent extends \hhu\z\QuesttypeAgent
+	class DragndropQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
 	{
 	}
 

questtypes/dragndrop/DragndropQuesttypeController.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class DragndropQuesttypeController extends \hhu\z\QuesttypeController
+	class DragndropQuesttypeController extends \hhu\z\controllers\QuesttypeController
 	{
 		/**
 		 * Required models

questtypes/dragndrop/DragndropQuesttypeModel.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class DragndropQuesttypeModel extends \hhu\z\QuesttypeModel
+	class DragndropQuesttypeModel extends \hhu\z\models\QuesttypeModel
 	{
 		
 		

questtypes/multiplechoice/MultiplechoiceQuesttypeAgent.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class MultiplechoiceQuesttypeAgent extends \hhu\z\QuesttypeAgent
+	class MultiplechoiceQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
 	{
 	}
 

questtypes/multiplechoice/MultiplechoiceQuesttypeController.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class MultiplechoiceQuesttypeController extends \hhu\z\QuesttypeController
+	class MultiplechoiceQuesttypeController extends \hhu\z\controllers\QuesttypeController
 	{
 		
 		

questtypes/multiplechoice/MultiplechoiceQuesttypeModel.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class MultiplechoiceQuesttypeModel extends \hhu\z\QuesttypeModel
+	class MultiplechoiceQuesttypeModel extends \hhu\z\models\QuesttypeModel
 	{
 		
 		

questtypes/submit/SubmitQuesttypeAgent.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class SubmitQuesttypeAgent extends \hhu\z\QuesttypeAgent
+	class SubmitQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
 	{
 	}
 

questtypes/submit/SubmitQuesttypeController.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class SubmitQuesttypeController extends \hhu\z\QuesttypeController
+	class SubmitQuesttypeController extends \hhu\z\controllers\QuesttypeController
 	{
 		/**
 		 * Required models

questtypes/submit/SubmitQuesttypeModel.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class SubmitQuesttypeModel extends \hhu\z\QuesttypeModel
+	class SubmitQuesttypeModel extends \hhu\z\models\QuesttypeModel
 	{
 		/**
 		 * Required models

questtypes/textinput/TextinputQuesttypeAgent.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class TextinputQuesttypeAgent extends \hhu\z\QuesttypeAgent
+	class TextinputQuesttypeAgent extends \hhu\z\agents\QuesttypeAgent
 	{
 	}
 

questtypes/textinput/TextinputQuesttypeController.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class TextinputQuesttypeController extends \hhu\z\QuesttypeController
+	class TextinputQuesttypeController extends \hhu\z\controllers\QuesttypeController
 	{
 		
 		

questtypes/textinput/TextinputQuesttypeModel.inc

@@ -17,7 +17,7 @@
 	 * 
 	 * @author	Oliver Hanraths <oliver.hanraths@uni-duesseldorf.de>
 	 */
-	class TextinputQuesttypeModel extends \hhu\z\QuesttypeModel
+	class TextinputQuesttypeModel extends \hhu\z\models\QuesttypeModel
 	{