[phpwiki-checkins] SF.net SVN: phpwiki:[8461] trunk

[<var...@us...>]

Revision: 8461
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8461&view=rev
Author:   vargenau
Date:     2012-11-14 17:35:05 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Add action DeleteAcl

Modified Paths:
--------------
    trunk/lib/IniConfig.php
    trunk/lib/PagePerm.php
    trunk/lib/main.php
    trunk/pgsrc/PhpWikiAdministration
    trunk/themes/fusionforge/pgsrc/PhpWikiAdministration

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/lib/IniConfig.php	2012-11-14 17:35:05 UTC (rev 8461)
@@ -716,6 +716,7 @@
     $AllAllowedPlugins[] = 'WikiAdminRemove';
     $AllAllowedPlugins[] = 'WikiAdminRename';
     $AllAllowedPlugins[] = 'WikiAdminSearchReplace';
+    $AllAllowedPlugins[] = 'WikiAdminDeleteAcl';
     $AllAllowedPlugins[] = 'WikiAdminSetAcl';
     $AllAllowedPlugins[] = 'WikiAdminSetAclSimple';
     $AllAllowedPlugins[] = 'WikiAdminUtils';
@@ -781,6 +782,7 @@
     $AllActionPages[] = 'PhpWikiAdministration/Remove';
     $AllActionPages[] = 'PhpWikiAdministration/Rename';
     $AllActionPages[] = 'PhpWikiAdministration/SearchReplace';
+    $AllActionPages[] = 'PhpWikiAdministration/DeleteAcl';
     $AllActionPages[] = 'PhpWikiAdministration/SetAcl';
     $AllActionPages[] = 'PhpWikiAdministration/SetAclSimple';
     $AllActionPages[] = 'RecentChangesMyPages';
@@ -1131,9 +1133,9 @@
     // Detect PrettyWiki setup (not loading index.php directly)
     // $SCRIPT_FILENAME should be the same as __FILE__ in index.php
     if (!isset($SCRIPT_FILENAME))
-        $SCRIPT_FILENAME = @$HTTP_SERVER_VARS['SCRIPT_FILENAME'];
+        $SCRIPT_FILENAME = @$_SERVER['SCRIPT_FILENAME'];
     if (!isset($SCRIPT_FILENAME))
-        $SCRIPT_FILENAME = @$HTTP_ENV_VARS['SCRIPT_FILENAME'];
+        $SCRIPT_FILENAME = @$_ENV['SCRIPT_FILENAME'];
     if (!isset($SCRIPT_FILENAME))
         $SCRIPT_FILENAME = dirname(__FILE__ . '/../') . '/index.php';
     if (isWindows())

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/lib/PagePerm.php	2012-11-14 17:35:05 UTC (rev 8461)
@@ -211,6 +211,7 @@
         case 'upgrade':
         case 'chown':
         case 'setacl':
+        case 'deleteacl':
             return 'change';
         default:
             //Todo: Plugins should be able to override its access type

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/lib/main.php	2012-11-14 17:35:05 UTC (rev 8461)
@@ -1129,6 +1129,11 @@
         $this->adminActionSubpage(_("SetAclSimple"));
     }
 
+    function action_deleteacl()
+    {
+        $this->adminActionSubpage(_("DeleteAcl"));
+    }
+
     function action_rename()
     {
         $this->adminActionSubpage(_("Rename"));

Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration	2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/pgsrc/PhpWikiAdministration	2012-11-14 17:35:05 UTC (rev 8461)
@@ -20,7 +20,7 @@
 
 or call the available ~WikiAdmin actions directly:
 
-| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]]
+| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]] | [[/DeleteAcl]]
 
 == Global Access Rights ==
 

Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration	2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration	2012-11-14 17:35:05 UTC (rev 8461)
@@ -20,7 +20,7 @@
 
 or call the available ~WikiAdmin actions directly:
 
-| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]]
+| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]] | [[/DeleteAcl]]
 
 == Global Access Rights ==
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.