Explorar o código

fix to allow correct group to view bookmarks (#1632)

CauseFX %!s(int64=5) %!d(string=hai) anos
pai
achega
b7f99f325c
Modificáronse 2 ficheiros con 26 adicións e 1 borrados
  1. 1 1
      api/plugins/api/bookmark.php
  2. 25 0
      api/plugins/bookmark.php

+ 1 - 1
api/plugins/api/bookmark.php

@@ -14,7 +14,7 @@ $app->get('/plugins/bookmark/settings', function ($request, $response, $args) {
 $app->get('/plugins/bookmark/page', function ($request, $response, $args) {
 	$Bookmark = new Bookmark();
 	if ($Bookmark->_checkRequest($request) && $Bookmark->checkRoute($request)) {
-		if ($Bookmark->qualifyRequest(1, true)) {
+		if ($Bookmark->qualifyRequest($Bookmark->_bookmarkGetOrganizrTabInfo(), true)) {
 			$GLOBALS['api']['response']['data'] = $Bookmark->_getPage();
 		}
 	}

+ 25 - 0
api/plugins/bookmark.php

@@ -25,6 +25,31 @@ class Bookmark extends Organizr
 		parent::writeLog($type, "Plugin 'Bookmark': " . $message, $username);
 	}
 	
+	public function _bookmarkGetOrganizrTabInfo()
+	{
+		$response = [
+			array(
+				'function' => 'fetch',
+				'query' => array(
+					'SELECT * FROM tabs',
+					'WHERE url = ?',
+					'api/v2/plugins/bookmark/page'
+				)
+			),
+		];
+		return $this->processQueries($response);
+	}
+	
+	public function _bookmarkGetOrganizrTabGroupId()
+	{
+		$tab = $this->_bookmarkGetOrganizrTabInfo();
+		if ($tab) {
+			return $tab['group_id'];
+		} else {
+			return 999;
+		}
+	}
+	
 	public function _checkRequest($request)
 	{
 		$result = false;