v0.9.2

dragomano · Feb 1, 2020 · a41ff79 · a41ff79
1 parent 838884e
commit a41ff79
Show file tree

Hide file tree

Showing 29 changed files with 69 additions and 57 deletions.
diff --git a/Sources/LightPortal/Block.php b/Sources/LightPortal/Block.php
@@ -11,7 +11,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))
@@ -339,10 +339,8 @@ public static function edit()
 		$item = !empty($_REQUEST['block_id']) ? (int) $_REQUEST['block_id'] : null;
 		$item = $item ?: (!empty($_REQUEST['id']) ? (int) $_REQUEST['id'] : null);
 
-		if (empty($item)) {
-			header('HTTP/1.1 404 Not Found');
-			fatal_lang_error('lp_block_not_found', false);
-		}
+		if (empty($item))
+			fatal_lang_error('lp_block_not_found', false, null, 404);
 
 		loadTemplate('LightPortal/ManageBlocks');
 
@@ -963,10 +961,8 @@ public static function getData($item)
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 0)	{
-			header('HTTP/1.1 404 Not Found');
-			fatal_lang_error('lp_block_not_found', false);
-		}
+		if ($smcFunc['db_num_rows']($request) == 0)
+			fatal_lang_error('lp_block_not_found', false, null, 404);
 
 		while ($row = $smcFunc['db_fetch_assoc']($request)) {
 			censorText($row['content']);

diff --git a/Sources/LightPortal/Helpers.php b/Sources/LightPortal/Helpers.php
@@ -11,7 +11,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/Integration.php b/Sources/LightPortal/Integration.php
@@ -11,7 +11,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))
@@ -70,7 +70,7 @@ public static function userInfo()
 		global $sourcedir;
 
 		$lp_constants = [
-			'LP_VERSION' => '0.9.1',
+			'LP_VERSION' => '0.9.2',
 			'LP_NAME'    => 'Light Portal',
 			'LP_ADDONS'  => $sourcedir . '/LightPortal/addons'
 		];
@@ -110,7 +110,7 @@ public static function loadTheme()
 	 */
 	public static function actions(&$actions)
 	{
-		global $context, $modSettings;
+		global $modSettings, $context;
 
 		if (!empty($modSettings['lp_frontpage_disable']))
 			return;

diff --git a/Sources/LightPortal/Page.php b/Sources/LightPortal/Page.php
@@ -11,7 +11,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))
@@ -467,6 +467,8 @@ public static function add()
 			'description' => $txt['lp_pages_add_tab_description']
 		);
 
+		Subs::getForumLanguages();
+
 		self::validateData();
 		self::prepareFormFields();
 		self::prepareEditor();
@@ -492,10 +494,8 @@ public static function edit()
 		$item = !empty($_REQUEST['page_id']) ? (int) $_REQUEST['page_id'] : null;
 		$item = $item ?: (!empty($_REQUEST['id']) ? (int) $_REQUEST['id'] : null);
 
-		if (empty($item)) {
-			header('HTTP/1.1 404 Not Found');
-			fatal_lang_error('lp_page_not_found', false);
-		}
+		if (empty($item))
+			fatal_lang_error('lp_page_not_found', false, null, 404);
 
 		$context['page_title'] = $txt['lp_portal'] . ' - ' . $txt['lp_pages_edit_title'];
 
@@ -509,6 +509,8 @@ public static function edit()
 		if ($context['lp_current_page']['can_edit'] === false)
 			fatal_lang_error('lp_page_not_editable', false);
 
+		Subs::getForumLanguages();
+
 		self::validateData();
 
 		$context['page_area_title'] = $txt['lp_pages_edit_title'] . ' - ' . $context['lp_page']['title'];
