Merge pull request #138 from dragomano/prepare_release

Build 2.1.4 with latest fixes

Author: dragomano

Sources/LightPortal/Addons/RandomPages/RandomPages.php

@@ -10,7 +10,7 @@
  * @license https://spdx.org/licenses/GPL-3.0-or-later.html GPL-3.0-or-later
  *
  * @category addon
- * @version 21.04.23
+ * @version 28.04.23
  */
 
 namespace Bugo\LightPortal\Addons\RandomPages;
@@ -139,7 +139,7 @@ public function getData(array $parameters): array
 			$this->context['lp_num_queries']++;
 
 			if (empty($page_ids))
-				return $this->getData($num_pages - 1);
+				return $this->getData(array_merge($parameters, ['num_pages' => $num_pages - 1]));
 
 			$request = $this->smcFunc['db_query']('', '
 				SELECT p.page_id, p.alias, p.created_at, p.num_views, COALESCE(mem.real_name, {string:guest}) AS author_name, mem.id_member AS author_id

Sources/LightPortal/Areas/Config/BasicConfig.php

@@ -40,7 +40,7 @@ public function show(): void
 		$this->context['canonical_url'] = $this->scripturl . '?action=admin;area=lp_settings;sa=basic';
 		$this->context['post_url']      = $this->context['canonical_url'] . ';save';
 
-		$this->context['permissions_excluded']['light_portal_manage_blocks']    = [-1, 0];
+		//$this->context['permissions_excluded']['light_portal_manage_blocks']    = [-1, 0];
 		$this->context['permissions_excluded']['light_portal_manage_pages_own'] = [-1, 0];
 		$this->context['permissions_excluded']['light_portal_manage_pages_any'] = [-1, 0];
 		$this->context['permissions_excluded']['light_portal_approve_pages']    = [-1, 0];
@@ -91,7 +91,7 @@ public function show(): void
 			['title', 'edit_permissions'],
 			['check', 'lp_prohibit_php', 'invalid' => true],
 			['permissions', 'light_portal_view', 'help' => 'permissionhelp_light_portal_view'],
-			['permissions', 'light_portal_manage_blocks', 'help' => 'permissionhelp_light_portal_manage_blocks'],
+			//['permissions', 'light_portal_manage_blocks', 'help' => 'permissionhelp_light_portal_manage_blocks'],
 			['permissions', 'light_portal_manage_pages_own', 'help' => 'permissionhelp_light_portal_manage_pages_own'],
 			['permissions', 'light_portal_manage_pages_any', 'help' => 'permissionhelp_light_portal_manage_pages'],
 			['permissions', 'light_portal_approve_pages', 'help' => 'permissionhelp_light_portal_approve_pages'],

Sources/LightPortal/Areas/Config/ExtraConfig.php

@@ -113,7 +113,6 @@ public function show(): void
 			$save_vars[] = ['int', 'lp_time_to_change_comments'];
 			$save_vars[] = ['int', 'lp_num_comments_per_page'];
 			$save_vars[] = ['int', 'lp_comment_sorting'];
-			$save_vars[] = ['check', 'lp_allow_comment_ratings'];
 
 			$this->saveDBSettings($save_vars);
 

Sources/LightPortal/Areas/CreditArea.php

@@ -71,6 +71,10 @@ public function prepareComponents(): void
 				'name' => 'Wylek',
 				'link' => 'https://www.simplemachines.org/community/index.php?action=profile;u=608635'
 			],
