coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

add support for moodpic sources and revamp moodpic integration a little bit

Browse source
This commit is contained in:
oliver 2015-08-20 13:20:49 +02:00
parent 41f3ee0349
commit 5cb60679e0
37 changed files with 271 additions and 292 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
agents/intermediate/AchievementsAgent.inc
View file

@ -31,8 +31,8 @@
*/
public function index(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -44,8 +44,8 @@
*/
public function create(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -57,8 +57,8 @@
*/
public function edit(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -70,8 +70,8 @@
*/
public function manage(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -83,8 +83,8 @@
*/
public function conditions(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(1));
}
@ -96,8 +96,8 @@
*/
public function delete(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
}

40
agents/intermediate/CharactergroupsAgent.inc
View file

@ -31,8 +31,8 @@
*/
public function index(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -44,8 +44,8 @@
*/
public function groupsgroup(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -57,8 +57,8 @@
*/
public function creategroupsgroup(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -70,8 +70,8 @@
*/
public function editgroupsgroup(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -83,8 +83,8 @@
*/
public function deletegroupsgroup(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -96,8 +96,8 @@
*/
public function group(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -109,8 +109,8 @@
*/
public function creategroup(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -122,8 +122,8 @@
*/
public function managegroup(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -135,8 +135,8 @@
*/
public function editgroup(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -148,8 +148,8 @@
*/
public function deletegroup(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
}

24
agents/intermediate/CharactergroupsquestsAgent.inc
View file

@ -31,8 +31,8 @@
*/
public function index(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', 'charactergroups');
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), 'charactergroups');
}
@ -44,8 +44,8 @@
*/
public function quest(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', 'charactergroups');
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), 'charactergroups');
}
@ -57,8 +57,8 @@
*/
public function create(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', 'charactergroups');
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), 'charactergroups');
}
@ -70,8 +70,8 @@
*/
public function manage(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', 'charactergroups');
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), 'charactergroups');
}
@ -83,8 +83,8 @@
*/
public function edit(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', 'charactergroups');
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), 'charactergroups');
}
@ -96,8 +96,8 @@
*/
public function delete(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', 'charactergroups');
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), 'charactergroups');
}
}

24
agents/intermediate/CharactersAgent.inc
View file

@ -31,8 +31,8 @@
*/
public function index(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3));
}
@ -44,8 +44,8 @@
*/
public function character(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3));
}
@ -57,8 +57,8 @@
*/
public function register(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3));
}
@ -70,8 +70,8 @@
*/
public function manage(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3));
}
@ -83,8 +83,8 @@
*/
public function edit(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3));
}
@ -96,8 +96,8 @@
*/
public function delete(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3));
}
}

16
agents/intermediate/CharactertypesAgent.inc
View file

