' . $txt['lp_page_keywords_after'] . ''; $context['posting_fields']['keywords']['input'] = array( - 'type' => 'textarea', + 'type' => 'text', 'attributes' => array( - 'id' => 'keywords', - 'maxlength' => 255, - 'value' => $context['lp_page']['keywords'] + 'id' => 'keywords', + 'value' => $context['lp_page']['keywords'], + 'style' => 'width: 100%', + 'dir' => $context['right_to_left'] ? 'rtl' : 'ltr' ), 'tab' => 'seo' ); @@ -875,7 +912,7 @@ private static function prepareFormFields() 'type' => 'textarea', 'attributes' => array( 'id' => 'content', - 'maxlength' => Helpers::getMaxMessageLength(), + 'maxlength' => MAX_MSG_LENGTH, 'value' => $context['lp_page']['content'], 'required' => true ), @@ -952,7 +989,7 @@ private static function preparePreview() { global $context, $smcFunc, $txt; - if (!isset($_POST['preview'])) + if (Helpers::post()->has('preview') === false) return; checkSubmitOnce('free'); @@ -965,7 +1002,7 @@ private static function preparePreview() censorText($context['preview_content']); if (!empty($context['preview_content'])) - Subs::parseContent($context['preview_content'], $context['lp_page']['type']); + Helpers::parseContent($context['preview_content'], $context['lp_page']['type']); $context['page_title'] = $txt['preview'] . ($context['preview_title'] ? ' - ' . $context['preview_title'] : ''); $context['preview_title'] = Helpers::getPreviewTitle(); @@ -1025,7 +1062,7 @@ private static function setData(int $item = 0) { global $context, $smcFunc, $db_type; - if (!empty($context['post_errors']) || !isset($_POST['save'])) + if (!empty($context['post_errors']) || Helpers::post()->has('save') === false) return; checkSubmitOnce('check'); @@ -1039,7 +1076,7 @@ private static function setData(int $item = 0) 'author_id' => 'int', 'alias' => 'string-255', 'description' => 'string-255', - 'content' => 'string-' . Helpers::getMaxMessageLength(), + 'content' => 'string-' . MAX_MSG_LENGTH, 'type' => 'string-4', 'permissions' => 'int', 'status' => 'int', @@ -1059,9 +1096,9 @@ private static function setData(int $item = 0) 1 ); - $context['lp_num_queries']++; + $smcFunc['lp_num_queries']++; - Subs::runAddons('onDataSaving', array($item)); + Subs::runAddons('onPageSaving', array($item)); if (!empty($context['lp_page']['title'])) { $titles = []; @@ -1086,15 +1123,15 @@ private static function setData(int $item = 0) array('item_id', 'type', 'lang') ); - $context['lp_num_queries']++; + $smcFunc['lp_num_queries']++; } if (!empty($context['lp_page']['options'])) { - $parameters = []; + $params = []; foreach ($context['lp_page']['options'] as $param_name => $value) { $value = is_array($value) ? implode(',', $value) : $value; - $parameters[] = array( + $params[] = array( 'item_id' => $item, 'type' => 'page', 'name' => $param_name, @@ -1110,17 +1147,17 @@ private static function setData(int $item = 0) 'name' => 'string', 'value' => 'string' ), - $parameters, + $params, array('item_id', 'type', 'name') ); - $context['lp_num_queries']++; + $smcFunc['lp_num_queries']++; } if (!empty($context['lp_page']['keywords'])) { - $keywords = []; + $tags = []; foreach ($context['lp_page']['keywords'] as $value) { - $keywords[] = array( + $tags[] = array( 'page_id' => $item, 'value' => $value ); @@ -1132,11 +1169,11 @@ private static function setData(int $item = 0) 'page_id' => 'int', 'value' => 'string' ), - $keywords, + $tags, array('page_id', 'value') ); - $context['lp_num_queries']++; + $smcFunc['lp_num_queries']++; } } else { $smcFunc['db_query']('', ' @@ -1156,9 +1193,9 @@ private static function setData(int $item = 0) ) ); - $context['lp_num_queries']++; + $smcFunc['lp_num_queries']++; - Subs::runAddons('onDataSaving', array($item)); + Subs::runAddons('onPageSaving', array($item)); if (!empty($context['lp_page']['title'])) { $titles = []; @@ -1183,15 +1220,15 @@ private static function setData(int $item = 0) array('item_id', 'type', 'lang') ); - $context['lp_num_queries']++; + $smcFunc['lp_num_queries']++; } if (!empty($context['lp_page']['options'])) { - $parameters = []; + $params = []; foreach ($context['lp_page']['options'] as $param_name => $value) { $value = is_array($value) ? implode(',', $value) : $value; - $parameters[] = array( + $params[] = array( 'item_id' => $item, 'type' => 'page', 'name' => $param_name, @@ -1207,11 +1244,11 @@ private static function setData(int $item = 0) 'name' => 'string', 'value' => 'string' ), - $parameters, + $params, array('item_id', 'type', 'name') ); - $context['lp_num_queries']++; + $smcFunc['lp_num_queries']++; } $smcFunc['db_query']('', ' @@ -1222,12 +1259,12 @@ private static function setData(int $item = 0) ) ); - $context['lp_num_queries']++; + $smcFunc['lp_num_queries']++; if (!empty($context['lp_page']['keywords'])) { - $keywords = []; + $tags = []; foreach ($context['lp_page']['keywords'] as $value) { - $keywords[] = array( + $tags[] = array( 'page_id' => $item, 'value' => $value ); @@ -1239,15 +1276,16 @@ private static function setData(int $item = 0) 'page_id' => 'int', 'value' => 'string' ), - $keywords, + $tags, array('page_id', 'value') ); - $context['lp_num_queries']++; + $smcFunc['lp_num_queries']++; } } - clean_cache(); + Helpers::cache()->flush(); + redirectexit('action=admin;area=lp_pages;sa=main'); } @@ -1260,12 +1298,13 @@ private static function setData(int $item = 0) */ private static function getAutoIncrementValue() { - global $smcFunc, $context; + global $smcFunc; $request = $smcFunc['db_query']('', 'SELECT setval(\'{db_prefix}lp_pages_seq\', (SELECT MAX(page_id) FROM {db_prefix}lp_pages))'); [$value] = $smcFunc['db_fetch_row']($request); + $smcFunc['db_free_result']($request); - $context['lp_num_queries']++; + $smcFunc['lp_num_queries']++; return (int) $value + 1; } @@ -1280,7 +1319,7 @@ private static function getAutoIncrementValue() */ private static function isUnique(array $data) { - global $smcFunc, $context; + global $smcFunc; $request = $smcFunc['db_query']('', ' SELECT COUNT(page_id) @@ -1294,470 +1333,10 @@ private static function isUnique(array $data) ); [$count] = $smcFunc['db_fetch_row']($request); - $smcFunc['db_free_result']($request); - $context['lp_num_queries']++; - - return (bool) $count; - } - - /** - * Page export - * - * Экспорт страниц - * - * @return void - */ - public static function export() - { - global $context, $txt, $scripturl, $sourcedir; - - $context['page_title'] = $txt['lp_portal'] . ' - ' . $txt['lp_pages_export']; - $context['page_area_title'] = $txt['lp_pages_export']; - $context['canonical_url'] = $scripturl . '?action=admin;area=lp_pages;sa=export'; - - $context[$context['admin_menu_name']]['tab_data'] = array( - 'title' => LP_NAME, - 'description' => $txt['lp_pages_export_tab_description'] - ); - - self::runExport(self::getXmlFile()); - - $listOptions = array( - 'id' => 'pages', - 'items_per_page' => self::$num_pages, - 'title' => $txt['lp_pages_export'], - 'no_items_label' => $txt['lp_no_items'], - 'base_href' => $scripturl . '?action=admin;area=lp_pages;sa=export', - 'default_sort_col' => 'id', - 'get_items' => array( - 'function' => __CLASS__ . '::getAll' - ), - 'get_count' => array( - 'function' => __CLASS__ . '::getTotalQuantity' - ), - 'columns' => array( - 'id' => array( - 'header' => array( - 'value' => '#', - 'style' => 'width: 5%' - ), - 'data' => array( - 'db' => 'id', - 'class' => 'centertext' - ), - 'sort' => array( - 'default' => 'p.page_id', - 'reverse' => 'p.page_id DESC' - ) - ), - 'alias' => array( - 'header' => array( - 'value' => $txt['lp_page_alias'] - ), - 'data' => array( - 'db' => 'alias', - 'class' => 'centertext word_break' - ), - 'sort' => array( - 'default' => 'p.alias DESC', - 'reverse' => 'p.alias' - ) - ), - 'title' => array( - 'header' => array( - 'value' => $txt['lp_title'] - ), - 'data' => array( - 'function' => function ($entry) use ($scripturl) - { - $title = Helpers::getPublicTitle($entry); - - return '' . $title . ''; - }, - 'class' => 'word_break' - ), - 'sort' => array( - 'default' => 't.title DESC', - 'reverse' => 't.title' - ) - ), - 'actions' => array( - 'header' => array( - 'value' => '' - ), - 'data' => array( - 'function' => function ($entry) - { - return ''; - }, - 'class' => 'centertext' - ) - ) - ), - 'form' => array( - 'href' => $scripturl . '?action=admin;area=lp_pages;sa=export' - ), - 'additional_rows' => array( - array( - 'position' => 'below_table_data', - 'value' => ' - - ', - 'class' => 'floatright' - ) - ) - ); - - require_once($sourcedir . '/Subs-List.php'); - createList($listOptions); - - $context['sub_template'] = 'show_list'; - $context['default_list'] = 'pages'; - } - - /** - * Creating data in XML format - * - * Формируем данные в XML-формате - * - * @return mixed - */ - private static function getDataForXml() - { - global $smcFunc, $context; - - if (empty($_POST['pages']) && !isset($_POST['export_all'])) - return false; - - $pages = !empty($_POST['pages']) && !isset($_POST['export_all']) ? $_POST['pages'] : null; - - $request = $smcFunc['db_query']('', ' - SELECT - p.page_id, p.author_id, p.alias, p.description, p.content, p.type, p.permissions, p.status, p.num_views, p.num_comments, p.created_at, p.updated_at, - pt.lang, pt.title, pp.name, pp.value, t.value AS keyword, com.id, com.parent_id, com.author_id AS com_author_id, com.message, com.created_at AS com_created_at - FROM {db_prefix}lp_pages AS p - LEFT JOIN {db_prefix}lp_titles AS pt ON (p.page_id = pt.item_id AND pt.type = {string:type}) - LEFT JOIN {db_prefix}lp_params AS pp ON (p.page_id = pp.item_id AND pp.type = {string:type}) - LEFT JOIN {db_prefix}lp_tags AS t ON (p.page_id = t.page_id) - LEFT JOIN {db_prefix}lp_comments AS com ON (p.page_id = com.page_id)' . (!empty($pages) ? ' - WHERE p.page_id IN ({array_int:pages})' : ''), - array( - 'type' => 'page', - 'pages' => $pages - ) - ); - - $items = []; - while ($row = $smcFunc['db_fetch_assoc']($request)) { - if (!isset($items[$row['page_id']])) - $items[$row['page_id']] = array( - 'page_id' => $row['page_id'], - 'author_id' => $row['author_id'], - 'alias' => $row['alias'], - 'description' => trim($row['description']), - 'content' => $row['content'], - 'type' => $row['type'], - 'permissions' => $row['permissions'], - 'status' => $row['status'], - 'num_views' => $row['num_views'], - 'num_comments' => $row['num_comments'], - 'created_at' => $row['created_at'], - 'updated_at' => $row['updated_at'] - ); - - if (!empty($row['lang'])) - $items[$row['page_id']]['titles'][$row['lang']] = $row['title']; - - if (!empty($row['name'])) - $items[$row['page_id']]['params'][$row['name']] = $row['value']; - - if (!empty($row['keyword'])) - $items[$row['page_id']]['keywords'][] = $row['keyword']; - - if (!empty($row['message'])) { - $items[$row['page_id']]['comments'][$row['id']] = array( - 'id' => $row['id'], - 'parent_id' => $row['parent_id'], - 'author_id' => $row['com_author_id'], - 'message' => trim($row['message']), - 'created_at' => $row['com_created_at'] - ); - } - } $smcFunc['db_free_result']($request); - $context['lp_num_queries']++; - - return $items; - } - - /** - * Get filename with XML data - * - * Получаем имя файла с XML-данными - * - * @return string - */ - private static function getXmlFile() - { - $items = self::getDataForXml(); - - if (empty($items)) - return ''; - - $xml = new \DomDocument('1.0', 'utf-8'); - $root = $xml->appendChild($xml->createElement('light_portal')); - - $xml->formatOutput = true; - - $xmlElements = $root->appendChild($xml->createElement('pages')); - foreach ($items as $item) { - $xmlElement = $xmlElements->appendChild($xml->createElement('item')); - foreach ($item as $key => $val) { - $xmlName = $xmlElement->appendChild(in_array($key, ['page_id', 'author_id', 'permissions', 'status', 'num_views', 'num_comments', 'created_at', 'updated_at']) ? $xml->createAttribute($key) : $xml->createElement($key)); - - if (in_array($key, ['titles', 'params'])) { - foreach ($item[$key] as $k => $v) { - $xmlTitle = $xmlName->appendChild($xml->createElement($k)); - $xmlTitle->appendChild($xml->createTextNode($v)); - } - } elseif (in_array($key, ['description', 'content'])) { - $xmlName->appendChild($xml->createCDATASection($val)); - } elseif ($key == 'keywords' && !empty($val)) { - $xmlName->appendChild($xml->createTextNode(implode(', ', array_unique($val)))); - } elseif ($key == 'comments') { - foreach ($item[$key] as $k => $comment) { - $xmlComment = $xmlName->appendChild($xml->createElement('comment')); - foreach ($comment as $label => $text) { - $xmlCommentElem = $xmlComment->appendChild($label == 'message' ? $xml->createElement($label) : $xml->createAttribute($label)); - $xmlCommentElem->appendChild($label == 'message' ? $xml->createCDATASection($text) : $xml->createTextNode($text)); - } - } - } else { - $xmlName->appendChild($xml->createTextNode($val)); - } - } - } - - $file = sys_get_temp_dir() . '/lp_pages_backup.xml'; - $xml->save($file); - - return $file; - } - - /** - * Page import - * - * Импорт страниц - * - * @return void - */ - public static function import() - { - global $context, $txt, $scripturl; - - loadTemplate('LightPortal/ManageImport'); + $smcFunc['lp_num_queries']++; - $context['page_title'] = $txt['lp_portal'] . ' - ' . $txt['lp_pages_import']; - $context['page_area_title'] = $txt['lp_pages_import']; - $context['canonical_url'] = $scripturl . '?action=admin;area=lp_pages;sa=import'; - - $context[$context['admin_menu_name']]['tab_data'] = array( - 'title' => LP_NAME, - 'description' => $txt['lp_pages_import_tab_description'] - ); - - $context['sub_template'] = 'manage_import'; - - self::runImport(); - } - - /** - * Import from an XML file - * - * Импорт из XML-файла - * - * @return void - */ - private static function runImport() - { - global $db_temp_cache, $db_cache, $smcFunc, $context; - - if (empty($_FILES['import_file'])) - return; - - // Might take some time. - @set_time_limit(600); - - // Don't allow the cache to get too full - $db_temp_cache = $db_cache; - $db_cache = []; - - $file = $_FILES['import_file']; - - if ($file['type'] !== 'text/xml') - return; - - $xml = simplexml_load_file($file['tmp_name']); - - if ($xml === false) - return; - - if (!isset($xml->pages->item[0]['page_id'])) - fatal_lang_error('lp_wrong_import_file', false); - - $items = $titles = $params = $keywords = $comments = []; - - foreach ($xml as $element) { - foreach ($element->item as $item) { - $items[] = [ - 'page_id' => $page_id = intval($item['page_id']), - 'author_id' => intval($item['author_id']), - 'alias' => (string) $item->alias, - 'description' => $item->description, - 'content' => $item->content, - 'type' => (string) $item->type, - 'permissions' => intval($item['permissions']), - 'status' => intval($item['status']), - 'num_views' => intval($item['num_views']), - 'num_comments' => intval($item['num_comments']), - 'created_at' => intval($item['created_at']), - 'updated_at' => intval($item['updated_at']) - ]; - - if (!empty($item->titles)) { - foreach ($item->titles as $title) { - foreach ($title as $k => $v) { - $titles[] = [ - 'item_id' => $page_id, - 'type' => 'page', - 'lang' => $k, - 'title' => $v - ]; - } - } - } - - if (!empty($item->params)) { - foreach ($item->params as $param) { - foreach ($param as $k => $v) { - $params[] = [ - 'item_id' => $page_id, - 'type' => 'page', - 'name' => $k, - 'value' => intval($v) - ]; - } - } - } - - if (!empty($item->keywords)) { - foreach (explode(', ', $item->keywords) as $value) { - $keywords[] = [ - 'page_id' => $page_id, - 'value' => $value - ]; - } - } - - if (!empty($item->comments)) { - foreach ($item->comments as $comment) { - foreach ($comment as $k => $v) { - $comments[] = [ - 'id' => $v['id'], - 'parent_id' => $v['parent_id'], - 'page_id' => $page_id, - 'author_id' => $v['author_id'], - 'message' => $v->message, - 'created_at' => $v['created_at'] - ]; - } - } - } - } - } - - if (!empty($items)) { - $items = array_chunk($items, 100); - $count = sizeof($items); - - for ($i = 0; $i < $count; $i++) { - $sql = "REPLACE INTO {db_prefix}lp_pages (`page_id`, `author_id`, `alias`, `description`, `content`, `type`, `permissions`, `status`, `num_views`, `num_comments`, `created_at`, `updated_at`) - VALUES "; - - $sql .= self::getValues($items[$i]); - - $result = $smcFunc['db_query']('', $sql); - $context['lp_num_queries']++; - } - } - - if (!empty($titles) && !empty($result)) { - $titles = array_chunk($titles, 100); - $count = sizeof($titles); - - for ($i = 0; $i < $count; $i++) { - $sql = "REPLACE INTO {db_prefix}lp_titles (`item_id`, `type`, `lang`, `title`) - VALUES "; - - $sql .= self::getValues($titles[$i]); - - $result = $smcFunc['db_query']('', $sql); - $context['lp_num_queries']++; - } - } - - if (!empty($params) && !empty($result)) { - $params = array_chunk($params, 100); - $count = sizeof($params); - - for ($i = 0; $i < $count; $i++) { - $sql = "REPLACE INTO {db_prefix}lp_params (`item_id`, `type`, `name`, `value`) - VALUES "; - - $sql .= self::getValues($params[$i]); - - $result = $smcFunc['db_query']('', $sql); - $context['lp_num_queries']++; - } - } - - if (!empty($keywords) && !empty($result)) { - $keywords = array_chunk($keywords, 100); - $count = sizeof($keywords); - - for ($i = 0; $i < $count; $i++) { - $sql = "REPLACE INTO {db_prefix}lp_tags (`page_id`, `value`) - VALUES "; - - $sql .= self::getValues($keywords[$i]); - - $result = $smcFunc['db_query']('', $sql); - $context['lp_num_queries']++; - } - } - - if (!empty($comments) && !empty($result)) { - $comments = array_chunk($comments, 100); - $count = sizeof($comments); - - for ($i = 0; $i < $count; $i++) { - $sql = "REPLACE INTO {db_prefix}lp_comments (`id`, `parent_id`, `page_id`, `author_id`, `message`, `created_at`) - VALUES "; - - $sql .= self::getValues($comments[$i]); - - $result = $smcFunc['db_query']('', $sql); - $context['lp_num_queries']++; - } - } - - if (empty($result)) - fatal_lang_error('lp_import_failed', false); - - // Restore the cache - $db_cache = $db_temp_cache; - - clean_cache(); + return (bool) $count; } } diff --git a/Sources/LightPortal/Notify.php b/Sources/LightPortal/Notify.php index f30b4c07d..8894a303d 100644 --- a/Sources/LightPortal/Notify.php +++ b/Sources/LightPortal/Notify.php @@ -11,7 +11,7 @@ * @copyright 2019-2020 Bugo * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later * - * @version 1.2 + * @version 1.3 */ class Notify extends \SMF_BackgroundTask @@ -25,7 +25,7 @@ class Notify extends \SMF_BackgroundTask */ public function execute() { - global $sourcedir, $user_profile, $smcFunc, $context; + global $sourcedir, $user_profile, $smcFunc; require_once($sourcedir . '/Subs-Members.php'); $members = membersAllowedTo('light_portal_view'); @@ -57,10 +57,12 @@ public function execute() foreach ($prefs as $member => $pref_option) { foreach ($alert_bits as $type => $bitvalue) { if ($this->_details['content_type'] == 'new_comment') { - if ($pref_option['page_comment'] & $bitvalue) + if ($pref_option['page_comment'] & $bitvalue) { $notifies[$type][] = $member; - } elseif ($pref_option['page_comment_reply'] & $bitvalue) + } + } elseif ($pref_option['page_comment_reply'] & $bitvalue) { $notifies[$type][] = $member; + } } } @@ -98,7 +100,7 @@ public function execute() array('id_alert') ); - $context['lp_num_queries']++; + $smcFunc['lp_num_queries']++; updateMemberData($notifies['alert'], array('alerts' => '+')); } diff --git a/Sources/LightPortal/Page.php b/Sources/LightPortal/Page.php index 45dd7496e..c69f5a312 100644 --- a/Sources/LightPortal/Page.php +++ b/Sources/LightPortal/Page.php @@ -11,7 +11,7 @@ * @copyright 2019-2020 Bugo * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later * - * @version 1.2 + * @version 1.3 */ if (!defined('SMF')) @@ -35,7 +35,7 @@ public static function show() isAllowedTo('light_portal_view'); - $alias = filter_input(INPUT_GET, 'page'); + $alias = Helpers::request('page'); if (empty($alias) && !empty($modSettings['lp_frontpage_mode']) && $modSettings['lp_frontpage_mode'] == 1 && !empty($modSettings['lp_frontpage_alias'])) { $context['lp_page'] = self::getDataByAlias($modSettings['lp_frontpage_alias']); @@ -62,17 +62,17 @@ public static function show() if ($context['lp_page']['created_at'] > time()) send_http_status(404); - Subs::parseContent($context['lp_page']['content'], $context['lp_page']['type']); + Helpers::parseContent($context['lp_page']['content'], $context['lp_page']['type']); if (empty($alias)) { - $context['page_title'] = Helpers::getPublicTitle($context['lp_page']) ?: $txt['lp_portal']; + $context['page_title'] = Helpers::getTitle($context['lp_page']) ?: $txt['lp_portal']; $context['canonical_url'] = $scripturl; $context['lp_current_page_url'] = $context['canonical_url'] . '?'; $context['linktree'][] = array( 'name' => $txt['lp_portal'] ); } else { - $context['page_title'] = Helpers::getPublicTitle($context['lp_page']) ?: $txt['lp_post_error_no_title']; + $context['page_title'] = Helpers::getTitle($context['lp_page']) ?: $txt['lp_post_error_no_title']; $context['canonical_url'] = $scripturl . '?page=' . $alias; $context['lp_current_page_url'] = $context['canonical_url'] . ';'; $context['linktree'][] = array( @@ -170,19 +170,30 @@ public static function getRelatedPages() if (empty($item = $context['lp_page'])) return []; + $title_words = explode(' ', $title = Helpers::getTitle($item)); + $alias_words = explode('_', $item['alias']); + + $search_formula = ''; + foreach ($title_words as $key => $word) { + $search_formula .= ($search_formula ? ' + ' : '') . 'CASE WHEN lower(t.title) LIKE lower(\'%' . $word . '%\') THEN ' . (count($title_words) - $key) * 2 . ' ELSE 0 END'; + } + + foreach ($alias_words as $key => $word) { + $search_formula .= ' + CASE WHEN lower(p.alias) LIKE lower(\'%' . $word . '%\') THEN ' . (count($alias_words) - $key) . ' ELSE 0 END'; + } + $request = $smcFunc['db_query']('', ' - SELECT p.page_id, p.alias, p.content, p.type, (IF (t.title LIKE {string:title}, 80, 0) + IF (p.alias LIKE {string:alias}, 20, 0)) AS related, t.title + SELECT p.page_id, p.alias, p.content, p.type, (' . $search_formula . ') AS related, t.title FROM {db_prefix}lp_pages AS p LEFT JOIN {db_prefix}lp_titles AS t ON (p.page_id = t.item_id AND t.lang = {string:current_lang}) - WHERE p.status = {int:status} + WHERE (' . $search_formula . ') > 0 + AND p.status = {int:status} AND p.created_at <= {int:current_time} AND p.permissions IN ({array_int:permissions}) AND p.page_id != {int:current_page} - HAVING related > 0 - ORDER BY related DESC', + ORDER BY related DESC + LIMIT 4', array( - 'title' => Helpers::getPublicTitle($context['lp_page']), - 'alias' => $item['alias'], 'current_lang' => $context['user']['language'], 'status' => 1, 'current_time' => time(), @@ -196,7 +207,7 @@ public static function getRelatedPages() if (Helpers::isFrontpage($row['alias'])) continue; - Subs::parseContent($row['content'], $row['type']); + Helpers::parseContent($row['content'], $row['type']); $first_post_image = preg_match('/
' . $txt['lp_new_version_is_available'] . ' (' . $new_version . ')
diff --git a/Sources/LightPortal/Subs.php b/Sources/LightPortal/Subs.php
index a1da7be96..9be21b19b 100644
--- a/Sources/LightPortal/Subs.php
+++ b/Sources/LightPortal/Subs.php
@@ -11,7 +11,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -49,8 +49,8 @@ public static function loadBlocks()
$context['lp_all_content_classes'] = self::getContentClasses();
$context['lp_fontawesome_enabled'] = Helpers::doesThisThemeUseFontAwesome();
- $context['lp_active_blocks'] = Helpers::getFromCache('active_blocks', 'getActiveBlocks', __CLASS__);
- $context['lp_num_active_pages'] = Helpers::getFromCache('num_active_pages_u' . $context['user']['id'], 'getNumActivePages', __CLASS__);
+ $context['lp_active_blocks'] = Helpers::cache('active_blocks', 'getActiveBlocks', __CLASS__);
+ $context['lp_num_active_pages'] = Helpers::cache('num_active_pages_u' . $context['user']['id'], 'getNumActivePages', __CLASS__);
// Width of some panels | Ширина некоторых панелей
$context['lp_header_panel_width'] = !empty($modSettings['lp_header_panel_width']) ? (int) $modSettings['lp_header_panel_width'] : 12;
@@ -106,8 +106,7 @@ public static function getActiveBLocks()
'title_class' => $row['title_class'],
'title_style' => $row['title_style'],
'content_class' => $row['content_class'],
- 'content_style' => $row['content_style'],
- 'permissions' => $row['permissions']
+ 'content_style' => $row['content_style']
);
$active_blocks[$row['block_id']]['title'][$row['lang']] = $row['title'];
@@ -117,15 +116,15 @@ public static function getActiveBLocks()
}
$smcFunc['db_free_result']($request);
- $context['lp_num_queries']++;
+ $smcFunc['lp_num_queries']++;
return $active_blocks;
}
/**
- * Get the total number of active pages of the current user
+ * Get the total number of active pages
*
- * Подсчитываем общее количество активных страниц текущего пользователя
+ * Подсчитываем общее количество активных страниц
*
* @return int
*/
@@ -145,8 +144,9 @@ public static function getNumActivePages()
);
[$num_pages] = $smcFunc['db_fetch_row']($request);
+
$smcFunc['db_free_result']($request);
- $context['lp_num_queries']++;
+ $smcFunc['lp_num_queries']++;
return (int) $num_pages;
}
@@ -187,75 +187,6 @@ public static function unsetDisabledActions(array &$data)
return $disabled_actions;
}
- /**
- * Prepare content to display
- *
- * Готовим контент к отображению в браузере
- *
- * @param string $content
- * @param string $type
- * @param int $block_id
- * @param int $cache_time
- * @return void
- */
- public static function prepareContent(string &$content, string $type = 'bbc', int $block_id = 0, int $cache_time = 0)
- {
- global $context;
-
- !empty($block_id) && !empty($context['lp_active_blocks'][$block_id])
- ? $parameters = $context['lp_active_blocks'][$block_id]['parameters'] ?? []
- : $parameters = $context['lp_block']['options']['parameters'] ?? [];
-
- self::runAddons('prepareContent', array(&$content, $type, $block_id, $cache_time, $parameters));
- }
-
- /**
- * Parse content depending on the type
- *
- * Парсим контент в зависимости от типа
- *
- * @param string $content
- * @param string $type
- * @return void
- */
- public static function parseContent(string &$content, string $type = 'bbc')
- {
- global $context;
-
- switch ($type) {
- case 'bbc':
- $content = parse_bbc($content);
-
- // Integrate with the Paragrapher mod
- call_integration_hook('integrate_paragrapher_string', array(&$content));
-
- break;
- case 'html':
- $content = un_htmlspecialchars($content);
-
- break;
- case 'php':
- $content = trim(un_htmlspecialchars($content));
- $content = trim($content, '');
-
- ob_start();
-
- try {
- $content = html_entity_decode($content, ENT_COMPAT, $context['character_set'] ?? 'UTF-8');
- eval($content);
- } catch (\ParseError $p) {
- echo $p->getMessage();
- }
-
- $content = ob_get_clean();
-
- break;
- default:
- self::runAddons('parseContent', array(&$content, $type));
- }
- }
-
/**
* Get names of the current addons
*
@@ -448,7 +379,7 @@ public static function getContentClasses()
*/
public static function getAllTitles(string $type = 'page')
{
- global $smcFunc, $context;
+ global $smcFunc;
$request = $smcFunc['db_query']('', '
SELECT item_id, lang, title
@@ -467,7 +398,7 @@ public static function getAllTitles(string $type = 'page')
}
$smcFunc['db_free_result']($request);
- $context['lp_num_queries']++;
+ $smcFunc['lp_num_queries']++;
return $titles;
}
@@ -481,9 +412,9 @@ public static function getAllTitles(string $type = 'page')
*/
public static function showDebugInfo()
{
- global $context, $txt;
+ global $context, $txt, $smcFunc;
- $context['lp_load_page_stats'] = LP_DEBUG ? sprintf($txt['lp_load_page_stats'], round(microtime(true) - $context['lp_load_time'], 3), $context['lp_num_queries']) : false;
+ $context['lp_load_page_stats'] = LP_DEBUG ? sprintf($txt['lp_load_page_stats'], round(microtime(true) - $context['lp_load_time'], 3), $smcFunc['lp_num_queries']) : false;
if (!empty($context['lp_load_page_stats']) && !empty($context['template_layers'])) {
loadTemplate('LightPortal/ViewDebug');
@@ -539,6 +470,8 @@ public static function fixLinktree()
/**
* Check if the portal must not be loaded
*
+ * Проверяем, должен портал загружаться или нет
+ *
* @return bool
*/
public static function isPortalMustNotBeLoaded()
diff --git a/Sources/LightPortal/Tag.php b/Sources/LightPortal/Tag.php
index 0b3cc1a59..6a7f7b99b 100644
--- a/Sources/LightPortal/Tag.php
+++ b/Sources/LightPortal/Tag.php
@@ -11,7 +11,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -30,10 +30,10 @@ public static function show()
{
global $context, $smcFunc, $txt, $scripturl, $modSettings, $sourcedir;
- if (empty($_GET['key']))
+ if (Helpers::request()->isEmpty('key'))
self::showAll();
- $context['lp_keyword'] = $smcFunc['htmlspecialchars'](trim($_GET['key']), ENT_QUOTES);
+ $context['lp_keyword'] = $smcFunc['htmlspecialchars'](trim(Helpers::request('key')), ENT_QUOTES);
$context['page_title'] = sprintf($txt['lp_all_tags_by_key'], $context['lp_keyword']);
$context['canonical_url'] = $scripturl . '?action=portal;sa=tags;key=' . urlencode($context['lp_keyword']);
$context['robot_no_index'] = true;
@@ -84,7 +84,7 @@ public static function show()
'data' => array(
'function' => function ($entry) use ($scripturl)
{
- return '' . Helpers::getPublicTitle($entry) . '';
+ return '' . Helpers::getTitle($entry) . '';
},
'class' => 'centertext'
)
@@ -147,7 +147,7 @@ public static function getAllPagesWithSelectedTag(int $start, int $items_per_pag
{
global $smcFunc, $txt, $context, $modSettings, $scripturl, $user_info;
- $titles = Helpers::getFromCache('all_titles', 'getAllTitles', '\Bugo\LightPortal\Subs', LP_CACHE_TIME, 'page');
+ $titles = Helpers::cache('all_titles', 'getAllTitles', '\Bugo\LightPortal\Subs', LP_CACHE_TIME, 'page');
$request = $smcFunc['db_query']('', '
SELECT
@@ -176,7 +176,7 @@ public static function getAllPagesWithSelectedTag(int $start, int $items_per_pag
$items = [];
while ($row = $smcFunc['db_fetch_assoc']($request)) {
- Subs::parseContent($row['content'], $row['type']);
+ Helpers::parseContent($row['content'], $row['type']);
$image = null;
if (!empty($modSettings['lp_show_images_in_articles'])) {
@@ -203,7 +203,7 @@ public static function getAllPagesWithSelectedTag(int $start, int $items_per_pag
}
$smcFunc['db_free_result']($request);
- $context['lp_num_queries']++;
+ $smcFunc['lp_num_queries']++;
return $items;
}
@@ -240,7 +240,7 @@ public static function getTotalQuantityPagesWithSelectedTag()
$items[$row['page_id']] = $row['value'];
$smcFunc['db_free_result']($request);
- $context['lp_num_queries']++;
+ $smcFunc['lp_num_queries']++;
return sizeof($items);
}
@@ -330,19 +330,20 @@ public static function showAll()
*/
public static function getAll(int $start, int $items_per_page, string $sort)
{
- global $smcFunc, $scripturl, $context;
+ global $smcFunc, $scripturl;
$request = $smcFunc['db_query']('', '
SELECT t.value
FROM {db_prefix}lp_tags AS t
INNER JOIN {db_prefix}lp_pages AS p ON (t.page_id = p.page_id)
- WHERE t.value IS NOT NULL
+ WHERE t.value <> {string:blank_string}
AND p.status = {int:status}
AND p.created_at <= {int:current_time}
AND p.permissions IN ({array_int:permissions})
ORDER BY {raw:sort}' . ($items_per_page ? '
LIMIT {int:start}, {int:limit}' : ''),
array(
+ 'blank_string' => '',
'status' => Page::STATUS_ACTIVE,
'current_time' => time(),
'permissions' => Helpers::getPermissions(),
@@ -366,7 +367,7 @@ public static function getAll(int $start, int $items_per_page, string $sort)
}
$smcFunc['db_free_result']($request);
- $context['lp_num_queries']++;
+ $smcFunc['lp_num_queries']++;
uasort($items, function ($a, $b) {
return $a['frequency'] < $b['frequency'];
@@ -384,7 +385,7 @@ public static function getAll(int $start, int $items_per_page, string $sort)
*/
public static function getTotalQuantity()
{
- global $smcFunc, $context;
+ global $smcFunc;
$request = $smcFunc['db_query']('', '
SELECT t.page_id, t.value
@@ -406,7 +407,7 @@ public static function getTotalQuantity()
$items[$row['value']] = $row['page_id'];
$smcFunc['db_free_result']($request);
- $context['lp_num_queries']++;
+ $smcFunc['lp_num_queries']++;
return sizeof($items);
}
@@ -443,14 +444,14 @@ private static function showAsArticles()
'num_views' => 'p.num_views'
);
- $context['current_sorting'] = $_POST['sort'] ?? 'created;desc';
+ $context['current_sorting'] = Helpers::post('sort', 'created;desc');
$sort = $sorting_types[$context['current_sorting']];
$articles = self::getAllPagesWithSelectedTag($start, $limit, $sort);
$articles = array_map(function ($article) use ($modSettings) {
if (isset($article['title']))
- $article['title'] = Helpers::getPublicTitle($article);
+ $article['title'] = Helpers::getTitle($article);
if (empty($article['image']) && !empty($modSettings['lp_image_placeholder']))
$article['image'] = $modSettings['lp_image_placeholder'];
@@ -463,7 +464,7 @@ private static function showAsArticles()
$context['lp_frontpage_articles'] = $articles;
- $context['lp_frontpage_layout'] = FrontPage::getNumColumns();
+ $context['lp_frontpage_layout'] = Front\Article::getNumColumns();
loadTemplate('LightPortal/ViewFrontPage');
loadTemplate('LightPortal/ViewTags');
diff --git a/Sources/LightPortal/addons/AdsBlock/AdsBlock.php b/Sources/LightPortal/addons/AdsBlock/AdsBlock.php
index 83809d13b..553ca04fc 100644
--- a/Sources/LightPortal/addons/AdsBlock/AdsBlock.php
+++ b/Sources/LightPortal/addons/AdsBlock/AdsBlock.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -91,7 +91,7 @@ public static function menuButtons()
if (empty($context['current_board']))
return;
- $context['lp_ads_blocks'] = Helpers::getFromCache('ads_block_addon', 'getData', __CLASS__);
+ $context['lp_ads_blocks'] = Helpers::cache('ads_block_addon', 'getData', __CLASS__);
if (!empty($context['lp_ads_blocks']))
$context['lp_blocks'] = array_merge($context['lp_blocks'], $context['lp_ads_blocks']);
@@ -114,6 +114,7 @@ public static function getData()
if (empty($context['lp_blocks']['ads']))
return [];
+ $ads_blocks = [];
foreach ($txt['lp_ads_block_addon_placement_set'] as $position => $dump)
$ads_blocks[$position] = self::getByPosition($position);
@@ -189,7 +190,9 @@ public static function prepareDisplayContext(&$output, &$message, $counter)
*
* Вывод рекламы перед каждым последним сообщением
*/
- $before_every_last_post = empty($options['view_newest_first']) ? $counter == $context['total_visible_posts'] || $counter % $context['messages_per_page'] == 0 : ($output['id'] == $context['topic_first_message'] || ($context['total_visible_posts'] - $counter) % $context['messages_per_page'] == 0);
+ $before_every_last_post = empty($options['view_newest_first'])
+ ? $counter == $context['total_visible_posts'] || $counter % $context['messages_per_page'] == 0
+ : ($output['id'] == $context['topic_first_message'] || ($context['total_visible_posts'] - $counter) % $context['messages_per_page'] == 0);
if (!empty($context['lp_ads_blocks']['before_every_last_post']) && $before_every_last_post) {
lp_show_blocks('before_every_last_post');
}
@@ -221,56 +224,6 @@ public static function prepareDisplayContext(&$output, &$message, $counter)
if (!empty($context['lp_ads_blocks']['after_every_first_post']) && ($output['counter'] == (empty($options['view_newest_first']) ? $context['start'] + 1 : $current_counter - 1))) {
lp_show_blocks('after_every_first_post');
}
-
- /**
- * Displaying ads after every fifth message on the page
- *
- * Вывод рекламы после каждого пятого сообщения
- */
- if (!empty($context['lp_ads_blocks']['after_every_five_post']) && abs($current_counter - $counter) == 5) {
- ob_start();
-
- lp_show_blocks('after_every_five_post');
-
- $after_every_five_post = ob_get_clean();
-
- addInlineJavaScript('
- const all_windowbg = document.getElementById("quickModForm").querySelectorAll("div.windowbg");
- all_windowbg[all_windowbg.length - 1].insertAdjacentHTML("afterend", ' . JavaScriptEscape($after_every_five_post) . ');', true);
- }
-
- /**
- * Displaying ads after each last message on the page
- *
- * Вывод рекламы после каждого последнего сообщения
- */
- if (!empty($context['lp_ads_blocks']['after_every_last_post']) && ($counter == $context['total_visible_posts'] || $counter % $context['messages_per_page'] == 0)) {
- ob_start();
-
- lp_show_blocks('after_every_last_post');
-
- $after_every_last_post = ob_get_clean();
-
- addInlineJavaScript('
- const all_windowbg2 = document.getElementById("quickModForm").querySelectorAll("div.windowbg");
- all_windowbg2[all_windowbg2.length - 1].insertAdjacentHTML("afterend", ' . JavaScriptEscape($after_every_last_post) . ');', true);
- }
-
- /**
- * Displaying ads after the last message
- *
- * Вывод рекламы после последнего сообщения
- */
- if (!empty($context['lp_ads_blocks']['after_last_post']) && $output['id'] == (empty($options['view_newest_first']) ? $context['topic_last_message'] : $context['topic_first_message'])) {
- ob_start();
-
- lp_show_blocks('after_last_post');
-
- $after_last_post = ob_get_clean();
-
- addInlineJavaScript('
- document.getElementById("quickModForm").insertAdjacentHTML("beforeend", ' . JavaScriptEscape($after_last_post) . ');', true);
- }
}
/**
@@ -281,14 +234,14 @@ public static function prepareDisplayContext(&$output, &$message, $counter)
* @param string $position
* @return array
*/
- private static function getByPosition($position)
+ private static function getByPosition(string $position)
{
global $context;
if (empty($position))
return [];
- $blocks = array_filter($context['lp_blocks']['ads'], function ($block) use ($position, $context) {
+ return array_filter($context['lp_blocks']['ads'], function ($block) use ($position, $context) {
if (!empty($block['parameters']['ads_boards'])) {
$boards = array_flip(explode(',', $block['parameters']['ads_boards']));
if (!array_key_exists($context['current_board'], $boards))
@@ -308,8 +261,6 @@ private static function getByPosition($position)
return false;
});
-
- return $blocks;
}
/**
@@ -403,7 +354,9 @@ public static function prepareBlockFields()
)
);
- $context['lp_block']['options']['parameters']['ads_placement'] = is_array($context['lp_block']['options']['parameters']['ads_placement']) ? $context['lp_block']['options']['parameters']['ads_placement'] : explode(',', $context['lp_block']['options']['parameters']['ads_placement']);
+ if (!is_array($context['lp_block']['options']['parameters']['ads_placement'])) {
+ $context['lp_block']['options']['parameters']['ads_placement'] = explode(',', $context['lp_block']['options']['parameters']['ads_placement']);
+ }
$context['posting_fields']['ads_placement']['label']['text'] = $txt['lp_block_placement'];
$context['posting_fields']['ads_placement']['input'] = array(
diff --git a/Sources/LightPortal/addons/AdsBlock/langs/english.php b/Sources/LightPortal/addons/AdsBlock/langs/english.php
index ee9b9ab74..334563565 100644
--- a/Sources/LightPortal/addons/AdsBlock/langs/english.php
+++ b/Sources/LightPortal/addons/AdsBlock/langs/english.php
@@ -19,8 +19,5 @@
'before_every_last_post' => 'Before each last message on the page',
'before_last_post' => 'Before the last message',
'after_first_post' => 'After the first message',
- 'after_every_first_post' => 'After each first message on the page',
- 'after_every_five_post' => 'After every fifth message on the page',
- 'after_every_last_post' => 'After each last message on the page',
- 'after_last_post' => 'After the last message'
+ 'after_every_first_post' => 'After each first message on the page'
);
\ No newline at end of file
diff --git a/Sources/LightPortal/addons/AdsBlock/langs/polish.php b/Sources/LightPortal/addons/AdsBlock/langs/polish.php
index f67d434b1..b188b6d31 100644
--- a/Sources/LightPortal/addons/AdsBlock/langs/polish.php
+++ b/Sources/LightPortal/addons/AdsBlock/langs/polish.php
@@ -19,8 +19,5 @@
'before_every_last_post' => 'Przed ostatnią wiadomością na każdej stronie wątku',
'before_last_post' => 'Przed ostatnią wiadomością',
'after_first_post' => 'Po pierwszej wiadomości',
- 'after_every_first_post' => 'Po pierwszej wiadomości na każdej stronie wątku',
- 'after_every_five_post' => 'Po piątej wiadomości na każdej stronie wątku',
- 'after_every_last_post' => 'Po ostatniej wiadomości na każdej stronie wątku',
- 'after_last_post' => 'Po ostatniej wiadomości'
+ 'after_every_first_post' => 'Po pierwszej wiadomości na każdej stronie wątku'
);
diff --git a/Sources/LightPortal/addons/AdsBlock/langs/russian.php b/Sources/LightPortal/addons/AdsBlock/langs/russian.php
index c046d75c2..61e1668f0 100644
--- a/Sources/LightPortal/addons/AdsBlock/langs/russian.php
+++ b/Sources/LightPortal/addons/AdsBlock/langs/russian.php
@@ -19,8 +19,5 @@
'before_every_last_post' => 'Перед каждым последним сообщением на странице',
'before_last_post' => 'Перед последним сообщением',
'after_first_post' => 'После первого сообщения',
- 'after_every_first_post' => 'После каждого первого сообщения на странице',
- 'after_every_five_post' => 'После каждого пятого сообщения на странице',
- 'after_every_last_post' => 'После каждого последнего сообщения на странице',
- 'after_last_post' => 'После последнего сообщения'
+ 'after_every_first_post' => 'После каждого первого сообщения на странице'
);
\ No newline at end of file
diff --git a/Sources/LightPortal/addons/AdsBlock/langs/spanish_es.php b/Sources/LightPortal/addons/AdsBlock/langs/spanish_es.php
index b2644c8e4..8173ce6d6 100644
--- a/Sources/LightPortal/addons/AdsBlock/langs/spanish_es.php
+++ b/Sources/LightPortal/addons/AdsBlock/langs/spanish_es.php
@@ -21,8 +21,5 @@
'before_every_last_post' => 'Antes de cada último mensaje en la página',
'before_last_post' => 'Antes del último mensaje',
'after_first_post' => 'Después del primer mensaje',
- 'after_every_first_post' => 'Después de cada primer mensaje en la página',
- 'after_every_five_post' => 'Después de cada quinto mensaje en la página',
- 'after_every_last_post' => 'Después de cada último mensaje en la página.',
- 'after_last_post' => 'Después del último mensaje'
+ 'after_every_first_post' => 'Después de cada primer mensaje en la página'
);
diff --git a/Sources/LightPortal/addons/AdsBlock/langs/spanish_latin.php b/Sources/LightPortal/addons/AdsBlock/langs/spanish_latin.php
index 8889271ed..07b261cee 100644
--- a/Sources/LightPortal/addons/AdsBlock/langs/spanish_latin.php
+++ b/Sources/LightPortal/addons/AdsBlock/langs/spanish_latin.php
@@ -21,8 +21,5 @@
'before_every_last_post' => 'Antes de cada último mensaje en la página',
'before_last_post' => 'Antes del último mensaje',
'after_first_post' => 'Después del primer mensaje',
- 'after_every_first_post' => 'Después de cada primer mensaje en la página',
- 'after_every_five_post' => 'Después de cada quinto mensaje en la página',
- 'after_every_last_post' => 'Después de cada último mensaje en la página.',
- 'after_last_post' => 'Después del último mensaje'
+ 'after_every_first_post' => 'Después de cada primer mensaje en la página'
);
diff --git a/Sources/LightPortal/addons/AdsBlock/langs/ukrainian.php b/Sources/LightPortal/addons/AdsBlock/langs/ukrainian.php
index 2c0466526..0959d2df8 100644
--- a/Sources/LightPortal/addons/AdsBlock/langs/ukrainian.php
+++ b/Sources/LightPortal/addons/AdsBlock/langs/ukrainian.php
@@ -20,7 +20,4 @@
'before_last_post' => 'Перед останнім повідомленням',
'after_first_post' => 'Після першого повідомлення',
'after_every_first_post' => 'Після кожного першого повідомлення на сторінці',
- 'after_every_five_post' => 'Після кожного п\'ятого повідомлення на сторінці',
- 'after_every_last_post' => 'Після кожного останнього повідомлення на сторінці',
- 'after_last_post' => 'Після останнього повідомлення'
);
\ No newline at end of file
diff --git a/Sources/LightPortal/addons/ArticleList/ArticleList.php b/Sources/LightPortal/addons/ArticleList/ArticleList.php
index b4b7eac0a..62376ae70 100644
--- a/Sources/LightPortal/addons/ArticleList/ArticleList.php
+++ b/Sources/LightPortal/addons/ArticleList/ArticleList.php
@@ -3,7 +3,6 @@
namespace Bugo\LightPortal\Addons\ArticleList;
use Bugo\LightPortal\Helpers;
-use Bugo\LightPortal\Subs;
/**
* ArticleList
@@ -14,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -134,7 +133,8 @@ public static function prepareBlockFields()
'attributes' => array(
'id' => 'article_body_class'
),
- 'options' => array()
+ 'options' => array(),
+ 'tab' => 'appearance'
);
foreach ($context['lp_all_content_classes'] as $key => $data) {
@@ -210,7 +210,7 @@ public static function prepareBlockFields()
*/
public static function getTopics(array $parameters)
{
- global $smcFunc, $modSettings, $context;
+ global $smcFunc, $modSettings;
if (empty($parameters['ids']))
return [];
@@ -250,7 +250,7 @@ public static function getTopics(array $parameters)
}
$smcFunc['db_free_result']($request);
- $context['lp_num_queries']++;
+ $smcFunc['lp_num_queries']++;
return $topics;
}
@@ -265,12 +265,12 @@ public static function getTopics(array $parameters)
*/
public static function getPages(array $parameters)
{
- global $smcFunc, $modSettings, $context;
+ global $smcFunc, $modSettings;
if (empty($parameters['ids']))
return [];
- $titles = Helpers::getFromCache('all_titles', 'getAllTitles', '\Bugo\LightPortal\Subs', LP_CACHE_TIME, 'page');
+ $titles = Helpers::cache('all_titles', 'getAllTitles', '\Bugo\LightPortal\Subs', LP_CACHE_TIME, 'page');
$request = $smcFunc['db_query']('', '
SELECT page_id, alias, content, description, type
@@ -294,7 +294,7 @@ public static function getPages(array $parameters)
continue;
if (!empty($parameters['seek_images'])) {
- Subs::parseContent($row['content'], $row['type']);
+ Helpers::parseContent($row['content'], $row['type']);
$first_post_image = preg_match('/
+ ![' . $topic['title'] . '](' . $topic['image'] . ')
';
}
@@ -366,14 +366,14 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
}
} else {
foreach ($article_list as $page) {
- if (empty($title = Helpers::getPublicTitle($page)))
+ if (empty($title = Helpers::getTitle($page)))
continue;
$content = '';
if (!empty($page['image'])) {
$content .= '
- 
+
';
}
@@ -385,8 +385,9 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
echo '
';
- } else
- echo $txt['lp_article_list_addon_no_items'];
+ } else {
+ echo '', $txt['lp_article_list_addon_no_items'], '
';
+ }
$content = ob_get_clean();
}
diff --git a/Sources/LightPortal/addons/BoardIndex/BoardIndex.php b/Sources/LightPortal/addons/BoardIndex/BoardIndex.php
index d83429c1d..b2f793a9b 100644
--- a/Sources/LightPortal/addons/BoardIndex/BoardIndex.php
+++ b/Sources/LightPortal/addons/BoardIndex/BoardIndex.php
@@ -11,7 +11,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -56,6 +56,10 @@ public static function addSettings(&$config_vars)
*/
public static function init()
{
+ global $txt, $scripturl;
+
+ $txt['lp_board_index_description'] = sprintf($txt['lp_board_index_description'], $scripturl . '?action=forum');
+
add_integration_function('integrate_mark_read_button', __CLASS__ . '::toggleRobotNoIndex', false, __FILE__);
}
diff --git a/Sources/LightPortal/addons/BoardIndex/langs/english.php b/Sources/LightPortal/addons/BoardIndex/langs/english.php
index 35f38a524..74e7ae0df 100644
--- a/Sources/LightPortal/addons/BoardIndex/langs/english.php
+++ b/Sources/LightPortal/addons/BoardIndex/langs/english.php
@@ -1,5 +1,5 @@
?action=forum) if the portal is enabled.';
+$txt['lp_board_index_description'] = 'Additional settings of the forum home page if the portal is enabled.';
$txt['lp_board_index_addon_allow_for_spiders'] = 'Allow indexing of the forum home page';
diff --git a/Sources/LightPortal/addons/BoardIndex/langs/russian.php b/Sources/LightPortal/addons/BoardIndex/langs/russian.php
index 0441fc11e..a01f10ae7 100644
--- a/Sources/LightPortal/addons/BoardIndex/langs/russian.php
+++ b/Sources/LightPortal/addons/BoardIndex/langs/russian.php
@@ -1,5 +1,5 @@
?action=forum), если включен портал.';
+$txt['lp_board_index_description'] = 'Дополнительные настройки главной страницы форума, если включен портал.';
$txt['lp_board_index_addon_allow_for_spiders'] = 'Разрешить индексацию главной страницы форума';
diff --git a/Sources/LightPortal/addons/BoardIndex/langs/ukrainian.php b/Sources/LightPortal/addons/BoardIndex/langs/ukrainian.php
index dd9ae304f..d0de5b9e5 100644
--- a/Sources/LightPortal/addons/BoardIndex/langs/ukrainian.php
+++ b/Sources/LightPortal/addons/BoardIndex/langs/ukrainian.php
@@ -1,5 +1,5 @@
?action=forum), якщо включений портал.';
+$txt['lp_board_index_description'] = 'Додаткові налаштування головної сторінки форуму, якщо включений портал.';
$txt['lp_board_index_addon_allow_for_spiders'] = 'Дозволити індексацію головної сторінки форуму';
diff --git a/Sources/LightPortal/addons/BoardList/BoardList.php b/Sources/LightPortal/addons/BoardList/BoardList.php
index 985a0a95d..605be2093 100644
--- a/Sources/LightPortal/addons/BoardList/BoardList.php
+++ b/Sources/LightPortal/addons/BoardList/BoardList.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -196,7 +196,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'board_list')
return;
- $board_list = Helpers::getFromCache('board_list_addon_b' . $block_id . '_u' . $context['user']['id'], 'getData', __CLASS__, $cache_time);
+ $board_list = Helpers::cache('board_list_addon_b' . $block_id . '_u' . $context['user']['id'], 'getData', __CLASS__, $cache_time);
if (!empty($board_list)) {
$context['current_board'] = $context['current_board'] ?? 0;
diff --git a/Sources/LightPortal/addons/BoardNews/BoardNews.php b/Sources/LightPortal/addons/BoardNews/BoardNews.php
index a94bb430b..4b2eb4e83 100644
--- a/Sources/LightPortal/addons/BoardNews/BoardNews.php
+++ b/Sources/LightPortal/addons/BoardNews/BoardNews.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -194,7 +194,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'board_news')
return;
- $board_news = Helpers::getFromCache('board_news_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $cache_time, $parameters);
+ $board_news = Helpers::cache('board_news_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $cache_time, $parameters);
if (!empty($board_news)) {
ob_start();
diff --git a/Sources/LightPortal/addons/CodeMirror/CodeMirror.php b/Sources/LightPortal/addons/CodeMirror/CodeMirror.php
index cf8c13c45..1492b5735 100644
--- a/Sources/LightPortal/addons/CodeMirror/CodeMirror.php
+++ b/Sources/LightPortal/addons/CodeMirror/CodeMirror.php
@@ -11,7 +11,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
diff --git a/Sources/LightPortal/addons/CurrentMonth/CurrentMonth.php b/Sources/LightPortal/addons/CurrentMonth/CurrentMonth.php
index 565b1d360..81b8f951d 100644
--- a/Sources/LightPortal/addons/CurrentMonth/CurrentMonth.php
+++ b/Sources/LightPortal/addons/CurrentMonth/CurrentMonth.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -188,7 +188,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time)
if ($type !== 'current_month')
return;
- $calendar_data = Helpers::getFromCache('current_month_addon_u' . $user_info['id'], 'getData', __CLASS__, $cache_time);
+ $calendar_data = Helpers::cache('current_month_addon_u' . $user_info['id'], 'getData', __CLASS__, $cache_time);
if (!empty($calendar_data)) {
ob_start();
diff --git a/Sources/LightPortal/addons/EasyMarkdownEditor/EasyMarkdownEditor.php b/Sources/LightPortal/addons/EasyMarkdownEditor/EasyMarkdownEditor.php
index 74b839e97..68561db55 100644
--- a/Sources/LightPortal/addons/EasyMarkdownEditor/EasyMarkdownEditor.php
+++ b/Sources/LightPortal/addons/EasyMarkdownEditor/EasyMarkdownEditor.php
@@ -11,7 +11,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
diff --git a/Sources/LightPortal/addons/FaBoardIcons/FaBoardIcons.php b/Sources/LightPortal/addons/FaBoardIcons/FaBoardIcons.php
index bfcce25e7..056eb28e6 100644
--- a/Sources/LightPortal/addons/FaBoardIcons/FaBoardIcons.php
+++ b/Sources/LightPortal/addons/FaBoardIcons/FaBoardIcons.php
@@ -11,7 +11,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
diff --git a/Sources/LightPortal/addons/FacebookComments/FacebookComments.php b/Sources/LightPortal/addons/FacebookComments/FacebookComments.php
index a73099432..ccdbcde78 100644
--- a/Sources/LightPortal/addons/FacebookComments/FacebookComments.php
+++ b/Sources/LightPortal/addons/FacebookComments/FacebookComments.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
diff --git a/Sources/LightPortal/addons/FlipsterCarousel/FlipsterCarousel.php b/Sources/LightPortal/addons/FlipsterCarousel/FlipsterCarousel.php
index f548d2db5..28b9f9dd3 100644
--- a/Sources/LightPortal/addons/FlipsterCarousel/FlipsterCarousel.php
+++ b/Sources/LightPortal/addons/FlipsterCarousel/FlipsterCarousel.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -245,7 +245,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'flipster_carousel')
return;
- $flipster_html = Helpers::getFromCache('flipster_carousel_addon_b' . $block_id, 'getHtml', __CLASS__, $cache_time, $block_id, $parameters);
+ $flipster_html = Helpers::cache('flipster_carousel_addon_b' . $block_id, 'getHtml', __CLASS__, $cache_time, $block_id, $parameters);
if (!empty($flipster_html)) {
loadCSSFile('https://cdn.jsdelivr.net/npm/jquery.flipster@1/dist/jquery.flipster.min.css', array('external' => true));
diff --git a/Sources/LightPortal/addons/FlipsterCarousel/langs/english.php b/Sources/LightPortal/addons/FlipsterCarousel/langs/english.php
index b266e174f..6e74cc771 100644
--- a/Sources/LightPortal/addons/FlipsterCarousel/langs/english.php
+++ b/Sources/LightPortal/addons/FlipsterCarousel/langs/english.php
@@ -16,9 +16,9 @@
$txt['lp_flipster_carousel_addon_show_buttons'] = 'Display Previous/Next buttons';
$txt['lp_flipster_carousel_addon_images'] = 'Image list';
$txt['lp_flipster_carousel_addon_images_subtext'] = 'One image url per line. Example:
-https://example.com/image1.png|Image 1 title|Image 1 category
+https://picsum.photos/seed/picsum1/300/200|Image 1 title|Image 1 category
-https://example.com/image2.png|Image 2 title|Image 2 category
+https://picsum.photos/seed/picsum2/300/200|Image 2 title|Image 2 category
-https://example.com/image1.png|Tytuł obrazu 1|Kategoria obrazu 1
+https://picsum.photos/seed/picsum1/300/200|Tytuł obrazu 1|Kategoria obrazu 1
-https://example.com/image2.png|Tytuł obrazu 2|Kategoria obrazu 2
+https://picsum.photos/seed/picsum2/300/200|Tytuł obrazu 2|Kategoria obrazu 2
-https://example.com/image1.png|Заголовок 1|Категория 1
+https://picsum.photos/seed/picsum1/300/200|Заголовок 1|Категория 1
-https://example.com/image2.png|Заголовок 2|Категория 2
+https://picsum.photos/seed/picsum2/300/200|Заголовок 2|Категория 2
-https://example.com/image1.png|Заголовок 1|Категорія 1
+https://picsum.photos/seed/picsum1/300/200|Заголовок 1|Категорія 1
-https://example.com/image2.png|Заголовок 2|Категорія 2
+https://picsum.photos/seed/picsum2/300/200|Заголовок 2|Категорія 2
-
-
+
+ ';
+}
+
+/**
+ * Topics from selected boards as sources of articles (Flarum style)
+ *
+ * Темы из выбранных разделов в виде статей
+ *
+ * @return void
+ */
+function template_show_topics_as_flarum_style()
+{
+ global $context, $txt;
+
+ echo '
+
+
+ +
';
@@ -83,8 +95,8 @@ function template_show_topics_as_flarum_style()
if (!empty($topic['image'])) {
echo '
-
- ';
+
+
+ ';
}
diff --git a/Themes/default/LightPortal/ManageSettings.template.php b/Themes/default/LightPortal/ManageSettings.template.php
index a394e002f..ac976abde 100644
--- a/Themes/default/LightPortal/ManageSettings.template.php
+++ b/Themes/default/LightPortal/ManageSettings.template.php
@@ -121,6 +121,9 @@ function template_callback_panel_layout()
+
- ![', $topic['subject'], '](', $topic['image'], ')
+
';
$content = ob_get_clean();
diff --git a/Sources/LightPortal/addons/Todays/Todays.php b/Sources/LightPortal/addons/Todays/Todays.php
index 6e888bce2..2ff718cbe 100644
--- a/Sources/LightPortal/addons/Todays/Todays.php
+++ b/Sources/LightPortal/addons/Todays/Todays.php
@@ -2,8 +2,6 @@
namespace Bugo\LightPortal\Addons\Todays;
-use Bugo\LightPortal\Helpers;
-
/**
* Todays
*
@@ -13,7 +11,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -63,8 +61,6 @@ public static function blockOptions(&$options)
*/
public static function validateBlockData(&$parameters, $type)
{
- global $context;
-
if ($type !== 'todays')
return;
diff --git a/Sources/LightPortal/addons/TopBoards/TopBoards.php b/Sources/LightPortal/addons/TopBoards/TopBoards.php
index bb62ec7fa..0cac09a27 100644
--- a/Sources/LightPortal/addons/TopBoards/TopBoards.php
+++ b/Sources/LightPortal/addons/TopBoards/TopBoards.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -127,6 +127,7 @@ public static function getData($num_boards)
global $boarddir;
require_once($boarddir . '/SSI.php');
+
return ssi_topBoards($num_boards, 'array');
}
@@ -149,7 +150,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'top_boards')
return;
- $top_boards = Helpers::getFromCache('top_boards_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $cache_time, $parameters);
+ $top_boards = Helpers::cache('top_boards_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $cache_time, $parameters['num_boards']);
if (!empty($top_boards)) {
ob_start();
diff --git a/Sources/LightPortal/addons/TopPages/TopPages.php b/Sources/LightPortal/addons/TopPages/TopPages.php
index 096fea7ef..f030076ef 100644
--- a/Sources/LightPortal/addons/TopPages/TopPages.php
+++ b/Sources/LightPortal/addons/TopPages/TopPages.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -158,9 +158,9 @@ public static function prepareBlockFields()
*/
public static function getData($parameters)
{
- global $smcFunc, $scripturl, $context;
+ global $smcFunc, $scripturl;
- $titles = Helpers::getFromCache('all_titles', 'getAllTitles', '\Bugo\LightPortal\Subs', LP_CACHE_TIME, 'page');
+ $titles = Helpers::cache('all_titles', 'getAllTitles', '\Bugo\LightPortal\Subs', LP_CACHE_TIME, 'page');
$request = $smcFunc['db_query']('', '
SELECT page_id, alias, type, num_views, num_comments
@@ -171,7 +171,6 @@ public static function getData($parameters)
ORDER BY ' . ($parameters['popularity_type'] == 'comments' ? 'num_comments' : 'num_views') . ' DESC
LIMIT {int:limit}',
array(
- 'type' => 'page',
'status' => 1,
'current_time' => time(),
'permissions' => Helpers::getPermissions(),
@@ -193,7 +192,7 @@ public static function getData($parameters)
}
$smcFunc['db_free_result']($request);
- $context['lp_num_queries']++;
+ $smcFunc['lp_num_queries']++;
return $pages;
}
@@ -217,7 +216,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'top_pages')
return;
- $top_pages = Helpers::getFromCache('top_pages_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $cache_time, $parameters);
+ $top_pages = Helpers::cache('top_pages_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $cache_time, $parameters);
ob_start();
@@ -231,7 +230,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
diff --git a/Themes/default/LightPortal/ManagePages.template.php b/Themes/default/LightPortal/ManagePages.template.php
index 192ea3d9d..56078b218 100644
--- a/Themes/default/LightPortal/ManagePages.template.php
+++ b/Themes/default/LightPortal/ManagePages.template.php
@@ -71,12 +71,30 @@ function template_page_post()
+
';
} else {
echo '
@@ -96,18 +108,25 @@ function template_show_topics_as_flarum_style()
echo '
- ', $topic['subject'], '', $topic['is_new'] ? ' + ', $topic['subject'], '', $topic['is_new'] ? ' ' . $txt['new'] . ' ' : '', '
';
+ if (!empty($topic['num_replies'])) {
+ echo '
+ ';
+ }
+
if (!empty($topic['author_id'])) {
echo '
', $topic['author_name'], ', ';
- } else
+ } else {
echo $topic['author_name'], ', ';
+ }
- echo $topic['date'], '
+ echo '
+ ', $topic['date'], '
';
if (!empty($topic['teaser'])) {
diff --git a/Sources/LightPortal/addons/HidingBlocks/HidingBlocks.php b/Sources/LightPortal/addons/HidingBlocks/HidingBlocks.php
index 23c06d190..584cdc40d 100644
--- a/Sources/LightPortal/addons/HidingBlocks/HidingBlocks.php
+++ b/Sources/LightPortal/addons/HidingBlocks/HidingBlocks.php
@@ -2,6 +2,8 @@
namespace Bugo\LightPortal\Addons\HidingBlocks;
+use Bugo\LightPortal\Helpers;
+
/**
* HidingBlocks
*
@@ -11,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -122,7 +124,7 @@ public static function prepareBlockFields()
if (isset($context['lp_block']['options']['parameters']['hidden_breakpoints'])) {
$context['lp_block']['options']['parameters']['hidden_breakpoints'] = is_array($context['lp_block']['options']['parameters']['hidden_breakpoints']) ? $context['lp_block']['options']['parameters']['hidden_breakpoints'] : explode(',', $context['lp_block']['options']['parameters']['hidden_breakpoints']);
} else
- $context['lp_block']['options']['parameters']['hidden_breakpoints'] = $_POST['hidden_breakpoints'] ?? [];
+ $context['lp_block']['options']['parameters']['hidden_breakpoints'] = Helpers::post('hidden_breakpoints', []);
$context['posting_fields']['hidden_breakpoints']['label']['text'] = $txt['lp_hiding_blocks_addon_hidden_breakpoints'];
$context['posting_fields']['hidden_breakpoints']['input'] = array(
diff --git a/Sources/LightPortal/addons/KarmaPostRating/KarmaPostRating.php b/Sources/LightPortal/addons/KarmaPostRating/KarmaPostRating.php
index c41c10127..4eefbb124 100644
--- a/Sources/LightPortal/addons/KarmaPostRating/KarmaPostRating.php
+++ b/Sources/LightPortal/addons/KarmaPostRating/KarmaPostRating.php
@@ -11,7 +11,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -37,15 +37,19 @@ class KarmaPostRating
* @param array $custom_tables
* @return void
*/
- public static function frontTopics(&$custom_columns, &$custom_tables)
+ public static function frontTopics(&$custom_columns, &$custom_tables, &$custom_wheres, &$custom_parameters)
{
global $modSettings;
if (!class_exists('\Bugo\KarmaPostRating\Subs'))
return;
- $custom_columns[] = 'IF (kpr.rating_plus || kpr.rating_minus, kpr.rating_plus + kpr.rating_minus' . (!empty($modSettings['kpr_num_topics_factor']) ? ' + t.num_replies' : '') . ', 0) AS rating';
- $custom_tables[] = 'LEFT JOIN {db_prefix}kpr_ratings AS kpr ON (t.id_first_msg = kpr.item_id AND kpr.item = "message")';
+ $custom_columns[] = 'IF (kpr.rating_plus || kpr.rating_minus, kpr.rating_plus + kpr.rating_minus' . (!empty($modSettings['kpr_num_topics_factor'])
+ ? ' + t.num_replies' : '') . ', 0) AS rating';
+
+ $custom_tables[] = 'LEFT JOIN {db_prefix}kpr_ratings AS kpr ON (t.id_first_msg = kpr.item_id AND kpr.item = {string:kpr_item_type})';
+
+ $custom_parameters['kpr_item_type'] = 'message';
}
/**
@@ -67,7 +71,7 @@ public static function frontTopicsOutput(&$topics, $row)
*
* @return void
*/
- public static function frontpageAssets()
+ public static function frontAssets()
{
global $context;
diff --git a/Sources/LightPortal/addons/LanguageAccess/LanguageAccess.php b/Sources/LightPortal/addons/LanguageAccess/LanguageAccess.php
index db96494f9..c0a444bf4 100644
--- a/Sources/LightPortal/addons/LanguageAccess/LanguageAccess.php
+++ b/Sources/LightPortal/addons/LanguageAccess/LanguageAccess.php
@@ -2,6 +2,8 @@
namespace Bugo\LightPortal\Addons\LanguageAccess;
+use Bugo\LightPortal\Helpers;
+
/**
* LanguageAccess
*
@@ -11,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -108,7 +110,7 @@ public static function prepareBlockFields()
if (isset($context['lp_block']['options']['parameters']['allowed_languages'])) {
$context['lp_block']['options']['parameters']['allowed_languages'] = is_array($context['lp_block']['options']['parameters']['allowed_languages']) ? $context['lp_block']['options']['parameters']['allowed_languages'] : explode(',', $context['lp_block']['options']['parameters']['allowed_languages']);
} else
- $context['lp_block']['options']['parameters']['allowed_languages'] = $_POST['allowed_languages'] ?? [];
+ $context['lp_block']['options']['parameters']['allowed_languages'] = Helpers::post('allowed_languages', []);
$context['posting_fields']['allowed_languages']['label']['text'] = $txt['lp_language_access_addon_allowed_languages'];
$context['posting_fields']['allowed_languages']['input'] = array(
diff --git a/Sources/LightPortal/addons/Likely/Likely.php b/Sources/LightPortal/addons/Likely/Likely.php
index 8cecfe30a..fdbc78615 100644
--- a/Sources/LightPortal/addons/Likely/Likely.php
+++ b/Sources/LightPortal/addons/Likely/Likely.php
@@ -11,7 +11,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
diff --git a/Sources/LightPortal/addons/Markdown/Markdown.php b/Sources/LightPortal/addons/Markdown/Markdown.php
index cb7d68b9f..a3417cf9d 100644
--- a/Sources/LightPortal/addons/Markdown/Markdown.php
+++ b/Sources/LightPortal/addons/Markdown/Markdown.php
@@ -11,7 +11,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
diff --git a/Sources/LightPortal/addons/Markdown/Michelf/MarkdownSMF.php b/Sources/LightPortal/addons/Markdown/Michelf/MarkdownSMF.php
index f285d5659..955bfc3bf 100644
--- a/Sources/LightPortal/addons/Markdown/Michelf/MarkdownSMF.php
+++ b/Sources/LightPortal/addons/Markdown/Michelf/MarkdownSMF.php
@@ -11,7 +11,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
class MarkdownSMF extends \Michelf\MarkdownExtra
diff --git a/Sources/LightPortal/addons/News/News.php b/Sources/LightPortal/addons/News/News.php
index dd1cbb830..1298ed822 100644
--- a/Sources/LightPortal/addons/News/News.php
+++ b/Sources/LightPortal/addons/News/News.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -123,6 +123,7 @@ public static function prepareBlockFields()
*
* Получаем новость форума
*
+ * @param int $item
* @return string
*/
public static function getData($item = 0)
diff --git a/Sources/LightPortal/addons/PageList/PageList.php b/Sources/LightPortal/addons/PageList/PageList.php
index 99b4bde08..bf0d21087 100644
--- a/Sources/LightPortal/addons/PageList/PageList.php
+++ b/Sources/LightPortal/addons/PageList/PageList.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -141,7 +141,7 @@ public static function getData(array $parameters)
{
global $smcFunc, $txt, $context;
- $titles = Helpers::getFromCache('all_titles', 'getAllTitles', '\Bugo\LightPortal\Subs', LP_CACHE_TIME, 'page');
+ $titles = Helpers::cache('all_titles', 'getAllTitles', '\Bugo\LightPortal\Subs', LP_CACHE_TIME, 'page');
$request = $smcFunc['db_query']('', '
SELECT
@@ -186,7 +186,7 @@ public static function getData(array $parameters)
}
$smcFunc['db_free_result']($request);
- $context['lp_num_queries']++;
+ $smcFunc['lp_num_queries']++;
return $pages;
}
@@ -210,7 +210,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'page_list')
return;
- $page_list = Helpers::getFromCache('page_list_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $cache_time, $parameters);
+ $page_list = Helpers::cache('page_list_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $cache_time, $parameters);
ob_start();
@@ -219,7 +219,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
- ';
foreach ($page_list as $page) {
- if (empty($title = Helpers::getPublicTitle($page)))
+ if (empty($title = Helpers::getTitle($page)))
continue;
echo '
@@ -235,8 +235,9 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
echo '
', $txt['lp_page_list_addon_no_items'], '
';
+ }
$content = ob_get_clean();
}
diff --git a/Sources/LightPortal/addons/PrettyUrls/PrettyUrls.php b/Sources/LightPortal/addons/PrettyUrls/PrettyUrls.php
index de5d0a45c..395519ea4 100644
--- a/Sources/LightPortal/addons/PrettyUrls/PrettyUrls.php
+++ b/Sources/LightPortal/addons/PrettyUrls/PrettyUrls.php
@@ -11,7 +11,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
diff --git a/Sources/LightPortal/addons/RandomTopics/RandomTopics.php b/Sources/LightPortal/addons/RandomTopics/RandomTopics.php
index 619424370..8bd8664e7 100644
--- a/Sources/LightPortal/addons/RandomTopics/RandomTopics.php
+++ b/Sources/LightPortal/addons/RandomTopics/RandomTopics.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -115,31 +115,37 @@ public static function prepareBlockFields()
*/
public static function getData($num_topics)
{
- global $db_type, $smcFunc, $modSettings, $user_info, $context, $settings, $scripturl;
+ global $modSettings, $user_info, $db_type, $smcFunc, $context, $settings, $scripturl;
if (empty($num_topics))
return [];
+ $ignore_boards = !empty($modSettings['recycle_board']) ? [(int) $modSettings['recycle_board']] : [];
+
+ if (!empty($modSettings['allow_ignore_boards'])) {
+ $ignore_boards = array_unique(array_merge($ignore_boards, $user_info['ignoreboards']));
+ }
+
if ($db_type == 'postgresql') {
$request = $smcFunc['db_query']('', '
WITH RECURSIVE r AS (
WITH b AS (
SELECT min(t.id_topic), (
SELECT t.id_topic FROM {db_prefix}topics AS t
- WHERE t.approved = {int:is_approved}' . (!empty($modSettings['recycle_board']) ? '
- AND t.id_board != {int:recycle_board}' : '') . '
+ WHERE t.approved = {int:is_approved}' . (!empty($ignore_boards) ? '
+ AND t.id_board NOT IN ({array_int:ignore_boards})' : '') . '
ORDER BY t.id_topic DESC
LIMIT 1 OFFSET {int:limit} - 1
) max
FROM {db_prefix}topics AS t
- WHERE t.approved = {int:is_approved}' . (!empty($modSettings['recycle_board']) ? '
- AND t.id_board != {int:recycle_board}' : '') . '
+ WHERE t.approved = {int:is_approved}' . (!empty($ignore_boards) ? '
+ AND t.id_board NOT IN ({array_int:ignore_boards})' : '') . '
)
(
SELECT t.id_topic, min, max, array[]::integer[] || t.id_topic AS a, 0 AS n
FROM {db_prefix}topics AS t, b
- WHERE t.id_topic >= min + ((max - min) * random())::int' . (!empty($modSettings['recycle_board']) ? '
- AND t.id_board != {int:recycle_board}' : '') . '
+ WHERE t.id_topic >= min + ((max - min) * random())::int' . (!empty($ignore_boards) ? '
+ AND t.id_board NOT IN ({array_int:ignore_boards})' : '') . '
AND t.approved = {int:is_approved}
LIMIT 1
) UNION ALL (
@@ -147,8 +153,8 @@ public static function getData($num_topics)
FROM {db_prefix}topics AS t, r
WHERE t.id_topic >= min + ((max - min) * random())::int
AND t.id_topic <> all(a)
- AND r.n + 1 < {int:limit}' . (!empty($modSettings['recycle_board']) ? '
- AND t.id_board != {int:recycle_board}' : '') . '
+ AND r.n + 1 < {int:limit}' . (!empty($ignore_boards) ? '
+ AND t.id_board NOT IN ({array_int:ignore_boards})' : '') . '
AND t.approved = {int:is_approved}
LIMIT 1
)
@@ -158,7 +164,7 @@ public static function getData($num_topics)
WHERE r.id_topic = t.id_topic',
array(
'is_approved' => 1,
- 'recycle_board' => !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : null,
+ 'ignore_boards' => $ignore_boards,
'limit' => $num_topics
)
);
@@ -168,7 +174,7 @@ public static function getData($num_topics)
$topic_ids[] = $row['id_topic'];
$smcFunc['db_free_result']($request);
- $context['lp_num_queries']++;
+ $smcFunc['lp_num_queries']++;
if (empty($topic_ids))
return self::getData($num_topics - 1);
@@ -181,11 +187,10 @@ public static function getData($num_topics)
FROM {db_prefix}topics AS t
INNER JOIN {db_prefix}messages AS ml ON (t.id_last_msg = ml.id_msg)
INNER JOIN {db_prefix}messages AS mf ON (t.id_first_msg = mf.id_msg)
- LEFT JOIN {db_prefix}members AS mem ON (mf.id_member = mem.id_member)' . (!$user_info['is_guest'] ? '
+ LEFT JOIN {db_prefix}members AS mem ON (mf.id_member = mem.id_member)' . ($user_info['is_guest'] ? '' : '
LEFT JOIN {db_prefix}log_topics AS lt ON (t.id_topic = lt.id_topic AND lt.id_member = {int:current_member})
- LEFT JOIN {db_prefix}log_mark_read AS lmr ON (t.id_board = lmr.id_board AND lmr.id_member = {int:current_member})' : '') . '
- WHERE t.id_topic IN ({array_int:topic_ids})' . (!empty($modSettings['allow_ignore_boards']) ? '
- AND t.id_board NOT IN (SELECT ignore_boards FROM {db_prefix}members WHERE id_member = {int:current_member})' : ''),
+ LEFT JOIN {db_prefix}log_mark_read AS lmr ON (t.id_board = lmr.id_board AND lmr.id_member = {int:current_member})') . '
+ WHERE t.id_topic IN ({array_int:topic_ids})',
array(
'current_member' => $user_info['id'],
'topic_ids' => $topic_ids
@@ -200,19 +205,17 @@ public static function getData($num_topics)
FROM {db_prefix}topics AS t
INNER JOIN {db_prefix}messages AS ml ON (t.id_last_msg = ml.id_msg)
INNER JOIN {db_prefix}messages AS mf ON (t.id_first_msg = mf.id_msg)
- LEFT JOIN {db_prefix}members AS mem ON (mf.id_member = mem.id_member)' . (!$user_info['is_guest'] ? '
+ LEFT JOIN {db_prefix}members AS mem ON (mf.id_member = mem.id_member)' . ($user_info['is_guest'] ? '' : '
LEFT JOIN {db_prefix}log_topics AS lt ON (t.id_topic = lt.id_topic AND lt.id_member = {int:current_member})
- LEFT JOIN {db_prefix}log_mark_read AS lmr ON (t.id_board = lmr.id_board AND lmr.id_member = {int:current_member})' : '') . '
- WHERE t.approved = {int:is_approved}' . (!empty($modSettings['recycle_board']) ? '
- AND t.id_board != {int:recycle_board}' : '') . (!empty($modSettings['allow_ignore_boards']) ? '
- AND t.id_board NOT IN (SELECT ignore_boards FROM {db_prefix}members WHERE id_member = {int:current_member})' : '') . '
- AND t.id_topic IN (SELECT id_topic FROM {db_prefix}topics)
+ LEFT JOIN {db_prefix}log_mark_read AS lmr ON (t.id_board = lmr.id_board AND lmr.id_member = {int:current_member})') . '
+ WHERE t.approved = {int:is_approved}
+ AND t.id_board NOT IN ({array_int:ignore_boards})
ORDER BY RAND()
LIMIT {int:limit}',
array(
'current_member' => $user_info['id'],
'is_approved' => 1,
- 'recycle_board' => !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : null,
+ 'ignore_boards' => $ignore_boards,
'limit' => $num_topics
)
);
@@ -224,10 +227,11 @@ public static function getData($num_topics)
$topics = [];
while ($row = $smcFunc['db_fetch_assoc']($request)) {
- if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
+ if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
- elseif (!isset($icon_sources[$row['icon']]))
+ } elseif (!isset($icon_sources[$row['icon']])) {
$icon_sources[$row['icon']] = 'images_url';
+ }
$topics[] = array(
'poster' => empty($row['id_member']) ? $row['poster_name'] : '' . $row['poster_name'] . '',
@@ -239,7 +243,7 @@ public static function getData($num_topics)
}
$smcFunc['db_free_result']($request);
- $context['lp_num_queries']++;
+ $smcFunc['lp_num_queries']++;
return $topics;
}
@@ -263,7 +267,13 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'random_topics')
return;
- $random_topics = Helpers::getFromCache('random_topics_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $cache_time, $parameters['num_topics']);
+ $random_topics = Helpers::cache(
+ 'random_topics_addon_b' . $block_id . '_u' . $user_info['id'],
+ 'getData',
+ __CLASS__,
+ $cache_time,
+ $parameters['num_topics']
+ );
if (!empty($random_topics)) {
ob_start();
@@ -271,7 +281,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
echo '
- ';
- foreach ($topics as $topic) {
+ foreach ($random_topics as $topic) {
echo '
- ', ($topic['is_new'] ? '
' . $txt['new'] . '' : ''), $topic['icon'], ' ', $topic['link'], '
diff --git a/Sources/LightPortal/addons/RecentAttachments/RecentAttachments.php b/Sources/LightPortal/addons/RecentAttachments/RecentAttachments.php
index 55e158abf..7e39925f2 100644
--- a/Sources/LightPortal/addons/RecentAttachments/RecentAttachments.php
+++ b/Sources/LightPortal/addons/RecentAttachments/RecentAttachments.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -188,7 +188,13 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'recent_attachments')
return;
- $attachment_list = Helpers::getFromCache('recent_attachments_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $cache_time, $parameters);
+ $attachment_list = Helpers::cache(
+ 'recent_attachments_addon_b' . $block_id . '_u' . $user_info['id'],
+ 'getData',
+ __CLASS__,
+ $cache_time,
+ $parameters
+ );
if (!empty($attachment_list)) {
ob_start();
diff --git a/Sources/LightPortal/addons/RecentPosts/RecentPosts.php b/Sources/LightPortal/addons/RecentPosts/RecentPosts.php
index d2c96dd73..3602d9b48 100644
--- a/Sources/LightPortal/addons/RecentPosts/RecentPosts.php
+++ b/Sources/LightPortal/addons/RecentPosts/RecentPosts.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -324,7 +324,7 @@ public static function getData($parameters)
$item['poster']['avatar'] = $memberContext[$item['poster']['id']]['avatar']['image'];
} else {
- $item['poster']['avatar'] = '
';
+ $item['poster']['avatar'] = '';
}
return $item;
@@ -353,7 +353,13 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'recent_posts')
return;
- $recent_posts = Helpers::getFromCache('recent_posts_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $parameters['update_interval'] ?? $cache_time, $parameters);
+ $recent_posts = Helpers::cache(
+ 'recent_posts_addon_b' . $block_id . '_u' . $user_info['id'],
+ 'getData',
+ __CLASS__,
+ $parameters['update_interval'] ?? $cache_time,
+ $parameters
+ );
if (!empty($recent_posts)) {
ob_start();
@@ -372,8 +378,10 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
', $post['poster']['avatar'], '';
if ($post['is_new'])
+ /* echo '
+ ', $txt['new'], ''; */
echo '
- ', $txt['new'], '';
+ ', $txt['new'], '1';
echo '
', $post[$parameters['link_type']];
diff --git a/Sources/LightPortal/addons/RecentTopics/RecentTopics.php b/Sources/LightPortal/addons/RecentTopics/RecentTopics.php
index 8db1f7382..8085caf73 100644
--- a/Sources/LightPortal/addons/RecentTopics/RecentTopics.php
+++ b/Sources/LightPortal/addons/RecentTopics/RecentTopics.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -230,7 +230,7 @@ public static function getData($parameters)
$item['poster']['avatar'] = $memberContext[$item['poster']['id']]['avatar']['image'];
} else {
- $item['poster']['avatar'] = '';
+ $item['poster']['avatar'] = '';
}
return $item;
@@ -259,7 +259,13 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'recent_topics')
return;
- $recent_topics = Helpers::getFromCache('recent_topics_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $parameters['update_interval'] ?? $cache_time, $parameters);
+ $recent_topics = Helpers::cache(
+ 'recent_topics_addon_b' . $block_id . '_u' . $user_info['id'],
+ 'getData',
+ __CLASS__,
+ $parameters['update_interval'] ?? $cache_time,
+ $parameters
+ );
if (!empty($recent_topics)) {
ob_start();
@@ -276,8 +282,10 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
', $topic['poster']['avatar'], '';
if ($topic['is_new'])
+ /* echo '
+ ', $txt['new'], ''; */
echo '
- ', $txt['new'], '';
+ ', $txt['new'], '';
echo $topic['icon'], ' ', $topic['link'];
diff --git a/Sources/LightPortal/addons/RssFeed/RssFeed.php b/Sources/LightPortal/addons/RssFeed/RssFeed.php
index 2c61d7608..6ece3a8a4 100644
--- a/Sources/LightPortal/addons/RssFeed/RssFeed.php
+++ b/Sources/LightPortal/addons/RssFeed/RssFeed.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -154,7 +154,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'rss_feed')
return;
- $rss_feed = Helpers::getFromCache('rss_feed_addon_b' . $block_id, 'getData', __CLASS__, $cache_time, $parameters['url']);
+ $rss_feed = Helpers::cache('rss_feed_addon_b' . $block_id, 'getData', __CLASS__, $cache_time, $parameters['url']);
if (!empty($rss_feed)) {
ob_start();
diff --git a/Sources/LightPortal/addons/SlickSlider/SlickSlider.php b/Sources/LightPortal/addons/SlickSlider/SlickSlider.php
index e378d28cb..0eaa66100 100644
--- a/Sources/LightPortal/addons/SlickSlider/SlickSlider.php
+++ b/Sources/LightPortal/addons/SlickSlider/SlickSlider.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -310,7 +310,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'slick_slider')
return;
- $slick_slider_html = Helpers::getFromCache('slick_slider_addon_b' . $block_id, 'getHtml', __CLASS__, $cache_time, $block_id, $parameters);
+ $slick_slider_html = Helpers::cache('slick_slider_addon_b' . $block_id, 'getHtml', __CLASS__, $cache_time, $block_id, $parameters);
if (!empty($slick_slider_html)) {
loadCSSFile('https://cdn.jsdelivr.net/npm/slick-carousel@1/slick/slick.css', array('external' => true));
diff --git a/Sources/LightPortal/addons/SlickSlider/langs/english.php b/Sources/LightPortal/addons/SlickSlider/langs/english.php
index 99e52dc6e..9cdc1fe2b 100644
--- a/Sources/LightPortal/addons/SlickSlider/langs/english.php
+++ b/Sources/LightPortal/addons/SlickSlider/langs/english.php
@@ -13,7 +13,11 @@
$txt['lp_slick_slider_addon_speed'] = 'Transition speed, ms';
$txt['lp_slick_slider_addon_images'] = 'Image list';
$txt['lp_slick_slider_addon_images_subtext'] = 'One image url per line. Example:
'; \ No newline at end of file diff --git a/Sources/LightPortal/addons/SlickSlider/langs/polish.php b/Sources/LightPortal/addons/SlickSlider/langs/polish.php index 59566e430..489b1295e 100644 --- a/Sources/LightPortal/addons/SlickSlider/langs/polish.php +++ b/Sources/LightPortal/addons/SlickSlider/langs/polish.php @@ -13,7 +13,11 @@ $txt['lp_slick_slider_addon_speed'] = 'Prędkość przejścia, ms'; $txt['lp_slick_slider_addon_images'] = 'Lista obrazów'; $txt['lp_slick_slider_addon_images_subtext'] = 'Jeden URL obrazu w linii. Przykład:-https://example.com/image1.png +https://picsum.photos/seed/picsum1/300/200
-https://example.com/image2.png +https://picsum.photos/seed/picsum2/300/200 +
+https://picsum.photos/seed/picsum3/300/200 +
+https://picsum.photos/seed/picsum4/300/200
'; diff --git a/Sources/LightPortal/addons/SlickSlider/langs/russian.php b/Sources/LightPortal/addons/SlickSlider/langs/russian.php index d55c03725..4fdc0493a 100644 --- a/Sources/LightPortal/addons/SlickSlider/langs/russian.php +++ b/Sources/LightPortal/addons/SlickSlider/langs/russian.php @@ -13,7 +13,11 @@ $txt['lp_slick_slider_addon_speed'] = 'Скорость перехода между слайдами (в миллисекундах)'; $txt['lp_slick_slider_addon_images'] = 'Список изображений'; $txt['lp_slick_slider_addon_images_subtext'] = 'Одна картинка в строке. Пример:-https://example.com/image1.png +https://picsum.photos/seed/picsum1/300/200
-https://example.com/image2.png +https://picsum.photos/seed/picsum2/300/200 +
+https://picsum.photos/seed/picsum3/300/200 +
+https://picsum.photos/seed/picsum4/300/200
'; \ No newline at end of file diff --git a/Sources/LightPortal/addons/SlickSlider/langs/ukrainian.php b/Sources/LightPortal/addons/SlickSlider/langs/ukrainian.php index 5e7d7d2d5..8ba72806b 100644 --- a/Sources/LightPortal/addons/SlickSlider/langs/ukrainian.php +++ b/Sources/LightPortal/addons/SlickSlider/langs/ukrainian.php @@ -13,7 +13,11 @@ $txt['lp_slick_slider_addon_speed'] = 'Швидкість переходу між слайдами (в мілісекундах)'; $txt['lp_slick_slider_addon_images'] = 'Список зображень'; $txt['lp_slick_slider_addon_images_subtext'] = 'Одна картинка в рядку. Приклад:-https://example.com/image1.png +https://picsum.photos/seed/picsum1/300/200
-https://example.com/image2.png +https://picsum.photos/seed/picsum2/300/200 +
+https://picsum.photos/seed/picsum3/300/200 +
+https://picsum.photos/seed/picsum4/300/200
'; \ No newline at end of file diff --git a/Sources/LightPortal/addons/TagList/TagList.php b/Sources/LightPortal/addons/TagList/TagList.php index 0a210dd02..419532fb3 100644 --- a/Sources/LightPortal/addons/TagList/TagList.php +++ b/Sources/LightPortal/addons/TagList/TagList.php @@ -13,7 +13,7 @@ * @copyright 2019-2020 Bugo * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later * - * @version 1.2 + * @version 1.3 */ if (!defined('SMF')) @@ -120,7 +120,7 @@ public static function prepareBlockFields() */ public static function getAllTopicKeywords() { - global $smcFunc, $scripturl, $context; + global $smcFunc, $scripturl; if (!class_exists('\Bugo\Optimus\Keywords')) return []; @@ -144,7 +144,7 @@ public static function getAllTopicKeywords() } $smcFunc['db_free_result']($request); - $context['lp_num_queries']++; + $smcFunc['lp_num_queries']++; return $keywords; } @@ -157,6 +157,8 @@ public static function getAllTopicKeywords() * @param string $content * @param string $type * @param int $block_id + * @param int $cache_time + * @param array $parameters * @return void */ public static function prepareContent(&$content, $type, $block_id, $cache_time, $parameters) @@ -167,9 +169,11 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time, return; if ($parameters['source'] == 'lp_tags') { - $tag_list = Helpers::getFromCache('tag_list_addon_b' . $block_id . '_u' . $user_info['id'], 'getAll', '\Bugo\LightPortal\Tag', $cache_time, ...array(0, 0, 'value')); + $tag_list = Helpers::cache( + 'tag_list_addon_b' . $block_id . '_u' . $user_info['id'], 'getAll', '\Bugo\LightPortal\Tag', $cache_time, ...array(0, 0, 'value') + ); } else { - $tag_list = Helpers::getFromCache('tag_list_addon_b' . $block_id . '_u' . $user_info['id'], 'getAllTopicKeywords', __CLASS__, $cache_time); + $tag_list = Helpers::cache('tag_list_addon_b' . $block_id . '_u' . $user_info['id'], 'getAllTopicKeywords', __CLASS__, $cache_time); } ob_start(); @@ -179,8 +183,9 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time, echo ' ', $tag['value'], ' ', $tag['frequency'], ''; } - } else + } else { echo $txt['lp_no_tags']; + } $content = ob_get_clean(); } diff --git a/Sources/LightPortal/addons/ThemeSwitcher/ThemeSwitcher.php b/Sources/LightPortal/addons/ThemeSwitcher/ThemeSwitcher.php index 2c48d528a..af7266436 100644 --- a/Sources/LightPortal/addons/ThemeSwitcher/ThemeSwitcher.php +++ b/Sources/LightPortal/addons/ThemeSwitcher/ThemeSwitcher.php @@ -13,7 +13,7 @@ * @copyright 2019-2020 Bugo * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later * - * @version 1.2 + * @version 1.3 */ if (!defined('SMF')) @@ -39,31 +39,12 @@ class ThemeSwitcher */ public static function getAvailableThemes() { - global $modSettings, $smcFunc, $context; + global $modSettings; if (empty($modSettings['knownThemes'])) return []; - $request = $smcFunc['db_query']('', ' - SELECT id_theme, value - FROM {db_prefix}themes - WHERE id_member = 0 - AND variable = {string:name} - AND id_theme IN ({array_int:themes})', - array( - 'name' => 'name', - 'themes' => explode(',', $modSettings['knownThemes']) - ) - ); - - $available_themes = []; - while ($row = $smcFunc['db_fetch_row']($request)) - $available_themes[$row[0]] = $row[1]; - - $smcFunc['db_free_result']($request); - $context['lp_num_queries']++; - - return $available_themes; + return array_intersect_key(Helpers::getForumThemes(), array_flip(explode(',', $modSettings['knownThemes']))); } /** @@ -84,7 +65,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time) if ($type !== 'theme_switcher') return; - $available_themes = Helpers::getFromCache('theme_switcher_addon', 'getAvailableThemes', __CLASS__, $cache_time); + $available_themes = Helpers::cache('theme_switcher_addon', 'getAvailableThemes', __CLASS__, $cache_time); if (!empty($available_themes)) { ob_start(); @@ -111,9 +92,7 @@ function lp_block_', $block_id, '_themeswitcher_change() { search = search != "" ? search + ";" : "?"; window.location = window.location.origin + window.location.pathname + search + "theme=" + lp_block_', $block_id, '_themeswitcher_theme_id; } - '; - - echo ' +-https://example.com/image1.png +https://picsum.photos/seed/picsum1/300/200
-https://example.com/image2.png +https://picsum.photos/seed/picsum2/300/200 +
+https://picsum.photos/seed/picsum3/300/200 +
+https://picsum.photos/seed/picsum4/300/200
- ';
foreach ($top_pages as $page) {
- if ($page['num_' . $parameters['popularity_type']] < 1 || empty($title = Helpers::getPublicTitle($page)))
+ if ($page['num_' . $parameters['popularity_type']] < 1 || empty($title = Helpers::getTitle($page)))
continue;
$width = $page['num_' . $parameters['popularity_type']] * 100 / $max;
diff --git a/Sources/LightPortal/addons/TopPosters/TopPosters.php b/Sources/LightPortal/addons/TopPosters/TopPosters.php
index 9a3f6c782..b40211730 100644
--- a/Sources/LightPortal/addons/TopPosters/TopPosters.php
+++ b/Sources/LightPortal/addons/TopPosters/TopPosters.php
@@ -13,7 +13,7 @@
* @copyright 2019-2020 Bugo
* @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
*
- * @version 1.2
+ * @version 1.3
*/
if (!defined('SMF'))
@@ -144,14 +144,13 @@ public static function prepareBlockFields()
*/
public static function getData($parameters)
{
- global $smcFunc, $scripturl, $modSettings, $context;
+ global $smcFunc, $memberContext, $scripturl;
$request = $smcFunc['db_query']('', '
- SELECT mem.id_member, mem.real_name, mem.posts' . ($parameters['show_avatars'] ? ', mem.avatar, a.id_attach, a.attachment_type, a.filename' : '') . '
- FROM {db_prefix}members AS mem' . ($parameters['show_avatars'] ? '
- LEFT JOIN {db_prefix}attachments AS a ON (mem.id_member = a.id_member)' : '') . '
- WHERE mem.posts > {int:num_posts}
- ORDER BY mem.posts DESC
+ SELECT id_member, real_name, posts
+ FROM {db_prefix}members
+ WHERE posts > {int:num_posts}
+ ORDER BY posts DESC
LIMIT {int:num_posters}',
array(
'num_posts' => 0,
@@ -159,19 +158,28 @@ public static function getData($parameters)
)
);
+ $result = $smcFunc['db_fetch_all']($request);
+
+ if (empty($result))
+ return [];
+
+ loadMemberData(array_column($result, 'id_member'));
+
$posters = [];
- while ($row = $smcFunc['db_fetch_assoc']($request)) {
+ foreach ($result as $row) {
+ if (!isset($memberContext[$row['id_member']]))
+ loadMemberContext($row['id_member']);
+
$posters[] = array(
'name' => $row['real_name'],
'link' => allowedTo('profile_view') ? '' . $row['real_name'] . '' : $row['real_name'],
- 'avatar' => $parameters['show_avatars'] ? ($row['avatar'] == '' ? ($row['id_attach'] > 0 ? (empty($row['attachment_type']) ? $scripturl . '?action=dlattach;attach=' . $row['id_attach'] . ';type=avatar' : $modSettings['custom_avatar_url'] . '/' . $row['filename']) : $modSettings['avatar_url'] . '/default.png') : (stristr($row['avatar'], 'http://') ? $row['avatar'] : $modSettings['avatar_url'] . '/' . $row['avatar'])) : null,
+ 'avatar' => $parameters['show_avatars'] ? $memberContext[$row['id_member']]['avatar']['image'] : null,
'posts' => $row['posts']
);
}
$smcFunc['db_free_result']($request);
-
- $context++;
+ $smcFunc['lp_num_queries']++;
return $posters;
}
@@ -195,7 +203,7 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
if ($type !== 'top_posters')
return;
- $top_posters = Helpers::getFromCache('top_posters_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $cache_time, $parameters);
+ $top_posters = Helpers::cache('top_posters_addon_b' . $block_id . '_u' . $user_info['id'], 'getData', __CLASS__, $cache_time, $parameters);
if (!empty($top_posters)) {
ob_start();
@@ -209,15 +217,12 @@ public static function prepareContent(&$content, $type, $block_id, $cache_time,
echo '
- ';
- if (!empty($poster['avatar'])) {
- echo '
-
'; - } + if (!empty($poster['avatar'])) + echo $poster['avatar']; $width = $poster['posts'] * 100 / $max; - echo ' - ', $poster['link'], ' + echo ' ', $poster['link'], '
-
+ ';
+
+ if (!empty($context['lp_page']['id'])) {
+ echo '
+ ';
+ }
+
+ echo '
+ +
@@ -208,6 +211,9 @@ function template_callback_panel_layout()
+
+ +
diff --git a/Themes/default/LightPortal/ViewBlock.template.php b/Themes/default/LightPortal/ViewBlock.template.php
index 429145d98..7cf249dc9 100644
--- a/Themes/default/LightPortal/ViewBlock.template.php
+++ b/Themes/default/LightPortal/ViewBlock.template.php
@@ -34,7 +34,7 @@ function template_portal_above()
if (!empty($context['lp_blocks']['left'])) {
echo '
+ +
-