+			[
+				'name' => 'Panoulis64',
+				'link' => 'https://www.simplemachines.org/community/index.php?action=profile;u=301719'
+			]
 		];
 
 		$this->context['sponsors'] = [

Sources/LightPortal/Areas/PluginArea.php

@@ -188,7 +188,7 @@ private function extendPluginList(): void
 		$this->context['lp_can_download'] = [];
 
 		if (($xml = $this->cache()->get('custom_addon_list', 259200)) === null) {
-			$link = 'https://api.jsonserve.com/BkKVmS';
+			$link = 'https://api.jsonserve.com/b5Jrly';
 
 			$addon_list = $this->fetchWebData($link);
 

Sources/LightPortal/Integration.php

@@ -371,12 +371,12 @@ public function loadPermissions(array &$permissionGroups, array &$permissionList
 	{
 		$this->txt['permissiongroup_light_portal'] = LP_NAME;
 
-		$this->context['permissions_excluded']['light_portal_manage_blocks'][] = 0;
+		//$this->context['permissions_excluded']['light_portal_manage_blocks'][] = 0;
 		$this->context['permissions_excluded']['light_portal_manage_pages'][]  = 0;
 		$this->context['permissions_excluded']['light_portal_approve_pages'][] = 0;
 
 		$permissionList['membergroup']['light_portal_view']          = [false, 'light_portal'];
-		$permissionList['membergroup']['light_portal_manage_blocks'] = [false, 'light_portal'];
+		//$permissionList['membergroup']['light_portal_manage_blocks'] = [false, 'light_portal'];
 		$permissionList['membergroup']['light_portal_manage_pages']  = [true, 'light_portal'];
 		$permissionList['membergroup']['light_portal_approve_pages'] = [false, 'light_portal'];
 

Sources/LightPortal/Repositories/PageRepository.php

@@ -60,7 +60,7 @@ public function getAll(int $start, int $items_per_page, string $sort, string $qu
 				'author_name'  => $row['author_name'],
 				'created_at'   => $this->getFriendlyTime((int) $row['date']),
 				'is_front'     => $this->isFrontpage($row['alias']),
-				'title'        => $row['title'] ?: $row['fallback_title'] ?: $row['alias'],
+				'title'        => ($row['title'] ?: $row['fallback_title']) ?: $row['alias'],
 			];
 		}
 

Sources/LightPortal/Utils/SMFTrait.php

@@ -302,12 +302,17 @@ protected function getBoardList(array $options = []): array
 	{
 		require_once $this->sourcedir . '/Subs-MessageIndex.php';
 
-		return getBoardList(array_merge([
+		$defaultOptions = [
 			'ignore_boards'   => true,
 			'use_permissions' => true,
 			'not_redirection' => true,
 			'excluded_boards' => empty($this->modSettings['recycle_board']) ? null : [(int) $this->modSettings['recycle_board']],
-		], $options));
+		];
+
+		if (isset($options['included_boards']))
+			unset($defaultOptions['excluded_boards']);
+
+		return getBoardList(array_merge($defaultOptions, $options));
 	}
 
 	protected function updateMemberData(array $members, array $data): void

Themes/default/LightPortal/ManageSettings.template.php

@@ -451,17 +451,6 @@ function toggleSelectAll(target) {
 	echo '
 				</select>
 			</dd>
-		</template>
-
-		<template x-if="comment_block === \'default\'">
-			<dt>
-				<a id="setting_lp_allow_comment_ratings"></a> <span><label for="lp_allow_comment_ratings">', $txt['lp_allow_comment_ratings'], '</label></span>
-			</dt>
-		</template>
-		<template x-if="comment_block === \'default\'">
-			<dd>
-				<input type="checkbox" name="lp_allow_comment_ratings" id="lp_allow_comment_ratings"', empty($modSettings['lp_allow_comment_ratings']) ? '' : ' checked', ' value="1">
-			</dd>
 		</template>';
 }
 

package-info.xml

@@ -7,7 +7,6 @@
 	<type>modification</type>
 
 	<upgrade from="2.1.1-2.1.3" for="2.1.*">
-		<remove-dir name="$sourcedir/LightPortal/Addons" />
 		<require-dir name="Sources" destination="$boarddir" />
 		<require-dir name="Themes" destination="$boarddir" />
 	</upgrade>

version.txt

@@ -1 +1 @@
-2.1.3
+2.1.4