@ -31,8 +31,8 @@
*/
public function index(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -44,8 +44,8 @@
*/
public function create(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -57,8 +57,8 @@
*/
public function edit(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -70,8 +70,8 @@
*/
public function delete(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
}

24
agents/intermediate/LibraryAgent.inc
View file

@ -31,8 +31,8 @@
*/
public function index(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -44,8 +44,8 @@
*/
public function create(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -57,8 +57,8 @@
*/
public function topic(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -70,8 +70,8 @@
*/
public function manage(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -83,8 +83,8 @@
*/
public function edit(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -96,8 +96,8 @@
*/
public function delete(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
}

6
agents/intermediate/MapAgent.inc
View file

@ -31,7 +31,8 @@
*/
public function index(\nre\core\Request $request, \nre\core\Response $response)
{
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -43,7 +44,8 @@
*/
public function edit(\nre\core\Request $request, \nre\core\Response $response)
{
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
}

28
agents/intermediate/QuestgroupsAgent.inc
View file

@ -31,8 +31,8 @@
*/
public function questgroup(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4));
@ -47,8 +47,8 @@
*/
public function create(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3));
}
@ -60,8 +60,8 @@
*/
public function edit(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4));
@ -76,8 +76,8 @@
*/
public function edittexts(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4));
@ -92,8 +92,8 @@
*/
public function moveup(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4));
@ -108,8 +108,8 @@
*/
public function movedown(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4));
@ -124,8 +124,8 @@
*/
public function delete(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4));

36
agents/intermediate/QuestsAgent.inc
View file

@ -31,8 +31,8 @@
*/
public function index(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3));
}
@ -44,8 +44,8 @@
*/
public function quest(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true);
@ -60,8 +60,8 @@
*/
public function submissions(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true);
@ -76,8 +76,8 @@
*/
public function submission(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true);
@ -92,8 +92,8 @@
*/
public function create(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true);
@ -108,8 +108,8 @@
*/
public function edit(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true);
@ -124,8 +124,8 @@
*/
public function edittask(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true);
@ -140,8 +140,8 @@
*/
public function edittexts(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true);
@ -156,8 +156,8 @@
*/
public function delete(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'questgroup', $request->getParam(3), $request->getParam(4));
// Add Questgroups hierarchy path
$this->addSubAgent('Questgroupshierarchypath', 'index', $request->getParam(3), $request->getParam(4), true);

27
agents/intermediate/SeminariesAgent.inc
View file

@ -31,6 +31,8 @@
*/
public function index(\nre\core\Request $request, \nre\core\Response $response)
{
// Add Moodpic
$this->addSubAgent('Moodpic', 'index');
}
@ -42,7 +44,21 @@
*/
public function seminary(\nre\core\Request $request, \nre\core\Response $response)
{
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3));
}
/**
* Action: create.
*
* @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)
{
// Add Moodpic
$this->addSubAgent('Moodpic', 'index');
}
@ -54,7 +70,8 @@
*/
public function edit(\nre\core\Request $request, \nre\core\Response $response)
{
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -66,7 +83,8 @@
*/
public function copy(\nre\core\Request $request, \nre\core\Response $response)
{
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
@ -78,7 +96,8 @@
*/
public function delete(\nre\core\Request $request, \nre\core\Response $response)
{
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3), $request->getParam(1));
}
}

4
agents/intermediate/XplevelsAgent.inc
View file

@ -31,8 +31,8 @@
*/
public function manage(\nre\core\Request $request, \nre\core\Response $response)
{
// Add (default) Moodpic
$this->addSubAgent('Moodpic', 'index', $request->getParam(1));
// Add Moodpic
$this->addSubAgent('Moodpic', 'seminary', $request->getParam(3));
}
}

88
controllers/MoodpicController.inc
View file

