Merge branch 'develop'

lib/Exception/PermissionException.php

@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Datei für ...
+ *
+ * @version       1.0 / 2024-11-12
+ * @author        akrys
+ */
+namespace FriendsOfRedaxo\UsageCheck\Exception;
+
+/**
+ * Description of PermissionException
+ *
+ * @author akrys
+ */
+class PermissionException
+	extends \Exception
+{
+	//put your code here
+}

lib/Modules/Actions.php

@@ -9,6 +9,7 @@
 
 use FriendsOfRedaxo\UsageCheck\Enum\ModuleType;
 use FriendsOfRedaxo\UsageCheck\Enum\Perm;
+use FriendsOfRedaxo\UsageCheck\Exception\PermissionException;
 use FriendsOfRedaxo\UsageCheck\Lib\BaseModule;
 use FriendsOfRedaxo\UsageCheck\Permission;
 use rex_sql;
@@ -36,7 +37,7 @@ class Actions extends BaseModule
 	public function get(): array
 	{
 		if (!$this->hasPerm()) {
-			return [];
+			throw new PermissionException();
 		}
 
 		$rexSQL = $this->getRexSql();

lib/Modules/Modules.php

@@ -9,6 +9,7 @@
 
 use FriendsOfRedaxo\UsageCheck\Enum\ModuleType;
 use FriendsOfRedaxo\UsageCheck\Enum\Perm;
+use FriendsOfRedaxo\UsageCheck\Exception\PermissionException;
 use FriendsOfRedaxo\UsageCheck\Lib\BaseModule;
 use FriendsOfRedaxo\UsageCheck\Permission;
 use rex_sql;
@@ -36,8 +37,7 @@ class Modules extends BaseModule
 	public function get(): array
 	{
 		if (!$this->hasPerm()) {
-			//Permission::PERM_MODUL
-			return [];
+			throw new PermissionException();
 		}
 
 		$rexSQL = $this->getRexSql();

lib/Modules/Pictures.php

@@ -10,6 +10,7 @@
 use Exception;
 use FriendsOfRedaxo\UsageCheck\Enum\ModuleType;
 use FriendsOfRedaxo\UsageCheck\Enum\Perm;
+use FriendsOfRedaxo\UsageCheck\Exception\PermissionException;
 use FriendsOfRedaxo\UsageCheck\Lib\BaseModule;
 use FriendsOfRedaxo\UsageCheck\Lib\PictureYFrom;
 use FriendsOfRedaxo\UsageCheck\Medium;
@@ -68,7 +69,7 @@ public function setCategory(int $id): void
 	public function get(): array
 	{
 		if (!$this->hasPerm()) {
-			return [];
+			throw new PermissionException();
 		}
 
 		$rexSQL = $this->getRexSql();
@@ -585,7 +586,7 @@ public static function showUsedInfo(array $item, array $fields): string
 	 * Rechte prüfen
 	 * @return bool
 	 */
-	public function hasPerm():bool
+	public function hasPerm(): bool
 	{
 		return Permission::getInstance()->check(Perm::PERM_MEDIA);
 	}

lib/Modules/Templates.php

@@ -10,6 +10,7 @@
 use FriendsOfRedaxo\UsageCheck\Enum\ModuleType;
 use FriendsOfRedaxo\UsageCheck\Enum\Perm;
 use FriendsOfRedaxo\UsageCheck\Error;
+use FriendsOfRedaxo\UsageCheck\Exception\PermissionException;
 use FriendsOfRedaxo\UsageCheck\Lib\BaseModule;
 use FriendsOfRedaxo\UsageCheck\Permission;
 use rex;
@@ -56,8 +57,7 @@ public function get(): array
 		$showInactive = $this->showInactive;
 
 		if (!$this->hasPerm()) {
-			//Permission::PERM_TEMPLATE
-			return [];
+			throw new PermissionException();
 		}
 
 		$user = rex::getUser();

package.yml

@@ -1,5 +1,5 @@
 package: usage_check
-version: '3.2'
+version: '3.2.1'
 author: Axel Krysztofiak
 supportpage: https://github.com/akrys/redaxo-usage_check
 #load: early

pages/_action.php

@@ -6,10 +6,11 @@
 
 use FriendsOfRedaxo\UsageCheck\Addon;
 use FriendsOfRedaxo\UsageCheck\Config;
+use FriendsOfRedaxo\UsageCheck\Exception\PermissionException;
 use FriendsOfRedaxo\UsageCheck\Modules\Actions;
 
-if(!isset($subpage)) {
-	throw new \Exception("this file should not be called directly.");
+if (!isset($subpage)) {
+	throw new Exception("this file should not be called directly.");
 }
 
 $title = new rex_fragment();
@@ -18,7 +19,6 @@
 $title->setVar('version', Addon::getInstance()->getVersion());
 echo rex_view::title($title->parse('fragments/title.php'));
 
-
 $actions = new Actions();
 $actions->setRexSql(rex_sql::factory());
 
@@ -34,18 +34,9 @@
 
 $actions->showAll($showAll);
 
-$items = $actions->get();
+try {
+	$items = $actions->get();
 
-if (empty($items)) {
-	$msg = rex_i18n::rawMsg('akrys_usagecheck_no_rights');
-	$fragment = new rex_fragment([
-		'text' => $msg,
-	]);
-	$fragment = new rex_fragment([
-		'text' => $fragment->parse('fragments/msg/tagged_msg.php'),
-	]);
-	echo $fragment->parse('fragments/msg/error.php');
-} else {
 	$showAllParam = '&showall=true';
 	$showAllLinktext = rex_i18n::rawMsg('akrys_usagecheck_action_link_show_all');
 	if ($showAll) {
@@ -70,4 +61,13 @@
 		'actions' => $actions,
 	]);
 	echo $fragment->parse('fragments/modules/actions.php');
+} catch (PermissionException $e) {
+	$msg = rex_i18n::rawMsg('akrys_usagecheck_no_rights');
+	$fragment = new rex_fragment([
+		'text' => $msg,
+	]);
+	$fragment = new rex_fragment([
+		'text' => $fragment->parse('fragments/msg/tagged_msg.php'),
+	]);
+	echo $fragment->parse('fragments/msg/error.php');
 }

pages/_module.php

@@ -3,12 +3,14 @@
 /**
  * Frontend-Ausagbe für die Seite Module
  */
+
 use FriendsOfRedaxo\UsageCheck\Addon;
 use FriendsOfRedaxo\UsageCheck\Config;
+use FriendsOfRedaxo\UsageCheck\Exception\PermissionException;
 use FriendsOfRedaxo\UsageCheck\Modules\Modules;
 
-if(!isset($subpage)) {
-	throw new \Exception("this file should not be called directly.");
+if (!isset($subpage)) {
+	throw new Exception("this file should not be called directly.");
 }
 
 $modules = new Modules();
@@ -32,18 +34,9 @@
 $title->setVar('version', Addon::getInstance()->getVersion());
 echo rex_view::title($title->parse('fragments/title.php'));
 
-$items = $modules->get();
+try {
+	$items = $modules->get();
 
-if (empty($items)) {
-	$msg = rex_i18n::rawMsg('akrys_usagecheck_no_rights');
-	$fragment = new rex_fragment([
-		'text' => $msg,
-	]);
-	$fragment = new rex_fragment([
-		'text' => $fragment->parse('fragments/msg/tagged_msg.php'),
-	]);
-	echo $fragment->parse('fragments/msg/error.php');
-} else {
 	$showAllParam = '&showall=true';
 	$showAllLinktext = rex_i18n::rawMsg('akrys_usagecheck_module_link_show_all');
 	if ($showAll) {
@@ -68,4 +61,14 @@
 		'modules' => $modules,
 	]);
 	echo $fragment->parse('fragments/modules/modules.php');
+} catch (PermissionException $e) {
+	$items = [];
+	$msg = rex_i18n::rawMsg('akrys_usagecheck_no_rights');
+	$fragment = new rex_fragment([
+		'text' => $msg,
+	]);
+	$fragment = new rex_fragment([
+		'text' => $fragment->parse('fragments/msg/tagged_msg.php'),
+	]);
+	echo $fragment->parse('fragments/msg/error.php');
 }

pages/_picture.php

@@ -3,12 +3,14 @@
 /**
  * Anzeige der nicht verwendeten Bilder.
  */
+
 use FriendsOfRedaxo\UsageCheck\Addon;
 use FriendsOfRedaxo\UsageCheck\Config;
+use FriendsOfRedaxo\UsageCheck\Exception\PermissionException;
 use FriendsOfRedaxo\UsageCheck\Modules\Pictures;
 
-if(!isset($subpage)) {
-	throw new \Exception("this file should not be called directly.");
+if (!isset($subpage)) {
+	throw new Exception("this file should not be called directly.");
 }
 
 $pictures = new Pictures();
@@ -37,19 +39,9 @@
 	$pictures->setCategory($fileCat);
 	$catParam = '&rex_file_category='.$fileCat;
 }
+try {
+	$items = $pictures->get();
 
-$items = $pictures->get();
-
-if (empty($items)) {
-	$msg = rex_i18n::rawMsg('akrys_usagecheck_no_rights');
-	$fragment = new rex_fragment([
-		'text' => $msg,
-	]);
-	$fragment = new rex_fragment([
-		'text' => $fragment->parse('fragments/msg/tagged_msg.php'),
-	]);
-	echo $fragment->parse('fragments/msg/error.php');
-} else {
 	$showAllLinktext = rex_i18n::rawMsg('akrys_usagecheck_images_link_show_unused');
 	$showAllParam = '';
 	if (!$showAll) {
@@ -74,4 +66,13 @@
 		'pictures' => $pictures,
 	]);
 	echo $fragment->parse('fragments/modules/pictures.php');
+} catch (PermissionException $e) {
+	$msg = rex_i18n::rawMsg('akrys_usagecheck_no_rights');
+	$fragment = new rex_fragment([
+		'text' => $msg,
+	]);
+	$fragment = new rex_fragment([
+		'text' => $fragment->parse('fragments/msg/tagged_msg.php'),
+	]);
+	echo $fragment->parse('fragments/msg/error.php');
 }

pages/_template.php

@@ -3,12 +3,14 @@
 /**
  * Frontend-Ausagbe für die Seite Tempalte
  */
+
 use FriendsOfRedaxo\UsageCheck\Addon;
 use FriendsOfRedaxo\UsageCheck\Config;
+use FriendsOfRedaxo\UsageCheck\Exception\PermissionException;
 use FriendsOfRedaxo\UsageCheck\Modules\Templates;
 
-if(!isset($subpage)) {
-	throw new \Exception("this file should not be called directly.");
+if (!isset($subpage)) {
+	throw new Exception("this file should not be called directly.");
 }
 
 switch (rex_get('showall', 'string', "")) {
@@ -47,18 +49,10 @@
 if ($showInactive) {
 	$templates->showInactive($showInactive);
 }
-$items = $templates->get();
 
-if (empty($items)) {
-	$msg = rex_i18n::rawMsg('akrys_usagecheck_no_rights');
-	$fragment = new rex_fragment([
-		'text' => $msg,
-	]);
-	$fragment = new rex_fragment([
-		'text' => $fragment->parse('fragments/msg/tagged_msg.php'),
-	]);
-	echo $fragment->parse('fragments/msg/error.php');
-} else {
+try {
+	$items = $templates->get();
+
 // <editor-fold defaultstate="collapsed" desc="Menü">
 
 	$param = [
@@ -106,7 +100,6 @@
 
 	$menu = new rex_fragment($params);
 
-
 	echo $menu->parse('fragments/menu/linklist.php');
 // </editor-fold>
 
@@ -115,4 +108,13 @@
 		'templates' => $templates,
 	]);
 	echo $fragment->parse('fragments/modules/templates.php');
+} catch (PermissionException $e) {
+	$msg = rex_i18n::rawMsg('akrys_usagecheck_no_rights');
+	$fragment = new rex_fragment([
+		'text' => $msg,
+	]);
+	$fragment = new rex_fragment([
+		'text' => $fragment->parse('fragments/msg/tagged_msg.php'),
+	]);
+	echo $fragment->parse('fragments/msg/error.php');
 }

pages/release_notes/de/2024-11-12_3.2.1.php

@@ -0,0 +1,4 @@
+
+<ul>
+	<li>Optimierung der Ansicht, wenn keine Ergebnisse gefunden werden.</li>
+</ul>

pages/release_notes/en/2024-11-12_3.2.1.php

@@ -0,0 +1,4 @@
+
+<ul>
+	<li>Output optimization if no results were found.</li>
+</ul>