@@ -1019,10 +1021,8 @@ public static function getFromDB($params)
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 0)	{
-			header('HTTP/1.1 404 Not Found');
-			fatal_lang_error('lp_page_not_found', false);
-		}
+		if ($smcFunc['db_num_rows']($request) == 0)
+			fatal_lang_error('lp_page_not_found', false, null, 404);
 
 		while ($row = $smcFunc['db_fetch_assoc']($request)) {
 			censorText($row['content']);

diff --git a/Sources/LightPortal/Settings.php b/Sources/LightPortal/Settings.php
@@ -11,7 +11,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))
@@ -305,6 +305,9 @@ private static function loadGeneralSettingParameters($subActions = [], $defaultA
 	 */
 	public static function isNewVersionExist()
 	{
+		if (!extension_loaded('curl'))
+			return false;
+
 		$ch = curl_init('https://api.github.com/repos/dragomano/light-portal/releases/latest');
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_HTTPHEADER, [

diff --git a/Sources/LightPortal/Subs.php b/Sources/LightPortal/Subs.php
@@ -11,7 +11,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))
@@ -72,11 +72,12 @@ public static function getTopicsFromSelectedBoards()
 		// Check whether compatible modifications are installed
 		// Проверяем, установлены ли совместимые модификации
 		$topic_rating_bar = class_exists('TopicRatingBar');
+		$karma_post_rating = class_exists('\Bugo\KarmaPostRating\Subs');
 		$optimus = class_exists('\Bugo\Optimus\Subs') && !empty($modSettings['optimus_allow_change_desc']);
 
 		$request = $smcFunc['db_query']('', '
 			SELECT
-				t.id_topic, t.id_board, t.num_views, t.num_replies, t.is_sticky, t.id_first_msg, t.id_member_started, mf.subject, mf.body, mf.smileys_enabled, COALESCE(mem.real_name, mf.poster_name) AS poster_name, mf.poster_time, mf.id_member, ml.id_msg, b.name, ' . ($user_info['is_guest'] ? '0' : 'COALESCE(lt.id_msg, lmr.id_msg, -1) + 1') . ' AS new_from, ml.id_msg_modified' . (!empty($modSettings['lp_show_images_in_articles']) ? ', COALESCE(a.id_attach, 0) AS attach_id' : '') . ($topic_rating_bar ? ', tr.total_votes, tr.total_value' : '') . ($optimus ? ', COALESCE(t.optimus_description, 0) AS optimus_description' : '') . '
+				t.id_topic, t.id_board, t.num_views, t.num_replies, t.is_sticky, t.id_first_msg, t.id_member_started, mf.subject, mf.body, mf.smileys_enabled, COALESCE(mem.real_name, mf.poster_name) AS poster_name, mf.poster_time, mf.id_member, ml.id_msg, b.name, ' . ($user_info['is_guest'] ? '0' : 'COALESCE(lt.id_msg, lmr.id_msg, -1) + 1') . ' AS new_from, ml.id_msg_modified' . (!empty($modSettings['lp_show_images_in_articles']) ? ', COALESCE(a.id_attach, 0) AS attach_id' : '') . ($topic_rating_bar ? ', tr.total_votes, tr.total_value' : '') . ($karma_post_rating ? ', 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' : '') . ($optimus ? ', COALESCE(t.optimus_description, 0) AS optimus_description' : '') . '
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS ml ON (ml.id_msg = t.id_last_msg)
 				INNER JOIN {db_prefix}messages AS mf ON (mf.id_msg = t.id_first_msg)
@@ -85,16 +86,22 @@ public static function getTopicsFromSelectedBoards()
 				LEFT JOIN {db_prefix}log_topics AS lt ON (lt.id_topic = t.id_topic AND lt.id_member = {int:current_member})
 				LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = t.id_board AND lmr.id_member = {int:current_member})') . (!empty($modSettings['lp_show_images_in_articles']) ? '
 				LEFT JOIN {db_prefix}attachments AS a ON (a.id_msg = t.id_first_msg AND a.id_thumb <> 0 AND a.width > 0 AND a.height > 0)' : '') . ($topic_rating_bar ? '
-				LEFT JOIN {db_prefix}topic_ratings AS tr ON (tr.id = t.id_topic)' : '') . '
-			WHERE t.approved = 1
-				AND t.id_poll = 0
-				AND t.id_redirect_topic = 0
-				AND t.id_board IN ({array_int:select_boards})
+				LEFT JOIN {db_prefix}topic_ratings AS tr ON (tr.id = t.id_topic)' : '') . ($karma_post_rating ? '
+				LEFT JOIN {db_prefix}kpr_ratings AS kpr ON (kpr.item_id = t.id_first_msg AND kpr.item = "message")' : '') . '
+			WHERE t.approved = {int:is_approved}
+				AND t.id_poll = {int:id_poll}
+				AND t.id_redirect_topic = {int:id_redirect_topic}
+				AND t.id_board IN ({array_int:select_boards})' . ($karma_post_rating && !empty($context['kpr_ignored_boards']) ? '
+				AND t.id_board NOT IN ({array_int:kpr_ignored_boards)' : '') . '
 				AND {query_wanna_see_board}
 			ORDER BY t.id_last_msg DESC',
 			array(
-				'current_member' => $user_info['id'],
-				'select_boards'  => $boards
+				'current_member'     => $user_info['id'],
+				'is_approved'        => 1,
+				'id_poll'            => 0,
+				'id_redirect_topic'  => 0,
+				'select_boards'      => $boards,
+				'kpr_ignored_boards' => !empty($context['kpr_ignored_boards']) ? $context['kpr_ignored_boards'] : null
 			)
 		);
 
@@ -109,6 +116,7 @@ public static function getTopicsFromSelectedBoards()
 			$row['subject'] = Helpers::cleanBbcode($row['subject']);
 
 			$rating = !empty($row['total_votes']) ? number_format($row['total_value'] / $row['total_votes'], 0) : 0;
+			$kpr_rating = $row['rating'] ?: 0;
 
 			$image = null;
 			if (!empty($modSettings['lp_show_images_in_articles'])) {
@@ -135,7 +143,7 @@ public static function getTopicsFromSelectedBoards()
 				'poster_link' => $scripturl . '?action=profile;u=' . $row['id_member'],
 				'poster_name' => $row['poster_name'],
 				'time'        => Helpers::getFriendlyTime($row['poster_time']),
-				'subject'     => !empty($subject_size) ? shorten_subject($row['subject'], $subject_size - $rating) : $row['subject'],
+				'subject'     => !empty($subject_size) ? shorten_subject($row['subject'], $subject_size - $rating - strlen((string) $kpr_rating)) : $row['subject'],
 				'preview'     => $row['optimus_description'] ?: $row['body'],
 				'link'        => $scripturl . '?topic=' . $row['id_topic'] . ($row['new_from'] > $row['id_msg_modified'] ? '.0' : '.new;topicseen#new'),
 				'board'       => '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>',
@@ -145,7 +153,8 @@ public static function getTopicsFromSelectedBoards()
 				'num_replies' => $row['num_replies'],
 				'css_class'   => $colorClass,
 				'image'       => $image,
-				'rating'      => $rating
+				'rating'      => $rating,
+				'kpr_rating'  => $kpr_rating
 			);
 		}
 

