From 3e0e722445292dbf20b4e8c96c57eba4421c3527 Mon Sep 17 00:00:00 2001 From: Jelle Kok Date: Thu, 28 Feb 2019 19:24:00 +0100 Subject: [PATCH] Codestyle --- .../com_kunena/controllers/users.php | 36 ++++++++-------- .../components/com_kunena/install/model.php | 43 +++++++++---------- .../plg_kunena_altauserpoints/avatar.php | 1 - .../plg_kunena_comprofiler/profile.php | 2 +- .../plg_kunena_easysocial/activity.php | 2 +- .../plugins/plg_kunena_joomla/access.php | 6 +-- .../plugins/plg_kunena_joomla/login.php | 2 +- .../language/all/install.script.php | 1 - .../com_kunena/models/categories.php | 2 +- .../components/com_kunena/models/user.php | 2 +- .../com_kunena/template/j3/logs/clean.php | 1 - .../template/j3/plugins/default.php | 2 +- .../com_kunena/template/j3/ranks/default.php | 1 - .../template/j3/smilies/default.php | 1 - .../com_kunena/template/j3/templates/add.php | 1 - .../template/j3/templates/choosecss.php | 1 - .../template/j3/templates/editcss.php | 1 - .../template/j3/templates/editless.php | 1 - .../com_kunena/template/j3/trash/messages.php | 1 - .../com_kunena/template/j3/trash/purge.php | 1 - .../com_kunena/template/j3/trash/topics.php | 1 - .../com_kunena/template/j3/user/edit.php | 1 - .../com_kunena/template/j3/user/move.php | 1 - .../template/j4/attachments/default.php | 1 - .../template/j4/categories/default.php | 1 - .../com_kunena/template/j4/logs/clean.php | 1 - .../template/j4/plugins/default.php | 2 +- .../com_kunena/template/j4/templates/add.php | 1 - .../template/j4/templates/editcss.php | 1 - .../template/j4/templates/editless.php | 1 - .../template/j4/tools/cleanupip.php | 1 - .../template/j4/tools/diagnostics.php | 1 - .../com_kunena/template/j4/tools/menu.php | 1 - .../com_kunena/template/j4/tools/prune.php | 1 - .../template/j4/tools/purgerestatements.php | 1 - .../com_kunena/template/j4/tools/report.php | 1 - .../template/j4/tools/syncusers.php | 1 - .../template/j4/tools/uninstall.php | 1 - .../com_kunena/template/j4/trash/messages.php | 1 - .../com_kunena/template/j4/trash/purge.php | 1 - .../com_kunena/template/j4/trash/topics.php | 1 - .../com_kunena/template/j4/user/move.php | 1 - .../controller/category/index/display.php | 2 +- .../category/subscriptions/display.php | 6 +-- .../com_kunena/controller/credits/display.php | 10 ++--- .../message/item/actions/display.php | 2 +- .../controller/topic/form/create/display.php | 2 +- .../controller/topic/form/reply/display.php | 2 +- .../controller/topic/item/actions/display.php | 2 +- .../controller/topic/item/display.php | 1 + .../controller/widget/login/display.php | 6 +-- .../com_kunena/controllers/category.php | 4 +- .../com_kunena/controllers/misc.php | 1 - .../com_kunena/controllers/topics.php | 2 +- .../com_kunena/controllers/user.php | 18 ++++---- .../com_kunena/layout/category/item.php | 20 ++++----- .../com_kunena/layout/topic/edit/editor.php | 2 +- .../com_kunena/layout/topic/moderate.php | 2 +- .../com_kunena/layout/widget/editor.php | 1 - src/components/com_kunena/models/category.php | 10 ++--- src/components/com_kunena/models/search.php | 2 +- src/components/com_kunena/models/topics.php | 4 +- .../crypsis/layouts/attachment/item/audio.php | 1 - .../layouts/attachment/item/default.php | 1 - .../layouts/attachment/item/general.php | 1 - .../crypsis/layouts/attachment/item/image.php | 1 - .../layouts/attachment/item/thumbnail.php | 1 - .../crypsis/layouts/attachment/item/video.php | 1 - .../layouts/bbcode/confidential/default.php | 1 + .../crypsis/layouts/bbcode/ebay/default.php | 1 + .../crypsis/layouts/bbcode/hide/default.php | 1 + .../layouts/bbcode/spoiler/default.php | 1 + .../crypsis/layouts/category/list/default.php | 1 + .../layouts/category/list/row/default.php | 1 + .../layouts/category/manage/default.php | 1 + .../layouts/category/moderators/default.php | 1 + .../crypsis/layouts/credits/default.php | 1 + .../crypsis/layouts/message/edit/full.php | 3 +- .../layouts/message/edit/quickreply.php | 3 +- .../layouts/message/item/actions/default.php | 1 + .../layouts/message/item/bottom/default.php | 2 +- .../crypsis/layouts/message/item/default.php | 2 +- .../layouts/message/item/top/default.php | 3 +- .../crypsis/layouts/message/row/default.php | 1 + .../crypsis/layouts/page/unauthorized.php | 1 - .../crypsis/layouts/search/form/default.php | 1 + .../layouts/search/results/default.php | 1 + .../layouts/search/results/row/default.php | 1 + .../layouts/statistics/general/default.php | 1 + .../topic/edit/attachments/default.php | 1 + .../crypsis/layouts/topic/edit/default.php | 1 - .../layouts/topic/edit/history/default.php | 1 + .../layouts/topic/item/actions/default.php | 1 + .../topic/item/message/actions/default.php | 1 + .../layouts/topic/item/rating/default.php | 1 + .../layouts/topic/moderate/default.php | 1 + .../layouts/topic/poll/vote/default.php | 1 + .../crypsis/layouts/topic/report/default.php | 1 + .../crypsis/layouts/topic/row/category.php | 1 + .../crypsis/layouts/topic/row/default.php | 1 + .../crypsis/layouts/topic/row/user.php | 1 + .../layouts/user/attachments/default.php | 1 + .../crypsis/layouts/user/ban/form/default.php | 1 + .../layouts/user/ban/history/default.php | 2 +- .../layouts/user/ban/manager/default.php | 2 +- .../crypsis/layouts/user/edit/default.php | 1 + .../layouts/user/edit/profile/default.php | 2 +- .../layouts/user/edit/settings/default.php | 1 + .../layouts/user/edit/user/default.php | 1 + .../crypsis/layouts/user/item/default.php | 1 + .../layouts/user/item/status/default.php | 1 + .../crypsis/layouts/user/list/default.php | 2 +- .../crypsis/layouts/user/profile/default.php | 1 + .../layouts/user/profile/horizontal.php | 1 + .../widget/announcement/button/default.php | 1 + .../layouts/widget/announcement/default.php | 1 + .../crypsis/layouts/widget/button/default.php | 1 + .../crypsis/layouts/widget/editor/bbcode.php | 1 + .../crypsis/layouts/widget/editor/wysibb.php | 1 + .../layouts/widget/editor/wysibb_quick.php | 1 + .../crypsis/layouts/widget/error/default.php | 1 + .../crypsis/layouts/widget/footer/default.php | 1 + .../crypsis/layouts/widget/modal/default.php | 1 + .../widget/pagination/item/default.php | 1 + .../crypsis/layouts/widget/rating/default.php | 4 +- .../crypsis/layouts/widget/search/topic.php | 1 + .../crypsis/layouts/widget/search/user.php | 1 + .../layouts/widget/statistics/default.php | 1 + .../layouts/widget/whoisonline/avatar.php | 1 + .../layouts/widget/whoisonline/both.php | 1 + .../layouts/widget/whoisonline/default.php | 1 + .../layouts/widget/whoisonline/name.php | 1 + .../pages/category/default/default.php | 1 - .../crypsis/pages/topic/create/default.php | 1 - .../crypsis/pages/topic/default/default.php | 1 - .../crypsis/pages/topic/edit/default.php | 1 - .../crypsis/pages/topic/moderate/default.php | 1 - .../crypsis/pages/topic/poll/default.php | 1 - .../crypsis/pages/topic/reply/default.php | 1 - .../crypsis/pages/topic/report/default.php | 1 - .../crypsis/pages/topic/vote/default.php | 1 - .../layouts/attachment/item/audio.php | 1 - .../layouts/attachment/item/default.php | 1 - .../layouts/attachment/item/general.php | 1 - .../layouts/attachment/item/image.php | 1 - .../layouts/attachment/item/thumbnail.php | 1 - .../layouts/attachment/item/video.php | 1 - .../crypsisb3/layouts/message/edit/full.php | 2 +- .../layouts/message/edit/quickreply.php | 4 +- .../layouts/message/item/bottom/default.php | 1 - .../layouts/message/item/default.php | 3 +- .../layouts/message/item/top/default.php | 3 +- .../crypsisb3/layouts/page/unauthorized.php | 1 - .../layouts/search/results/row/default.php | 1 - .../topic/item/message/actions/default.php | 1 - .../layouts/topic/item/rating/default.php | 1 + .../crypsisb3/layouts/topic/row/category.php | 1 - .../crypsisb3/layouts/topic/row/default.php | 1 - .../crypsisb3/layouts/topic/row/user.php | 1 - .../layouts/user/ban/history/default.php | 1 - .../layouts/user/ban/manager/default.php | 1 - .../layouts/user/edit/profile/default.php | 1 - .../layouts/user/item/summary/default.php | 1 - .../layouts/user/profile/default.php | 1 - .../layouts/user/profile/horizontal.php | 1 - .../layouts/widget/rating/default.php | 4 +- .../pages/category/default/default.php | 1 - .../crypsisb3/pages/topic/create/default.php | 1 - .../crypsisb3/pages/topic/default/default.php | 1 - .../crypsisb3/pages/topic/edit/default.php | 1 - .../pages/topic/moderate/default.php | 1 - .../crypsisb3/pages/topic/poll/default.php | 1 - .../crypsisb3/pages/topic/reply/default.php | 1 - .../crypsisb3/pages/topic/report/default.php | 1 - .../crypsisb3/pages/topic/vote/default.php | 1 - .../system/layouts/attachment/item/audio.php | 1 - .../layouts/attachment/item/default.php | 1 - .../layouts/attachment/item/general.php | 1 - .../system/layouts/attachment/item/image.php | 1 - .../layouts/attachment/item/textlink.php | 1 - .../layouts/attachment/item/thumbnail.php | 1 - .../system/layouts/attachment/item/video.php | 1 - .../layouts/bbcode/attachment/audio.php | 1 - .../layouts/bbcode/attachment/default.php | 1 - .../layouts/bbcode/attachment/deleted.php | 1 - .../system/layouts/bbcode/attachment/file.php | 1 - .../layouts/bbcode/attachment/image.php | 1 - .../system/layouts/bbcode/attachment/pdf.php | 1 - .../bbcode/attachment/unauthorised.php | 2 - .../layouts/bbcode/attachment/video.php | 1 - .../system/layouts/bbcode/twitter/default.php | 1 - .../com_kunena/views/topic/view.html.php | 2 +- .../com_kunena/views/topic/view.raw.php | 1 - src/libraries/kunena/access.php | 2 +- src/libraries/kunena/date.php | 2 +- src/libraries/kunena/image/image.php | 2 +- src/libraries/kunena/log/log.php | 8 ++-- src/libraries/kunena/login.php | 4 +- src/libraries/kunena/table/object.php | 1 - src/libraries/kunena/template/template.php | 2 +- src/libraries/kunena/upload/upload.php | 2 +- 201 files changed, 182 insertions(+), 230 deletions(-) diff --git a/src/administrator/components/com_kunena/controllers/users.php b/src/administrator/components/com_kunena/controllers/users.php index 574f98d753..c93f7fbf96 100644 --- a/src/administrator/components/com_kunena/controllers/users.php +++ b/src/administrator/components/com_kunena/controllers/users.php @@ -679,42 +679,42 @@ public function moderate() { $this->app->enqueueMessage(Text::_('COM_KUNENA_ERROR_TOKEN'), 'error'); $this->setRedirect(KunenaRoute::_($this->baseurl, false)); - + return; } - + $modCatids = $this->app->input->get('catid', array(), 'post', 'array'); $modCatids = ArrayHelper::toInteger($modCatids); - + $cid = $this->app->input->get('cid', array(), 'post', 'array'); $cid = ArrayHelper::toInteger($cid); $userid = array_shift($cid); - + if ($userid <= 0) { $this->app->enqueueMessage(Text::_('COM_KUNENA_PROFILE_NO_USER'), 'error'); $this->setRedirect(KunenaRoute::_($this->baseurl, false)); - + return; } - + if ($userid <= 0) { $this->app->enqueueMessage(Text::_('COM_KUNENA_PROFILE_NO_USER'), 'error'); $this->setRedirect(KunenaRoute::_($this->baseurl, false)); - + return; } - + $user = KunenaUserHelper::get($userid); - - $this->setModerate($user, $modCatids); - + + $this->setModerate($user, $modCatids); + $this->app->enqueueMessage(Text::_('COM_KUNENA_USER_MODERATE_DONE')); - + $this->setRedirect(KunenaRoute::_($this->baseurl, false)); } - + /** * Unmoderate * @@ -1178,7 +1178,7 @@ protected function cleanSocial(&$user, $app) $user->youtube = str_replace(' ', '', trim($app->input->getString('youtube', ''))); $user->ok = str_replace(' ', '', trim($app->input->getString('ok', ''))); } - + /** * Set moderator rights on the user given * @@ -1191,18 +1191,18 @@ protected function setModerate(KunenaUser $user, $modCatids) { // Update moderator rights $categories = KunenaForumCategoryHelper::getCategories(false, false, 'admin'); - + foreach ($categories as $category) { $category->setModerator($user, in_array($category->id, $modCatids)); } - + // Global moderator is a special case if ($this->me->isAdmin()) { - KunenaAccess::getInstance()->setModerator(0, $user, in_array(0, $modCatids)); + KunenaAccess::getInstance()->setModerator(0, $user, in_array(0, $modCatids)); } - + return true; } } diff --git a/src/administrator/components/com_kunena/install/model.php b/src/administrator/components/com_kunena/install/model.php index 86d7a8217e..17a40c6e8f 100644 --- a/src/administrator/components/com_kunena/install/model.php +++ b/src/administrator/components/com_kunena/install/model.php @@ -26,7 +26,6 @@ define('KUNENA_INSTALLER_SITEPATH', JPATH_SITE . '/components/' . basename(KUNENA_INSTALLER_ADMINPATH)); define('KUNENA_INSTALLER_MEDIAPATH', JPATH_SITE . '/media/kunena'); - /** * Install Model for Kunena * @@ -120,27 +119,27 @@ public function __construct() // TODO: move to migration $this->_kVersions = array( - array('component' => null, 'prefix' => null, 'version' => null, 'date' => null),); + array('component' => null, 'prefix' => null, 'version' => null, 'date' => null), ); // TODO: move to migration $this->_fbVersions = array( array('component' => 'FireBoard', 'prefix' => 'fb_', 'version' => '1.0.4', 'date' => '2007-12-23', - 'table' => 'fb_sessions', 'column' => 'currvisit',), + 'table' => 'fb_sessions', 'column' => 'currvisit', ), array('component' => 'FireBoard', 'prefix' => 'fb_', 'version' => '1.0.3', 'date' => '2007-09-04', - 'table' => 'fb_categories', 'column' => 'headerdesc',), + 'table' => 'fb_categories', 'column' => 'headerdesc', ), array('component' => 'FireBoard', 'prefix' => 'fb_', 'version' => '1.0.2', 'date' => '2007-08-03', - 'table' => 'fb_users', 'column' => 'rank',), + 'table' => 'fb_users', 'column' => 'rank', ), array('component' => 'FireBoard', 'prefix' => 'fb_', 'version' => '1.0.1', 'date' => '2007-05-20', - 'table' => 'fb_users', 'column' => 'uhits',), + 'table' => 'fb_users', 'column' => 'uhits', ), array('component' => 'FireBoard', 'prefix' => 'fb_', 'version' => '1.0.0', 'date' => '2007-04-15', - 'table' => 'fb_messages',), - array('component' => null, 'prefix' => null, 'version' => null, 'date' => null),); + 'table' => 'fb_messages', ), + array('component' => null, 'prefix' => null, 'version' => null, 'date' => null), ); // TODO: move to migration $this->_sbVersions = array( array('component' => 'JoomlaBoard', 'prefix' => 'sb_', 'version' => 'v1.0.5', 'date' => '1000-01-01', - 'table' => 'sb_messages',), - array('component' => null, 'prefix' => null, 'version' => null, 'date' => null),); + 'table' => 'sb_messages', ), + array('component' => null, 'prefix' => null, 'version' => null, 'date' => null), ); $this->steps = array( array('step' => '', 'menu' => Text::_('COM_KUNENA_INSTALL_STEP_INSTALL')), @@ -148,7 +147,7 @@ public function __construct() array('step' => 'Plugins', 'menu' => Text::_('COM_KUNENA_INSTALL_STEP_PLUGINS')), array('step' => 'Database', 'menu' => Text::_('COM_KUNENA_INSTALL_STEP_DATABASE')), array('step' => 'Finish', 'menu' => Text::_('COM_KUNENA_INSTALL_STEP_FINISH')), - array('step' => '', 'menu' => Text::_('COM_KUNENA_INSTALL_STEP_COMPLETE')),); + array('step' => '', 'menu' => Text::_('COM_KUNENA_INSTALL_STEP_COMPLETE')), ); } /** @@ -2984,26 +2983,26 @@ public function deleteTables($prefix) public function createMenu() { $menu = array('name' => Text::_('COM_KUNENA_MENU_ITEM_FORUM'), 'alias' => KunenaRoute::stringURLSafe(Text::_('COM_KUNENA_MENU_FORUM_ALIAS'), 'forum'), - 'link' => 'index.php?option=com_kunena&view=home', 'access' => 1, 'params' => array('catids' => 0),); + 'link' => 'index.php?option=com_kunena&view=home', 'access' => 1, 'params' => array('catids' => 0), ); $submenu = array( 'index' => array('name' => Text::_('COM_KUNENA_MENU_ITEM_INDEX'), 'alias' => KunenaRoute::stringURLSafe(Text::_('COM_KUNENA_MENU_INDEX_ALIAS'), 'index'), - 'link' => 'index.php?option=com_kunena&view=category&layout=list', 'access' => 1, 'default' => 'categories', 'params' => array(),), + 'link' => 'index.php?option=com_kunena&view=category&layout=list', 'access' => 1, 'default' => 'categories', 'params' => array(), ), 'recent' => array('name' => Text::_('COM_KUNENA_MENU_ITEM_RECENT'), 'alias' => KunenaRoute::stringURLSafe(Text::_('COM_KUNENA_MENU_RECENT_ALIAS'), 'recent'), - 'link' => 'index.php?option=com_kunena&view=topics&mode=replies', 'access' => 1, 'default' => 'recent', 'params' => array('topics_catselection' => '', 'topics_categories' => '', 'topics_time' => ''),), + 'link' => 'index.php?option=com_kunena&view=topics&mode=replies', 'access' => 1, 'default' => 'recent', 'params' => array('topics_catselection' => '', 'topics_categories' => '', 'topics_time' => ''), ), 'unread' => array('name' => Text::_('COM_KUNENA_MENU_ITEM_UNREAD'), 'alias' => KunenaRoute::stringURLSafe(Text::_('COM_KUNENA_MENU_UNREAD_ALIAS'), 'unread'), - 'link' => 'index.php?option=com_kunena&view=topics&layout=unread', 'access' => 2, 'params' => array(),), + 'link' => 'index.php?option=com_kunena&view=topics&layout=unread', 'access' => 2, 'params' => array(), ), 'newtopic' => array('name' => Text::_('COM_KUNENA_MENU_ITEM_NEWTOPIC'), 'alias' => KunenaRoute::stringURLSafe(Text::_('COM_KUNENA_MENU_NEWTOPIC_ALIAS'), 'newtopic'), - 'link' => 'index.php?option=com_kunena&view=topic&layout=create', 'access' => 2, 'params' => array(),), + 'link' => 'index.php?option=com_kunena&view=topic&layout=create', 'access' => 2, 'params' => array(), ), 'noreplies' => array('name' => Text::_('COM_KUNENA_MENU_ITEM_NOREPLIES'), 'alias' => KunenaRoute::stringURLSafe(Text::_('COM_KUNENA_MENU_NOREPLIES_ALIAS'), 'noreplies'), - 'link' => 'index.php?option=com_kunena&view=topics&mode=noreplies', 'access' => 2, 'params' => array('topics_catselection' => '', 'topics_categories' => '', 'topics_time' => ''),), + 'link' => 'index.php?option=com_kunena&view=topics&mode=noreplies', 'access' => 2, 'params' => array('topics_catselection' => '', 'topics_categories' => '', 'topics_time' => ''), ), 'mylatest' => array('name' => Text::_('COM_KUNENA_MENU_ITEM_MYLATEST'), 'alias' => KunenaRoute::stringURLSafe(Text::_('COM_KUNENA_MENU_MYLATEST_ALIAS'), 'mylatest'), - 'link' => 'index.php?option=com_kunena&view=topics&layout=user&mode=default', 'access' => 2, 'default' => 'my', 'params' => array('topics_catselection' => '2', 'topics_categories' => '0', 'topics_time' => ''),), + 'link' => 'index.php?option=com_kunena&view=topics&layout=user&mode=default', 'access' => 2, 'default' => 'my', 'params' => array('topics_catselection' => '2', 'topics_categories' => '0', 'topics_time' => ''), ), 'profile' => array('name' => Text::_('COM_KUNENA_MENU_ITEM_PROFILE'), 'alias' => KunenaRoute::stringURLSafe(Text::_('COM_KUNENA_MENU_PROFILE_ALIAS'), 'profile'), - 'link' => 'index.php?option=com_kunena&view=user', 'access' => 2, 'params' => array('integration' => 1),), + 'link' => 'index.php?option=com_kunena&view=user', 'access' => 2, 'params' => array('integration' => 1), ), 'help' => array('name' => Text::_('COM_KUNENA_MENU_ITEM_HELP'), 'alias' => KunenaRoute::stringURLSafe(Text::_('COM_KUNENA_MENU_HELP_ALIAS'), 'help'), - 'link' => 'index.php?option=com_kunena&view=misc', 'access' => 3, 'params' => array('body' => Text::_('COM_KUNENA_MENU_HELP_BODY'), 'body_format' => 'bbcode'),), + 'link' => 'index.php?option=com_kunena&view=misc', 'access' => 3, 'params' => array('body' => Text::_('COM_KUNENA_MENU_HELP_BODY'), 'body_format' => 'bbcode'), ), 'search' => array('name' => Text::_('COM_KUNENA_MENU_ITEM_SEARCH'), 'alias' => KunenaRoute::stringURLSafe(Text::_('COM_KUNENA_MENU_SEARCH_ALIAS'), 'search'), - 'link' => 'index.php?option=com_kunena&view=search', 'access' => 1, 'params' => array(),), + 'link' => 'index.php?option=com_kunena&view=search', 'access' => 1, 'params' => array(), ), ); // Disable language debugging while creating menu items. @@ -3078,7 +3077,7 @@ public function createMenuJ25($menu, $submenu) 'menu-meta_description' => '', 'menu-meta_keywords' => '', 'robots' => '', - 'secure' => 0,); + 'secure' => 0, ); $gparams = new \Joomla\Registry\Registry($paramdata); diff --git a/src/administrator/components/com_kunena/install/plugins/plg_kunena_altauserpoints/avatar.php b/src/administrator/components/com_kunena/install/plugins/plg_kunena_altauserpoints/avatar.php index 8ad7935d9f..b5ddc6c486 100644 --- a/src/administrator/components/com_kunena/install/plugins/plg_kunena_altauserpoints/avatar.php +++ b/src/administrator/components/com_kunena/install/plugins/plg_kunena_altauserpoints/avatar.php @@ -14,7 +14,6 @@ use Joomla\CMS\Uri\Uri; use Joomla\CMS\Router\Route; - /** * Class KunenaAvatarAltaUserPoints * @since Kunena diff --git a/src/administrator/components/com_kunena/install/plugins/plg_kunena_comprofiler/profile.php b/src/administrator/components/com_kunena/install/plugins/plg_kunena_comprofiler/profile.php index 120df563ac..35519f3f61 100644 --- a/src/administrator/components/com_kunena/install/plugins/plg_kunena_comprofiler/profile.php +++ b/src/administrator/components/com_kunena/install/plugins/plg_kunena_comprofiler/profile.php @@ -137,7 +137,7 @@ public function showProfile($view, &$params) return implode( ' ', $_PLUGINS->trigger( 'forumSideProfile', array('kunena', $view, $view->profile->userid, - array('config' => &$view->config, 'userprofile' => &$view->profile, 'params' => &$params),) + array('config' => &$view->config, 'userprofile' => &$view->profile, 'params' => &$params), ) ) ); } diff --git a/src/administrator/components/com_kunena/install/plugins/plg_kunena_easysocial/activity.php b/src/administrator/components/com_kunena/install/plugins/plg_kunena_easysocial/activity.php index c9d6243b7c..3e9d268c84 100644 --- a/src/administrator/components/com_kunena/install/plugins/plg_kunena_easysocial/activity.php +++ b/src/administrator/components/com_kunena/install/plugins/plg_kunena_easysocial/activity.php @@ -150,7 +150,7 @@ public function onAfterReply($message) 'title' => '', 'type' => 'post', 'url' => $permalink, - 'image' => '' + 'image' => '', ); // Add notifications in EasySocial diff --git a/src/administrator/components/com_kunena/install/plugins/plg_kunena_joomla/access.php b/src/administrator/components/com_kunena/install/plugins/plg_kunena_joomla/access.php index 4989a2c089..8e13018a49 100644 --- a/src/administrator/components/com_kunena/install/plugins/plg_kunena_joomla/access.php +++ b/src/administrator/components/com_kunena/install/plugins/plg_kunena_joomla/access.php @@ -79,7 +79,7 @@ public function getCategoryAccess(KunenaForumCategory $category) $accessname = Text::sprintf($category->pub_recurse ? 'COM_KUNENA_A_GROUP_X_PLUS' : 'COM_KUNENA_A_GROUP_X_ONLY', $groupname ? Text::_($groupname) : Text::_('COM_KUNENA_NOBODY')); $list["joomla.group.{$category->pub_access}"] = array('type' => 'joomla.group', 'id' => $category->pub_access, 'alias' => $accessname, - 'title' => $accessname,); + 'title' => $accessname, ); $groupname = $this->getGroupName($category->accesstype, $category->admin_access); @@ -87,14 +87,14 @@ public function getCategoryAccess(KunenaForumCategory $category) { $accessname = Text::sprintf($category->admin_recurse ? 'COM_KUNENA_A_GROUP_X_PLUS' : 'COM_KUNENA_A_GROUP_X_ONLY', Text::_($groupname)); $list["joomla.group.{$category->admin_access}"] = array('type' => 'joomla.group', 'id' => $category->admin_access, 'alias' => $accessname, - 'title' => $accessname,); + 'title' => $accessname, ); } } else { $groupname = $this->getGroupName($category->accesstype, $category->access); $list["joomla.level.{$category->access}"] = array('type' => 'joomla.level', 'id' => $category->access, 'alias' => $groupname, - 'title' => $groupname,); + 'title' => $groupname, ); } return $list; diff --git a/src/administrator/components/com_kunena/install/plugins/plg_kunena_joomla/login.php b/src/administrator/components/com_kunena/install/plugins/plg_kunena_joomla/login.php index 77ffb1146d..b35254c030 100644 --- a/src/administrator/components/com_kunena/install/plugins/plg_kunena_joomla/login.php +++ b/src/administrator/components/com_kunena/install/plugins/plg_kunena_joomla/login.php @@ -185,7 +185,7 @@ public function getRemindURL() return Route::_('index.php?option=com_users&view=remind' . ($Itemid ? "&Itemid={$Itemid}" : '')); } - + /** * Return the parameters of the plugin * diff --git a/src/administrator/components/com_kunena/language/all/install.script.php b/src/administrator/components/com_kunena/language/all/install.script.php index def3b2b6ca..6a6ac7ad84 100644 --- a/src/administrator/components/com_kunena/language/all/install.script.php +++ b/src/administrator/components/com_kunena/language/all/install.script.php @@ -11,7 +11,6 @@ use Joomla\CMS\Factory; - /** * Class pkg_kunena_languagesInstallerScript * @since Kunena diff --git a/src/administrator/components/com_kunena/models/categories.php b/src/administrator/components/com_kunena/models/categories.php index a92b1a5a86..fd52d2356d 100644 --- a/src/administrator/components/com_kunena/models/categories.php +++ b/src/administrator/components/com_kunena/models/categories.php @@ -371,7 +371,7 @@ public function getAdminCategories() 'filter_allow_polls' => $this->getState('filter.allow_polls'), 'filter_review' => $this->getState('filter.review'), 'filter_anonymous' => $this->getState('filter.anonymous'), - 'action' => 'admin',); + 'action' => 'admin', ); $catid = $this->getState('item.id', 0); $categories = array(); diff --git a/src/administrator/components/com_kunena/models/user.php b/src/administrator/components/com_kunena/models/user.php index 9f6c387705..e37a93f0f4 100644 --- a/src/administrator/components/com_kunena/models/user.php +++ b/src/administrator/components/com_kunena/models/user.php @@ -158,7 +158,7 @@ public function getListmodcats() $params = array( 'sections' => false, - 'action' => 'read',); + 'action' => 'read', ); $modCats = HTMLHelper::_('kunenaforum.categorylist', 'catid[]', 0, $categoryList, $params, 'class="inputbox" multiple="multiple" size="15"', 'value', 'text', $modCatList, 'kforums'); return $modCats; diff --git a/src/administrator/components/com_kunena/template/j3/logs/clean.php b/src/administrator/components/com_kunena/template/j3/logs/clean.php index 3903412dfb..fbb62aa949 100644 --- a/src/administrator/components/com_kunena/template/j3/logs/clean.php +++ b/src/administrator/components/com_kunena/template/j3/logs/clean.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j3/plugins/default.php b/src/administrator/components/com_kunena/template/j3/plugins/default.php index 6685c3f07d..702cf3cfa9 100644 --- a/src/administrator/components/com_kunena/template/j3/plugins/default.php +++ b/src/administrator/components/com_kunena/template/j3/plugins/default.php @@ -219,7 +219,7 @@ class="element-invisible">' . '' + . \Joomla\CMS\Language\Text::_("JAPPLY") . '', ) ); ?> diff --git a/src/administrator/components/com_kunena/template/j3/ranks/default.php b/src/administrator/components/com_kunena/template/j3/ranks/default.php index c8833d5beb..0b41bb307c 100644 --- a/src/administrator/components/com_kunena/template/j3/ranks/default.php +++ b/src/administrator/components/com_kunena/template/j3/ranks/default.php @@ -14,7 +14,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - HTMLHelper::_('behavior.tooltip'); HTMLHelper::_('behavior.multiselect'); HTMLHelper::_('dropdown.init'); diff --git a/src/administrator/components/com_kunena/template/j3/smilies/default.php b/src/administrator/components/com_kunena/template/j3/smilies/default.php index 1714069c06..3418659405 100644 --- a/src/administrator/components/com_kunena/template/j3/smilies/default.php +++ b/src/administrator/components/com_kunena/template/j3/smilies/default.php @@ -14,7 +14,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - HTMLHelper::_('behavior.tooltip'); HTMLHelper::_('behavior.multiselect'); HTMLHelper::_('dropdown.init'); diff --git a/src/administrator/components/com_kunena/template/j3/templates/add.php b/src/administrator/components/com_kunena/template/j3/templates/add.php index f76af706cc..2f29e4a49f 100644 --- a/src/administrator/components/com_kunena/template/j3/templates/add.php +++ b/src/administrator/components/com_kunena/template/j3/templates/add.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j3/templates/choosecss.php b/src/administrator/components/com_kunena/template/j3/templates/choosecss.php index 8e1356e2a5..32954ac49f 100644 --- a/src/administrator/components/com_kunena/template/j3/templates/choosecss.php +++ b/src/administrator/components/com_kunena/template/j3/templates/choosecss.php @@ -11,7 +11,6 @@ defined('_JEXEC') or die(); use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j3/templates/editcss.php b/src/administrator/components/com_kunena/template/j3/templates/editcss.php index 3e216e642d..972b6719f1 100644 --- a/src/administrator/components/com_kunena/template/j3/templates/editcss.php +++ b/src/administrator/components/com_kunena/template/j3/templates/editcss.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j3/templates/editless.php b/src/administrator/components/com_kunena/template/j3/templates/editless.php index bb4cadd874..a774c74f90 100644 --- a/src/administrator/components/com_kunena/template/j3/templates/editless.php +++ b/src/administrator/components/com_kunena/template/j3/templates/editless.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j3/trash/messages.php b/src/administrator/components/com_kunena/template/j3/trash/messages.php index 494a18d6a7..5aa604191d 100644 --- a/src/administrator/components/com_kunena/template/j3/trash/messages.php +++ b/src/administrator/components/com_kunena/template/j3/trash/messages.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - HTMLHelper::_('behavior.tooltip'); HTMLHelper::_('behavior.multiselect'); HTMLHelper::_('dropdown.init'); diff --git a/src/administrator/components/com_kunena/template/j3/trash/purge.php b/src/administrator/components/com_kunena/template/j3/trash/purge.php index f7aaac2ded..4482ee7dd1 100644 --- a/src/administrator/components/com_kunena/template/j3/trash/purge.php +++ b/src/administrator/components/com_kunena/template/j3/trash/purge.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - HTMLHelper::_('behavior.tooltip'); HTMLHelper::_('behavior.multiselect'); HTMLHelper::_('dropdown.init'); diff --git a/src/administrator/components/com_kunena/template/j3/trash/topics.php b/src/administrator/components/com_kunena/template/j3/trash/topics.php index 7e3a93f0cf..7ea69d987d 100644 --- a/src/administrator/components/com_kunena/template/j3/trash/topics.php +++ b/src/administrator/components/com_kunena/template/j3/trash/topics.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - HTMLHelper::_('behavior.tooltip'); HTMLHelper::_('behavior.multiselect'); HTMLHelper::_('dropdown.init'); diff --git a/src/administrator/components/com_kunena/template/j3/user/edit.php b/src/administrator/components/com_kunena/template/j3/user/edit.php index 9026ed76be..edf2c71e33 100644 --- a/src/administrator/components/com_kunena/template/j3/user/edit.php +++ b/src/administrator/components/com_kunena/template/j3/user/edit.php @@ -15,7 +15,6 @@ use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; - HTMLHelper::_('behavior.tooltip'); HTMLHelper::_('behavior.multiselect'); HTMLHelper::_('dropdown.init'); diff --git a/src/administrator/components/com_kunena/template/j3/user/move.php b/src/administrator/components/com_kunena/template/j3/user/move.php index 3455dfe98e..1c3ee8ef2f 100644 --- a/src/administrator/components/com_kunena/template/j3/user/move.php +++ b/src/administrator/components/com_kunena/template/j3/user/move.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j4/attachments/default.php b/src/administrator/components/com_kunena/template/j4/attachments/default.php index cbf20387be..525a632faf 100644 --- a/src/administrator/components/com_kunena/template/j4/attachments/default.php +++ b/src/administrator/components/com_kunena/template/j4/attachments/default.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - HTMLHelper::_('behavior.tooltip'); HTMLHelper::_('behavior.multiselect'); HTMLHelper::_('dropdown.init'); diff --git a/src/administrator/components/com_kunena/template/j4/categories/default.php b/src/administrator/components/com_kunena/template/j4/categories/default.php index d3331b40ef..6a159d0a4b 100644 --- a/src/administrator/components/com_kunena/template/j4/categories/default.php +++ b/src/administrator/components/com_kunena/template/j4/categories/default.php @@ -14,7 +14,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; - HTMLHelper::_('behavior.tooltip'); HTMLHelper::_('behavior.multiselect'); HTMLHelper::_('dropdown.init'); diff --git a/src/administrator/components/com_kunena/template/j4/logs/clean.php b/src/administrator/components/com_kunena/template/j4/logs/clean.php index 2479b54d46..0d7c42f9b0 100644 --- a/src/administrator/components/com_kunena/template/j4/logs/clean.php +++ b/src/administrator/components/com_kunena/template/j4/logs/clean.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j4/plugins/default.php b/src/administrator/components/com_kunena/template/j4/plugins/default.php index 4fc72168f3..1c34e92c78 100644 --- a/src/administrator/components/com_kunena/template/j4/plugins/default.php +++ b/src/administrator/components/com_kunena/template/j4/plugins/default.php @@ -217,7 +217,7 @@ class="element-invisible"> . \Joomla\CMS\Language\Text::_("JSAVE") . '' . '' + . \Joomla\CMS\Language\Text::_("JAPPLY") . '', ) ); ?> diff --git a/src/administrator/components/com_kunena/template/j4/templates/add.php b/src/administrator/components/com_kunena/template/j4/templates/add.php index 3fa92e9d8b..fd371fc5db 100644 --- a/src/administrator/components/com_kunena/template/j4/templates/add.php +++ b/src/administrator/components/com_kunena/template/j4/templates/add.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j4/templates/editcss.php b/src/administrator/components/com_kunena/template/j4/templates/editcss.php index f48bd4dc17..8bc577eb0c 100644 --- a/src/administrator/components/com_kunena/template/j4/templates/editcss.php +++ b/src/administrator/components/com_kunena/template/j4/templates/editcss.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j4/templates/editless.php b/src/administrator/components/com_kunena/template/j4/templates/editless.php index 98c401b6ff..3accb9f2ec 100644 --- a/src/administrator/components/com_kunena/template/j4/templates/editless.php +++ b/src/administrator/components/com_kunena/template/j4/templates/editless.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j4/tools/cleanupip.php b/src/administrator/components/com_kunena/template/j4/tools/cleanupip.php index ba91cfdf5b..ba4a0a9e1b 100644 --- a/src/administrator/components/com_kunena/template/j4/tools/cleanupip.php +++ b/src/administrator/components/com_kunena/template/j4/tools/cleanupip.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j4/tools/diagnostics.php b/src/administrator/components/com_kunena/template/j4/tools/diagnostics.php index a42dedf675..3e3e49af29 100644 --- a/src/administrator/components/com_kunena/template/j4/tools/diagnostics.php +++ b/src/administrator/components/com_kunena/template/j4/tools/diagnostics.php @@ -14,7 +14,6 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Session\Session; - ?>
diff --git a/src/administrator/components/com_kunena/template/j4/tools/menu.php b/src/administrator/components/com_kunena/template/j4/tools/menu.php index e348862e7d..d4cf25571a 100644 --- a/src/administrator/components/com_kunena/template/j4/tools/menu.php +++ b/src/administrator/components/com_kunena/template/j4/tools/menu.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j4/tools/prune.php b/src/administrator/components/com_kunena/template/j4/tools/prune.php index a8bde94a78..a6faddcc07 100644 --- a/src/administrator/components/com_kunena/template/j4/tools/prune.php +++ b/src/administrator/components/com_kunena/template/j4/tools/prune.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j4/tools/purgerestatements.php b/src/administrator/components/com_kunena/template/j4/tools/purgerestatements.php index f721139fbc..81148c1178 100644 --- a/src/administrator/components/com_kunena/template/j4/tools/purgerestatements.php +++ b/src/administrator/components/com_kunena/template/j4/tools/purgerestatements.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j4/tools/report.php b/src/administrator/components/com_kunena/template/j4/tools/report.php index be3339012a..a758a86cd3 100644 --- a/src/administrator/components/com_kunena/template/j4/tools/report.php +++ b/src/administrator/components/com_kunena/template/j4/tools/report.php @@ -14,7 +14,6 @@ use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; - $document = Factory::getDocument(); $document->addScriptDeclaration( " diff --git a/src/administrator/components/com_kunena/template/j4/tools/syncusers.php b/src/administrator/components/com_kunena/template/j4/tools/syncusers.php index 282b815deb..e3294fd967 100644 --- a/src/administrator/components/com_kunena/template/j4/tools/syncusers.php +++ b/src/administrator/components/com_kunena/template/j4/tools/syncusers.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j4/tools/uninstall.php b/src/administrator/components/com_kunena/template/j4/tools/uninstall.php index 02658aa9e4..c5ec6bd3ce 100644 --- a/src/administrator/components/com_kunena/template/j4/tools/uninstall.php +++ b/src/administrator/components/com_kunena/template/j4/tools/uninstall.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/administrator/components/com_kunena/template/j4/trash/messages.php b/src/administrator/components/com_kunena/template/j4/trash/messages.php index 015a270085..ae94c99aa5 100644 --- a/src/administrator/components/com_kunena/template/j4/trash/messages.php +++ b/src/administrator/components/com_kunena/template/j4/trash/messages.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - HTMLHelper::_('behavior.tooltip'); HTMLHelper::_('behavior.multiselect'); HTMLHelper::_('dropdown.init'); diff --git a/src/administrator/components/com_kunena/template/j4/trash/purge.php b/src/administrator/components/com_kunena/template/j4/trash/purge.php index edf00af070..0e2483116c 100644 --- a/src/administrator/components/com_kunena/template/j4/trash/purge.php +++ b/src/administrator/components/com_kunena/template/j4/trash/purge.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - HTMLHelper::_('behavior.tooltip'); HTMLHelper::_('behavior.multiselect'); HTMLHelper::_('dropdown.init'); diff --git a/src/administrator/components/com_kunena/template/j4/trash/topics.php b/src/administrator/components/com_kunena/template/j4/trash/topics.php index f3f4e7c5a8..79848ec2e5 100644 --- a/src/administrator/components/com_kunena/template/j4/trash/topics.php +++ b/src/administrator/components/com_kunena/template/j4/trash/topics.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - HTMLHelper::_('behavior.tooltip'); HTMLHelper::_('behavior.multiselect'); HTMLHelper::_('dropdown.init'); diff --git a/src/administrator/components/com_kunena/template/j4/user/move.php b/src/administrator/components/com_kunena/template/j4/user/move.php index d03c519866..3cc72338fc 100644 --- a/src/administrator/components/com_kunena/template/j4/user/move.php +++ b/src/administrator/components/com_kunena/template/j4/user/move.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - ?>
diff --git a/src/components/com_kunena/controller/category/index/display.php b/src/components/com_kunena/controller/category/index/display.php index 45953b4e02..5118329799 100644 --- a/src/components/com_kunena/controller/category/index/display.php +++ b/src/components/com_kunena/controller/category/index/display.php @@ -73,7 +73,7 @@ protected function before() $this->me = KunenaUserHelper::getMyself(); $this->ktemplate = KunenaFactory::getTemplate(); - + // Get sections to display. $catid = $this->input->getInt('catid', 0); $view = $this->input->getInt('view'); diff --git a/src/components/com_kunena/controller/category/subscriptions/display.php b/src/components/com_kunena/controller/category/subscriptions/display.php index 4141a2ecd2..542ec6cd76 100644 --- a/src/components/com_kunena/controller/category/subscriptions/display.php +++ b/src/components/com_kunena/controller/category/subscriptions/display.php @@ -62,16 +62,16 @@ protected function before() $this->model = new KunenaModelCategory(array(), $this->input); $this->model->initialize($this->getOptions(), $this->getOptions()->get('embedded', false)); $this->state = $this->model->getState(); - + $me = KunenaUserHelper::getMyself(); if (!$me->exists()) { throw new KunenaExceptionAuthorise(Text::_('COM_KUNENA_NO_ACCESS'), 401); } - + $this->user = KunenaUserHelper::get($this->state->get('user')); - + $limit = $this->input->getInt('limit', 0); if ($limit < 1 || $limit > 100) diff --git a/src/components/com_kunena/controller/credits/display.php b/src/components/com_kunena/controller/credits/display.php index 2b4baa994d..48d1e1a1d7 100644 --- a/src/components/com_kunena/controller/credits/display.php +++ b/src/components/com_kunena/controller/credits/display.php @@ -87,23 +87,23 @@ protected function before() array( 'name' => 'Florian Dal Fitto', 'url' => 'https://www.kunena.org/forum/user/1288-xillibit', - 'title' => Text::_('COM_KUNENA_CREDITS_DEVELOPMENT'),), + 'title' => Text::_('COM_KUNENA_CREDITS_DEVELOPMENT'), ), array( 'name' => 'Jelle Kok', 'url' => 'https://www.kunena.org/forum/user/634-810', - 'title' => Text::sprintf('COM_KUNENA_CREDITS_X_AND_Y', Text::_('COM_KUNENA_CREDITS_DEVELOPMENT'), Text::_('COM_KUNENA_CREDITS_DESIGN')),), + 'title' => Text::sprintf('COM_KUNENA_CREDITS_X_AND_Y', Text::_('COM_KUNENA_CREDITS_DEVELOPMENT'), Text::_('COM_KUNENA_CREDITS_DESIGN')), ), array( 'name' => 'Richard Binder', 'url' => 'https://www.kunena.org/forum/user/2198-rich', - 'title' => Text::sprintf('COM_KUNENA_CREDITS_X_AND_Y', Text::_('COM_KUNENA_CREDITS_MODERATION'), Text::_('COM_KUNENA_CREDITS_TESTING')),), + 'title' => Text::sprintf('COM_KUNENA_CREDITS_X_AND_Y', Text::_('COM_KUNENA_CREDITS_MODERATION'), Text::_('COM_KUNENA_CREDITS_TESTING')), ), array( 'name' => 'Matias Griese', 'url' => 'https://www.kunena.org/forum/user/63-matias', - 'title' => Text::_('COM_KUNENA_CREDITS_DEVELOPMENT'),), + 'title' => Text::_('COM_KUNENA_CREDITS_DEVELOPMENT'), ), array( 'name' => 'Oliver Ratzesberger', 'url' => 'https://www.kunena.org/forum/user/64-fxstein', - 'title' => Text::_('COM_KUNENA_CREDITS_FOUNDER'),), + 'title' => Text::_('COM_KUNENA_CREDITS_FOUNDER'), ), ); $this->thanks = Text::sprintf( 'COM_KUNENA_CREDITS_THANKS', 'https://www.kunena.org/team#special_thanks', diff --git a/src/components/com_kunena/controller/message/item/actions/display.php b/src/components/com_kunena/controller/message/item/actions/display.php index 19091fb6bb..9cc252f5c2 100644 --- a/src/components/com_kunena/controller/message/item/actions/display.php +++ b/src/components/com_kunena/controller/message/item/actions/display.php @@ -612,7 +612,7 @@ public function getButton($url, $name, $scope, $type, $id = null, $normal = true { return KunenaLayout::factory('Widget/Button') ->setProperties(array('url' => KunenaRoute::_($url), 'name' => $name, 'scope' => $scope, - 'type' => $type, 'id' => 'btn_' . $id, 'normal' => $normal, 'icon' => $icon,) + 'type' => $type, 'id' => 'btn_' . $id, 'normal' => $normal, 'icon' => $icon, ) ); } } diff --git a/src/components/com_kunena/controller/topic/form/create/display.php b/src/components/com_kunena/controller/topic/form/create/display.php index ec44d94b70..34a926b0c9 100644 --- a/src/components/com_kunena/controller/topic/form/create/display.php +++ b/src/components/com_kunena/controller/topic/form/create/display.php @@ -142,7 +142,7 @@ protected function before() \Joomla\CMS\Plugin\PluginHelper::importPlugin('captcha'); $result = Factory::getApplication()->triggerEvent('onInit', array('dynamic_recaptcha_1')); $output = Factory::getApplication()->triggerEvent('onDisplay', array(null, 'dynamic_recaptcha_1', 'class="controls g-recaptcha" data-sitekey="' - . $captcha_pubkey . '" data-theme="light"',)); + . $captcha_pubkey . '" data-theme="light"', )); $this->captchaDisplay = $output[0]; $this->captchaEnabled = $result[0]; } diff --git a/src/components/com_kunena/controller/topic/form/reply/display.php b/src/components/com_kunena/controller/topic/form/reply/display.php index cc37a3f947..4404968c8e 100644 --- a/src/components/com_kunena/controller/topic/form/reply/display.php +++ b/src/components/com_kunena/controller/topic/form/reply/display.php @@ -109,7 +109,7 @@ protected function before() \Joomla\CMS\Plugin\PluginHelper::importPlugin('captcha'); $result = Factory::getApplication()->triggerEvent('onInit', array('dynamic_recaptcha_1')); $output = Factory::getApplication()->triggerEvent('onDisplay', array(null, 'dynamic_recaptcha_1', 'class="controls g-recaptcha" data-sitekey="' - . $captcha_pubkey . '" data-theme="light"',) + . $captcha_pubkey . '" data-theme="light"', ) ); $this->captchaDisplay = $output[0]; $this->captchaEnabled = $result[0]; diff --git a/src/components/com_kunena/controller/topic/item/actions/display.php b/src/components/com_kunena/controller/topic/item/actions/display.php index 1228b2f063..e498b85347 100644 --- a/src/components/com_kunena/controller/topic/item/actions/display.php +++ b/src/components/com_kunena/controller/topic/item/actions/display.php @@ -351,7 +351,7 @@ public function getButton($url, $name, $scope, $type, $primary = false, $normal { return KunenaLayout::factory('Widget/Button') ->setProperties(array('url' => KunenaRoute::_($url), 'name' => $name, - 'scope' => $scope, 'type' => $type, 'primary' => $primary, 'normal' => $normal, 'icon' => $icon,) + 'scope' => $scope, 'type' => $type, 'primary' => $primary, 'normal' => $normal, 'icon' => $icon, ) ); } } diff --git a/src/components/com_kunena/controller/topic/item/display.php b/src/components/com_kunena/controller/topic/item/display.php index c51ae2f096..254f3bee7e 100644 --- a/src/components/com_kunena/controller/topic/item/display.php +++ b/src/components/com_kunena/controller/topic/item/display.php @@ -16,6 +16,7 @@ use Joomla\CMS\Uri\Uri; use Joomla\CMS\MVC\Controller\BaseController; use Joomla\CMS\Object\CMSObject; + /** * Class ComponentKunenaControllerTopicItemDisplay * diff --git a/src/components/com_kunena/controller/widget/login/display.php b/src/components/com_kunena/controller/widget/login/display.php index f5490f87de..2bc06a65e3 100644 --- a/src/components/com_kunena/controller/widget/login/display.php +++ b/src/components/com_kunena/controller/widget/login/display.php @@ -103,7 +103,7 @@ class ComponentKunenaControllerWidgetLoginDisplay extends KunenaControllerDispla * @since Kunena 5.1 */ public $plglogin; - + /** * Prepare login display. * @@ -119,8 +119,8 @@ protected function before() $login = KunenaLogin::getInstance(); $params = new JRegistry($login->getParams()); - $this->plglogin = $params->get('login','1'); - + $this->plglogin = $params->get('login', '1'); + if (!$login->enabled()) { return false; diff --git a/src/components/com_kunena/controllers/category.php b/src/components/com_kunena/controllers/category.php index 934a546334..d353dc4211 100644 --- a/src/components/com_kunena/controllers/category.php +++ b/src/components/com_kunena/controllers/category.php @@ -183,11 +183,11 @@ public function unsubscribe() return; } - + $me = KunenaUserHelper::getMyself(); $userid = $this->app->input->getInt('userid'); - + $catid = $this->app->input->getInt('catid', 0); $catids = $catid ? array($catid) diff --git a/src/components/com_kunena/controllers/misc.php b/src/components/com_kunena/controllers/misc.php index e59613ad2b..36b37da1b7 100644 --- a/src/components/com_kunena/controllers/misc.php +++ b/src/components/com_kunena/controllers/misc.php @@ -12,7 +12,6 @@ defined('_JEXEC') or die(); use Joomla\CMS\Factory; -use Joomla\CMS\Language\Text; use Joomla\CMS\Uri\Uri; /** diff --git a/src/components/com_kunena/controllers/topics.php b/src/components/com_kunena/controllers/topics.php index 7c3a509dd6..04ad289b32 100644 --- a/src/components/com_kunena/controllers/topics.php +++ b/src/components/com_kunena/controllers/topics.php @@ -497,7 +497,7 @@ public function unsubscribe() } $userid = $this->app->input->getInt('userid'); - + $ids = array_keys($this->app->input->get('topics', array(), 'post', 'array')); $ids = ArrayHelper::toInteger($ids); diff --git a/src/components/com_kunena/controllers/user.php b/src/components/com_kunena/controllers/user.php index 7cede18889..f7fa2e75e1 100644 --- a/src/components/com_kunena/controllers/user.php +++ b/src/components/com_kunena/controllers/user.php @@ -1365,21 +1365,21 @@ protected function report($user, string $evidence) if (!empty($ip)) { $options = new \Joomla\Registry\Registry; - + $transport = new \Joomla\CMS\Http\Transport\StreamTransport($options); - + // Create a 'stream' transport. $http = new \Joomla\CMS\Http\Http($options, $transport); - + $data = 'username=' . $spammer->username . '&ip_addr=' . $ip . '&email=' . $spammer->email . '&api_key=' . $this->config->stopforumspam_key . '&evidence=' . $evidence; - + $response = $http->post('https://www.stopforumspam.com/add', $data); - + if ($response->code == '200') { // Report accepted. There is no need to display the reason $this->app->enqueueMessage(Text::_('COM_KUNENA_STOPFORUMSPAM_REPORT_SUCCESS')); - + return true; } else @@ -1387,14 +1387,14 @@ protected function report($user, string $evidence) // Report failed or refused $reasons = array(); preg_match('/

.*<\/p>/', $response->body, $reasons); - + // Stopforumspam returns only one reason, which is reasons[0], but we need to strip out the html tags before using it $this->app->enqueueMessage(Text::sprintf('COM_KUNENA_STOPFORUMSPAM_REPORT_FAILED', strip_tags($reasons[0])), 'error'); - + return false; } } - else + else { $this->app->enqueueMessage(Text::_('COM_KUNENA_STOPFORUMSPAM_REPORT_NO_IP_GIVEN'), 'error'); } diff --git a/src/components/com_kunena/layout/category/item.php b/src/components/com_kunena/layout/category/item.php index 9bd7844c96..10e1a96425 100644 --- a/src/components/com_kunena/layout/category/item.php +++ b/src/components/com_kunena/layout/category/item.php @@ -83,21 +83,21 @@ public function getCategoryActions() { $actions['create'] = $this->subLayout('Widget/Button') ->setProperties(array('url' => $url, 'name' => 'create', 'scope' => 'topic', 'type' => 'communication', 'success' => true, - 'icon' => 'glyphicon glyphicon-edit glyphicon-white',) + 'icon' => 'glyphicon glyphicon-edit glyphicon-white', ) ); } elseif ($url && $topicicontype == 'fa') { $actions['create'] = $this->subLayout('Widget/Button') ->setProperties(array('url' => $url, 'name' => 'create', 'scope' => 'topic', 'type' => 'communication', 'success' => true, - 'icon' => 'fa fa-pencil-alt',) + 'icon' => 'fa fa-pencil-alt', ) ); } else { $actions['create'] = $this->subLayout('Widget/Button') ->setProperties(array('url' => $url, 'name' => 'create', 'scope' => 'topic', 'type' => 'communication', 'success' => true, - 'icon' => 'icon-edit icon-white',) + 'icon' => 'icon-edit icon-white', ) ); } } @@ -113,7 +113,7 @@ public function getCategoryActions() { $actions['markread'] = $this->subLayout('Widget/Button') ->setProperties(array('url' => $url, 'name' => 'markread', 'scope' => 'category', 'type' => 'user', - 'icon' => 'glyphicon glyphicon-check',) + 'icon' => 'glyphicon glyphicon-check', ) ); } elseif ($url && $topicicontype == 'fa') @@ -141,7 +141,7 @@ public function getCategoryActions() $url = "index.php?option=com_kunena&view=category&task=subscribe&catid={$category->id}{$token}"; $actions['subscribe'] = $this->subLayout('Widget/Button') ->setProperties(array('url' => $url, 'name' => 'subscribe', 'scope' => 'category', 'type' => 'user', - 'icon' => 'glyphicon glyphicon-envelope',) + 'icon' => 'glyphicon glyphicon-envelope', ) ); } else @@ -149,7 +149,7 @@ public function getCategoryActions() $url = "index.php?option=com_kunena&view=category&task=unsubscribe&catid={$category->id}{$token}"; $actions['unsubscribe'] = $this->subLayout('Widget/Button') ->setProperties(array('url' => $url, 'name' => 'unsubscribe', 'scope' => 'category', 'type' => 'user', - 'icon' => 'glyphicon glyphicon-envelope',) + 'icon' => 'glyphicon glyphicon-envelope', ) ); } } @@ -160,7 +160,7 @@ public function getCategoryActions() $url = "index.php?option=com_kunena&view=category&task=subscribe&catid={$category->id}{$token}"; $actions['subscribe'] = $this->subLayout('Widget/Button') ->setProperties(array('url' => $url, 'name' => 'subscribe', 'scope' => 'category', 'type' => 'user', - 'icon' => 'fa fa-envelope',) + 'icon' => 'fa fa-envelope', ) ); } else @@ -168,7 +168,7 @@ public function getCategoryActions() $url = "index.php?option=com_kunena&view=category&task=unsubscribe&catid={$category->id}{$token}"; $actions['unsubscribe'] = $this->subLayout('Widget/Button') ->setProperties(array('url' => $url, 'name' => 'unsubscribe', 'scope' => 'category', 'type' => 'user', - 'icon' => 'fas fa-envelope-open',) + 'icon' => 'fas fa-envelope-open', ) ); } } @@ -179,7 +179,7 @@ public function getCategoryActions() $url = "index.php?option=com_kunena&view=category&task=subscribe&catid={$category->id}{$token}"; $actions['subscribe'] = $this->subLayout('Widget/Button') ->setProperties(array('url' => $url, 'name' => 'subscribe', 'scope' => 'category', 'type' => 'user', - 'icon' => 'icon-envelope',) + 'icon' => 'icon-envelope', ) ); } else @@ -187,7 +187,7 @@ public function getCategoryActions() $url = "index.php?option=com_kunena&view=category&task=unsubscribe&catid={$category->id}{$token}"; $actions['unsubscribe'] = $this->subLayout('Widget/Button') ->setProperties(array('url' => $url, 'name' => 'unsubscribe', 'scope' => 'category', 'type' => 'user', - 'icon' => 'icon-envelope-opened',) + 'icon' => 'icon-envelope-opened', ) ); } } diff --git a/src/components/com_kunena/layout/topic/edit/editor.php b/src/components/com_kunena/layout/topic/edit/editor.php index d645a49b59..3072ce99ea 100644 --- a/src/components/com_kunena/layout/topic/edit/editor.php +++ b/src/components/com_kunena/layout/topic/edit/editor.php @@ -36,7 +36,7 @@ public function getCodeTypes() $paths = array( JPATH_ROOT . '/plugins/content/geshiall/geshi/geshi', - JPATH_ROOT . '/plugins/content/geshi/geshi/geshi' + JPATH_ROOT . '/plugins/content/geshi/geshi/geshi', ); foreach ($paths as $path) diff --git a/src/components/com_kunena/layout/topic/moderate.php b/src/components/com_kunena/layout/topic/moderate.php index fd5b61cd5f..3ec6475d24 100644 --- a/src/components/com_kunena/layout/topic/moderate.php +++ b/src/components/com_kunena/layout/topic/moderate.php @@ -50,7 +50,7 @@ public function getTopicOptions() $db = Factory::getDbo(); $params = array( 'orderby' => 'tt.last_post_time DESC', - 'where' => " AND tt.id != {$db->Quote($this->topic->id)} ",); + 'where' => " AND tt.id != {$db->Quote($this->topic->id)} ", ); list($total, $topics) = KunenaForumTopicHelper::getLatestTopics($this->category->id, 0, 30, $params); foreach ($topics as $topic) diff --git a/src/components/com_kunena/layout/widget/editor.php b/src/components/com_kunena/layout/widget/editor.php index 87553fe89b..fa10e91169 100644 --- a/src/components/com_kunena/layout/widget/editor.php +++ b/src/components/com_kunena/layout/widget/editor.php @@ -13,7 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; - /** * KunenaLayoutTopicEditEditor * diff --git a/src/components/com_kunena/models/category.php b/src/components/com_kunena/models/category.php index fde8986275..436c9342ca 100644 --- a/src/components/com_kunena/models/category.php +++ b/src/components/com_kunena/models/category.php @@ -65,9 +65,9 @@ protected function populateState() $params = $this->getParameters(); $this->setState('params', $params); - + $userid = $this->getInt('userid', -1); - + if ($userid < 0) { $userid = $this->me->userid; @@ -80,9 +80,9 @@ protected function populateState() { $userid = 0; } - + $this->setState('user', $userid); - + // Administrator state if ($layout == 'manage' || $layout == 'create' || $layout == 'edit') { @@ -340,7 +340,7 @@ public function getTopics() $moved = $format == 'feed' ? 0 : 1; $params = array( 'hold' => $hold, - 'moved' => $moved,); + 'moved' => $moved, ); switch ($topic_ordering) { diff --git a/src/components/com_kunena/models/search.php b/src/components/com_kunena/models/search.php index b3c5752da9..7c1be9d43a 100644 --- a/src/components/com_kunena/models/search.php +++ b/src/components/com_kunena/models/search.php @@ -460,7 +460,7 @@ public function getUrlParams() // Turn internal state into URL, but ignore default values $defaults = array('titleonly' => 0, 'searchuser' => '', 'exactname' => 0, 'childforums' => 0, 'starteronly' => 0, 'replyless' => 0, 'replylimit' => 0, 'searchdate' => '365', 'beforeafter' => 'after', 'sortby' => 'lastpost', - 'order' => 'dec', 'catids' => '0', 'show' => '0', 'topic_id' => 0, 'ids' => 0, 'searchatdate' => '',); + 'order' => 'dec', 'catids' => '0', 'show' => '0', 'topic_id' => 0, 'ids' => 0, 'searchatdate' => '', ); $url_params = ''; $state = $this->getState(); diff --git a/src/components/com_kunena/models/topics.php b/src/components/com_kunena/models/topics.php index 32bb73a558..b04f25594e 100644 --- a/src/components/com_kunena/models/topics.php +++ b/src/components/com_kunena/models/topics.php @@ -356,7 +356,7 @@ protected function getRecentTopics() 'orderby' => $lastpost ? 'tt.last_post_time DESC' : 'tt.first_post_time DESC', 'starttime' => $time, 'hold' => $hold, - 'where' => $where,); + 'where' => $where, ); list($this->total, $this->topics) = KunenaForumTopicHelper::getLatestTopics($latestcategory, $limitstart, $limit, $params); @@ -416,7 +416,7 @@ protected function getUserTopics() 'started' => $started, 'posted' => $posts, 'favorited' => $favorites, - 'subscribed' => $subscriptions,); + 'subscribed' => $subscriptions, ); list($this->total, $this->topics) = KunenaForumTopicHelper::getLatestTopics($latestcategory, $limitstart, $limit, $params); diff --git a/src/components/com_kunena/template/crypsis/layouts/attachment/item/audio.php b/src/components/com_kunena/template/crypsis/layouts/attachment/item/audio.php index 8f21440e72..e4675f7b27 100644 --- a/src/components/com_kunena/template/crypsis/layouts/attachment/item/audio.php +++ b/src/components/com_kunena/template/crypsis/layouts/attachment/item/audio.php @@ -11,7 +11,6 @@ **/ defined('_JEXEC') or die(); - $attachment = $this->attachment; $location = $attachment->getUrl(); diff --git a/src/components/com_kunena/template/crypsis/layouts/attachment/item/default.php b/src/components/com_kunena/template/crypsis/layouts/attachment/item/default.php index a3e824cefe..20874dc335 100644 --- a/src/components/com_kunena/template/crypsis/layouts/attachment/item/default.php +++ b/src/components/com_kunena/template/crypsis/layouts/attachment/item/default.php @@ -11,7 +11,6 @@ **/ defined('_JEXEC') or die(); - $attachment = $this->attachment; if ($attachment->isImage()) diff --git a/src/components/com_kunena/template/crypsis/layouts/attachment/item/general.php b/src/components/com_kunena/template/crypsis/layouts/attachment/item/general.php index 9e9242fe5f..f444077c98 100644 --- a/src/components/com_kunena/template/crypsis/layouts/attachment/item/general.php +++ b/src/components/com_kunena/template/crypsis/layouts/attachment/item/general.php @@ -11,7 +11,6 @@ **/ defined('_JEXEC') or die(); - $attachment = $this->attachment; ?> diff --git a/src/components/com_kunena/template/crypsis/layouts/attachment/item/image.php b/src/components/com_kunena/template/crypsis/layouts/attachment/item/image.php index 988e09abff..54794aa3c1 100644 --- a/src/components/com_kunena/template/crypsis/layouts/attachment/item/image.php +++ b/src/components/com_kunena/template/crypsis/layouts/attachment/item/image.php @@ -11,7 +11,6 @@ **/ defined('_JEXEC') or die(); - $attachment = $this->attachment; $location = $attachment->getUrl(); diff --git a/src/components/com_kunena/template/crypsis/layouts/attachment/item/thumbnail.php b/src/components/com_kunena/template/crypsis/layouts/attachment/item/thumbnail.php index cac4bf2d9e..91670d7657 100644 --- a/src/components/com_kunena/template/crypsis/layouts/attachment/item/thumbnail.php +++ b/src/components/com_kunena/template/crypsis/layouts/attachment/item/thumbnail.php @@ -11,7 +11,6 @@ **/ defined('_JEXEC') or die(); - $attachment = $this->attachment; echo $this->subLayout('Widget/Lightbox'); diff --git a/src/components/com_kunena/template/crypsis/layouts/attachment/item/video.php b/src/components/com_kunena/template/crypsis/layouts/attachment/item/video.php index 69cebf85a6..1550f03cd3 100644 --- a/src/components/com_kunena/template/crypsis/layouts/attachment/item/video.php +++ b/src/components/com_kunena/template/crypsis/layouts/attachment/item/video.php @@ -11,7 +11,6 @@ **/ defined('_JEXEC') or die(); - $attachment = $this->attachment; $location = $attachment->getUrl(); diff --git a/src/components/com_kunena/template/crypsis/layouts/bbcode/confidential/default.php b/src/components/com_kunena/template/crypsis/layouts/bbcode/confidential/default.php index 886ecb58ae..1ff2786a92 100644 --- a/src/components/com_kunena/template/crypsis/layouts/bbcode/confidential/default.php +++ b/src/components/com_kunena/template/crypsis/layouts/bbcode/confidential/default.php @@ -11,6 +11,7 @@ **/ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; + // [confidential]For moderators only[/confidential] // Hide content from everyone except the author and moderators. diff --git a/src/components/com_kunena/template/crypsis/layouts/bbcode/ebay/default.php b/src/components/com_kunena/template/crypsis/layouts/bbcode/ebay/default.php index cf584ec9f5..9ce365ab46 100644 --- a/src/components/com_kunena/template/crypsis/layouts/bbcode/ebay/default.php +++ b/src/components/com_kunena/template/crypsis/layouts/bbcode/ebay/default.php @@ -10,6 +10,7 @@ **/ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; + // [ebay]112233445566[/ebay] // Display ebay item. diff --git a/src/components/com_kunena/template/crypsis/layouts/bbcode/hide/default.php b/src/components/com_kunena/template/crypsis/layouts/bbcode/hide/default.php index 88bb5cb9ce..555b6a17bc 100644 --- a/src/components/com_kunena/template/crypsis/layouts/bbcode/hide/default.php +++ b/src/components/com_kunena/template/crypsis/layouts/bbcode/hide/default.php @@ -10,6 +10,7 @@ **/ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; + // [hide]Hidden from guests[/hide] // Hide content from guests, on users highlight the contents as being hidden from guests. diff --git a/src/components/com_kunena/template/crypsis/layouts/bbcode/spoiler/default.php b/src/components/com_kunena/template/crypsis/layouts/bbcode/spoiler/default.php index ec4f612265..485c55c65f 100644 --- a/src/components/com_kunena/template/crypsis/layouts/bbcode/spoiler/default.php +++ b/src/components/com_kunena/template/crypsis/layouts/bbcode/spoiler/default.php @@ -10,6 +10,7 @@ **/ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; + // [spoiler="Do not look here!"]I said so![/spoiler] // Display spoiler text (hidden until you click it open). diff --git a/src/components/com_kunena/template/crypsis/layouts/category/list/default.php b/src/components/com_kunena/template/crypsis/layouts/category/list/default.php index cefb29ebb8..34931e4837 100644 --- a/src/components/com_kunena/template/crypsis/layouts/category/list/default.php +++ b/src/components/com_kunena/template/crypsis/layouts/category/list/default.php @@ -12,6 +12,7 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; + ?>

