diff --git a/app/TextFormatter.inc b/app/TextFormatter.inc index e226c7e5..e11a42ed 100644 --- a/app/TextFormatter.inc +++ b/app/TextFormatter.inc @@ -81,13 +81,13 @@ foreach($seminarymediaIds as &$seminarymediaId) { $replacement = null; - if(!is_null(\hhu\z\controllers\SeminaryRoleController::$seminary) && $this->loadMediaModel()) + if(!is_null(\hhu\z\controllers\SeminaryController::$seminary) && $this->loadMediaModel()) { try { $medium = self::$Media->getSeminaryMediaById($seminarymediaId); $replacement = sprintf( '%s', - $this->linker->link(array('media','seminary', \hhu\z\controllers\SeminaryRoleController::$seminary['url'],$medium['url'])), + $this->linker->link(array('media','seminary', \hhu\z\controllers\SeminaryController::$seminary['url'],$medium['url'])), $medium['description'] ); } diff --git a/app/controllers/SeminaryRoleController.inc b/app/controllers/SeminaryController.inc similarity index 91% rename from app/controllers/SeminaryRoleController.inc rename to app/controllers/SeminaryController.inc index f6f0007e..7e28f18b 100644 --- a/app/controllers/SeminaryRoleController.inc +++ b/app/controllers/SeminaryController.inc @@ -18,7 +18,7 @@ * * @author Oliver Hanraths */ - abstract class SeminaryRoleController extends \hhu\z\controllers\IntermediateController + abstract class SeminaryController extends \hhu\z\controllers\IntermediateController { /** * Required components @@ -31,7 +31,7 @@ * * @var array */ - public $models = array('seminaries', 'userseminaryroles', 'characters', 'achievements'); + public $models = array('seminaries', 'characters', 'characterroles', 'achievements'); /** * Current Seminary * @@ -49,7 +49,7 @@ /** - * Construct a new SeminaryRole Controller. + * Construct a new Seminary Controller. * * @throws DriverNotFoundException * @throws DriverNotValidException @@ -82,8 +82,8 @@ self::$seminary = $this->Seminaries->getSeminaryByUrl($this->request->getParam(3)); if(!is_null(self::$user)) { - self::$user['seminaryroles'] = array_map(function($r) { return $r['name']; }, $this->Userseminaryroles->getUserseminaryrolesForUserById(self::$user['id'], self::$seminary['id'])); self::$character = $this->Characters->getCharacterForUserAndSeminary(self::$user['id'], self::$seminary['id']); + self::$character['characterroles'] = array_map(function($r) { return $r['name']; }, $this->Characterroles->getCharacterrolesForCharacterById(self::$character['id'])); } } catch(\nre\exceptions\IdNotFoundException $e) { @@ -140,7 +140,7 @@ // Check permissions - if(!array_key_exists('seminaryroles', self::$user) || count(array_intersect(self::$user['seminaryroles'], $permissions)) == 0) { + if(!array_key_exists('characterroles', self::$character) || count(array_intersect(self::$character['characterroles'], $permissions)) == 0) { throw new \nre\exceptions\AccessDeniedException(); } } @@ -158,7 +158,7 @@ // Get unachieved Achievments $achievements = $this->Achievements->getUnachhievedAchievementsForCharacter(self::$seminary['id'], self::$character['id']); - if(in_array('user', self::$user['seminaryroles'])) { + if(in_array('user', self::$character['characterroles'])) { $achievements = array_merge($achievements, $this->Achievements->getUnachievedOnlyOnceAchievementsForSeminary(self::$seminary['id'])); } diff --git a/controllers/AchievementsController.inc b/controllers/AchievementsController.inc index d99671b6..27341bdf 100644 --- a/controllers/AchievementsController.inc +++ b/controllers/AchievementsController.inc @@ -17,7 +17,7 @@ * * @author Oliver Hanraths */ - class AchievementsController extends \hhu\z\controllers\SeminaryRoleController + class AchievementsController extends \hhu\z\controllers\SeminaryController { /** * Required models @@ -59,7 +59,7 @@ $seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl); // Get Character - $character = SeminaryRoleController::$character; + $character = SeminaryController::$character; // Get seldom Achievements $seldomAchievements = $this->Achievements->getSeldomAchievements($seminary['id'], \nre\configs\AppConfig::$misc['achievements_range']); diff --git a/controllers/CharactergroupsController.inc b/controllers/CharactergroupsController.inc index d4cf6cee..0811e6c9 100644 --- a/controllers/CharactergroupsController.inc +++ b/controllers/CharactergroupsController.inc @@ -17,7 +17,7 @@ * * @author Oliver Hanraths */ - class CharactergroupsController extends \hhu\z\controllers\SeminaryRoleController + class CharactergroupsController extends \hhu\z\controllers\SeminaryController { /** * Required models diff --git a/controllers/CharactergroupsquestsController.inc b/controllers/CharactergroupsquestsController.inc index fb9d18c8..0285db3e 100644 --- a/controllers/CharactergroupsquestsController.inc +++ b/controllers/CharactergroupsquestsController.inc @@ -18,7 +18,7 @@ * * @author Oliver Hanraths */ - class CharactergroupsquestsController extends \hhu\z\controllers\SeminaryRoleController + class CharactergroupsquestsController extends \hhu\z\controllers\SeminaryController { /** * Required models diff --git a/controllers/CharactersController.inc b/controllers/CharactersController.inc index 7046e1a1..37038999 100644 --- a/controllers/CharactersController.inc +++ b/controllers/CharactersController.inc @@ -17,7 +17,7 @@ * * @author Oliver Hanraths */ - class CharactersController extends \hhu\z\controllers\SeminaryRoleController + class CharactersController extends \hhu\z\controllers\SeminaryController { /** * Required models @@ -268,9 +268,10 @@ // Send notification mail to system moderators $subject = sprintf('new Character registration: %s', $charactername); $message = sprintf('User “%s” <%s> has registered a new Character “%s” for the Seminary “%s”', self::$user['username'], self::$user['email'], $charactername, self::$seminary['title']); - $moderators = $this->Users->getUsersWithSeminaryRole(self::$seminary['id'], 'moderator'); - foreach($moderators as &$moderator) + $characters = $this->Characters->getCharactersWithCharacterRole(self::$seminary['id'], 'moderator'); + foreach($characters as &$character) { + $moderator = $this->Users->getUserById($character['user_id']); \hhu\z\Utils::sendMail($sender, $moderator['email'], $subject, $message); } } diff --git a/controllers/HtmlController.inc b/controllers/HtmlController.inc index dd4bc86c..2d7eef25 100644 --- a/controllers/HtmlController.inc +++ b/controllers/HtmlController.inc @@ -50,8 +50,8 @@ // Set userdata $this->set('loggedUser', IntermediateController::$user); - $this->set('loggedSeminary', SeminaryRoleController::$seminary); - $this->set('loggedCharacter', SeminaryRoleController::$character); + $this->set('loggedSeminary', SeminaryController::$seminary); + $this->set('loggedCharacter', SeminaryController::$character); } } diff --git a/controllers/LibraryController.inc b/controllers/LibraryController.inc index b6c77079..1fee6e2c 100644 --- a/controllers/LibraryController.inc +++ b/controllers/LibraryController.inc @@ -17,7 +17,7 @@ * * @author Oliver Hanraths */ - class LibraryController extends \hhu\z\controllers\SeminaryRoleController + class LibraryController extends \hhu\z\controllers\SeminaryController { /** * Required models @@ -59,7 +59,7 @@ $seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl); // Get Character - $character = SeminaryRoleController::$character; + $character = SeminaryController::$character; // Get Quest topics $totalQuestcount = 0; @@ -100,7 +100,7 @@ $seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl); // Get Character - $character = SeminaryRoleController::$character; + $character = SeminaryController::$character; // Get Questtopic $questtopic = $this->Questtopics->getQuesttopicByUrl($seminary['id'], $questtopicUrl); diff --git a/controllers/MediaController.inc b/controllers/MediaController.inc index e6bb69d2..c81511d4 100644 --- a/controllers/MediaController.inc +++ b/controllers/MediaController.inc @@ -17,7 +17,7 @@ * * @author Oliver Hanraths */ - class MediaController extends \hhu\z\controllers\SeminaryRoleController + class MediaController extends \hhu\z\controllers\SeminaryController { /** * User permissions @@ -220,7 +220,7 @@ $seminary = $this->Seminaries->getSeminaryByUrl($seminaryUrl); // Get Character - $character = SeminaryRoleController::$character; + $character = SeminaryController::$character; // Get Achievement $achievement = $this->Achievements->getAchievementByUrl($seminary['id'], $achievementUrl); diff --git a/controllers/MenuController.inc b/controllers/MenuController.inc index b7557c1f..6c6a7d58 100644 --- a/controllers/MenuController.inc +++ b/controllers/MenuController.inc @@ -35,8 +35,8 @@ // Set userdata $this->set('loggedUser', IntermediateController::$user); - $this->set('loggedCharacter', SeminaryRoleController::$character); - $this->set('loggedSeminary', SeminaryRoleController::$seminary); + $this->set('loggedCharacter', SeminaryController::$character); + $this->set('loggedSeminary', SeminaryController::$seminary); } diff --git a/controllers/QuestgroupsController.inc b/controllers/QuestgroupsController.inc index 3cd33c37..e8325c73 100644 --- a/controllers/QuestgroupsController.inc +++ b/controllers/QuestgroupsController.inc @@ -17,7 +17,7 @@ * * @author Oliver Hanraths */ - class QuestgroupsController extends \hhu\z\controllers\SeminaryRoleController + class QuestgroupsController extends \hhu\z\controllers\SeminaryController { /** * Required models @@ -71,7 +71,7 @@ $character = $this->Characters->getCharacterForUserAndSeminary($this->Auth->getUserId(), $seminary['id']); // Check permission - if(count(array_intersect(array('admin','moderator'), IntermediateController::$user['seminaryroles'])) == 0) + if(count(array_intersect(array('admin','moderator'), SeminaryController::$character['characterroles'])) == 0) { $previousQuestgroup = $this->Questgroups->getPreviousQuestgroup($questgroup['id']); if(!is_null($previousQuestgroup)) { @@ -97,7 +97,7 @@ $group['solved'] = $this->Questgroups->hasCharacterSolvedQuestgroup($group['id'], $character['id']); // Check permission of Questgroups - if($i >= 1 && count(array_intersect(array('admin','moderator'), IntermediateController::$user['seminaryroles'])) == 0) + if($i >= 1 && count(array_intersect(array('admin','moderator'), SeminaryController::$character['characterroles'])) == 0) { if(!$hierarchy['questgroups'][$i-1]['solved']) { @@ -170,7 +170,7 @@ $quests[] = $currentQuest; } } - while(!is_null($currentQuest) && ($currentQuest['solved'] || count(array_intersect(array('admin','moderator'), IntermediateController::$user['seminaryroles'])) > 0)); + while(!is_null($currentQuest) && ($currentQuest['solved'] || count(array_intersect(array('admin','moderator'), SeminaryController::$character['characterroles'])) > 0)); } diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc index f5a3284d..b0804a89 100644 --- a/controllers/QuestsController.inc +++ b/controllers/QuestsController.inc @@ -17,7 +17,7 @@ * * @author Oliver Hanraths */ - class QuestsController extends \hhu\z\controllers\SeminaryRoleController + class QuestsController extends \hhu\z\controllers\SeminaryController { /** * Required models @@ -146,7 +146,7 @@ $character = $this->Characters->getCharacterForUserAndSeminary($this->Auth->getUserId(), $seminary['id']); // Check permissions - if(count(array_intersect(array('admin','moderator'), IntermediateController::$user['seminaryroles'])) == 0) + if(count(array_intersect(array('admin','moderator'), SeminaryController::$character['characterroles'])) == 0) { $previousQuests = $this->Quests->getPreviousQuests($quest['id']); if(count($previousQuests) == 0) diff --git a/controllers/SeminariesController.inc b/controllers/SeminariesController.inc index 45bfd155..345d4085 100644 --- a/controllers/SeminariesController.inc +++ b/controllers/SeminariesController.inc @@ -17,14 +17,14 @@ * * @author Oliver Hanraths */ - class SeminariesController extends \hhu\z\controllers\SeminaryRoleController + class SeminariesController extends \hhu\z\controllers\SeminaryController { /** * Required models * * @var array */ - public $models = array('seminaries', 'users', 'userseminaryroles', 'questgroupshierarchy', 'questgroups', 'media'); + public $models = array('seminaries', 'users', 'characterroles', 'questgroupshierarchy', 'questgroups', 'media'); /** * User permissions * @@ -72,10 +72,10 @@ // Character of currently logged-in user try { $seminary['usercharacter'] = $this->Characters->getCharacterForUserAndSeminary($this->Auth->getUserId(), $seminary['id']); + $seminary['usercharacter']['characterroles'] = $this->Characterroles->getCharacterrolesForCharacterById($seminary['usercharacter']['id']); } catch(\nre\exceptions\IdNotFoundException $e) { } - $seminary['userroles'] = $this->Userseminaryroles->getUserseminaryrolesForUserById(IntermediateController::$user['id'], $seminary['id']); } @@ -115,7 +115,7 @@ foreach($hierarchy['questgroups'] as $i => &$questgroup) { // Check permission of Questgroups - if($i >= 1 && count(array_intersect(array('admin','moderator'), IntermediateController::$user['seminaryroles'])) == 0) + if($i >= 1 && count(array_intersect(array('admin','moderator'), SeminaryController::$character['characterroles'])) == 0) { if(!$this->Questgroups->hasCharacterSolvedQuestgroup($hierarchy['questgroups'][$i-1]['id'], $character['id'])) { diff --git a/controllers/SeminarybarController.inc b/controllers/SeminarybarController.inc index 88c1037e..8b1e18bc 100644 --- a/controllers/SeminarybarController.inc +++ b/controllers/SeminarybarController.inc @@ -35,15 +35,15 @@ */ public function index() { - if(is_null(SeminaryRoleController::$seminary)) { + if(is_null(SeminaryController::$seminary)) { return; } // Get Seminary - $seminary = SeminaryRoleController::$seminary; + $seminary = SeminaryController::$seminary; // Get Character - $character = SeminaryRoleController::$character; + $character = SeminaryController::$character; if(is_null($character)) { return; } diff --git a/controllers/SeminarymenuController.inc b/controllers/SeminarymenuController.inc index 8f2957d7..30311c93 100644 --- a/controllers/SeminarymenuController.inc +++ b/controllers/SeminarymenuController.inc @@ -18,7 +18,7 @@ * * @author Oliver Hanraths */ - class SeminarymenuController extends \hhu\z\controllers\SeminaryRoleController + class SeminarymenuController extends \hhu\z\controllers\SeminaryController { diff --git a/controllers/UploadsController.inc b/controllers/UploadsController.inc index f651a414..4d1da994 100644 --- a/controllers/UploadsController.inc +++ b/controllers/UploadsController.inc @@ -17,21 +17,29 @@ * * @author Oliver Hanraths */ - class UploadsController extends \hhu\z\controllers\IntermediateController + class UploadsController extends \hhu\z\controllers\SeminaryController { /** * Required models * * @var array */ - public $models = array('uploads', 'users', 'userroles', 'seminaries'); + public $models = array('uploads', 'users', 'userroles', 'characterroles', 'seminaries'); /** * User permissions * * @var array */ public $permissions = array( - 'index' => array('admin', 'moderator', 'user', 'userseminaryroles') + 'index' => array('admin', 'moderator', 'user', 'guest') + ); + /** + * User seminary permissions + * + * @var array + */ + public $seminaryPermissions = array( + 'seminary' => array('admin', 'moderator', 'user', 'guest') ); @@ -85,9 +93,9 @@ // Owner of file if($upload['created_user_id'] != $user['id']) { - // Seminary roles - $userSeminaryRoles = array_map(function($r) { return $r['name']; }, $this->Userseminaryroles->getUserseminaryrolesForUserById($user['id'], $seminary['id'])); - if(count(array_intersect(array('admin', 'moderator'), $userSeminaryRoles)) == 0) { + // Seminary permissions + $characterRoles = array_map(function($r) { return $r['name']; }, $this->Characterroles->getCharacterrolesForCharacterById($character['id'])); + if(count(array_intersect(array('admin', 'moderator'), $characterRoles)) == 0) { throw new \nre\exceptions\AccessDeniedException(); } } diff --git a/controllers/UsersController.inc b/controllers/UsersController.inc index f0888cce..70ab8904 100644 --- a/controllers/UsersController.inc +++ b/controllers/UsersController.inc @@ -36,7 +36,7 @@ * * @var array */ - public $models = array('users', 'characters', 'avatars', 'media', 'userseminaryroles'); + public $models = array('users', 'characters', 'avatars', 'media', 'characterroles'); /** * Required components * @@ -87,8 +87,8 @@ foreach($characters as &$character) { // Seminary roles - $character['user_seminaryroles'] = $this->Userseminaryroles->getUserseminaryrolesForUserById(\hhu\z\controllers\IntermediateController::$user['id'], $character['seminary_id']); - $character['user_seminaryroles'] = array_map(function($a) { return $a['name']; }, $character['user_seminaryroles']); + $character['characterroles'] = $this->Characterroles->getCharacterrolesForCharacterById($character['id']); + $character['characterroles'] = array_map(function($a) { return $a['name']; }, $character['characterroles']); // Level $character['xplevel'] = $this->Characters->getXPLevelOfCharacters($character['id']); diff --git a/models/CharacterrolesModel.inc b/models/CharacterrolesModel.inc new file mode 100644 index 00000000..013ff749 --- /dev/null +++ b/models/CharacterrolesModel.inc @@ -0,0 +1,57 @@ + + * @copyright 2014 Heinrich-Heine-Universität Düsseldorf + * @license http://www.gnu.org/licenses/gpl.html + * @link https://bitbucket.org/coderkun/the-legend-of-z + */ + + namespace hhu\z\models; + + + /** + * Model to interact with characterroles-table. + * + * @author Oliver Hanraths + */ + class CharacterrolesModel extends \hhu\z\Model + { + + + + + /** + * Construct a new CharacterrolesModel. + */ + public function __construct() + { + parent::__construct(); + } + + + + + /** + * Get all characterroles for a Character referenced by its ID. + * + * @param int $userId ID of an user + * @return array Characterroles for a Character + */ + public function getCharacterrolesForCharacterById($characterId) + { + return $this->db->query( + 'SELECT characterroles.id, characterroles.created, characterroles.name '. + 'FROM characters_characterroles '. + 'LEFT JOIN characterroles ON characterroles.id = characters_characterroles.characterrole_id '. + 'WHERE characters_characterroles.character_id = ?', + 'i', + $characterId + ); + } + + } + +?> diff --git a/models/CharactersModel.inc b/models/CharactersModel.inc index e15198ca..97e95f77 100644 --- a/models/CharactersModel.inc +++ b/models/CharactersModel.inc @@ -468,6 +468,29 @@ ); } + + /** + * Get Characters with the given Character role. + * + * @param int $seminaryId ID of Seminary + * @param string $characterrole Character role + * @return array List of users + */ + public function getCharactersWithCharacterRole($seminaryId, $characterrole) + { + return $this->db->query( + 'SELECT characters.id, characters.created, characters.charactertype_id, characters.name, characters.url, characters.user_id, characters.xps, characters.xplevel, characters.avatar_id, charactertypes.name AS charactertype_name, charactertypes.url AS charactertype_url, seminaries.id AS seminary_url, seminaries.title AS seminary_title, seminaries.url AS seminary_url '. + 'FROM v_characters AS characters '. + 'LEFT JOIN charactertypes ON charactertypes.id = characters.charactertype_id '. + 'LEFT JOIN seminaries ON seminaries.id = charactertypes.seminary_id '. + 'LEFT JOIN characters_characterroles ON characters_characterroles.character_id = characters.id '. + 'LEFT JOIN characterroles ON characterroles.id = characters_characterroles.characterrole_id '. + 'WHERE seminaries.id = ? AND characterroles.name = ?', + 'is', + $seminaryId, $characterrole + ); + } + } ?> diff --git a/models/UsersModel.inc b/models/UsersModel.inc index c773a0b5..d2a69003 100644 --- a/models/UsersModel.inc +++ b/models/UsersModel.inc @@ -70,28 +70,6 @@ } - /** - * Get users with the given user Seminary role. - * - * @param int $seminaryId ID of Seminary - * @param string $userseminaryrole User Seminary role - * @return array List of users - */ - public function getUsersWithSeminaryRole($seminaryId, $userseminaryrole) - { - return $this->db->query( - 'SELECT users.id, users.created, users.username, users.url, users.surname, users.prename, users.email '. - 'FROM users '. - 'LEFT JOIN users_userseminaryroles ON users_userseminaryroles.user_id = users.id '. - 'LEFT JOIN userseminaryroles ON userseminaryroles.id = users_userseminaryroles.userseminaryrole_id '. - 'WHERE users_userseminaryroles.seminary_id = ? AND userseminaryroles.name = ? '. - 'ORDER BY username ASC', - 'is', - $seminaryId, $userseminaryrole - ); - } - - /** * Get a user and its data by its ID. * diff --git a/models/UserseminaryrolesModel.inc b/models/UserseminaryrolesModel.inc deleted file mode 100644 index c07d4c7a..00000000 --- a/models/UserseminaryrolesModel.inc +++ /dev/null @@ -1,78 +0,0 @@ - - * @copyright 2014 Heinrich-Heine-Universität Düsseldorf - * @license http://www.gnu.org/licenses/gpl.html - * @link https://bitbucket.org/coderkun/the-legend-of-z - */ - - namespace hhu\z\models; - - - /** - * Model to interact with userseminaryroles-table. - * - * @author Oliver Hanraths - */ - class UserseminaryrolesModel extends \hhu\z\Model - { - - - - - /** - * Construct a new UserseminaryrolesModel. - */ - public function __construct() - { - parent::__construct(); - } - - - - - /** - * Get all userseminaryroles for an user referenced by its ID. - * - * @param int $userId ID of an user - * @return array Userseminaryroles for an user - */ - public function getUserseminaryrolesForUserById($userId, $seminaryId) - { - return $this->db->query( - 'SELECT userseminaryroles.id, userseminaryroles.created, userseminaryroles.name '. - 'FROM users_userseminaryroles '. - 'LEFT JOIN userseminaryroles ON userseminaryroles.id = users_userseminaryroles.userseminaryrole_id '. - 'WHERE users_userseminaryroles.user_id = ? AND users_userseminaryroles.seminary_id = ?', - 'ii', - $userId, $seminaryId - ); - } - - - /** - * Get all userseminaryroles for an user referenced by its - * URL-username. - * - * @param string $userUrl URL-Username of an user - * @return array Userseminaryroles for an user - */ - public function getUserrolesForUserByUrl($userUrl) - { - return $this->db->query( - 'SELECT userroles.id, userroles.created, userroles.name '. - 'FROM users '. - 'LEFT JOIN users_userseminaryroles ON users_userseminaryroles.user_id = users.id '. - 'LEFT JOIN userseminaryroles ON userseminaryroles.id = users_userseminaryroles.userseminaryrole_id '. - 'WHERE users.url = ?', - 's', - $userUrl - ); - } - - } - -?> diff --git a/views/html/html.tpl b/views/html/html.tpl index f60d4d71..69ab8f63 100644 --- a/views/html/html.tpl +++ b/views/html/html.tpl @@ -54,7 +54,7 @@ diff --git a/views/html/menu/index.tpl b/views/html/menu/index.tpl index dbab43c2..0e9d4aea 100644 --- a/views/html/menu/index.tpl +++ b/views/html/menu/index.tpl @@ -1,7 +1,7 @@
  • The Legend of Z
    • 0) : ?>
    • - 0) : ?> + 0) : ?>
    • diff --git a/views/html/seminaries/index.tpl b/views/html/seminaries/index.tpl index 40cdcd7c..922a6e03 100644 --- a/views/html/seminaries/index.tpl +++ b/views/html/seminaries/index.tpl @@ -12,7 +12,7 @@

    - 0) : ?> + 0) : ?> @@ -22,7 +22,7 @@

    - +

    diff --git a/views/html/seminaries/seminary.tpl b/views/html/seminaries/seminary.tpl index b28b5a14..7aa0ce44 100644 --- a/views/html/seminaries/seminary.tpl +++ b/views/html/seminaries/seminary.tpl @@ -4,11 +4,11 @@

    - 0) : ?> + 0) : ?>

    diff --git a/views/html/users/user.tpl b/views/html/users/user.tpl index b5e23aa7..4be14ae5 100644 --- a/views/html/users/user.tpl +++ b/views/html/users/user.tpl @@ -20,7 +20,7 @@

    - 0) : ?> + 0) : ?>