Commit 0c7bfd82 authored by Tino Goratsch's avatar Tino Goratsch

- reformatted code

- fixed errors in categories admin controller
parent 67457bec
......@@ -18,12 +18,13 @@ class Cache extends Core\Modules\AbstractCacheStorage
/**
* @param Core\Cache $cache
* @param Model $articlesModel
* @param Model $articlesModel
*/
public function __construct(
Core\Cache $cache,
Model $articlesModel
) {
)
{
parent::__construct($cache);
$this->articlesModel = $articlesModel;
......
......@@ -46,12 +46,12 @@ class Index extends Core\Modules\AdminController
protected $formTokenHelper;
/**
* @param \ACP3\Core\Modules\Controller\AdminContext $context
* @param \ACP3\Core\Date $date
* @param \ACP3\Modules\ACP3\Articles\Model $articlesModel
* @param \ACP3\Modules\ACP3\Articles\Cache $articlesCache
* @param \ACP3\Modules\ACP3\Articles\Validator $articlesValidator
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
* @param \ACP3\Core\Modules\Controller\AdminContext $context
* @param \ACP3\Core\Date $date
* @param \ACP3\Modules\ACP3\Articles\Model $articlesModel
* @param \ACP3\Modules\ACP3\Articles\Cache $articlesCache
* @param \ACP3\Modules\ACP3\Articles\Validator $articlesValidator
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
*/
public function __construct(
Core\Modules\Controller\AdminContext $context,
......
......@@ -34,12 +34,12 @@ class Index extends Core\Modules\FrontendController
protected $articlesCache;
/**
* @param \ACP3\Core\Modules\Controller\FrontendContext $context
* @param \ACP3\Core\Date $date
* @param \ACP3\Core\Pagination $pagination
* @param \ACP3\Core\Helpers\TableOfContents $toc
* @param \ACP3\Modules\ACP3\Articles\Model $articlesModel
* @param \ACP3\Modules\ACP3\Articles\Cache $articlesCache
* @param \ACP3\Core\Modules\Controller\FrontendContext $context
* @param \ACP3\Core\Date $date
* @param \ACP3\Core\Pagination $pagination
* @param \ACP3\Core\Helpers\TableOfContents $toc
* @param \ACP3\Modules\ACP3\Articles\Model $articlesModel
* @param \ACP3\Modules\ACP3\Articles\Cache $articlesCache
*/
public function __construct(
Core\Modules\Controller\FrontendContext $context,
......@@ -76,7 +76,8 @@ class Index extends Core\Modules\FrontendController
public function actionDetails()
{
if ($this->get('core.validator.rules.misc')->isNumber($this->request->getParameters()->get('id')) === true &&
$this->articlesModel->resultExists($this->request->getParameters()->get('id'), $this->date->getCurrentDateTime()) === true) {
$this->articlesModel->resultExists($this->request->getParameters()->get('id'), $this->date->getCurrentDateTime()) === true
) {
$article = $this->articlesCache->getCache($this->request->getParameters()->get('id'));
$this->breadcrumb->replaceAncestor($article['title'], 0, true);
......
......@@ -24,10 +24,10 @@ class Index extends Core\Modules\Controller
protected $articlesModel;
/**
* @param \ACP3\Core\Modules\Controller\Context $context
* @param \ACP3\Core\Date $date
* @param \ACP3\Modules\ACP3\Articles\Model $articlesModel
* @param \ACP3\Modules\ACP3\Articles\Cache $articlesCache
* @param \ACP3\Core\Modules\Controller\Context $context
* @param \ACP3\Core\Date $date
* @param \ACP3\Modules\ACP3\Articles\Model $articlesModel
* @param \ACP3\Modules\ACP3\Articles\Cache $articlesCache
*/
public function __construct(
Core\Modules\Controller\Context $context,
......
......@@ -21,12 +21,13 @@ class Helpers
/**
* @param Core\Helpers\Forms $formsHelper
* @param Model $articlesModel
* @param Model $articlesModel
*/
public function __construct(
Core\Helpers\Forms $formsHelper,
Model $articlesModel
) {
)
{
$this->formsHelper = $formsHelper;
$this->articlesModel = $articlesModel;
}
......@@ -35,6 +36,7 @@ class Helpers
* Gibt alle angelegten Artikel zurück
*
* @param integer $id
*
* @return array
*/
public function articlesList($id = 0)
......@@ -52,6 +54,7 @@ class Helpers
/**
* @param $id
*
* @return bool
*/
public function articleExists($id)
......
......@@ -20,8 +20,9 @@ class Model extends Core\Model
}
/**
* @param $id
* @param $id
* @param string $time
*
* @return bool
*/
public function resultExists($id, $time = '')
......@@ -32,6 +33,7 @@ class Model extends Core\Model
/**
* @param $id
*
* @return array
*/
public function getOneById($id)
......@@ -41,6 +43,7 @@ class Model extends Core\Model
/**
* @param string $time
*
* @return int
*/
public function countAll($time = '')
......@@ -52,6 +55,7 @@ class Model extends Core\Model
* @param string $time
* @param string $limitStart
* @param string $resultsPerPage
*
* @return array
*/
public function getAll($time = '', $limitStart = '', $resultsPerPage = '')
......@@ -65,6 +69,7 @@ class Model extends Core\Model
* @param string $time
* @param string $limitStart
* @param string $resultsPerPage
*
* @return array
*/
public function getLatest($time = '', $limitStart = '', $resultsPerPage = '')
......@@ -88,11 +93,12 @@ class Model extends Core\Model
* @param $searchTerm
* @param $sort
* @param $time
*
* @return array
*/
public function getAllSearchResults($fields, $searchTerm, $sort, $time)
{
$period = ' AND ' . $this->_getPeriod();
return $this->db->fetchAll('SELECT id, title, text FROM ' . $this->db->getPrefix() . static::TABLE_NAME . ' WHERE MATCH (' . $fields . ') AGAINST (' . $this->db->getConnection()->quote($searchTerm) . ' IN BOOLEAN MODE)' . $period . ' ORDER BY start ' . $sort . ', end ' . $sort . ', title ' . $sort, ['time' => $time]);
return $this->db->fetchAll('SELECT id, title, text FROM ' . $this->db->getPrefix() . static::TABLE_NAME . ' WHERE MATCH (' . $fields . ') AGAINST (' . $this->db->getConnection()->quote($searchTerm) . ' IN BOOLEAN MODE)' . $period . ' ORDER BY START ' . $sort . ', END ' . $sort . ', title ' . $sort, ['time' => $time]);
}
}
......@@ -18,7 +18,7 @@ class Index extends Core\Modules\FrontendController
/**
* @param \ACP3\Core\Modules\Controller\FrontendContext $context
* @param \ACP3\Core\SessionHandler $sessionHandler
* @param \ACP3\Core\SessionHandler $sessionHandler
*/
public function __construct(
Core\Modules\Controller\FrontendContext $context,
......
......@@ -36,7 +36,7 @@ class Helpers
/**
* @param \ACP3\Core\Auth $auth
* @param \ACP3\Core\Http\Request $request
* @param \ACP3\Core\Http\Request $request
* @param \ACP3\Core\Router $router
* @param \ACP3\Core\SessionHandler $sessionHandler
* @param \ACP3\Core\View $view
......
......@@ -16,12 +16,13 @@ class Cache extends Core\Modules\AbstractCacheStorage
/**
* @param Core\Cache $cache
* @param Model $categoriesModel
* @param Model $categoriesModel
*/
public function __construct(
Core\Cache $cache,
Model $categoriesModel
) {
)
{
parent::__construct($cache);
$this->categoriesModel = $categoriesModel;
......
......@@ -29,11 +29,11 @@ class Index extends Core\Modules\AdminController
protected $formTokenHelper;
/**
* @param \ACP3\Core\Modules\Controller\AdminContext $context
* @param \ACP3\Modules\ACP3\Categories\Model $categoriesModel
* @param \ACP3\Modules\ACP3\Categories\Cache $categoriesCache
* @param \ACP3\Modules\ACP3\Categories\Validator $categoriesValidator
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
* @param \ACP3\Core\Modules\Controller\AdminContext $context
* @param \ACP3\Modules\ACP3\Categories\Model $categoriesModel
* @param \ACP3\Modules\ACP3\Categories\Cache $categoriesCache
* @param \ACP3\Modules\ACP3\Categories\Validator $categoriesValidator
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
*/
public function __construct(
Core\Modules\Controller\AdminContext $context,
......@@ -47,7 +47,7 @@ class Index extends Core\Modules\AdminController
$this->categoriesModel = $categoriesModel;
$this->categoriesCache = $categoriesCache;
$this->categoriesValidator = $categoriesValidator;
$this->secureHelper = $formTokenHelper;
$this->formTokenHelper = $formTokenHelper;
}
public function actionCreate()
......@@ -68,7 +68,7 @@ class Index extends Core\Modules\AdminController
}
$this->view->assign('mod_list', $modules);
$this->secureHelper->generateFormToken($this->request->getQuery());
$this->formTokenHelper->generateFormToken($this->request->getQuery());
}
/**
......@@ -98,7 +98,7 @@ class Index extends Core\Modules\AdminController
$this->categoriesCache->setCache(strtolower($formData['module']));
$this->secureHelper->unsetFormToken($this->request->getQuery());
$this->formTokenHelper->unsetFormToken($this->request->getQuery());
$this->redirectMessages()->setMessage($bool, $this->lang->t('system', $bool !== false ? 'create_success' : 'create_error'));
} catch (Core\Exceptions\InvalidFormToken $e) {
......@@ -163,7 +163,7 @@ class Index extends Core\Modules\AdminController
$this->view->assign('form', array_merge($category, $this->request->getPost()->getAll()));
$this->secureHelper->generateFormToken($this->request->getQuery());
$this->formTokenHelper->generateFormToken($this->request->getQuery());
} else {
throw new Core\Exceptions\ResultNotExists();
}
......@@ -196,7 +196,7 @@ class Index extends Core\Modules\AdminController
$this->categoriesCache->setCache($this->categoriesModel->getModuleNameFromCategoryId($this->request->getParameters()->get('id')));
$this->secureHelper->unsetFormToken($this->request->getQuery());
$this->formTokenHelper->unsetFormToken($this->request->getQuery());
$this->redirectMessages()->setMessage($bool, $this->lang->t('system', $bool !== false ? 'edit_success' : 'edit_error'));
} catch (Core\Exceptions\InvalidFormToken $e) {
......@@ -239,7 +239,7 @@ class Index extends Core\Modules\AdminController
$this->view->assign('form', array_merge($settings, $this->request->getPost()->getAll()));
$this->secureHelper->generateFormToken($this->request->getQuery());
$this->formTokenHelper->generateFormToken($this->request->getQuery());
}
/**
......@@ -257,7 +257,7 @@ class Index extends Core\Modules\AdminController
];
$bool = $this->config->setSettings($data, 'categories');
$this->secureHelper->unsetFormToken($this->request->getQuery());
$this->formTokenHelper->unsetFormToken($this->request->getQuery());
$this->redirectMessages()->setMessage($bool, $this->lang->t('system', $bool === true ? 'settings_success' : 'settings_error'));
} catch (Core\Exceptions\InvalidFormToken $e) {
......
......@@ -46,7 +46,7 @@ class Helpers
* @param \ACP3\Core\ACL $acl
* @param \ACP3\Core\Lang $lang
* @param \ACP3\Core\Modules $modules
* @param \ACP3\Core\Http\RequestInterface $request
* @param \ACP3\Core\Http\RequestInterface $request
* @param \ACP3\Core\View $view
* @param \ACP3\Core\Helpers\Forms $formsHelper
* @param \ACP3\Modules\ACP3\Categories\Cache $categoriesCache
......
......@@ -26,7 +26,7 @@ class Installer extends Modules\AbstractInstaller
`description` VARCHAR(120) NOT NULL,
`module_id` INT(10) UNSIGNED NOT NULL,
PRIMARY KEY (`id`)
) {engine} {charset};"
) {ENGINE} {CHARSET};"
];
}
......@@ -57,7 +57,7 @@ class Installer extends Modules\AbstractInstaller
{
return [
31 => [
"ALTER TABLE `{pre}categories` CHANGE `name` `title` VARCHAR(120) {charset} NOT NULL;",
"ALTER TABLE `{pre}categories` CHANGE `name` `title` VARCHAR(120) {CHARSET} NOT NULL;",
],
32 => [
"DELETE FROM `{pre}acl_resources` WHERE `module_id` = " . $this->getModuleId() . " AND `page` = \"functions\";",
......
......@@ -14,6 +14,7 @@ class Model extends Core\Model
/**
* @param $id
*
* @return bool
*/
public function resultExists($id)
......@@ -25,6 +26,7 @@ class Model extends Core\Model
* @param $title
* @param $module
* @param $categoryId
*
* @return bool
*/
public function resultIsDuplicate($title, $module, $categoryId)
......@@ -34,6 +36,7 @@ class Model extends Core\Model
/**
* @param $id
*
* @return array
*/
public function getOneById($id)
......@@ -43,6 +46,7 @@ class Model extends Core\Model
/**
* @param $id
*
* @return mixed
*/
public function getTitleById($id)
......@@ -52,6 +56,7 @@ class Model extends Core\Model
/**
* @param $moduleName
*
* @return array
*/
public function getAllByModuleName($moduleName)
......@@ -69,6 +74,7 @@ class Model extends Core\Model
/**
* @param $categoryId
*
* @return mixed
*/
public function getModuleNameFromCategoryId($categoryId)
......@@ -78,6 +84,7 @@ class Model extends Core\Model
/**
* @param $id
*
* @return array
*/
public function getCategoryDeleteInfosById($id)
......
......@@ -23,11 +23,11 @@ class Validator extends Core\Validator\AbstractValidator
protected $categoriesHelpers;
/**
* @param Core\Lang $lang
* @param Core\Lang $lang
* @param Core\Validator\Rules\Misc $validate
* @param Core\Validator\Rules\Mime $mimeValidator
* @param Helpers $categoriesHelpers
* @param Model $categoriesModel
* @param Helpers $categoriesHelpers
* @param Model $categoriesModel
*/
public function __construct(
Core\Lang $lang,
......@@ -35,7 +35,8 @@ class Validator extends Core\Validator\AbstractValidator
Core\Validator\Rules\Mime $mimeValidator,
Helpers $categoriesHelpers,
Model $categoriesModel
) {
)
{
parent::__construct($lang, $validate);
$this->mimeValidator = $mimeValidator;
......@@ -44,10 +45,11 @@ class Validator extends Core\Validator\AbstractValidator
}
/**
* @param array $formData
* @param $file
* @param array $settings
* @param array $formData
* @param $file
* @param array $settings
* @param string $categoryId
*
* @throws Core\Exceptions\InvalidFormToken
* @throws Core\Exceptions\ValidationFailed
*/
......@@ -82,6 +84,7 @@ class Validator extends Core\Validator\AbstractValidator
/**
* @param array $formData
*
* @throws Core\Exceptions\InvalidFormToken
* @throws Core\Exceptions\ValidationFailed
*/
......
......@@ -35,11 +35,11 @@ class Details extends Core\Modules\AdminController
protected $emoticonsHelpers;
/**
* @param \ACP3\Core\Modules\Controller\AdminContext $context
* @param \ACP3\Modules\ACP3\Comments\Model $commentsModel
* @param \ACP3\Modules\ACP3\Comments\Validator $commentsValidator
* @param \ACP3\Modules\ACP3\System\Model $systemModel
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
* @param \ACP3\Core\Modules\Controller\AdminContext $context
* @param \ACP3\Modules\ACP3\Comments\Model $commentsModel
* @param \ACP3\Modules\ACP3\Comments\Validator $commentsValidator
* @param \ACP3\Modules\ACP3\System\Model $systemModel
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
*/
public function __construct(
Core\Modules\Controller\AdminContext $context,
......
......@@ -29,11 +29,11 @@ class Index extends Core\Modules\AdminController
protected $formTokenHelper;
/**
* @param \ACP3\Core\Modules\Controller\AdminContext $context
* @param \ACP3\Core\Date $date
* @param \ACP3\Modules\ACP3\Comments\Model $commentsModel
* @param \ACP3\Modules\ACP3\Comments\Validator $commentsValidator
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
* @param \ACP3\Core\Modules\Controller\AdminContext $context
* @param \ACP3\Core\Date $date
* @param \ACP3\Modules\ACP3\Comments\Model $commentsModel
* @param \ACP3\Modules\ACP3\Comments\Validator $commentsValidator
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
*/
public function __construct(
Core\Modules\Controller\AdminContext $context,
......
......@@ -60,12 +60,12 @@ class Index extends Core\Modules\FrontendController
protected $commentsSettings;
/**
* @param \ACP3\Core\Modules\Controller\FrontendContext $context
* @param \ACP3\Core\Date $date
* @param \ACP3\Core\Pagination $pagination
* @param \ACP3\Modules\ACP3\Comments\Model $commentsModel
* @param \ACP3\Modules\ACP3\Comments\Validator $commentsValidator
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
* @param \ACP3\Core\Modules\Controller\FrontendContext $context
* @param \ACP3\Core\Date $date
* @param \ACP3\Core\Pagination $pagination
* @param \ACP3\Modules\ACP3\Comments\Model $commentsModel
* @param \ACP3\Modules\ACP3\Comments\Validator $commentsValidator
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
*/
public function __construct(
Core\Modules\Controller\FrontendContext $context,
......
......@@ -19,7 +19,7 @@ class Helpers
protected $commentsModel;
/**
* @param \ACP3\Core\Modules $modules
* @param \ACP3\Core\Modules $modules
* @param \ACP3\Modules\ACP3\Comments\Model $commentsModel
*/
public function __construct(
......
......@@ -29,7 +29,7 @@ class Installer extends Modules\AbstractInstaller
`module_id` INT(10) UNSIGNED NOT NULL,
`entry_id` INT(10) UNSIGNED NOT NULL,
PRIMARY KEY (`id`), INDEX (`module_id`, `entry_id`)
) {engine} {charset};"
) {ENGINE} {CHARSET};"
];
}
......
......@@ -35,14 +35,14 @@ class Validator extends Core\Validator\AbstractValidator
protected $commentsModel;
/**
* @param Core\Lang $lang
* @param Core\Validator\Rules\Misc $validate
* @param Core\Lang $lang
* @param Core\Validator\Rules\Misc $validate
* @param Core\Validator\Rules\Captcha $captchaValidator
* @param Core\ACL $acl
* @param Core\Auth $auth
* @param Core\Date $date
* @param Core\Modules $modules
* @param Model $commentsModel
* @param Core\ACL $acl
* @param Core\Auth $auth
* @param Core\Date $date
* @param Core\Modules $modules
* @param Model $commentsModel
*/
public function __construct(
Core\Lang $lang,
......@@ -53,7 +53,8 @@ class Validator extends Core\Validator\AbstractValidator
Core\Date $date,
Core\Modules $modules,
Model $commentsModel
) {
)
{
parent::__construct($lang, $validate);
$this->captchaValidator = $captchaValidator;
......@@ -66,7 +67,8 @@ class Validator extends Core\Validator\AbstractValidator
/**
* @param array $formData
* @param $ip
* @param $ip
*
* @throws Core\Exceptions\InvalidFormToken
* @throws Core\Exceptions\ValidationFailed
*/
......@@ -91,7 +93,8 @@ class Validator extends Core\Validator\AbstractValidator
}
if ($this->acl->hasPermission('frontend/captcha/index/image') === true &&
$this->auth->isUser() === false &&
$this->captchaValidator->captcha($formData['captcha']) === false) {
$this->captchaValidator->captcha($formData['captcha']) === false
) {
$this->errors['captcha'] = $this->lang->t('captcha', 'invalid_captcha_entered');
}
......@@ -100,6 +103,7 @@ class Validator extends Core\Validator\AbstractValidator
/**
* @param array $formData
*
* @throws Core\Exceptions\InvalidFormToken
* @throws Core\Exceptions\ValidationFailed
*/
......@@ -120,6 +124,7 @@ class Validator extends Core\Validator\AbstractValidator
/**
* @param array $formData
*
* @throws Core\Exceptions\InvalidFormToken
* @throws Core\Exceptions\ValidationFailed
*/
......
......@@ -21,9 +21,9 @@ class Index extends Core\Modules\AdminController
protected $contactValidator;
/**
* @param \ACP3\Core\Modules\Controller\AdminContext $context
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
* @param \ACP3\Modules\ACP3\Contact\Validator $contactValidator
* @param \ACP3\Core\Modules\Controller\AdminContext $context
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
* @param \ACP3\Modules\ACP3\Contact\Validator $contactValidator
*/
public function __construct(
Core\Modules\Controller\AdminContext $context,
......
......@@ -31,10 +31,10 @@ class Index extends Core\Modules\FrontendController
protected $captchaHelpers;
/**
* @param \ACP3\Core\Modules\Controller\FrontendContext $context
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
* @param \ACP3\Core\Helpers\SendEmail $sendEmailHelper
* @param \ACP3\Modules\ACP3\Contact\Validator $contactValidator
* @param \ACP3\Core\Modules\Controller\FrontendContext $context
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
* @param \ACP3\Core\Helpers\SendEmail $sendEmailHelper
* @param \ACP3\Modules\ACP3\Contact\Validator $contactValidator
*/
public function __construct(
Core\Modules\Controller\FrontendContext $context,
......
......@@ -24,11 +24,11 @@ class Validator extends Core\Validator\AbstractValidator
protected $acl;
/**
* @param Core\Lang $lang
* @param Core\Validator\Rules\Misc $validate
* @param Core\Lang $lang
* @param Core\Validator\Rules\Misc $validate
* @param Core\Validator\Rules\Captcha $captchaValidator
* @param Core\ACL $acl
* @param Core\Auth $auth
* @param Core\ACL $acl
* @param Core\Auth $auth
*/
public function __construct(
Core\Lang $lang,
......@@ -36,7 +36,8 @@ class Validator extends Core\Validator\AbstractValidator
Core\Validator\Rules\Captcha $captchaValidator,
Core\ACL $acl,
Core\Auth $auth
) {
)
{
parent::__construct($lang, $validate);
$this->captchaValidator = $captchaValidator;
......@@ -46,6 +47,7 @@ class Validator extends Core\Validator\AbstractValidator
/**
* @param array $formData
*
* @throws Core\Exceptions\InvalidFormToken
* @throws Core\Exceptions\ValidationFailed
*/
......@@ -74,6 +76,7 @@ class Validator extends Core\Validator\AbstractValidator
/**
* @param array $formData
*
* @throws Core\Exceptions\InvalidFormToken
* @throws Core\Exceptions\ValidationFailed
*/
......
......@@ -17,12 +17,13 @@ class Cache extends Core\Modules\AbstractCacheStorage
/**
* @param Core\Cache $cache
* @param Model $emoticonsModel
* @param Model $emoticonsModel
*/
public function __construct(
Core\Cache $cache,
Model $emoticonsModel
) {
)
{
parent::__construct($cache);
$this->emoticonsModel = $emoticonsModel;
......
......@@ -29,11 +29,11 @@ class Index extends Core\Modules\AdminController
protected $emoticonsCache;
/**
* @param \ACP3\Core\Modules\Controller\AdminContext $context
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
* @param \ACP3\Modules\ACP3\Emoticons\Model $emoticonsModel
* @param \ACP3\Modules\ACP3\Emoticons\Validator $emoticonsValidator
* @param \ACP3\Modules\ACP3\Emoticons\Cache $emoticonsCache
* @param \ACP3\Core\Modules\Controller\AdminContext $context
* @param \ACP3\Core\Helpers\FormToken $formTokenHelper
* @param \ACP3\Modules\ACP3\Emoticons\Model $emoticonsModel
* @param \ACP3\Modules\ACP3\Emoticons\Validator $emoticonsValidator
* @param \ACP3\Modules\ACP3\Emoticons\Cache $emoticonsCache
*/
public function __construct(
Core\Modules\Controller\AdminContext $context,
......
......@@ -25,7 +25,7 @@ class Installer extends Modules\AbstractInstaller
`description` VARCHAR(15) NOT NULL,
`img` VARCHAR(40) NOT NULL,
PRIMARY KEY (`id`)
) {engine} {charset};",
) {ENGINE} {CHARSET};",
// Default Smilies
"INSERT INTO `{pre}emoticons` VALUES ('', ':D', 'Very Happy', '1.gif');",
"INSERT INTO `{pre}emoticons` VALUES ('', ':)', 'Smile', '2.gif');",
......
......@@ -14,6 +14,7 @@ class Model extends Core\Model
/**
* @param $id
*
* @return bool
*/
public function resultExists($id)
......@@ -23,6 +24,7 @@ class Model extends Core\Model
/**
* @param $moduleId
*
* @return bool
*/
public function resultsExist($moduleId)
......@@ -32,6 +34,7 @@ class Model extends Core\Model
/**
* @param $id
*
* @return array
*/