diff --git a/src/components/com_kunena/template/crypsis/layouts/category/list/row/default.php b/src/components/com_kunena/template/crypsis/layouts/category/list/row/default.php index 025d40c5f2..4650eb3d78 100644 --- a/src/components/com_kunena/template/crypsis/layouts/category/list/row/default.php +++ b/src/components/com_kunena/template/crypsis/layouts/category/list/row/default.php @@ -10,6 +10,7 @@ **/ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; + /* * @var KunenaForumTopic $topic */ diff --git a/src/components/com_kunena/template/crypsis/layouts/category/manage/default.php b/src/components/com_kunena/template/crypsis/layouts/category/manage/default.php index b815502ec1..cc1c891e25 100644 --- a/src/components/com_kunena/template/crypsis/layouts/category/manage/default.php +++ b/src/components/com_kunena/template/crypsis/layouts/category/manage/default.php @@ -13,6 +13,7 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; + $this->document->addScript('includes/js/joomla.javascript.js'); ?>
diff --git a/src/components/com_kunena/template/crypsis/layouts/category/moderators/default.php b/src/components/com_kunena/template/crypsis/layouts/category/moderators/default.php index 00a2ca0872..c5ece55a33 100644 --- a/src/components/com_kunena/template/crypsis/layouts/category/moderators/default.php +++ b/src/components/com_kunena/template/crypsis/layouts/category/moderators/default.php @@ -10,6 +10,7 @@ **/ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; + ?> moderators)) : ?>
diff --git a/src/components/com_kunena/template/crypsis/layouts/credits/default.php b/src/components/com_kunena/template/crypsis/layouts/credits/default.php index 34de11786a..2bb2751540 100644 --- a/src/components/com_kunena/template/crypsis/layouts/credits/default.php +++ b/src/components/com_kunena/template/crypsis/layouts/credits/default.php @@ -10,6 +10,7 @@ **/ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; + ?>