@ -24,25 +24,101 @@
*
* @var array
*/
public $models = array();
public $models = array('seminaries', 'questgroups', 'media');
/**
* Action: index.
*
* Show the moodpic of a Seminary Agent.
*
* @param string $agentName Name of the Seminary Agent to show moodpic of
*/
public function index($agentName)
{
// Seminary moodpic
$seminary = SeminaryController::$seminary;
}
/**
* Action: seminary.
*
* Show moodpic of a Seminary.
*
* @param string $seminaryUrl URL of Seminary to show moodpic of
*/
public function seminary($seminaryUrl, $agentName=null)
{
// Get Seminary
if(property_exists('\hhu\z\controllers\SeminaryController', 'seminary') && !empty(SeminaryController::$seminary) && SeminaryController::$seminary['url'] == $seminaryUrl) {
$seminary = SeminaryController::$seminary;
}
else {
$seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl);
}
// Get medium
$medium = null;
// Agent medium
$seminaryMoodpicIndex = sprintf('%s_seminarymedia_id', $agentName);
if(array_key_exists($seminaryMoodpicIndex, $seminary) && !is_null($seminary[$seminaryMoodpicIndex]))
{
$medium = $this->Media->getSeminaryMediaById($seminary[$seminaryMoodpicIndex]);
$medium['url'] = $this->linker->link(array('media', 'seminarymoodpic', $seminary['url'], $agentName));
}
// Seminary medium
elseif(!is_null($seminary['seminarymedia_id']))
{
$medium = $this->Media->getSeminaryMediaById($seminary['seminarymedia_id']);
$medium['url'] = $this->linker->link(array('media', 'seminarymoodpic', $seminary['url']));
}
// Pass data to view
$this->set('seminary', $seminary);
$this->set('seminaryMoodpicIndex', $seminaryMoodpicIndex);
$this->set('agentName', $agentName);
$this->set('medium', $medium);
}
/**
* Action: questgroup.
*
* Show moodpic of a Questgroup.
*
* @param string $seminaryUrl URL of Seminary
* @param string $quesgroupUrl URL of Questgroup to show moodpic of
*/
public function questgroup($seminaryUrl, $questgroupUrl)
{
// Get Seminary
if(property_exists('\hhu\z\controllers\SeminaryController', 'seminary') && !empty(SeminaryController::$seminary) && SeminaryController::$seminary['url'] == $seminaryUrl) {
$seminary = SeminaryController::$seminary;
}
else {
$seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl);
}
// Get Questgroup
$questgroup = $this->Questgroups->getQuestgroupByUrl($seminary['id'], $questgroupUrl);
// Get medium
$medium = null;
// Questgroup medium
if(!is_null($questgroup['questgroupspicture_id']))
{
$medium = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
$medium['url'] = $this->linker->link(array('media', 'seminary', $seminary['url'], $medium['url']));
}
// Seminary medium
elseif(!is_null($seminary['seminarymedia_id']))
{
$medium = $this->Media->getSeminaryMediaById($seminary['seminarymedia_id']);
$medium['url'] = $this->linker->link(array('media', 'seminarymoodpic', $seminary['url']));
}
// Pass data to view
$this->set('medium', $medium);
}
}

44
controllers/QuestgroupsController.inc
View file

@ -164,14 +164,6 @@
// Get texts
$questgroupTexts = $this->Questgrouptexts->getQuestgroupTexts($questgroup['id']);
// Media
$picture = null;
if(!is_null($questgroup['questgroupspicture_id']))
{
$picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
}
// Get Quests
$quests = array();
if(count($childQuestgroupshierarchy) == 0)
@ -231,7 +223,6 @@
$this->set('questgroup', $questgroup);
$this->set('childquestgroupshierarchy', $childQuestgroupshierarchy);
$this->set('texts', $questgroupTexts);
$this->set('picture', $picture);
$this->set('quests', $quests);
}
@ -471,12 +462,6 @@
}
}
// Media
$picture = null;
if(!is_null($questgroup['questgroupspicture_id'])) {
$picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
}
// Get validation settings
$validationSettings = array();
foreach($fields as &$field) {
@ -491,7 +476,6 @@
// Pass data to view
$this->set('seminary', $seminary);
$this->set('questgroup', $questgroup);
$this->set('picture', $picture);
$this->set('title', $title);
$this->set('mimetypes', $mimetypes);
$this->set('validation', $validation);
@ -557,12 +541,6 @@
$this->redirect($this->linker->link(array('questgroup', $seminary['url'], $questgroup['url']), 1));
}
// Media
$picture = null;
if(!is_null($questgroup['questgroupspicture_id'])) {
$picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
}
// Set titile
$this->addTitleLocalized('Edit Questgroup texts');
@ -572,7 +550,6 @@
$this->set('seminary', $seminary);
$this->set('questgroup', $questgroup);
$this->set('questgrouptexts', $questgroupTexts);
$this->set('picture', $picture);
$this->set('mimetypes', $mimetypes);
}
@ -619,12 +596,6 @@
$this->redirect($this->linker->link(array('seminaries', 'seminary', $seminary['url'])));
}
// Media
$picture = null;
if(!is_null($questgroup['questgroupspicture_id'])) {
$picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
}
// Set titile
$this->addTitleLocalized('Move Questgroup');
@ -632,7 +603,6 @@
// Show confirmation
$this->set('seminary', $seminary);
$this->set('questgroup', $questgroup);
$this->set('picture', $picture);
}
@ -678,12 +648,6 @@
$this->redirect($this->linker->link(array('seminaries', 'seminary', $seminary['url'])));
}
// Media
$picture = null;
if(!is_null($questgroup['questgroupspicture_id'])) {
$picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
}
// Set titile
$this->addTitleLocalized('Move Questgroup');
@ -691,7 +655,6 @@
// Show confirmation
$this->set('seminary', $seminary);
$this->set('questgroup', $questgroup);
$this->set('picture', $picture);
}
@ -752,12 +715,6 @@
$this->redirect($this->linker->link(array('questgroup', $seminary['url'], $questgroup['url']), 1));
}
// Media
$picture = null;
if(!is_null($questgroup['questgroupspicture_id'])) {
$picture = $this->Media->getSeminaryMediaById($questgroup['questgroupspicture_id']);
}
// Set titile
$this->addTitleLocalized('Delete Questgroup');
@ -765,7 +722,6 @@
// Show confirmation
$this->set('seminary', $seminary);
$this->set('questgroup', $questgroup);
$this->set('picture', $picture);
}
}

