SF.net SVN: phpwiki:[10838] trunk/lib/plugin
vargenau--- via phpwiki-checkins <[email protected]> Wed, 05 Jan 2022 20:28:42 +0000
| Newsgroups | gmane.comp.web.wiki.phpwiki.checkins |
|---|---|
| Message-ID | <[email protected]> |
Revision: 10838
http://sourceforge.net/p/phpwiki/code/10838
Author: vargenau
Date: 2022-01-05 20:28:41 +0000 (Wed, 05 Jan 2022)
Log Message:
-----------
Better error message
Modified Paths:
--------------
trunk/lib/plugin/DebugAuthInfo.php
trunk/lib/plugin/DebugBackendInfo.php
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminDeleteAcl.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSelect.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/lib/plugin/WikiAdminSetExternal.php
Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php 2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/DebugAuthInfo.php 2022-01-05 20:28:41 UTC (rev 10838)
@@ -64,7 +64,7 @@
}
if (!$user->isAdmin() and !(DEBUG && _DEBUG_LOGIN)) {
$request->_notAuthorized(WIKIAUTH_ADMIN);
- $this->disabled("! user->isAdmin");
+ $this->disabled(_("You must be an administrator to use this plugin."));
}
$html = HTML(HTML::h2(fmt("General Auth Settings")));
Modified: trunk/lib/plugin/DebugBackendInfo.php
===================================================================
--- trunk/lib/plugin/DebugBackendInfo.php 2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/DebugBackendInfo.php 2022-01-05 20:28:41 UTC (rev 10838)
@@ -62,7 +62,7 @@
if (!$user->isAdmin() and !(DEBUG && _DEBUG_LOGIN)) {
$request->_notAuthorized(WIKIAUTH_ADMIN);
- $this->disabled("! user->isAdmin");
+ $this->disabled(_("You must be an administrator to use this plugin."));
}
if (empty($page)) {
Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php 2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminChown.php 2022-01-05 20:28:41 UTC (rev 10838)
@@ -25,7 +25,7 @@
/**
* Usage: <<WikiAdminChown s||=* >> or called via WikiAdminSelect
- * @author: Reini Urban <[email protected]>
+ * @author: Reini Urban
*
*/
@@ -142,7 +142,7 @@
// without individual PagePermissions:
if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
$request->_notAuthorized(WIKIAUTH_ADMIN);
- $this->disabled("! user->isAdmin");
+ $this->disabled(_("You must be an administrator to use this plugin."));
}
if ($post_args['action'] == 'verify') {
// Real action
Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php 2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2022-01-05 20:28:41 UTC (rev 10838)
@@ -111,7 +111,7 @@
if ($p && $request->isPost()) {
if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
$request->_notAuthorized(WIKIAUTH_ADMIN);
- $this->disabled("! user->isAdmin");
+ $this->disabled(_("You must be an administrator to use this plugin."));
}
return $this->deleteaclPages($request, array_keys($p));
}
Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php 2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminPurge.php 2022-01-05 20:28:41 UTC (rev 10838)
@@ -1,5 +1,5 @@
<?php
-/*
+/**
* Copyright © 2002,2004 $ThePhpWikiProgrammingTeam
* Copyright © 2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
@@ -119,7 +119,7 @@
// check individual PagePermissions
if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
$request->_notAuthorized(WIKIAUTH_ADMIN);
- $this->disabled("! user->isAdmin");
+ $this->disabled(_("You must be an administrator to use this plugin."));
}
if ($post_args['action'] == 'verify') {
// Real purge.
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminRemove.php 2022-01-05 20:28:41 UTC (rev 10838)
@@ -123,7 +123,7 @@
// check individual PagePermissions
if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
$request->_notAuthorized(WIKIAUTH_ADMIN);
- $this->disabled("! user->isAdmin");
+ $this->disabled(_("You must be an administrator to use this plugin."));
}
if ($post_args['action'] == 'verify') {
// Real delete.
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminRename.php 2022-01-05 20:28:41 UTC (rev 10838)
@@ -25,7 +25,7 @@
/**
* Usage: <<WikiAdminRename >> or called via WikiAdminSelect
- * @author: Reini Urban <[email protected]>
+ * @author: Reini Urban
*
*/
@@ -109,7 +109,7 @@
// without individual PagePermissions:
if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
$request->_notAuthorized(WIKIAUTH_ADMIN);
- $this->disabled("! user->isAdmin");
+ $this->disabled(_("You must be an administrator to use this plugin."));
}
// DONE: error message if not allowed.
if ($post_args['action'] == 'verify') {
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php 2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php 2022-01-05 20:28:41 UTC (rev 10838)
@@ -25,7 +25,7 @@
/**
* Usage: <<WikiAdminSearchReplace >> or called via WikiAdminSelect
- * Author: Reini Urban <[email protected]>
+ * Author: Reini Urban
*
*/
Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php 2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminSelect.php 2022-01-05 20:28:41 UTC (rev 10838)
@@ -28,7 +28,7 @@
* WikiAdmin plugins then. Then do Rename, Remove, Chown, ...
*
* Usage: <<WikiAdminSelect>>
- * Author: Reini Urban <[email protected]>
+ * Author: Reini Urban
*
* This is the base class for most WikiAdmin* classes, using
* collectPages() and preSelectS().
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2022-01-05 20:28:41 UTC (rev 10838)
@@ -27,7 +27,7 @@
* Set individual PagePermissions
*
* Usage: <<WikiAdminSetAcl >> or called via WikiAdminSelect
- * Author: Reini Urban <[email protected]>
+ * Author: Reini Urban
*
* TODO: UI to add custom group/username.
* Currently it's easier to dump a page, fix it manually and
@@ -175,7 +175,7 @@
// without individual PagePermissions:
if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
$request->_notAuthorized(WIKIAUTH_ADMIN);
- $this->disabled("! user->isAdmin");
+ $this->disabled(_("You must be an administrator to use this plugin."));
}
if ($post_args['action'] == 'verify') {
// Real action
Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php 2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2022-01-05 20:28:41 UTC (rev 10838)
@@ -28,7 +28,6 @@
*
* Usage: <<WikiAdminSetAclSimple >> or called via WikiAdminSelect
* Author: Marc-Etienne Vargenau, Alcatel-Lucent
- *
*/
require_once 'lib/plugin/WikiAdminSetAcl.php';
@@ -79,7 +78,7 @@
// without individual PagePermissions:
if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
$request->_notAuthorized(WIKIAUTH_ADMIN);
- $this->disabled("! user->isAdmin");
+ $this->disabled(_("You must be an administrator to use this plugin."));
}
if (!empty($post_args['aclliberal'])) {
return $this->setaclPages($request, array_keys($p), $this->liberalPerms());
Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php 2022-01-05 18:14:09 UTC (rev 10837)
+++ trunk/lib/plugin/WikiAdminSetExternal.php 2022-01-05 20:28:41 UTC (rev 10838)
@@ -126,7 +126,7 @@
// without individual PagePermissions:
if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
$request->_notAuthorized(WIKIAUTH_ADMIN);
- $this->disabled("! user->isAdmin");
+ $this->disabled(_("You must be an administrator to use this plugin."));
}
// Real action
return $this->setExternalPages($dbi, array_keys($p));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
_______________________________________________
phpwiki-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpwiki-checkins