merge

2015-04-27 16:42:05 +02:00 · 2015-04-27 16:42:05 +02:00 · ffa705005e
commit ffa705005e
parent a9a96a0cd8 ccc5ff3def
4149 changed files with 1180197 additions and 16 deletions
--- a/doc/.htaccess
+++ b/doc/.htaccess
@ -0,0 +1,5 @@
+# Fixes a vulnerability in CentOS: http://stackoverflow.com/questions/20533279/prevent-php-from-parsing-non-php-files-such-as-somefile-php-txt
+<FilesMatch \.php\.txt$>
+    RemoveHandler .php
+    ForceType text/plain
+</FilesMatch>
--- a/doc/classes/PHPMailer.html
+++ b/doc/classes/PHPMailer.html
--- a/doc/classes/SMTP.html
+++ b/doc/classes/SMTP.html
--- a/doc/classes/hhu.z.Controller.html
+++ b/doc/classes/hhu.z.Controller.html
--- a/doc/classes/hhu.z.Model.html
+++ b/doc/classes/hhu.z.Model.html
--- a/doc/classes/hhu.z.TextFormatter.html
+++ b/doc/classes/hhu.z.TextFormatter.html
--- a/doc/classes/hhu.z.Utils.html
+++ b/doc/classes/hhu.z.Utils.html
--- a/doc/classes/hhu.z.agents.QuesttypeAgent.html
+++ b/doc/classes/hhu.z.agents.QuesttypeAgent.html
--- a/doc/classes/hhu.z.agents.ToplevelAgent.html
+++ b/doc/classes/hhu.z.agents.ToplevelAgent.html
--- a/doc/classes/hhu.z.agents.bottomlevel.MailreceiverAgent.html
+++ b/doc/classes/hhu.z.agents.bottomlevel.MailreceiverAgent.html
--- a/doc/classes/hhu.z.agents.bottomlevel.MenuAgent.html
+++ b/doc/classes/hhu.z.agents.bottomlevel.MenuAgent.html
--- a/doc/classes/hhu.z.agents.bottomlevel.QuestgroupshierarchypathAgent.html
+++ b/doc/classes/hhu.z.agents.bottomlevel.QuestgroupshierarchypathAgent.html
--- a/doc/classes/hhu.z.agents.bottomlevel.SeminarybarAgent.html
+++ b/doc/classes/hhu.z.agents.bottomlevel.SeminarybarAgent.html
--- a/doc/classes/hhu.z.agents.bottomlevel.SeminarymenuAgent.html
+++ b/doc/classes/hhu.z.agents.bottomlevel.SeminarymenuAgent.html
--- a/doc/classes/hhu.z.agents.bottomlevel.UserrolesAgent.html
+++ b/doc/classes/hhu.z.agents.bottomlevel.UserrolesAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.AchievementsAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.AchievementsAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.CharactergroupsAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.CharactergroupsAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.CharactergroupsquestsAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.CharactergroupsquestsAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.CharactersAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.CharactersAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.CharactertypesAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.CharactertypesAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.ErrorAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.ErrorAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.IntroductionAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.IntroductionAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.LibraryAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.LibraryAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.MailAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.MailAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.MediaAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.MediaAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.QuestgroupsAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.QuestgroupsAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.QuestgroupshierarchyAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.QuestgroupshierarchyAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.QuestsAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.QuestsAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.SeminariesAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.SeminariesAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.UploadsAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.UploadsAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.UsersAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.UsersAgent.html
--- a/doc/classes/hhu.z.agents.intermediate.XplevelsAgent.html
+++ b/doc/classes/hhu.z.agents.intermediate.XplevelsAgent.html
--- a/doc/classes/hhu.z.agents.toplevel.AjaxAgent.html
+++ b/doc/classes/hhu.z.agents.toplevel.AjaxAgent.html
--- a/doc/classes/hhu.z.agents.toplevel.BinaryAgent.html
+++ b/doc/classes/hhu.z.agents.toplevel.BinaryAgent.html
--- a/doc/classes/hhu.z.agents.toplevel.FaultAgent.html
+++ b/doc/classes/hhu.z.agents.toplevel.FaultAgent.html
--- a/doc/classes/hhu.z.agents.toplevel.HtmlAgent.html
+++ b/doc/classes/hhu.z.agents.toplevel.HtmlAgent.html
--- a/doc/classes/hhu.z.agents.toplevel.HtmlmailAgent.html
+++ b/doc/classes/hhu.z.agents.toplevel.HtmlmailAgent.html
--- a/doc/classes/hhu.z.agents.toplevel.TextmailAgent.html
+++ b/doc/classes/hhu.z.agents.toplevel.TextmailAgent.html
--- a/doc/classes/hhu.z.apis.MailApi.html
+++ b/doc/classes/hhu.z.apis.MailApi.html
--- a/doc/classes/hhu.z.controllers.AchievementsController.html
+++ b/doc/classes/hhu.z.controllers.AchievementsController.html
--- a/doc/classes/hhu.z.controllers.AjaxController.html
+++ b/doc/classes/hhu.z.controllers.AjaxController.html
--- a/doc/classes/hhu.z.controllers.BinaryController.html
+++ b/doc/classes/hhu.z.controllers.BinaryController.html
--- a/doc/classes/hhu.z.controllers.CharactergroupsController.html
+++ b/doc/classes/hhu.z.controllers.CharactergroupsController.html
--- a/doc/classes/hhu.z.controllers.CharactergroupsquestsController.html
+++ b/doc/classes/hhu.z.controllers.CharactergroupsquestsController.html
--- a/doc/classes/hhu.z.controllers.CharactersController.html
+++ b/doc/classes/hhu.z.controllers.CharactersController.html
--- a/doc/classes/hhu.z.controllers.CharactertypesController.html
+++ b/doc/classes/hhu.z.controllers.CharactertypesController.html
--- a/doc/classes/hhu.z.controllers.ErrorController.html
+++ b/doc/classes/hhu.z.controllers.ErrorController.html
--- a/doc/classes/hhu.z.controllers.FaultController.html
+++ b/doc/classes/hhu.z.controllers.FaultController.html
--- a/doc/classes/hhu.z.controllers.HtmlController.html
+++ b/doc/classes/hhu.z.controllers.HtmlController.html
--- a/doc/classes/hhu.z.controllers.HtmlmailController.html
+++ b/doc/classes/hhu.z.controllers.HtmlmailController.html
--- a/doc/classes/hhu.z.controllers.IntermediateController.html
+++ b/doc/classes/hhu.z.controllers.IntermediateController.html
--- a/doc/classes/hhu.z.controllers.IntroductionController.html
+++ b/doc/classes/hhu.z.controllers.IntroductionController.html
--- a/doc/classes/hhu.z.controllers.LibraryController.html
+++ b/doc/classes/hhu.z.controllers.LibraryController.html
--- a/doc/classes/hhu.z.controllers.MailController.html
+++ b/doc/classes/hhu.z.controllers.MailController.html
--- a/doc/classes/hhu.z.controllers.MailreceiverController.html
+++ b/doc/classes/hhu.z.controllers.MailreceiverController.html
--- a/doc/classes/hhu.z.controllers.MediaController.html
+++ b/doc/classes/hhu.z.controllers.MediaController.html
--- a/doc/classes/hhu.z.controllers.MenuController.html
+++ b/doc/classes/hhu.z.controllers.MenuController.html
--- a/doc/classes/hhu.z.controllers.QuestgroupsController.html
+++ b/doc/classes/hhu.z.controllers.QuestgroupsController.html
--- a/doc/classes/hhu.z.controllers.QuestgroupshierarchyController.html
+++ b/doc/classes/hhu.z.controllers.QuestgroupshierarchyController.html
--- a/doc/classes/hhu.z.controllers.QuestgroupshierarchypathController.html
+++ b/doc/classes/hhu.z.controllers.QuestgroupshierarchypathController.html
--- a/doc/classes/hhu.z.controllers.QuestsController.html
+++ b/doc/classes/hhu.z.controllers.QuestsController.html
--- a/doc/classes/hhu.z.controllers.QuesttypeController.html
+++ b/doc/classes/hhu.z.controllers.QuesttypeController.html
--- a/doc/classes/hhu.z.controllers.SeminariesController.html
+++ b/doc/classes/hhu.z.controllers.SeminariesController.html
--- a/doc/classes/hhu.z.controllers.SeminaryController.html
+++ b/doc/classes/hhu.z.controllers.SeminaryController.html
--- a/doc/classes/hhu.z.controllers.SeminarybarController.html
+++ b/doc/classes/hhu.z.controllers.SeminarybarController.html
--- a/doc/classes/hhu.z.controllers.SeminarymenuController.html
+++ b/doc/classes/hhu.z.controllers.SeminarymenuController.html
--- a/doc/classes/hhu.z.controllers.TextmailController.html
+++ b/doc/classes/hhu.z.controllers.TextmailController.html
--- a/doc/classes/hhu.z.controllers.UploadsController.html
+++ b/doc/classes/hhu.z.controllers.UploadsController.html
--- a/doc/classes/hhu.z.controllers.UserrolesController.html
+++ b/doc/classes/hhu.z.controllers.UserrolesController.html
--- a/doc/classes/hhu.z.controllers.UsersController.html
+++ b/doc/classes/hhu.z.controllers.UsersController.html
--- a/doc/classes/hhu.z.controllers.XplevelsController.html
+++ b/doc/classes/hhu.z.controllers.XplevelsController.html
--- a/doc/classes/hhu.z.controllers.components.AchievementComponent.html
+++ b/doc/classes/hhu.z.controllers.components.AchievementComponent.html
--- a/doc/classes/hhu.z.controllers.components.AuthComponent.html
+++ b/doc/classes/hhu.z.controllers.components.AuthComponent.html
--- a/doc/classes/hhu.z.controllers.components.NotificationComponent.html
+++ b/doc/classes/hhu.z.controllers.components.NotificationComponent.html
--- a/doc/classes/hhu.z.controllers.components.ValidationComponent.html
+++ b/doc/classes/hhu.z.controllers.components.ValidationComponent.html
--- a/doc/classes/hhu.z.exceptions.FileUploadException.html
+++ b/doc/classes/hhu.z.exceptions.FileUploadException.html
--- a/doc/classes/hhu.z.exceptions.MailingException.html
+++ b/doc/classes/hhu.z.exceptions.MailingException.html
--- a/doc/classes/hhu.z.exceptions.MaxFilesizeException.html
+++ b/doc/classes/hhu.z.exceptions.MaxFilesizeException.html
--- a/doc/classes/hhu.z.exceptions.QuesttypeAgentNotFoundException.html
+++ b/doc/classes/hhu.z.exceptions.QuesttypeAgentNotFoundException.html
--- a/doc/classes/hhu.z.exceptions.QuesttypeAgentNotValidException.html
+++ b/doc/classes/hhu.z.exceptions.QuesttypeAgentNotValidException.html
--- a/doc/classes/hhu.z.exceptions.QuesttypeControllerNotFoundException.html
+++ b/doc/classes/hhu.z.exceptions.QuesttypeControllerNotFoundException.html
--- a/doc/classes/hhu.z.exceptions.QuesttypeControllerNotValidException.html
+++ b/doc/classes/hhu.z.exceptions.QuesttypeControllerNotValidException.html
--- a/doc/classes/hhu.z.exceptions.QuesttypeModelNotFoundException.html
+++ b/doc/classes/hhu.z.exceptions.QuesttypeModelNotFoundException.html
--- a/doc/classes/hhu.z.exceptions.QuesttypeModelNotValidException.html
+++ b/doc/classes/hhu.z.exceptions.QuesttypeModelNotValidException.html
--- a/doc/classes/hhu.z.exceptions.SubmissionNotValidException.html
+++ b/doc/classes/hhu.z.exceptions.SubmissionNotValidException.html
--- a/doc/classes/hhu.z.exceptions.WrongFiletypeException.html
+++ b/doc/classes/hhu.z.exceptions.WrongFiletypeException.html
--- a/doc/classes/hhu.z.lib.PHPMailer.html
+++ b/doc/classes/hhu.z.lib.PHPMailer.html
--- a/doc/classes/hhu.z.lib.PHPMailerAutoload.html
+++ b/doc/classes/hhu.z.lib.PHPMailerAutoload.html
--- a/doc/classes/hhu.z.lib.Password.html
+++ b/doc/classes/hhu.z.lib.Password.html
--- a/doc/classes/hhu.z.lib.SMTP.html
+++ b/doc/classes/hhu.z.lib.SMTP.html
--- a/doc/classes/hhu.z.models.AchievementsModel.html
+++ b/doc/classes/hhu.z.models.AchievementsModel.html
--- a/doc/classes/hhu.z.models.AvatarsModel.html
+++ b/doc/classes/hhu.z.models.AvatarsModel.html
--- a/doc/classes/hhu.z.models.CharactergroupsModel.html
+++ b/doc/classes/hhu.z.models.CharactergroupsModel.html
--- a/doc/classes/hhu.z.models.CharactergroupsquestsModel.html
+++ b/doc/classes/hhu.z.models.CharactergroupsquestsModel.html
--- a/doc/classes/hhu.z.models.CharacterrolesModel.html
+++ b/doc/classes/hhu.z.models.CharacterrolesModel.html
--- a/doc/classes/hhu.z.models.CharactersModel.html
+++ b/doc/classes/hhu.z.models.CharactersModel.html
--- a/doc/classes/hhu.z.models.CharactertypesModel.html
+++ b/doc/classes/hhu.z.models.CharactertypesModel.html
--- a/doc/classes/hhu.z.models.MediaModel.html
+++ b/doc/classes/hhu.z.models.MediaModel.html
--- a/doc/classes/hhu.z.models.QuestgroupsModel.html
+++ b/doc/classes/hhu.z.models.QuestgroupsModel.html
--- a/doc/classes/hhu.z.models.QuestgroupshierarchyModel.html
+++ b/doc/classes/hhu.z.models.QuestgroupshierarchyModel.html
--- a/Show more
+++ b/Show more