21
controllers/QuestsController.inc
View file

@ -383,12 +383,6 @@
// Get Quest
$quest = $this->Quests->getQuestByUrl($seminary['id'], $questgroup['id'], $questUrl);
// Media
$questmedia = null;
if(!is_null($quest['questsmedia_id'])) {
$questmedia = $this->Media->getSeminaryMediaById($quest['questsmedia_id']);
}
// Get submitted Character submissions waiting for approval
$submittedSubmissionCharacters = $this->Characters->getCharactersSubmittedQuest($quest['id']);
@ -408,7 +402,6 @@
$this->set('seminary', $seminary);
$this->set('questgroup', $questgroup);
$this->set('quest', $quest);
$this->set('media', $questmedia);
$this->set('submittedSubmissionCharacters', $submittedSubmissionCharacters);
$this->set('unsolvedSubmissionCharacters', $unsolvedSubmissionCharacters);
$this->set('solvedSubmissionCharacters', $solvedSubmissionCharacters);
@ -442,12 +435,6 @@
// Character
$character = $this->Characters->getCharacterByUrl($seminary['id'], $characterUrl);
// Media
$questmedia = null;
if(!is_null($quest['questsmedia_id'])) {
$questmedia = $this->Media->getSeminaryMediaById($quest['questsmedia_id']);
}
// Questtype
$questtype = $this->Questtypes->getQuesttypeById($quest['questtype_id']);
@ -465,7 +452,6 @@
$this->set('questgroup', $questgroup);
$this->set('quest', $quest);
$this->set('character', $character);
$this->set('media', $questmedia);
$this->set('output', $output);
}
@ -821,12 +807,6 @@
// Get Quest
$quest = $this->Quests->getQuestByUrl($seminary['id'], $questgroup['id'], $questUrl);
// Get Quest media
$questmedia = null;
if(!is_null($quest['questsmedia_id'])) {
$questmedia = $this->Media->getSeminaryMediaById($quest['questsmedia_id']);
}
// Render editing task
$task = null;
$questtype = $this->Questtypes->getQuesttypeById($quest['questtype_id']);
@ -843,7 +823,6 @@
$this->set('seminary', $seminary);
$this->set('questgroup', $questgroup);
$this->set('quest', $quest);
$this->set('media', $questmedia);
$this->set('task', $task);
}

5
db/create.sql
View file