diff --git a/src/components/com_kunena/template/crypsis/layouts/message/edit/full.php b/src/components/com_kunena/template/crypsis/layouts/message/edit/full.php index 8d34806248..62aaab66be 100644 --- a/src/components/com_kunena/template/crypsis/layouts/message/edit/full.php +++ b/src/components/com_kunena/template/crypsis/layouts/message/edit/full.php @@ -13,6 +13,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; + $message = $this->message; $template = KunenaTemplate::getInstance(); @@ -57,7 +58,7 @@ $result = Factory::getApplication()->triggerEvent('onInit', array('dynamic_recaptcha_' . $this->message->id)); $output = Factory::getApplication()->triggerEvent('onDisplay', array(null, 'dynamic_recaptcha_' . $this->message->id, - 'class="controls g-recaptcha" data-sitekey="' . $captcha_pubkey . '" data-theme="light"',) + 'class="controls g-recaptcha" data-sitekey="' . $captcha_pubkey . '" data-theme="light"', ) ); $this->quickcaptchaDisplay = $output[0]; $this->quickcaptchaEnabled = $result[0]; diff --git a/src/components/com_kunena/template/crypsis/layouts/message/edit/quickreply.php b/src/components/com_kunena/template/crypsis/layouts/message/edit/quickreply.php index e59a765528..cb62543bc8 100644 --- a/src/components/com_kunena/template/crypsis/layouts/message/edit/quickreply.php +++ b/src/components/com_kunena/template/crypsis/layouts/message/edit/quickreply.php @@ -21,7 +21,6 @@ return; } - $author = isset($this->author) ? $this->author : $message->getAuthor(); $topic = isset($this->topic) ? $this->topic : $message->getTopic(); @@ -64,7 +63,7 @@ $result = Factory::getApplication()->triggerEvent('onInit', array('dynamic_recaptcha_' . $this->message->id)); $output = Factory::getApplication()->triggerEvent('onDisplay', array(null, 'dynamic_recaptcha_' . $this->message->id, - 'class="controls g-recaptcha" data-sitekey="' . $captcha_pubkey . '" data-theme="light"',)); + 'class="controls g-recaptcha" data-sitekey="' . $captcha_pubkey . '" data-theme="light"', )); $this->quickcaptchaDisplay = $output[0]; $this->quickcaptchaEnabled = $result[0]; } diff --git a/src/components/com_kunena/template/crypsis/layouts/message/item/actions/default.php b/src/components/com_kunena/template/crypsis/layouts/message/item/actions/default.php index d9f126d379..b3877ab115 100644 --- a/src/components/com_kunena/template/crypsis/layouts/message/item/actions/default.php +++ b/src/components/com_kunena/template/crypsis/layouts/message/item/actions/default.php @@ -11,6 +11,7 @@ defined('_JEXEC') or die; use Joomla\CMS\Language\Text; + $config = KunenaConfig::getInstance(); $this->ktemplate = KunenaFactory::getTemplate(); $fullactions = $this->ktemplate->params->get('fullactions'); diff --git a/src/components/com_kunena/template/crypsis/layouts/message/item/bottom/default.php b/src/components/com_kunena/template/crypsis/layouts/message/item/bottom/default.php index b5314329f0..882d3113cc 100644 --- a/src/components/com_kunena/template/crypsis/layouts/message/item/bottom/default.php +++ b/src/components/com_kunena/template/crypsis/layouts/message/item/bottom/default.php @@ -78,7 +78,7 @@ echo KunenaLayout::factory('Widget/Button') ->setProperties(array('url' => '#report' . $message->id . '', 'name' => 'report', 'scope' => 'message', 'type' => 'user', 'id' => 'btn_report', 'normal' => '', 'icon' => KunenaIcons::reportname(), - 'modal' => 'modal', 'pullright' => 'pullright',)); + 'modal' => 'modal', 'pullright' => 'pullright', )); if ($this->me->isModerator($this->topic->getCategory()) || $this->config->user_report || !$this->config->user_report && $this->me->userid != $this->message->userid) : ?>