diff --git a/agents/ToplevelAgent.inc b/agents/ToplevelAgent.inc index d8b21da5..0b78ca41 100644 --- a/agents/ToplevelAgent.inc +++ b/agents/ToplevelAgent.inc @@ -36,19 +36,19 @@ /** * Current request * - * @var Request + * @var \nre\core\Request */ private $request; /** * Current response * - * @var Response + * @var \nre\core\Response */ private $response; /** * Layout instace * - * @var Layout + * @var \nre\core\Layout */ private $layout = null; /** @@ -64,18 +64,18 @@ /** * Construct a ToplevelAgent. * - * @throws ServiceUnavailableException - * @throws DatamodelException - * @throws DriverNotValidException - * @throws DriverNotFoundException - * @throws ViewNotFoundException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws ControllerNotValidException - * @throws ControllerNotFoundException - * @param Request $request Current request - * @param Response $response Current response - * @param Logger $log Log-system + * @throws \nre\exceptions\ServiceUnavailableException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ControllerNotValidException + * @throws \nre\exceptions\ControllerNotFoundException + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response + * @param \nre\core\Logger $log Log-system */ protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null) { @@ -106,10 +106,10 @@ /** * Run the Controller of this Agent and its SubAgents. * - * @throws ServiceUnavailableException - * @param Request $request Current request - * @param Response $response Current response - * @return Exception Last occurred exception of SubAgents + * @throws \nre\exceptions\ServiceUnavailableException + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response + * @return \Exception Last occurred exception of SubAgents */ public function run(\nre\core\Request $request, \nre\core\Response $response) { @@ -156,7 +156,7 @@ /** * Return the IntermediateAgent. * - * @return IntermediateAgent IntermediateAgent + * @return \nre\agents\IntermediateAgent IntermediateAgent */ public function getIntermediateAgent() { @@ -169,10 +169,10 @@ /** * Load a SubAgent and add it. * - * @throws ServiceUnavailableException - * @throws FatalDatamodelException - * @throws AgentNotFoundException - * @throws AgentNotValidException + * @throws \nre\exceptions\ServiceUnavailableException + * @throws \nre\exceptions\FatalDatamodelException + * @throws \nre\exceptions\AgentNotFoundException + * @throws \nre\exceptions\AgentNotValidException * @param string $agentName Name of the Agent to load * @param mixed … Additional parameters for the agent */ @@ -198,7 +198,7 @@ /** * Load IntermediateAgent defined by the current request. * - * @throws ServiceUnavailableException + * @throws \nre\exceptions\ServiceUnavailableException */ private function loadIntermediateAgent() { @@ -241,7 +241,7 @@ /** * Load IntermediateAgent defined by the current request. * - * @throws ServiceUnavailableException + * @throws \nre\exceptions\ServiceUnavailableException */ private function _loadIntermediateAgent() { @@ -276,13 +276,13 @@ /** * Run the Controller of this Agent and its SubAgents. * - * @throws AccessDeniedException - * @throws IdNotFoundException - * @throws ServiceUnavailableException - * @throws DatamodelException - * @param Request $request Current request - * @param Response $response Current response - * @return Exception Last occurred exception of SubAgents + * @throws \nre\exceptions\AccessDeniedException + * @throws \nre\exceptions\IdNotFoundException + * @throws \nre\exceptions\ServiceUnavailableException + * @throws \nre\exceptions\DatamodelException + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response + * @return \Exception Last occurred exception of SubAgents */ private function _run(\nre\core\Request $request, \nre\core\Response $response) { @@ -304,11 +304,11 @@ /** * Run IntermediateAgent. * - * @throws AccessDeniedException - * @throws ParamsNotValidException - * @throws IdNotFoundException - * @throws ServiceUnavailableException - * @throws DatamodelException + * @throws \nre\exceptions\AccessDeniedException + * @throws \nre\exceptions\ParamsNotValidException + * @throws \nre\exceptions\IdNotFoundException + * @throws \nre\exceptions\ServiceUnavailableException + * @throws \nre\exceptions\DatamodelException */ private function runIntermediateAgent() { @@ -323,8 +323,8 @@ * Handle an error that occurred during * loading/cnostructing/running of the IntermediateAgent. * - * @throws ServiceUnavailableException - * @param Exception $exception Occurred exception + * @throws \nre\exceptions\ServiceUnavailableException + * @param \Exception $exception Occurred exception * @param int $httpStatusCode HTTP-statuscode * @param string $stage Stage of execution */ diff --git a/agents/bottomlevel/MailreceiverAgent.inc b/agents/bottomlevel/MailreceiverAgent.inc index f6cf4afd..5ebffd3a 100644 --- a/agents/bottomlevel/MailreceiverAgent.inc +++ b/agents/bottomlevel/MailreceiverAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/bottomlevel/MenuAgent.inc b/agents/bottomlevel/MenuAgent.inc index cf1bbf18..0f0dc60d 100644 --- a/agents/bottomlevel/MenuAgent.inc +++ b/agents/bottomlevel/MenuAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/bottomlevel/QuestgroupshierarchypathAgent.inc b/agents/bottomlevel/QuestgroupshierarchypathAgent.inc index 130f5e7c..36b84474 100644 --- a/agents/bottomlevel/QuestgroupshierarchypathAgent.inc +++ b/agents/bottomlevel/QuestgroupshierarchypathAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/bottomlevel/SeminarybarAgent.inc b/agents/bottomlevel/SeminarybarAgent.inc index bc2eb038..2f43e474 100644 --- a/agents/bottomlevel/SeminarybarAgent.inc +++ b/agents/bottomlevel/SeminarybarAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/bottomlevel/SeminarymenuAgent.inc b/agents/bottomlevel/SeminarymenuAgent.inc index ad43aebb..1c55e419 100644 --- a/agents/bottomlevel/SeminarymenuAgent.inc +++ b/agents/bottomlevel/SeminarymenuAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/bottomlevel/UserrolesAgent.inc b/agents/bottomlevel/UserrolesAgent.inc index 26b2921f..1186eff4 100644 --- a/agents/bottomlevel/UserrolesAgent.inc +++ b/agents/bottomlevel/UserrolesAgent.inc @@ -26,8 +26,8 @@ /** * Action: user. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function user(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/AchievementsAgent.inc b/agents/intermediate/AchievementsAgent.inc index a8609b1e..de829ee1 100644 --- a/agents/intermediate/AchievementsAgent.inc +++ b/agents/intermediate/AchievementsAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/CharactergroupsAgent.inc b/agents/intermediate/CharactergroupsAgent.inc index 284aa02d..02b8244a 100644 --- a/agents/intermediate/CharactergroupsAgent.inc +++ b/agents/intermediate/CharactergroupsAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/CharactergroupsquestsAgent.inc b/agents/intermediate/CharactergroupsquestsAgent.inc index 488f1c74..3e5e17d1 100644 --- a/agents/intermediate/CharactergroupsquestsAgent.inc +++ b/agents/intermediate/CharactergroupsquestsAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/CharactersAgent.inc b/agents/intermediate/CharactersAgent.inc index d659b3f2..0bbfa315 100644 --- a/agents/intermediate/CharactersAgent.inc +++ b/agents/intermediate/CharactersAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { @@ -37,8 +37,8 @@ /** * Action: character. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function character(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/CharactertypesAgent.inc b/agents/intermediate/CharactertypesAgent.inc index 19f60a11..8c2693bb 100644 --- a/agents/intermediate/CharactertypesAgent.inc +++ b/agents/intermediate/CharactertypesAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/ErrorAgent.inc b/agents/intermediate/ErrorAgent.inc index 32a973b2..5554c417 100644 --- a/agents/intermediate/ErrorAgent.inc +++ b/agents/intermediate/ErrorAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/IntroductionAgent.inc b/agents/intermediate/IntroductionAgent.inc index aed14562..1ee6483a 100644 --- a/agents/intermediate/IntroductionAgent.inc +++ b/agents/intermediate/IntroductionAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/LibraryAgent.inc b/agents/intermediate/LibraryAgent.inc index 184969fa..b3105be9 100644 --- a/agents/intermediate/LibraryAgent.inc +++ b/agents/intermediate/LibraryAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/MailAgent.inc b/agents/intermediate/MailAgent.inc index fe53ac3e..34dcc512 100644 --- a/agents/intermediate/MailAgent.inc +++ b/agents/intermediate/MailAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/MediaAgent.inc b/agents/intermediate/MediaAgent.inc index c0555e55..550380a8 100644 --- a/agents/intermediate/MediaAgent.inc +++ b/agents/intermediate/MediaAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/QuestgroupsAgent.inc b/agents/intermediate/QuestgroupsAgent.inc index ff4144e3..2d2a4996 100644 --- a/agents/intermediate/QuestgroupsAgent.inc +++ b/agents/intermediate/QuestgroupsAgent.inc @@ -26,8 +26,8 @@ /** * Action: questgroup. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function questgroup(\nre\core\Request $request, \nre\core\Response $response) { @@ -38,8 +38,8 @@ /** * Action: edit. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function edit(\nre\core\Request $request, \nre\core\Response $response) { @@ -50,8 +50,8 @@ /** * Action: edittexts. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function edittexts(\nre\core\Request $request, \nre\core\Response $response) { @@ -62,8 +62,8 @@ /** * Action: delete. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function delete(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/QuestsAgent.inc b/agents/intermediate/QuestsAgent.inc index 9f3cfe15..1485d090 100644 --- a/agents/intermediate/QuestsAgent.inc +++ b/agents/intermediate/QuestsAgent.inc @@ -26,8 +26,8 @@ /** * Action: quest. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function quest(\nre\core\Request $request, \nre\core\Response $response) { @@ -38,8 +38,8 @@ /** * Action: submissions. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function submissions(\nre\core\Request $request, \nre\core\Response $response) { @@ -50,8 +50,8 @@ /** * Action: submission. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function submission(\nre\core\Request $request, \nre\core\Response $response) { @@ -62,8 +62,8 @@ /** * Action: create. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function create(\nre\core\Request $request, \nre\core\Response $response) { @@ -74,8 +74,8 @@ /** * Action: edit. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function edit(\nre\core\Request $request, \nre\core\Response $response) { @@ -86,8 +86,8 @@ /** * Action: edittask. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function edittask(\nre\core\Request $request, \nre\core\Response $response) { @@ -98,8 +98,8 @@ /** * Action: edittexts. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function edittexts(\nre\core\Request $request, \nre\core\Response $response) { @@ -110,8 +110,8 @@ /** * Action: delete. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function delete(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/SeminariesAgent.inc b/agents/intermediate/SeminariesAgent.inc index 5a7c8f83..79901cfe 100644 --- a/agents/intermediate/SeminariesAgent.inc +++ b/agents/intermediate/SeminariesAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/UploadsAgent.inc b/agents/intermediate/UploadsAgent.inc index 9419965a..ef01077e 100644 --- a/agents/intermediate/UploadsAgent.inc +++ b/agents/intermediate/UploadsAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/UsersAgent.inc b/agents/intermediate/UsersAgent.inc index 0a1daca8..9ba74df3 100644 --- a/agents/intermediate/UsersAgent.inc +++ b/agents/intermediate/UsersAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { @@ -37,8 +37,8 @@ /** * Action: user. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function user(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/intermediate/XplevelsAgent.inc b/agents/intermediate/XplevelsAgent.inc index a6713d80..dff540f3 100644 --- a/agents/intermediate/XplevelsAgent.inc +++ b/agents/intermediate/XplevelsAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/toplevel/AjaxAgent.inc b/agents/toplevel/AjaxAgent.inc index 37f58433..1ced33f1 100644 --- a/agents/toplevel/AjaxAgent.inc +++ b/agents/toplevel/AjaxAgent.inc @@ -26,9 +26,9 @@ /** * Construct a new AjaxAgent. * - * @param Request $request Current request - * @param Response $response Current response - * @param Logger $log Logger instance + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response + * @param \nre\core\Logger $log Logger instance */ protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null) { @@ -42,8 +42,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { @@ -55,7 +55,7 @@ /** * Set requested language. * - * @param Request $request Current request + * @param \nre\core\Request $request Current request */ private function setLanguage(\nre\core\Request $request) { diff --git a/agents/toplevel/BinaryAgent.inc b/agents/toplevel/BinaryAgent.inc index 728416e2..55d494e3 100644 --- a/agents/toplevel/BinaryAgent.inc +++ b/agents/toplevel/BinaryAgent.inc @@ -26,9 +26,9 @@ /** * Construct a new BinaryAgent. * - * @param Request $request Current request - * @param Response $response Current response - * @param Logger $log Logger instance + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response + * @param \nre\core\Logger $log Logger instance */ protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null) { @@ -39,8 +39,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/toplevel/FaultAgent.inc b/agents/toplevel/FaultAgent.inc index 2d6fbc7f..d289c041 100644 --- a/agents/toplevel/FaultAgent.inc +++ b/agents/toplevel/FaultAgent.inc @@ -26,8 +26,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/toplevel/HtmlAgent.inc b/agents/toplevel/HtmlAgent.inc index a160ea09..4af26dbc 100644 --- a/agents/toplevel/HtmlAgent.inc +++ b/agents/toplevel/HtmlAgent.inc @@ -26,9 +26,9 @@ /** * Construct a new HtmlAgent. * - * @param Request $request Current request - * @param Response $response Current response - * @param Logger $log Logger instance + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response + * @param \nre\core\Logger $log Logger instance */ protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null) { @@ -42,8 +42,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { @@ -60,7 +60,7 @@ /** * Set requested language. * - * @param Request $request Current request + * @param \nre\core\Request $request Current request */ private function setLanguage(\nre\core\Request $request) { diff --git a/agents/toplevel/HtmlmailAgent.inc b/agents/toplevel/HtmlmailAgent.inc index ad99c820..001886cd 100644 --- a/agents/toplevel/HtmlmailAgent.inc +++ b/agents/toplevel/HtmlmailAgent.inc @@ -26,9 +26,9 @@ /** * Construct a new HtmlmailAgent. * - * @param Request $request Current request - * @param Response $response Current response - * @param Logger $log Logger instance + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response + * @param \nre\core\Logger $log Logger instance */ protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null) { @@ -39,8 +39,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/agents/toplevel/TextmailAgent.inc b/agents/toplevel/TextmailAgent.inc index 66c58f30..ec4c34b2 100644 --- a/agents/toplevel/TextmailAgent.inc +++ b/agents/toplevel/TextmailAgent.inc @@ -26,9 +26,9 @@ /** * Construct a new TextmailAgent. * - * @param Request $request Current request - * @param Response $response Current response - * @param Logger $log Logger instance + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response + * @param \nre\core\Logger $log Logger instance */ protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null) { @@ -41,8 +41,8 @@ /** * Action: index. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function index(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/apis/WebApi.inc b/apis/WebApi.inc index e743b091..738b863f 100644 --- a/apis/WebApi.inc +++ b/apis/WebApi.inc @@ -156,7 +156,7 @@ * Handle an error that orrcurred during the * loading/constructing/running of the ToplevelAgent. * - * @param Exception $exception Occurred exception + * @param \Exception $exception Occurred exception * @param int $httpStatusCode HTTP-statuscode */ private function error(\nre\core\Exception $exception, $httpStatusCode) @@ -223,7 +223,7 @@ * Handle a error which cannot be handles by the system (and * HTTP 503). * - * @param Exception $exception Occurred exception + * @param \Exception $exception Occurred exception */ private function errorService($exception) { diff --git a/app/Controller.inc b/app/Controller.inc index f65e4ff7..cdd7e7d4 100644 --- a/app/Controller.inc +++ b/app/Controller.inc @@ -29,13 +29,13 @@ /** * Logger instance * - * @var Logger + * @var \nre\core\Logger */ protected $log = null; /** * Linker instance * - * @var Linker + * @var \nre\core\Linker */ protected $linker = null; @@ -45,14 +45,14 @@ /** * Construct a new application Controller. * - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws ViewNotFoundException - * @param string $layoutName Name of the current Layout - * @param string $action Current Action - * @param Agent $agent Corresponding Agent + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @param string $layoutName Name of the current Layout + * @param string $action Current Action + * @param \nre\core\Agent $agent Corresponding Agent */ public function __construct($layoutName, $action, $agent) { @@ -67,8 +67,8 @@ /** * Prefilter that is executed before running the Controller. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { @@ -104,8 +104,8 @@ /** * Postfilter that is executed after running the Controller. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function postFilter(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/app/Model.inc b/app/Model.inc index 32835d04..84ccb7d7 100644 --- a/app/Model.inc +++ b/app/Model.inc @@ -26,11 +26,11 @@ /** * Construct a new application Model. * - * @throws DatamodelException - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws ModelNotValidException - * @throws ModelNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException */ public function __construct() { diff --git a/app/TextFormatter.inc b/app/TextFormatter.inc index a7a8a0b7..71adba90 100644 --- a/app/TextFormatter.inc +++ b/app/TextFormatter.inc @@ -22,14 +22,14 @@ /** * Linker to create links. * - * @var Linker + * @var \nre\core\Linker */ private $linker; /** * Media-Model to retrieve media data * * @static - * @var model + * @var \nre\core\Model */ private static $Media = null; @@ -39,7 +39,7 @@ /** * Create a new text formatter. * - * @param Linker $linker Linker to create links with + * @param \nre\core\Linker $linker Linker to create links with */ public function __construct(\nre\core\Linker $linker) { diff --git a/app/Utils.inc b/app/Utils.inc index 322c10f4..397eb029 100644 --- a/app/Utils.inc +++ b/app/Utils.inc @@ -82,12 +82,12 @@ /** * Send an e‑mail. * - * @throws MailingException - * @param mixed $to One (string) or many (array) receivers - * @param string $messageAction Message Action - * @param boolean $html Whether mail should be formatted as HTML or not - * @param array $params Parameters to pass - * @param Linker $linker Linker instance + * @throws \hhu\z\exceptions\MailingException + * @param mixed $to One (string) or many (array) receivers + * @param string $messageAction Message Action + * @param boolean $html Whether mail should be formatted as HTML or not + * @param array $params Parameters to pass + * @param \nre\core\Linker $linker Linker instance */ public static function sendMail($to, $messageAction, $html=false, $params=null, $linker=null) { diff --git a/app/agents/QuesttypeAgent.inc b/app/agents/QuesttypeAgent.inc index ed66d15e..05d643c6 100644 --- a/app/agents/QuesttypeAgent.inc +++ b/app/agents/QuesttypeAgent.inc @@ -22,13 +22,13 @@ /** * Current request * - * @var Request + * @var \nre\core\Request */ private $request; /** * Current response * - * @var Response + * @var \nre\core\Response */ private $response; @@ -39,8 +39,8 @@ * Load a QuesttypeAgent. * * @static - * @throws QuesttypeAgentNotFoundException - * @throws QuesttypeAgentNotValidException + * @throws \hhu\z\exceptions\QuesttypeAgentNotFoundException + * @throws \hhu\z\exceptions\QuesttypeAgentNotValidException * @param string $questtypeName Name of the QuesttypeAgent to load */ public static function load($questtypeName) @@ -68,14 +68,14 @@ * Instantiate a QuesttypeAgent (Factory Pattern). * * @static - * @throws DatamodelException - * @throws DriverNotValidException - * @throws DriverNotFoundException - * @throws ViewNotFoundException - * @throws QuesttypeModelNotValidException - * @throws QuesttypeModelNotFoundException - * @throws QuesttypeControllerNotValidException - * @throws QuesttypeControllerNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @throws \hhu\z\exceptions\QuesttypeModelNotValidException + * @throws \hhu\z\exceptions\QuesttypeModelNotFoundException + * @throws \hhu\z\exceptions\QuesttypeControllerNotValidException + * @throws \hhu\z\exceptions\QuesttypeControllerNotFoundException * @param string $questtypeName Name of the QuesttypeAgent to instantiate * @param Request $request Current request * @param Response $response Current respone @@ -129,7 +129,7 @@ * Load the class of a QuesttypeAgent. * * @static - * @throws ClassNotFoundException + * @throws \nre\exceptions\ClassNotFoundException * @param string $questtypeName Name of the QuesttypeAgent to load * @param string $fullClassName Name of the class to load */ @@ -159,7 +159,7 @@ * Check inheritance of the QuesttypeAgent-class. * * @static - * @throws ClassNotValidException + * @throws \nre\exceptions\ClassNotValidException * @param string $className Name of the class to check * @param string $parentClassName Name of the parent class */ @@ -179,19 +179,19 @@ /** * Construct a new QuesttypeAgent. * - * @throws DatamodelException - * @throws DriverNotValidException - * @throws DriverNotFoundException - * @throws ViewNotFoundException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws QuesttypeModelNotValidException - * @throws QuesttypeModelNotFoundException - * @throws QuesttypeControllerNotValidException - * @throws QuesttypeControllerNotFoundException - * @param Request $request Current request - * @param Response $response Current response - * @param Logger $log Log-system + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \hhu\z\exceptions\QuesttypeModelNotValidException + * @throws \hhu\z\exceptions\QuesttypeModelNotFoundException + * @throws \hhu\z\exceptions\QuesttypeControllerNotValidException + * @throws \hhu\z\exceptions\QuesttypeControllerNotFoundException + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response + * @param \nre\core\Logger $log Log-system */ protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null) { @@ -242,16 +242,16 @@ /** * Load the Controller of this Agent. * - * @throws DatamodelException - * @throws DriverNotValidException - * @throws DriverNotFoundException - * @throws ViewNotFoundException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws QuesttypeModelNotValidException - * @throws QuesttypeModelNotFoundException - * @throws QuesttypeControllerNotValidException - * @throws QuesttypeControllerNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \hhu\z\exceptions\QuesttypeModelNotValidException + * @throws \hhu\z\exceptions\QuesttypeModelNotFoundException + * @throws \hhu\z\exceptions\QuesttypeControllerNotValidException + * @throws \hhu\z\exceptions\QuesttypeControllerNotFoundException */ protected function loadController() { diff --git a/app/agents/ToplevelAgent.inc b/app/agents/ToplevelAgent.inc index 722a7a63..c77c8b21 100644 --- a/app/agents/ToplevelAgent.inc +++ b/app/agents/ToplevelAgent.inc @@ -26,9 +26,9 @@ /** * Construct a new ToplevlAgent * - * @param Request $request Current request - * @param Response $response Current response - * @param Logger $log Logger instance + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response + * @param \nre\core\Logger $log Logger instance */ protected function __construct(\nre\core\Request $request, \nre\core\Response $response, \nre\core\Logger $log=null) { diff --git a/app/apis/MailApi.inc b/app/apis/MailApi.inc index a9ef68de..721bc547 100644 --- a/app/apis/MailApi.inc +++ b/app/apis/MailApi.inc @@ -46,7 +46,7 @@ /** * Set linker instance for creating links. * - * @param Linker $linker Linker instance for creating links + * @param \nre\core\Linker $linker Linker instance for creating links */ public function setLinker(\nre\core\Linker $linker) { @@ -140,7 +140,7 @@ * * This method runs the generation of mailtext. * - * @return Exception Occured exception or null + * @return \Exception Occured exception or null */ public function run() { diff --git a/app/controllers/IntermediateController.inc b/app/controllers/IntermediateController.inc index bed0a4fb..49da3fc2 100644 --- a/app/controllers/IntermediateController.inc +++ b/app/controllers/IntermediateController.inc @@ -44,14 +44,14 @@ /** * Construct a new IntermediateController. * - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws ViewNotFoundException - * @param string $layoutName Name of the current Layout - * @param string $action Current Action - * @param Agent $agent Corresponding Agent + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @param string $layoutName Name of the current Layout + * @param string $action Current Action + * @param \nre\core\Agent $agent Corresponding Agent */ public function __construct($layoutName, $action, $agent) { @@ -63,8 +63,8 @@ /** * Prefilter that is executed before running the Controller. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { @@ -89,8 +89,8 @@ /** * Postfilter that is executed after running the Controller. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function postFilter(\nre\core\Request $request, \nre\core\Response $response) { @@ -153,9 +153,9 @@ /** * Check user permissions. * - * @throws AccessDeniedException - * @param Request $request Current request - * @param Response $response Current response + * @throws \nre\exceptions\AccessDeniedException + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ private function checkPermission(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/app/controllers/QuesttypeController.inc b/app/controllers/QuesttypeController.inc index 1f6beea7..bdccb4cd 100644 --- a/app/controllers/QuesttypeController.inc +++ b/app/controllers/QuesttypeController.inc @@ -75,7 +75,7 @@ * @param array $questgroup Current Questgroup data * @param array $quest Current Quest data * @param array $character Current Character data - * @param Exception $exception Character submission exception + * @param \Exception $exception Character submission exception */ public abstract function quest($seminary, $questgroup, $quest, $character, $exception); @@ -111,8 +111,8 @@ * Load a QuesttypeController. * * @static - * @throws QuesttypeControllerNotFoundException - * @throws QuesttypeControllerNotValidException + * @throws \hhu\z\exceptions\QuesttypeControllerNotFoundException + * @throws \hhu\z\exceptions\QuesttypeControllerNotValidException * @param string $controllerName Name of the QuesttypeController to load */ public static function load($controllerName) @@ -140,18 +140,18 @@ * Instantiate a QuesttypeController (Factory Pattern). * * @static - * @throws DatamodelException - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws QuesttypeModelNotValidException - * @throws QuesttypeModelNotFoundException - * @throws ViewNotFoundException - * @param string $controllerName Name of the QuesttypeController to instantiate - * @param string $layoutName Name of the current Layout - * @param string $action Current Action - * @param Agent $agent Corresponding Agent + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @throws \hhu\z\exceptions\QuesttypeModelNotValidException + * @throws \hhu\z\exceptions\QuesttypeModelNotFoundException + * @param string $controllerName Name of the QuesttypeController to instantiate + * @param string $layoutName Name of the current Layout + * @param string $action Current Action + * @param \nre\core\Agent $agent Corresponding Agent */ public static function factory($controllerName, $layoutName, $action, $agent) { @@ -183,7 +183,7 @@ * Load the class of a QuesttypeController * * @static - * @throws ClassNotFoundException + * @throws \nre\exceptions\ClassNotFoundException * @param string $questtypeName Name of the QuesttypeController to load * @param string $fullClassName Name of the class to load */ @@ -213,7 +213,7 @@ * Check inheritance of the QuesttypeController-class. * * @static - * @throws ClassNotValidException + * @throws \nre\exceptions\ClassNotValidException * @param string $className Name of the class to check * @param string $parentClassName Name of the parent class */ @@ -233,13 +233,13 @@ /** * Construct a new application Controller. * - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws QuesttypeModelNotValidException - * @throws QuesttypeModelNotFoundException - * @throws ViewNotFoundException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @throws \hhu\z\exceptions\QuesttypeModelNotValidException + * @throws \hhu\z\exceptions\QuesttypeModelNotFoundException * @param string $layoutName Name of the current Layout * @param string $action Current Action * @param Agent $agent Corresponding Agent @@ -255,13 +255,13 @@ /** * Load the Models of this Controller. * - * @throws DatamodelException - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws QuesttypeModelNotValidException - * @throws QuesttypeModelNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \hhu\z\exceptions\QuesttypeModelNotValidException + * @throws \hhu\z\exceptions\QuesttypeModelNotFoundException */ protected function loadModels() { @@ -276,8 +276,8 @@ /** * Load the Model of the Questtype. * - * @throws QuesttypeModelNotValidException - * @throws QuesttypeModelNotFoundException + * @throws \hhu\z\exceptions\QuesttypeModelNotValidException + * @throws \hhu\z\exceptions\QuesttypeModelNotFoundException */ private function loadModel() { @@ -296,7 +296,7 @@ /** * Load the View of this QuesttypeController. * - * @throws ViewNotFoundException + * @throws \nre\exceptions\ViewNotFoundException * @param string $layoutName Name of the current Layout * @param string $action Current Action */ diff --git a/app/controllers/SeminaryController.inc b/app/controllers/SeminaryController.inc index 2810dec3..34fbcb44 100644 --- a/app/controllers/SeminaryController.inc +++ b/app/controllers/SeminaryController.inc @@ -51,14 +51,14 @@ /** * Construct a new Seminary Controller. * - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws ViewNotFoundException - * @param string $layoutName Name of the current Layout - * @param string $action Current Action - * @param Agent $agent Corresponding Agent + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @param string $layoutName Name of the current Layout + * @param string $action Current Action + * @param \nre\core\Agent $agent Corresponding Agent */ public function __construct($layoutName, $action, $agent) { @@ -70,8 +70,8 @@ /** * Prefilter that is executed before running the Controller. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { @@ -112,8 +112,8 @@ /** * Postfilter that is executed after running the Controller. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function postFilter(\nre\core\Request $request, \nre\core\Response $response) { @@ -126,8 +126,8 @@ * Check user permissions. * * @throws AccessDeniedException - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ private function checkPermission(\nre\core\Request $request, \nre\core\Response $response) { @@ -158,9 +158,9 @@ /** * Check for newly achieved Achievements. * - * @param Request $request Current request - * @param Response $response Current response - * @param array $checkConditions Conditions to check + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response + * @param array $checkConditions Conditions to check */ protected function checkAchievements(\nre\core\Request $request, \nre\core\Response $response, $checkConditions=null) { diff --git a/app/models/QuesttypeModel.inc b/app/models/QuesttypeModel.inc index 828ae401..545b24eb 100644 --- a/app/models/QuesttypeModel.inc +++ b/app/models/QuesttypeModel.inc @@ -27,8 +27,8 @@ * Load a Model. * * @static - * @throws QuesttypeModelNotFoundException - * @throws QuesttypeModelNotValidException + * @throws \hhu\z\exceptions\QuesttypeModelNotFoundException + * @throws \hhu\z\exceptions\QuesttypeModelNotValidException * @param string $modelName Name of the QuesttypeModel to load */ public static function load($modelName) @@ -88,7 +88,7 @@ * Load the class of a QuesttypeModel. * * @static - * @throws ClassNotFoundException + * @throws \nre\exceptions\ClassNotFoundException * @param string $questtypeName Name of the QuesttypeModel to load * @param string $fullClassName Name of the class to load */ @@ -118,7 +118,7 @@ * Check inheritance of the QuesttypeModel-class. * * @static - * @throws ClassNotValidException + * @throws \nre\exceptions\ClassNotValidException * @param string $className Name of the class to check * @param string $parentClassName Name of the parent class */ @@ -138,11 +138,11 @@ /** * Construct a new QuesttypeModel. * - * @throws DatamodelException - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws QuesttypeModelNotValidException - * @throws QuesttypeModelNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \hhu\z\exceptions\QuesttypeModelNotValidException + * @throws \hhu\z\exceptions\QuesttypeModelNotFoundException */ public function __construct() { diff --git a/app/requests/MailRequest.inc b/app/requests/MailRequest.inc index a70c0647..baaf02ab 100644 --- a/app/requests/MailRequest.inc +++ b/app/requests/MailRequest.inc @@ -22,7 +22,7 @@ /** * Linker * - * @var Linker + * @var \nre\core\Linker */ private $linker = null; @@ -80,7 +80,7 @@ /** * Get linker instance for creating links. * - * @return Linker Linker instance for creating links + * @return \nre\core\Linker Linker instance for creating links */ public function getLinker() { diff --git a/app/views/QuesttypeView.inc b/app/views/QuesttypeView.inc index 30101486..234147be 100644 --- a/app/views/QuesttypeView.inc +++ b/app/views/QuesttypeView.inc @@ -26,7 +26,7 @@ /** * Load and instantiate the QuesttypeView of a QuesttypeAgent. * - * @throws ViewNotFoundException + * @throws \nre\exceptions\ViewNotFoundException * @param string $layoutName Name of Layout in use * @param string $agentName Name of the Agent * @param string $action Current Action @@ -43,7 +43,7 @@ /** * Construct a new QuesttypeView. * - * @throws ViewNotFoundException + * @throws \nre\exceptions\ViewNotFoundException * @param string $layoutName Name of Layout in use * @param string $agentName Name of the Agent * @param string $action Current Action diff --git a/controllers/AchievementsController.inc b/controllers/AchievementsController.inc index 94e7467a..4f52b91d 100644 --- a/controllers/AchievementsController.inc +++ b/controllers/AchievementsController.inc @@ -68,7 +68,7 @@ * * List Achievements of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of Seminary */ public function index($seminaryUrl) @@ -208,7 +208,7 @@ * * Manage Achievements of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of Seminary */ public function manage($seminaryUrl) @@ -235,7 +235,7 @@ * * Create a new Achievement. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary */ public function create($seminaryUrl) @@ -400,7 +400,7 @@ * * Move an Achievement up (decrement position). * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary * @param string $achievementUrl URL-title of Achievement */ @@ -426,7 +426,7 @@ * * Move an Achievement down (increment position). * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary * @param string $achievementUrl URL-title of Achievement */ @@ -452,7 +452,7 @@ * * Edit an Achievement. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary * @param string $achievementUrl URL-title of Achievement to edit */ @@ -660,7 +660,7 @@ * * Edit conditions of an Achievement. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary * @param string $achievementUrl URL-title of Achievement to edit */ @@ -921,7 +921,7 @@ * * Delete an Achievement. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary * @param string $achievementUrl URL-title of Achievement */ diff --git a/controllers/AjaxController.inc b/controllers/AjaxController.inc index 8cdd2c31..9ed801df 100644 --- a/controllers/AjaxController.inc +++ b/controllers/AjaxController.inc @@ -26,8 +26,8 @@ /** * Prefilter. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/controllers/CharactergroupsController.inc b/controllers/CharactergroupsController.inc index 77c08856..e09e9487 100644 --- a/controllers/CharactergroupsController.inc +++ b/controllers/CharactergroupsController.inc @@ -74,7 +74,7 @@ * * Show Character groups-groups for a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary */ public function index($seminaryUrl) @@ -102,7 +102,7 @@ * Show Character groups for a Character groups-group of a * Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group */ @@ -139,7 +139,7 @@ * * Create a new Character groups-group for a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary */ public function creategroupsgroup($seminaryUrl) @@ -205,7 +205,7 @@ * * Edit a Character groups-group of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group */ @@ -274,7 +274,7 @@ * * Delete a Character groups-group of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group */ @@ -320,7 +320,7 @@ * Show a Character group for a Character groups-group of a * Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group * @param string $groupUrl URL-Title of a Character group @@ -370,7 +370,7 @@ * Manage a Character group for a Character groups-group of a * Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group * @param string $groupUrl URL-Title of a Character group @@ -457,7 +457,7 @@ * Create a Character group for a Character groups-group of a * Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group */ @@ -578,7 +578,7 @@ * Edit a Character group for a Character groups-group of a * Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group * @param string $groupUrl URL-Title of a Character group @@ -709,7 +709,7 @@ * Delete a Character group for a Character groups-group of a * Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group * @param string $groupUrl URL-Title of a Character group diff --git a/controllers/CharactergroupsquestsController.inc b/controllers/CharactergroupsquestsController.inc index df13c244..42e47e2d 100644 --- a/controllers/CharactergroupsquestsController.inc +++ b/controllers/CharactergroupsquestsController.inc @@ -58,7 +58,7 @@ * Show a Character groups Quest for a Character groups-group * of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group * @param string $questUrl URL-Title of a Character groups Quest @@ -109,7 +109,7 @@ * Manage a Character groups Quest for a Character groups-group * of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group * @param string $questUrl URL-Title of a Character groups Quest @@ -402,7 +402,7 @@ * Edit a Character groups Quest of a Character groups-group * of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group * @param string $questUrl URL-Title of a Character groups Quest @@ -565,7 +565,7 @@ * Delete a Character groups Quest of a Character groups-group * of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group * @param string $questUrl URL-Title of a Character groups Quest diff --git a/controllers/CharactersController.inc b/controllers/CharactersController.inc index 63c82bbf..96eaedb3 100644 --- a/controllers/CharactersController.inc +++ b/controllers/CharactersController.inc @@ -65,7 +65,7 @@ * * List registered Characters for a Seminary * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $all Whether to list all Characters at once or not (optional) */ @@ -140,7 +140,7 @@ * * Show a Charater and its details. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $characterUrl URL-name of a Charater */ @@ -226,8 +226,8 @@ * * Register a new character for a Seminary. * - * @throws IdNotFoundException - * @throws ParamsNotValidException + * @throws \nre\exceptions\IdNotFoundException + * @throws \nre\exceptions\ParamsNotValidException * @param string $seminaryUrl URL-Title of a Seminary */ public function register($seminaryUrl) @@ -362,7 +362,7 @@ * * Manage Characters. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary */ public function manage($seminaryUrl) @@ -471,8 +471,8 @@ * * Edit a new character for a Seminary. * - * @throws IdNotFoundException - * @throws ParamsNotValidException + * @throws \nre\exceptions\IdNotFoundException + * @throws \nre\exceptions\ParamsNotValidException * @param string $seminaryUrl URL-Title of a Seminary * @param string $characterUrl URL-name of a Charater */ @@ -608,7 +608,7 @@ * * Delete a Character. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $characterUrl URL-name of a Charater */ diff --git a/controllers/CharactertypesController.inc b/controllers/CharactertypesController.inc index c54c7176..60b3dbf3 100644 --- a/controllers/CharactertypesController.inc +++ b/controllers/CharactertypesController.inc @@ -52,7 +52,7 @@ * * List Character types. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary */ public function index($seminaryUrl) @@ -103,7 +103,7 @@ * * Create new Character type for a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary */ public function create($seminaryUrl) @@ -173,7 +173,7 @@ * * Edit Character type for a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of a Seminary * @param string $charactertypeUrl URL-title of Character type */ @@ -357,7 +357,7 @@ * * Delete Character type for a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of a Seminary * @param string $charactertypeUrl URL-title of Character type */ diff --git a/controllers/HtmlController.inc b/controllers/HtmlController.inc index bf79a7db..8291537a 100644 --- a/controllers/HtmlController.inc +++ b/controllers/HtmlController.inc @@ -32,8 +32,8 @@ /** * Prefilter. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { @@ -47,8 +47,8 @@ /** * Postfilter that is executed after running the Controller. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function postFilter(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/controllers/HtmlmailController.inc b/controllers/HtmlmailController.inc index 72e9dede..19640615 100644 --- a/controllers/HtmlmailController.inc +++ b/controllers/HtmlmailController.inc @@ -26,8 +26,8 @@ /** * Prefilter. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/controllers/LibraryController.inc b/controllers/LibraryController.inc index 01976e1b..0adfcdd8 100644 --- a/controllers/LibraryController.inc +++ b/controllers/LibraryController.inc @@ -66,7 +66,7 @@ * * List Questtopics of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of Seminary */ public function index($seminaryUrl) @@ -110,7 +110,7 @@ * * Show a Questtopic and its Quests with Questsubtopics. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $eminaryUrl URL-Title of Seminary * @param string $questtopicUrl URL-Title of Questtopic */ @@ -158,7 +158,7 @@ * * Manage a Questtopic and its Quests with Questsubtopics. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $eminaryUrl URL-Title of Seminary * @param string $questtopicUrl URL-Title of Questtopic */ @@ -232,7 +232,7 @@ * * Create a new Questtopic for a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of Seminary */ public function create($seminaryUrl) @@ -295,7 +295,7 @@ * * Edit a Questtopic of a Seminary and its Questsubtopics. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $eminaryUrl URL-Title of Seminary * @param string $questtopicUrl URL-Title of Questtopic */ @@ -471,7 +471,7 @@ * * Delete a Questtopic of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $eminaryUrl URL-Title of Seminary * @param string $questtopicUrl URL-Title of Questtopic */ diff --git a/controllers/MailController.inc b/controllers/MailController.inc index d49d2bb2..904a907f 100644 --- a/controllers/MailController.inc +++ b/controllers/MailController.inc @@ -26,8 +26,8 @@ /** * Prefilter. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/controllers/MediaController.inc b/controllers/MediaController.inc index 1013c48b..69c3607a 100644 --- a/controllers/MediaController.inc +++ b/controllers/MediaController.inc @@ -57,8 +57,8 @@ /** * Prefilter. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { @@ -102,7 +102,7 @@ * * Display the moodpic for a category of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of the Seminary * @param string $category Category to show moodpic of * @param string $action Action for processing the media @@ -149,7 +149,7 @@ * * Display a Seminary medium. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of the Seminary * @param string $mediaUrl URL-name of the medium * @param string $action Action for processing the media @@ -180,8 +180,8 @@ * * Display an Avatar as full size or portrait. * - * @throws ParamsNotValidException - * @throws IdNotFoundException + * @throws \nre\exceptions\ParamsNotValidException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of the Seminary * @param string $charactertypeUrl URL-title of Character type * @param int $xplevel XP-level @@ -229,7 +229,7 @@ * * Display the achievement of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of the Seminary * @param string $achievementUrl URL-title of the Achievement * @param string $action Action for processing the media @@ -286,7 +286,7 @@ * * Display the icon for a Character group of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group * @param string $groupUrl URL-Title of a Character group @@ -328,7 +328,7 @@ * * Display the icon for a Character groups Quest of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group * @param string $questUrl URL-Title of a Character groups Quest @@ -407,8 +407,8 @@ /** * Determine the file for a medium and process it if necessary. * - * @throws IdNotFoundException - * @throws ParamsNotValidException + * @throws \nre\exceptions\IdNotFoundException + * @throws \nre\exceptions\ParamsNotValidException * @param array $media Medium to get file for * @param string $action Action for processing the media * @return object File for the medium (or null if medium is cached) diff --git a/controllers/MenuController.inc b/controllers/MenuController.inc index 6c6a7d58..2a506d71 100644 --- a/controllers/MenuController.inc +++ b/controllers/MenuController.inc @@ -26,8 +26,8 @@ /** * Prefilter. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/controllers/QuestgroupsController.inc b/controllers/QuestgroupsController.inc index 7b6b507c..0f601060 100644 --- a/controllers/QuestgroupsController.inc +++ b/controllers/QuestgroupsController.inc @@ -68,7 +68,7 @@ * * Display a Questgroup and its data. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $questgroupUrl URL-Title of a Questgroup */ @@ -366,7 +366,7 @@ * * Edit a Questgroup. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of a Seminary * @param string $questgroupUrl URL-title of Questgroup to edit */ @@ -489,7 +489,7 @@ * * Edit the texts of a Questgroup. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of a Seminary * @param string $questgroupUrl URL-title of Questgroup to edit */ @@ -567,7 +567,7 @@ * * Move a Questgroup up (decrement position). * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary * @param string $questgroupUrl URL-title of Questgroup */ @@ -604,7 +604,7 @@ * * Move a Questgroup down (increment position). * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary * @param string $questgroupUrl URL-title of Questgroup */ @@ -641,7 +641,7 @@ * * Delete a Questgroup. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $questgroupUrl URL-Title of a Questgroup */ diff --git a/controllers/QuestgroupshierarchyController.inc b/controllers/QuestgroupshierarchyController.inc index 58fa3e0c..b50cad5e 100644 --- a/controllers/QuestgroupshierarchyController.inc +++ b/controllers/QuestgroupshierarchyController.inc @@ -154,7 +154,7 @@ * * Edit a Questgroupshierarchy. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary * @param string $questgroupshierarchyUrl URL-title of Questgroupshierarchy */ @@ -234,7 +234,7 @@ * * Move a Questgroupshierarchy up (decrement position). * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary * @param string $questgroupshierarchyUrl URL-title of Questgroupshierarchy */ @@ -270,7 +270,7 @@ * * Move a Questgroupshierarchy down (increment position). * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary * @param string $questgroupshierarchyUrl URL-title of Questgroupshierarchy */ @@ -306,7 +306,7 @@ * * Delete a Questgroupshierarchy. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary * @param string $questgroupshierarchyUrl URL-title of Questgroupshierarchy */ diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc index 80f5b23f..017ef6a8 100644 --- a/controllers/QuestsController.inc +++ b/controllers/QuestsController.inc @@ -70,8 +70,8 @@ /** * Prefilter that is executed before running the Controller. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { @@ -152,7 +152,7 @@ * * Show a quest and its task. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of Seminary * @param string $questgroupUrl URL-Title of Questgroup * @param string $questUrl URL-Title of Quest @@ -348,7 +348,7 @@ /** * List Character submissions for a Quest. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of Seminary * @param string $questgroupUrl URL-Title of Questgroup * @param string $questUrl URL-Title of Quest @@ -403,7 +403,7 @@ /** * Show and handle the submission of a Character for a Quest. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of Seminary * @param string $questgroupUrl URL-Title of Questgroup * @param string $questUrl URL-Title of Quest @@ -614,7 +614,7 @@ * * Edit a Quest of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of Seminary * @param string $questgroupUrl URL-Title of Questgroup * @param string $questUrl URL-Title of Quest @@ -788,7 +788,7 @@ * * Edit the task of a Quest of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of Seminary * @param string $questgroupUrl URL-Title of Questgroup * @param string $questUrl URL-Title of Quest @@ -838,7 +838,7 @@ * * Edit the texts of a Quest of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of Seminary * @param string $questgroupUrl URL-Title of Questgroup * @param string $questUrl URL-Title of Quest @@ -1059,7 +1059,7 @@ * * Delete a Quest of a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of Seminary * @param string $questgroupUrl URL-Title of Questgroup * @param string $questUrl URL-Title of Quest @@ -1358,9 +1358,9 @@ /** * Create a response for the Questtype rendering. * - * @param string $action Action to run - * @param mixed $param Additional parameters to add to the response - * @return Response Generated response + * @param string $action Action to run + * @param mixed $param Additional parameters to add to the response + * @return \nre\core\Response Generated response */ private function createQuesttypeResponse($action, $param1) { @@ -1389,10 +1389,10 @@ /** * Load and construct the QuesttypeAgent for a Questtype. * - * @param string $questtypeClassname Name of the class for the Questtype of a Quest - * @param Request $request Request - * @param Response $response Response - * @return QuesttypeAgent + * @param string $questtypeClassname Name of the class for the Questtype of a Quest + * @param \nre\core\Request $request Request + * @param \nre\core\Response $response Response + * @return \hhu\z\agents\QuesttypeAgent Questtype Agent */ private function loadQuesttypeAgent($questtypeClassname, $request, $response) { @@ -1408,9 +1408,9 @@ /** * Run and render the Agent for a QuesttypeAgent and return ist output. * - * @param Agent $questtypeAgent QuesttypeAgent to run and render - * @param Request $request Request - * @param Response $response Response + * @param \nre\core\Agent $questtypeAgent QuesttypeAgent to run and render + * @param \nre\core\Request $request Request + * @param \nre\core\Response $response Response * @return string Rendered output */ private function runQuesttypeAgent($questtypeAgent, $request, $response) diff --git a/controllers/SeminariesController.inc b/controllers/SeminariesController.inc index 93a31b8b..89ce5fa0 100644 --- a/controllers/SeminariesController.inc +++ b/controllers/SeminariesController.inc @@ -103,7 +103,7 @@ * * Show a seminary and its details. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a seminary */ public function seminary($seminaryUrl) @@ -281,7 +281,7 @@ * * Edit a seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a seminary */ public function edit($seminaryUrl) @@ -397,7 +397,7 @@ * * Delete a seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a seminary */ public function delete($seminaryUrl) @@ -436,7 +436,7 @@ * * (Re-) Calculate the amount of achievable XPs for a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary */ public function calculatexps($seminaryUrl) diff --git a/controllers/SeminarymenuController.inc b/controllers/SeminarymenuController.inc index 78c88082..ff9d34d5 100644 --- a/controllers/SeminarymenuController.inc +++ b/controllers/SeminarymenuController.inc @@ -27,8 +27,8 @@ /** * Prefilter. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/controllers/TextmailController.inc b/controllers/TextmailController.inc index a35976cd..d6b28068 100644 --- a/controllers/TextmailController.inc +++ b/controllers/TextmailController.inc @@ -27,8 +27,8 @@ /** * Prefilter. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { diff --git a/controllers/UploadsController.inc b/controllers/UploadsController.inc index 8b1e3e60..eb208b4d 100644 --- a/controllers/UploadsController.inc +++ b/controllers/UploadsController.inc @@ -50,8 +50,8 @@ /** * Prefilter. * - * @param Request $request Current request - * @param Response $response Current response + * @param \nre\core\Request $request Current request + * @param \nre\core\Response $response Current response */ public function preFilter(\nre\core\Request $request, \nre\core\Response $response) { @@ -70,8 +70,8 @@ * * Display a Seminary upload. * - * @throws AccessDeniedException - * @throws IdNotFoundException + * @throws \nre\exceptions\AccessDeniedException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-title of Seminary * @param string $uploadUrl URL-name of the upload * @param string $action Current action (optional) @@ -134,7 +134,7 @@ * * Display the icon of a Character group. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary * @param string $groupsgroupUrl URL-Title of a Character groups-group * @param string $groupUrl URL-Title of a Character group @@ -171,7 +171,7 @@ /** * Determine the file for an upload. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param array $upload Upload to get file for * @return object File for the upload (or null if upload is cached) */ diff --git a/controllers/UserrolesController.inc b/controllers/UserrolesController.inc index 80c00347..238f189b 100644 --- a/controllers/UserrolesController.inc +++ b/controllers/UserrolesController.inc @@ -28,7 +28,7 @@ * * Show a user and its details. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $userUrl URL-Username of an user */ public function user($userUrl) diff --git a/controllers/UsersController.inc b/controllers/UsersController.inc index d42b4828..39de6cfc 100644 --- a/controllers/UsersController.inc +++ b/controllers/UsersController.inc @@ -96,8 +96,8 @@ * * Show a user and its details. * - * @throws IdNotFoundException - * @throws AccessDeniedException + * @throws \nre\exceptions\IdNotFoundException + * @throws \nre\exceptions\AccessDeniedException * @param string $userUrl URL-Username of an user */ public function user($userUrl) @@ -446,7 +446,7 @@ * * Edit a user. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $userUrl URL-Username of an user */ public function edit($userUrl) @@ -542,7 +542,7 @@ * * Delete a user. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $userUrl URL-Username of an user */ public function delete($userUrl) diff --git a/controllers/XplevelsController.inc b/controllers/XplevelsController.inc index 1f21d697..069c8c90 100644 --- a/controllers/XplevelsController.inc +++ b/controllers/XplevelsController.inc @@ -49,7 +49,7 @@ * * Manage XP-levels. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a Seminary */ public function manage($seminaryUrl) diff --git a/core/Agent.inc b/core/Agent.inc index 9910c8ae..0d660f59 100644 --- a/core/Agent.inc +++ b/core/Agent.inc @@ -97,14 +97,14 @@ * Instantiate an Agent (Factory Pattern). * * @static - * @throws DatamodelException - * @throws DriverNotValidException - * @throws DriverNotFoundException - * @throws ViewNotFoundException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws ControllerNotValidException - * @throws ControllerNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ControllerNotValidException + * @throws \nre\exceptions\ControllerNotFoundException * @param string $agentName Name of the Agent to instantiate * @param Request $request Current request * @param Response $respone Current respone @@ -156,14 +156,14 @@ /** * Construct a new Agent. * - * @throws DatamodelException - * @throws DriverNotValidException - * @throws DriverNotFoundException - * @throws ViewNotFoundException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws ControllerNotValidException - * @throws ControllerNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ControllerNotValidException + * @throws \nre\exceptions\ControllerNotFoundException * @param Request $request Current request * @param Response $respone Current response * @param Logger $log Log-system @@ -188,13 +188,13 @@ /** * Run the Controller of this Agent and its SubAgents. * - * @throws ParamsNotValidException - * @throws IdNotFoundException - * @throws DatamodelException - * @throws ActionNotFoundException + * @throws \nre\exceptions\ParamsNotValidException + * @throws \nre\exceptions\IdNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\ActionNotFoundException * @param Request $request Current request * @param Response $response Current response - * @return Exception Last occurred exception of SubAgents + * @return \Exception Last occurred exception of SubAgents */ public function run(Request $request, Response $response) { @@ -302,14 +302,14 @@ /** * Load the Controller of this Agent. * - * @throws DatamodelException - * @throws DriverNotValidException - * @throws DriverNotFoundException - * @throws ViewNotFoundException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws ControllerNotValidException - * @throws ControllerNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ControllerNotValidException + * @throws \nre\exceptions\ControllerNotFoundException */ protected function loadController() { @@ -342,7 +342,7 @@ /** * Log an error. * - * @param Exception $exception Occurred exception + * @param \Exception $exception Occurred exception * @param int $logMode Log mode */ protected function log($exception, $logMode) @@ -361,9 +361,9 @@ /** * Load a SubAgent and add it. * - * @throws ServiceUnavailableException - * @throws AgentNotFoundException - * @throws AgentNotValidException + * @throws \nre\exceptions\ServiceUnavailableException + * @throws \nre\exceptions\AgentNotFoundException + * @throws \nre\exceptions\AgentNotValidException * @param string $agentName Name of the Agent to load * @param mixed … Additional parameters for the agent */ @@ -387,10 +387,10 @@ /** * Load a SubAgent and add it. * - * @throws ServiceUnavailableException - * @throws DatamodelException - * @throws AgentNotFoundException - * @throws AgentNotValidException + * @throws \nre\exceptions\ServiceUnavailableException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\AgentNotFoundException + * @throws \nre\exceptions\AgentNotValidException * @param string $agentName Name of the Agent to load * @param mixed … Additional parameters for the agent */ @@ -444,7 +444,7 @@ /** * Create a new SubAgent. * - * @throws DatamodelException + * @throws \nre\exceptions\DatamodelException * @param string $agentName Agent name * @return array SubAgent */ @@ -533,7 +533,7 @@ * Create a new InlineError. * * @param string $label Name of the original Agent - * @param Exception $exception Occurred exception + * @param \Exception $exception Occurred exception */ private function newInlineError($label, $exception) { diff --git a/core/Api.inc b/core/Api.inc index b89b12e7..2acf5b1a 100644 --- a/core/Api.inc +++ b/core/Api.inc @@ -31,7 +31,7 @@ /** * Der Toplevelagent * - * @var ToplevelAgent + * @var \nre\agents\ToplevelAgent */ private $toplevelAgent = null; /** @@ -74,17 +74,17 @@ /** * Run the application. * - * @throws DatamodelException - * @throws DriverNotValidException - * @throws DriverNotFoundException - * @throws ViewNotFoundException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws ControllerNotValidException - * @throws ControllerNotFoundException - * @throws AgentNotValidException - * @throws AgentNotFoundException - * @return Exception Last occurred exception of an subagent + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\ViewNotFoundException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ControllerNotValidException + * @throws \nre\exceptions\ControllerNotFoundException + * @throws \nre\exceptions\AgentNotValidException + * @throws \nre\exceptions\AgentNotFoundException + * @return \Exception Last occurred exception of an subagent */ public function run() { @@ -116,7 +116,7 @@ /** * Log an exception * - * @param Exception $exception Occurred exception + * @param \Exception $exception Occurred exception * @param int $logMode Log-mode */ protected function log($exception, $logMode) @@ -133,9 +133,9 @@ /** * Load the ToplevelAgent specified by the request. * - * @throws ServiceUnavailableException - * @throws AgentNotValidException - * @throws AgentNotFoundException + * @throws \nre\exceptions\ServiceUnavailableException + * @throws \nre\exceptions\AgentNotValidException + * @throws \nre\exceptions\AgentNotFoundException */ private function loadToplevelAgent() { diff --git a/core/ClassLoader.inc b/core/ClassLoader.inc index 81cf537a..56d2d771 100644 --- a/core/ClassLoader.inc +++ b/core/ClassLoader.inc @@ -26,7 +26,7 @@ /** * Load a class. * - * @throws ClassNotFoundException + * @throws \nre\exceptions\ClassNotFoundException * @param string $className Name of the class to load */ public static function load($fullClassName) @@ -55,7 +55,7 @@ /** * Check inheritance of a class. * - * @throws ClassNotValidException + * @throws \nre\exceptions\ClassNotValidException * @param string $className Name of the class to check * @param string $parentClassName Name of the parent class */ diff --git a/core/Component.inc b/core/Component.inc index a93363dc..fcc11c52 100644 --- a/core/Component.inc +++ b/core/Component.inc @@ -26,8 +26,8 @@ /** * Load the class of a Component. * - * @throws ComponentNotFoundException - * @throws ComponentNotValidException + * @throws \nre\exceptions\ComponentNotFoundException + * @throws \nre\exceptions\ComponentNotValidException * @param string $componentName Name of the Component to load */ public static function load($componentName) diff --git a/core/Controller.inc b/core/Controller.inc index c63ea34b..e0cace74 100644 --- a/core/Controller.inc +++ b/core/Controller.inc @@ -56,8 +56,8 @@ /** * Load the class of a Controller. * - * @throws ControllerNotFoundException - * @throws ControllerNotValidException + * @throws \nre\exceptions\ControllerNotFoundException + * @throws \nre\exceptions\ControllerNotValidException * @param string $controllerName Name of the Controller to load */ public static function load($controllerName) @@ -84,12 +84,12 @@ /** * Instantiate a Controller (Factory Pattern). * - * @throws DatamodelException - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws ViewNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ViewNotFoundException * @param string $controllerName Name of the Controller to instantiate * @param string $layoutName Name of the current Layout * @param string $action Current Action @@ -125,11 +125,11 @@ /** * Construct a new Controller. * - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws ModelNotValidException - * @throws ModelNotFoundException - * @throws ViewNotFoundException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ViewNotFoundException * @param string $layoutName Name of the current Layout * @param string $action Current Action * @param Agent $agent Corresponding Agent @@ -186,10 +186,10 @@ * This method executes the Action of the Controller defined by * the current Request. * - * @throws ParamsNotValidException - * @throws IdNotFoundException - * @throws DatamodelException - * @throws ActionNotFoundException + * @throws \nre\exceptions\ParamsNotValidException + * @throws \nre\exceptions\IdNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\ActionNotFoundException * @param Request $request Current request * @param Response $response Current response */ @@ -309,8 +309,8 @@ /** * Load the Components of this Controller. * - * @throws ComponentNotValidException - * @throws ComponentNotFoundException + * @throws \nre\exceptions\ComponentNotValidException + * @throws \nre\exceptions\ComponentNotFoundException */ private function loadComponents() { @@ -348,11 +348,11 @@ /** * Load the Models of this Controller. * - * @throws DatamodelException - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws ModelNotValidException - * @throws ModelNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException */ protected function loadModels() { @@ -405,7 +405,7 @@ /** * Load the View of this Controller. * - * @throws ViewNotFoundException + * @throws \nre\exceptions\ViewNotFoundException * @param string $layoutName Name of the current Layout * @param string $action Current Action */ diff --git a/core/Driver.inc b/core/Driver.inc index b4d83c7c..c4c9acf9 100644 --- a/core/Driver.inc +++ b/core/Driver.inc @@ -26,8 +26,8 @@ /** * Load the class of a Driver. * - * @throws DriverNotFoundException - * @throws DriverNotValidException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException * @param string $driverName Name of the Driver to load */ public static function load($driverName) diff --git a/core/Model.inc b/core/Model.inc index c0475b4a..2a2aadd1 100644 --- a/core/Model.inc +++ b/core/Model.inc @@ -26,8 +26,8 @@ /** * Load the class of a Model. * - * @throws ModelNotFoundException - * @throws ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException + * @throws \nre\exceptions\ModelNotValidException * @param string $modelName Name of the Model to load */ public static function load($modelName) @@ -88,11 +88,11 @@ * * TODO Catch exception * - * @throws DatamodelException - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws ModelNotValidException - * @throws ModelNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException */ protected function __construct() { @@ -106,11 +106,11 @@ /** * Load the Models of this Model. * - * @throws DatamodelException - * @throws DriverNotFoundException - * @throws DriverNotValidException - * @throws ModelNotValidException - * @throws ModelNotFoundException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException + * @throws \nre\exceptions\ModelNotValidException + * @throws \nre\exceptions\ModelNotFoundException */ private function loadModels() { diff --git a/core/View.inc b/core/View.inc index 554a8805..62b064ba 100644 --- a/core/View.inc +++ b/core/View.inc @@ -34,7 +34,7 @@ /** * Load and instantiate the View of an Agent. * - * @throws ViewNotFoundException + * @throws \nre\exceptions\ViewNotFoundException * @param string $layoutName Name of Layout in use * @param string $agentName Name of the Agent * @param string $action Current Action @@ -51,7 +51,7 @@ /** * Construct a new View. * - * @throws ViewNotFoundException + * @throws \nre\exceptions\ViewNotFoundException * @param string $layoutName Name of Layout in use * @param string $agentName Name of the Agent * @param string $action Current Action diff --git a/drivers/DatabaseDriver.inc b/drivers/DatabaseDriver.inc index dfd5c0fd..aaa86435 100644 --- a/drivers/DatabaseDriver.inc +++ b/drivers/DatabaseDriver.inc @@ -77,7 +77,7 @@ /** * Establish a connect to a MqSQL-database. * - * @throws DatamodelException + * @throws \nre\exceptions\DatamodelException * @param array $config Connection and login settings */ protected abstract function connect($config); diff --git a/drivers/MysqliDriver.inc b/drivers/MysqliDriver.inc index fe4fa81a..a0d411cb 100644 --- a/drivers/MysqliDriver.inc +++ b/drivers/MysqliDriver.inc @@ -26,7 +26,7 @@ /** * Construct a MySQL-driver. * - * @throws DatamodelException + * @throws \nre\exceptions\DatamodelException * @param array $config Connection and login settings */ function __construct($config) @@ -40,7 +40,7 @@ /** * Execute a SQL-query. * - * @throws DatamodelException + * @throws \nre\exceptions\DatamodelException * @param string $query Query to run * @param mixed … Params * @return array Result @@ -137,7 +137,7 @@ /** * Establish a connect to a MqSQL-database. * - * @throws DatamodelException + * @throws \nre\exceptions\DatamodelException * @param array $config Connection and login settings */ protected function connect($config) diff --git a/exceptions/ServiceUnavailableException.inc b/exceptions/ServiceUnavailableException.inc index bafc297f..cad4fa22 100644 --- a/exceptions/ServiceUnavailableException.inc +++ b/exceptions/ServiceUnavailableException.inc @@ -45,7 +45,7 @@ /** * Construct a new exception. * - * @param Exception $exception Exception that has occurred + * @param \Exception $exception Exception that has occurred */ function __construct($exception) { @@ -65,7 +65,7 @@ /** * Get the exception that hat occurred * - * @return Exception Exception that has occurred + * @return \Exception Exception that has occurred */ public function getException() { diff --git a/models/CharactergroupsModel.inc b/models/CharactergroupsModel.inc index ba52ff31..9accce7b 100644 --- a/models/CharactergroupsModel.inc +++ b/models/CharactergroupsModel.inc @@ -56,7 +56,7 @@ /** * Get a Character groups-group by its URL. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $seminaryId ID of the corresponding Seminary * @param string $groupsgroupUrl URL-name of the Character groups-group * @return array Character groups-group data @@ -82,7 +82,7 @@ /** * Get a Character groups-group by its ID. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $groupsgroupId ID of the Character groups-group * @return array Character groups-group data */ @@ -252,7 +252,7 @@ /** * Get a Character group by its URL. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $groupsgroupId ID of the Character groups-group * @param string $groupUrl URL-name of the Character group * @return array Character group data @@ -281,7 +281,7 @@ /** * Get a Character group by its ID. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $groupsgroupId ID of the Character group * @return array Character group data */ diff --git a/models/CharactergroupsquestsModel.inc b/models/CharactergroupsquestsModel.inc index 3d47a44c..1e55585b 100644 --- a/models/CharactergroupsquestsModel.inc +++ b/models/CharactergroupsquestsModel.inc @@ -63,7 +63,7 @@ /** * Get a Character groups Quest by its URL. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $groupsgroupId ID of the Character groups-group * @param string $questUrl URL-title of the Character groups Quest * @return array Character groups Quest data @@ -90,7 +90,7 @@ /** * Get a Character groups Quest by its ID. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $questId ID of the Character groups Quest * @return array Character groups Quest data */ diff --git a/models/CharactersModel.inc b/models/CharactersModel.inc index 0f2ea012..79d17395 100644 --- a/models/CharactersModel.inc +++ b/models/CharactersModel.inc @@ -241,7 +241,7 @@ /** * Get the character of a user for a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $userId ID of the user * @param int $seminaryId ID of the Seminary * @return array Character data @@ -273,7 +273,7 @@ /** * Get a Character by its Url. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $seminaryId ID of the Seminary * @param string $characterUrl URL-name of the Character * @return array Character data @@ -305,7 +305,7 @@ /** * Get a Character by its Id. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $characterId ID of the Character * @return array Character data */ diff --git a/models/DatabaseModel.inc b/models/DatabaseModel.inc index 51259f4f..02593354 100644 --- a/models/DatabaseModel.inc +++ b/models/DatabaseModel.inc @@ -33,9 +33,9 @@ /** * Construct a new datamase model. * - * @throws DatamodelException - * @throws DriverNotFoundException - * @throws DriverNotValidException + * @throws \nre\exceptions\DatamodelException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException * @param string $type Database type * @param array $config Connection settings */ @@ -56,8 +56,8 @@ /** * Load the database driver. * - * @throws DriverNotFoundException - * @throws DriverNotValidException + * @throws \nre\exceptions\DriverNotFoundException + * @throws \nre\exceptions\DriverNotValidException * @param string $driverName Name of the database driver */ private function loadDriver($driverName) @@ -69,7 +69,7 @@ /** * Establish a connection to the database. * - * @throws DatamodelException + * @throws \nre\exceptions\DatamodelException * @param string $driverName Name of the database driver * @param array $config Connection settings */ diff --git a/models/MediaModel.inc b/models/MediaModel.inc index f1616d4f..5c7f5423 100644 --- a/models/MediaModel.inc +++ b/models/MediaModel.inc @@ -37,7 +37,7 @@ /** * Get a medium by its URL. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $mediaURL URL-name of the Medium * @return array Medium data */ @@ -62,7 +62,7 @@ /** * Get a medium by its ID. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $mediaId ID of the Medium * @return array Medium data */ @@ -87,7 +87,7 @@ /** * Get a Seminary medium by its URL. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $seminaryId ID of the seminary * @param string $seminaryMediaUrl URL-name of the Seminary medium * @return array Seminary medium data @@ -113,7 +113,7 @@ /** * Get a Seminary medium by its ID. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $seminaryMediaId ID of the Seminary medium * @return array Seminary medium data */ diff --git a/models/QuestgroupsModel.inc b/models/QuestgroupsModel.inc index 9935c699..f85a52f3 100644 --- a/models/QuestgroupsModel.inc +++ b/models/QuestgroupsModel.inc @@ -111,7 +111,7 @@ /** * Get a Questgroup by its ID. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $questgroupId ID of a Questgroup * @return array Questgroup data */ @@ -136,7 +136,7 @@ /** * Get a Questgroup by its URL. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $seminaryId ID of the corresponding seminary * @param string $questgroupURL URL-title of a Questgroup * @return array Questgroup data @@ -586,7 +586,7 @@ /** * Edit a Questgroup. * - * @throws DatamodelException + * @throws \nre\exceptions\DatamodelException * @param int $questgroupId ID of Questgroup to edit * @param string $title New title of Questgroup */ diff --git a/models/QuestgroupshierarchyModel.inc b/models/QuestgroupshierarchyModel.inc index 5153c2aa..142c3694 100644 --- a/models/QuestgroupshierarchyModel.inc +++ b/models/QuestgroupshierarchyModel.inc @@ -37,7 +37,7 @@ /** * Get a Questgroup hierarchy by its ID. * - * throws IdNotFoundException + * throws \nre\exceptions\IdNotFoundException * @param int $questgroupshierarchyId ID of a Questgroup hierarchy * @return array Questgroup hierarchy */ @@ -62,7 +62,7 @@ /** * Get a Questgroup hierarchy by its URL. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $seminaryId ID of Seminary * @param int $questgroupshierarchyURL URL of a Questgroup hierarchy * @return array Questgroup hierarchy diff --git a/models/QuestsModel.inc b/models/QuestsModel.inc index c25d7ee6..9fc60db2 100644 --- a/models/QuestsModel.inc +++ b/models/QuestsModel.inc @@ -61,7 +61,7 @@ /** * Get a Quest and its data by its URL. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $seminaryId ID of the corresponding Seminary * @param int $questgroupId ID of the corresponding Questgroup * @param string $questURL URL-title of a Quest @@ -89,7 +89,7 @@ /** * Get a Quest and its data by its ID. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $questId ID of a Quest * @return array Quest data */ diff --git a/models/QuesttextsModel.inc b/models/QuesttextsModel.inc index 07711a2c..257d95f2 100644 --- a/models/QuesttextsModel.inc +++ b/models/QuesttextsModel.inc @@ -131,7 +131,7 @@ /** * Get corresponding Questtexts for a Questgroup. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $questgroupId ID of Questgroup to get the Questtexst for * @param array List of Questtexts */ diff --git a/models/SeminariesModel.inc b/models/SeminariesModel.inc index 7c8fd9a6..0d41bd39 100644 --- a/models/SeminariesModel.inc +++ b/models/SeminariesModel.inc @@ -59,7 +59,7 @@ /** * Get a seminary and its data by its ID. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryId ID of a seminary * @return array Seminary */ @@ -84,7 +84,7 @@ /** * Get a seminary and its data by its URL-title. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $seminaryUrl URL-Title of a seminary * @return array Seminary */ @@ -205,7 +205,7 @@ /** * Edit a seminary. * - * @throws DatamodelException + * @throws \nre\exceptions\DatamodelException * @param int $seminaryId ID of Seminary to edit * @param string $title New title of Seminary * @param string $course New course of Seminary diff --git a/models/UploadsModel.inc b/models/UploadsModel.inc index fc4ec2fd..d4510ec6 100644 --- a/models/UploadsModel.inc +++ b/models/UploadsModel.inc @@ -88,7 +88,7 @@ /** * Get an upload by its ID. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $uploadId ID of the uploaded file * @return array Upload data */ @@ -113,7 +113,7 @@ /** * Get an upload by its URL. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $seminaryId ID of Seminary * @param int $uploadId ID of the uploaded file * @return array Upload data diff --git a/models/UsersModel.inc b/models/UsersModel.inc index 43eee2a8..64eaf93f 100644 --- a/models/UsersModel.inc +++ b/models/UsersModel.inc @@ -59,7 +59,7 @@ /** * Get registered users. * - * @throws ParamsNotValidException + * @throws \nre\exceptions\ParamsNotValidException * @param string $sort Field to sort by * @param string $username Only get users with the given username (optional) * @param int $limit Limit amount of Characters (optional) @@ -127,7 +127,7 @@ /** * Get a user and its data by its ID. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $userId ID of an user * @return array Userdata */ @@ -153,7 +153,7 @@ /** * Get a user and its data by its URL-username. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param string $userUrl URL-Username of an user * @return array Userdata */ @@ -179,7 +179,7 @@ /** * Log a user in if its credentials are valid. * - * @throws DatamodelException + * @throws \nre\exceptions\DatamodelException * @param string $username The name of the user to log in * @param string $password Plaintext password of the user to log in */ @@ -302,7 +302,7 @@ /** * Edit a user. * - * @throws DatamodelException + * @throws \nre\exceptions\DatamodelException * @param int $userId ID of the user to delete * @param string $username New name of user * @param string $prename Prename of the user to create diff --git a/models/XplevelsModel.inc b/models/XplevelsModel.inc index 5535012e..c0df02b2 100644 --- a/models/XplevelsModel.inc +++ b/models/XplevelsModel.inc @@ -37,7 +37,7 @@ /** * Get XP-level by its ID. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $xplevelId ID of XP-level * @return array XP-level data */ @@ -62,7 +62,7 @@ /** * Get all XP-levels for a Seminary. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $seminaryId ID of Seminary * @return array List of XP-level */ diff --git a/questtypes/bossfight/BossfightQuesttypeController.inc b/questtypes/bossfight/BossfightQuesttypeController.inc index 20118002..8ddc22dc 100644 --- a/questtypes/bossfight/BossfightQuesttypeController.inc +++ b/questtypes/bossfight/BossfightQuesttypeController.inc @@ -93,7 +93,7 @@ * @param array $questgroup Current Questgroup data * @param array $quest Current Quest data * @param array $character Current Character data - * @param Exception $exception Character submission exception + * @param \Exception $exception Character submission exception */ public function quest($seminary, $questgroup, $quest, $character, $exception) { @@ -227,6 +227,23 @@ */ public function edittask($seminary, $questgroup, $quest) { + $fight = $this->Bossfight->getBossFight($quest['id']); + /* + if(!is_null($fight['boss_seminarymedia_id'])) { + $fight['bossmedia'] = $this->Media->getSeminaryMediaById($fight['boss_seminarymedia_id']); + } + */ + + // Get stages + $stage = $this->Bossfight->getFirstStage($quest['id']); + $stage['childs'] = $this->getChildStages($stage['id']); + + + // Pass data to view + $this->set('seminary', $seminary); + $this->set('fight', $fight); + $this->set('stages', $stage); + //print_r($stage); } @@ -249,6 +266,26 @@ $_SESSION['quests'][$questId]['stages'] = array(); } } + + + /** + * Get all child-stages of a parent-stage. + * + * @param int $stageId ID of parent-stage + * @return array List of child-stages + */ + private function getChildStages($stageId) + { + $childStages = $this->Bossfight->getChildStages($stageId); + if(!empty($childStages)) { + foreach($childStages as &$stage) { + $stage['childs'] = $this->getChildStages($stage['id']); + } + } + + + return $childStages; + } } diff --git a/questtypes/bossfight/BossfightQuesttypeModel.inc b/questtypes/bossfight/BossfightQuesttypeModel.inc index 07d6ed5f..ea2ad7db 100644 --- a/questtypes/bossfight/BossfightQuesttypeModel.inc +++ b/questtypes/bossfight/BossfightQuesttypeModel.inc @@ -26,7 +26,7 @@ /** * Get a Boss-Fight. * - * @throws IdNotFoundException + * @throws \nre\exceptions\IdNotFoundException * @param int $questId ID of Quest * @return array Boss-Fight data */ diff --git a/questtypes/bossfight/html/edittask.tpl b/questtypes/bossfight/html/edittask.tpl index c65158e7..eefa3747 100644 --- a/questtypes/bossfight/html/edittask.tpl +++ b/questtypes/bossfight/html/edittask.tpl @@ -1 +1,41 @@ -

TODO

+
+
+ + +
+ +
+ +
+ + +
+
+ + +
+ +
+ + +
+

+ +

+ +

vs.

+

+ &$childStage) : ?> + + + + + + Bedie verloren + + Boss verloren, Character gewonnen + + Boss gewonnen, Character verloren + +
+ diff --git a/questtypes/choiceinput/ChoiceinputQuesttypeController.inc b/questtypes/choiceinput/ChoiceinputQuesttypeController.inc index f5792a6a..98ac83b3 100644 --- a/questtypes/choiceinput/ChoiceinputQuesttypeController.inc +++ b/questtypes/choiceinput/ChoiceinputQuesttypeController.inc @@ -110,7 +110,7 @@ * @param array $questgroup Current Questgroup data * @param array $quest Current Quest data * @param array $character Current Character data - * @param Exception $exception Character submission exception + * @param \Exception $exception Character submission exception */ public function quest($seminary, $questgroup, $quest, $character, $exception) { diff --git a/questtypes/crossword/CrosswordQuesttypeController.inc b/questtypes/crossword/CrosswordQuesttypeController.inc index 8df3ba69..513a4cf3 100644 --- a/questtypes/crossword/CrosswordQuesttypeController.inc +++ b/questtypes/crossword/CrosswordQuesttypeController.inc @@ -169,7 +169,7 @@ * @param array $questgroup Current Questgroup data * @param array $quest Current Quest data * @param array $character Current Character data - * @param Exception $exception Character submission exception + * @param \Exception $exception Character submission exception */ public function quest($seminary, $questgroup, $quest, $character, $exception) { diff --git a/questtypes/dragndrop/DragndropQuesttypeController.inc b/questtypes/dragndrop/DragndropQuesttypeController.inc index ff3fd909..f4f262c6 100644 --- a/questtypes/dragndrop/DragndropQuesttypeController.inc +++ b/questtypes/dragndrop/DragndropQuesttypeController.inc @@ -125,7 +125,7 @@ * @param array $questgroup Current Questgroup data * @param array $quest Current Quest data * @param array $character Current Character data - * @param Exception $exception Character submission exception + * @param \Exception $exception Character submission exception */ public function quest($seminary, $questgroup, $quest, $character, $exception) { diff --git a/questtypes/multiplechoice/MultiplechoiceQuesttypeController.inc b/questtypes/multiplechoice/MultiplechoiceQuesttypeController.inc index bcb9cbed..591356ae 100644 --- a/questtypes/multiplechoice/MultiplechoiceQuesttypeController.inc +++ b/questtypes/multiplechoice/MultiplechoiceQuesttypeController.inc @@ -138,7 +138,7 @@ * @param array $questgroup Current Questgroup data * @param array $quest Current Quest data * @param array $character Current Character data - * @param Exception $exception Character submission exception + * @param \Exception $exception Character submission exception */ public function quest($seminary, $questgroup, $quest, $character, $exception) { diff --git a/questtypes/submit/SubmitQuesttypeController.inc b/questtypes/submit/SubmitQuesttypeController.inc index 42342fed..ba0181cb 100644 --- a/questtypes/submit/SubmitQuesttypeController.inc +++ b/questtypes/submit/SubmitQuesttypeController.inc @@ -32,7 +32,7 @@ /** * Save the answers of a Character for a Quest. * - * @throws SubmissionNotValidException + * @throws \hhu\z\exceptions\SubmissionNotValidException * @param array $seminary Current Seminary data * @param array $questgroup Current Questgroup data * @param array $quest Current Quest data @@ -137,7 +137,7 @@ * @param array $questgroup Current Questgroup data * @param array $quest Current Quest data * @param array $character Current Character data - * @param Exception $exception Character submission exception + * @param \Exception $exception Character submission exception */ public function quest($seminary, $questgroup, $quest, $character, $exception) { diff --git a/questtypes/textinput/TextinputQuesttypeController.inc b/questtypes/textinput/TextinputQuesttypeController.inc index 2592108c..205e047b 100644 --- a/questtypes/textinput/TextinputQuesttypeController.inc +++ b/questtypes/textinput/TextinputQuesttypeController.inc @@ -110,7 +110,7 @@ * @param array $questgroup Current Questgroup data * @param array $quest Current Quest data * @param array $character Current Character data - * @param Exception $exception Character submission exception + * @param \Exception $exception Character submission exception */ public function quest($seminary, $questgroup, $quest, $character, $exception) {