@ -1854,7 +1854,10 @@ CREATE TABLE `seminarymedia` (
`seminary_id` int(11) NOT NULL,
`name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
`url` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
`title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`description` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL,
`sourcelabel` varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`sourceurl` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`mimetype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `seminary_id_2` (`seminary_id`,`name`),
@ -2188,4 +2191,4 @@ DELIMITER ;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2015-08-19 22:23:25
-- Dump completed on 2015-08-20 13:14:00

2
models/MediaModel.inc
View file

@ -121,7 +121,7 @@
public function getSeminaryMediaById($mediaId)
{
$data = $this->db->query(
'SELECT id, name, url, description, mimetype '.
'SELECT id, name, url, title, description, sourcelabel, sourceurl, mimetype '.
'FROM seminarymedia '.
'WHERE id = ?',
'i',

10
views/html/moodpic/index.tpl
View file

@ -1,9 +1,5 @@
<div class="moodpic">
<?php if(!is_null($seminary) && array_key_exists($seminaryMoodpicIndex, $seminary) && !is_null($seminary[$seminaryMoodpicIndex])) : ?>
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url'],$agentName))?>">
<?php elseif(!is_null($seminary) && !is_null($seminary['seminarymedia_id'])) : ?>
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>">
<?php else : ?>
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
<?php endif ?>
<div>
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
</div>

20
views/html/moodpic/questgroup.tpl Normal file
View file

@ -0,0 +1,20 @@
<div class="moodpic">
<div>
<?php if(!is_null($medium)) : ?>
<img src="<?=$medium['url']?>" <?php if(!empty($medium['title'])) : ?>title="<?=$medium['title']?>"<?php endif ?> <?php if(!empty($medium['description'])) : ?>alt="<?=$medium['description']?>"<?php endif ?>/>
<?php if(!empty($medium['sourcelabel']) || !empty($medium['sourceurl'])) : ?>
<?php $label = (!empty($medium['sourcelabel'])) ? $medium['sourcelabel'] : substr($medium['sourceurl'], 0, 30).'…'; ?>
<span class="source">
<?=_('Image source')?>:
<?php if(!empty($medium['sourceurl'])): ?>
<a href="<?=$medium['sourceurl']?>" target="_blank"><?=$label?></a>
<?php else : ?>
<?=$label?>
<?php endif ?>
</span>
<?php endif ?>
<?php else : ?>
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
<?php endif ?>
</div>
</div>

20
views/html/moodpic/seminary.tpl Normal file
View file

@ -0,0 +1,20 @@
<div class="moodpic">
<div>
<?php if(!is_null($medium)) : ?>
<img src="<?=$medium['url']?>" <?php if(!empty($medium['title'])) : ?>title="<?=$medium['title']?>"<?php endif ?> <?php if(!empty($medium['description'])) : ?>alt="<?=$medium['description']?>"<?php endif ?>/>
<?php if(!empty($medium['sourcelabel']) || !empty($medium['sourceurl'])) : ?>
<?php $label = (!empty($medium['sourcelabel'])) ? $medium['sourcelabel'] : substr($medium['sourceurl'], 0, 30).'…'; ?>
<span class="source">
<?=_('Image source')?>:
<?php if(!empty($medium['sourceurl'])): ?>
<a href="<?=$medium['sourceurl']?>" target="_blank"><?=$label?></a>
<?php else : ?>
<?=$label?>
<?php endif ?>
</span>
<?php endif ?>
<?php else : ?>
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
<?php endif ?>
</div>
</div>

6
views/html/questgroups/create.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($seminary['seminarymedia_id'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminarymoodpic',$seminary['url']))?>" />
</div>
<?php else: ?>
<?=$moodpic?>
<?php endif ?>
<ul class="breadcrumbs">
<li><a href="<?=$linker->link(array('seminaries',$seminary['url']))?>"><?=$seminary['title']?></a></li>
<li><i class="fa fa-chevron-right fa-fw"></i><?=_('Questgroups')?></li>

6
views/html/questgroups/delete.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($picture)) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$picture['url']))?>" />
</div>
<?php else: ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<?php if(!is_null($questgroup['hierarchy'])) : ?>

6
views/html/questgroups/edit.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($picture)) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$picture['url']))?>" />
</div>
<?php else: ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<h1><?=_('Edit Questgroup')?></h1>

6
views/html/questgroups/edittexts.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($picture)) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$picture['url']))?>" />
</div>
<?php else: ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<h1><?=_('Edit Questgroup texts')?></h1>

6
views/html/questgroups/movedown.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($picture)) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$picture['url']))?>" />
</div>
<?php else: ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<?php if(!is_null($questgroup['hierarchy'])) : ?>

6
views/html/questgroups/moveup.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($picture)) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$picture['url']))?>" />
</div>
<?php else: ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<?php if(!is_null($questgroup['hierarchy'])) : ?>

6
views/html/questgroups/questgroup.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($picture)) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$picture['url']))?>" />
</div>
<?php else: ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<?php if(!is_null($questgroup['hierarchy'])) : ?>

6
views/html/quests/create.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($questgroup['picture'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questgroup['picture']['url']))?>" />
</div>
<?php else : ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<h1><?=_('Create Quest')?></h1>

6
views/html/quests/delete.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($questgroup['picture'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questgroup['picture']['url']))?>" />
</div>
<?php else : ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<h1><?=_('Delete Quest')?></h1>

6
views/html/quests/edit.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($questgroup['picture'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questgroup['picture']['url']))?>" />
</div>
<?php else : ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<h1><?=_('Edit Quest')?></h1>

6
views/html/quests/edittask.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($questgroup['picture'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questgroup['picture']['url']))?>" />
</div>
<?php else : ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<h1><?=_('Edit Quest task')?></h1>

6
views/html/quests/edittexts.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($questgroup['picture'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questgroup['picture']['url']))?>" />
</div>
<?php else : ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<h1><?=_('Edit Quest texts')?></h1>

6
views/html/quests/quest.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($questgroup['picture'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questgroup['picture']['url']))?>" />
</div>
<?php else : ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<h1><?=$quest['title']?></h1>

6
views/html/quests/submission.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($questgroup['picture'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questgroup['picture']['url']))?>" />
</div>
<?php else : ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<h1><?=$quest['title']?></h1>

6
views/html/quests/submissions.tpl
View file

@ -1,10 +1,4 @@
<?php if(!is_null($questgroup['picture'])) : ?>
<div class="moodpic">
<img src="<?=$linker->link(array('media','seminary',$seminary['url'],$questgroup['picture']['url']))?>" />
</div>
<?php else : ?>
<?=$moodpic?>
<?php endif ?>
<?=$questgroupshierarchypath?>
<h1><?=$quest['title']?> (<?=_('Submissions')?>)</h1>

4
views/html/seminaries/create.tpl
View file

@ -1,6 +1,4 @@
<div class="moodpic">
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
<?=$moodpic?>
<ul class="breadcrumbs">
<li><a href="<?=$linker->link('index',1)?>"><?=_('Seminaries')?></a></li>
</ul>

4
views/html/seminaries/index.tpl
View file

@ -1,6 +1,4 @@
<div class="moodpic">
<img src="<?=$linker->link(array('grafics','questlab.jpg'))?>" />
</div>
<?=$moodpic?>
<h1><?=_('Seminaries')?></h1>
<?php if(count(array_intersect(array('admin','moderator'),\hhu\z\controllers\IntermediateController::$user['roles'])) > 0) : ?>
<nav class="admin">

2
www/css/desktop.css
View file

@ -97,6 +97,8 @@ aside{display:none}
.moodpic{margin:-15px -5.5% 0 -5.5%;overflow:hidden}
.moodpic img{width:100vw}
.moodpic > div{position:relative}
.moodpic .source{position:absolute;right:0;bottom:15px;color:white;font-size:0.8em;padding:0.2em;background-color:rgba(0,0,0,0.3)}
.breadcrumbs li{display:block;font-size:.875em}
.breadcrumbs .fa{padding-right:5px;font-size:.75em;color:#989693}