diff --git a/Sources/LightPortal/addons/BoardList/BoardList.php b/Sources/LightPortal/addons/BoardList/BoardList.php
@@ -13,7 +13,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/BoardNews/BoardNews.php b/Sources/LightPortal/addons/BoardNews/BoardNews.php
@@ -13,7 +13,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/EasyMDE/EasyMDE.php b/Sources/LightPortal/addons/EasyMDE/EasyMDE.php
@@ -11,7 +11,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/GoogleTranslate/GoogleTranslate.php b/Sources/LightPortal/addons/GoogleTranslate/GoogleTranslate.php
@@ -11,7 +11,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/Likely/Likely.php b/Sources/LightPortal/addons/Likely/Likely.php
@@ -11,7 +11,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/Markdown/Markdown.php b/Sources/LightPortal/addons/Markdown/Markdown.php
@@ -11,7 +11,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git 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://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 class MarkdownSMF extends \Michelf\MarkdownExtra

diff --git a/Sources/LightPortal/addons/PageList/PageList.php b/Sources/LightPortal/addons/PageList/PageList.php
@@ -14,7 +14,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/RecentAttachments/RecentAttachments.php b/Sources/LightPortal/addons/RecentAttachments/RecentAttachments.php
@@ -13,7 +13,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/RecentPosts/RecentPosts.php b/Sources/LightPortal/addons/RecentPosts/RecentPosts.php
@@ -13,7 +13,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/RecentTopics/RecentTopics.php b/Sources/LightPortal/addons/RecentTopics/RecentTopics.php
@@ -13,7 +13,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/ThemeSwitcher/ThemeSwitcher.php b/Sources/LightPortal/addons/ThemeSwitcher/ThemeSwitcher.php
@@ -13,7 +13,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/Todays/Todays.php b/Sources/LightPortal/addons/Todays/Todays.php
@@ -13,7 +13,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/TopBoards/TopBoards.php b/Sources/LightPortal/addons/TopBoards/TopBoards.php
@@ -13,7 +13,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/TopPosters/TopPosters.php b/Sources/LightPortal/addons/TopPosters/TopPosters.php
@@ -13,7 +13,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/TopTopics/TopTopics.php b/Sources/LightPortal/addons/TopTopics/TopTopics.php
@@ -13,7 +13,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/Trumbowyg.php b/Sources/LightPortal/addons/Trumbowyg.php
@@ -11,7 +11,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/UserInfo/UserInfo.php b/Sources/LightPortal/addons/UserInfo/UserInfo.php
@@ -13,7 +13,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))

diff --git a/Sources/LightPortal/addons/WhosOnline/WhosOnline.php b/Sources/LightPortal/addons/WhosOnline/WhosOnline.php
@@ -13,7 +13,7 @@
  * @copyright 2019-2020 Bugo
  * @license https://opensource.org/licenses/BSD-3-Clause BSD
  *
- * @version 0.9.1
+ * @version 0.9.2
  */
 
 if (!defined('SMF'))