Changeset 7708

Timestamp:

06/09/10 15:33:17 (2 years ago)

Author:

CrawfordCurrie

Message:

Item1484: removed Aaron's debug flag again; the plugin should operate without plugin preferences. Removed non-functional check from TOPICPERMISSIONS. Doc update.

Location:

trunk/WebPermissionsPlugin

Files:

• data/System/WebPermissionsPlugin.txt (modified) (3 diffs)
• lib/Foswiki/Plugins/WebPermissionsPlugin.pm (modified) (2 diffs)
• lib/Foswiki/Plugins/WebPermissionsPlugin/Core.pm (modified) (13 diffs)

trunk/WebPermissionsPlugin/data/System/WebPermissionsPlugin.txt

@@ -148 +148 @@
 The topic permissions tool can be viewed (and edited) by entering =%<nop>TOPICPERMISSIONS%= anywhere in a topic. 
 
-To add  an "Edit ACLS" option to the "More topic actions" screen  add =webpermissions= to the front of the SKIN setting (e.g. =Set SKIN=webpermissions,pattern=)
+To add  an "Edit ACLS" option to the "More topic actions" screen  add =webpermissions= to the front of the SKIN setting (e.g. =Set SKIN = webpermissions,pattern=)
 
 ---++ Plugin Settings
@@ -177 +177 @@
    * Further work supported by [[http://www.spanlink.com/][Spanlink Communications]]
 
-|  Author: | Foswiki:Main.CrawfordCurrie & :Main.SvenDowideit, http://wikiring.com |
+|  Author: | Foswiki:Main.CrawfordCurrie & Foswiki:Main.SvenDowideit, http://wikiring.com |
 |  Copyright: | &copy; 2006, Evolved Media Network, Spanlink Communications and WikiRing |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
@@ -183 +183 @@
 |  Release: | %$RELEASE% |
 |  Change History: | |
+|  9 Jun 2010 | Foswikitask:Item1484: Aaron Scamehorn finished porting |
 |  21 Apr 2009 | Foswikitask:Item1484: Sven Dowideit, Crawford Currie, ported to Foswiki |
-|  4 Dec 2007 | TWikibug:Item4901 fixed templates TWikibug:Item5072 added users parameter to select a subset of users/groups in the web permissions interface |
-|  8 Sep 2007 | Updated for TWiki-4.2.0 |
-|  July 2006 | add Topic ACLs user interface via More topic actions - SvenDowideit@WikiRing.com |
-|  10216 | TWikibug:Item2291 - Added repeatheads and webs parameters |
-|  9048 | TWikibug:Item1766 - corrected problems with passing incorrect parameters to setACLs and not interpreting values from the form correctly. |
-|  8877 | TWikibug:Item1701 - first release |
 |  Dependencies: | %$DEPENDENCIES% |
 |  Plugin Home: | http://foswiki.org/Extensions/%TOPIC% |

trunk/WebPermissionsPlugin/lib/Foswiki/Plugins/WebPermissionsPlugin.pm

@@ -25 +25 @@
 # in each affected web.
 
-# ========================
 package Foswiki::Plugins::WebPermissionsPlugin;
 
 use strict;
 
-# ========================
 use Foswiki::Func ();
 
-our $debug = 0;
 our $VERSION    = '$Rev: 160$';
-our $RELEASE    = '21 Apr 2009';
+our $RELEASE    = '9 Jun 2010';
 our $SHORTDESCRIPTION = 'View and edit web permissions';
+our $NO_PREFS_IN_TOPIC = 1;
 
-# ========================
+use constant TRACE => 0;
+
 sub initPlugin {
     my ( $topic, $web, $user, $installWeb ) = @_;
@@ -59 +58 @@
 
     Foswiki::Func::registerRESTHandler( 'change', \&_changeHandler );
-
-    # Get preferences values
-    $debug = &Foswiki::Func::getPreferencesFlag( "WEBPERMISSIONSPLUGIN_DEBUG" );
 
     return 1;

trunk/WebPermissionsPlugin/lib/Foswiki/Plugins/WebPermissionsPlugin/Core.pm

@@ -19 +19 @@
 # For licensing info read LICENSE file in the Foswiki root.
 #
-# Author: Crawford Currie http://c-dot.co.uk
+# Authors: Crawford Currie http://c-dot.co.uk
 # Author: Sven Dowideit http://fosiki.com
 # Author: Eugen Mayer http://impressimpressive-media.de
@@ -38 +38 @@
 # =========================
 our $antiBeforeSaveRecursion;
-
-my $debug = $Foswiki::Plugins::WebPermissionsPlugin::debug;
 
 # =========================
@@ -317 +315 @@
     my ( $session, $params, $topic, $web ) = @_;
 
-    # this is to redirect to the "no access" page if this tag is used
-    # in a non-view template.
-    Foswiki::UI::checkAccess( $session, $web, $topic, 'view',
-        $session->{user} );
-
     my $disableSave = 'Disabled';
     $disableSave = ''
@@ -357 +350 @@
     my $acls = _getACLs( [ 'VIEW', 'CHANGE' ], $web, $topic );
     foreach my $user ( sort ( keys %$acls ) ) {
-        my $isGroup;
-        if ( defined &Foswiki::Func::isGroup ) {
-            $isGroup = Foswiki::Func::isGroup($user);
-        }
-        else {
-            $isGroup = ( $user =~ /Group$/ );
-        }
+        my $isGroup = Foswiki::Func::isGroup($user);
+
         if ( $acls->{$user}->{CHANGE} ) {
             $topicEditors .= '<OPTION>' . $user . '</OPTION>'
@@ -401 +389 @@
     return unless ( defined($action) );    #nothing to do with this plugin
 
-    &Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::beforeSaveHandler: action=" . $action ) if ( $debug );
+    Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::beforeSaveHandler: action=" . $action ) if ( Foswiki::Plugins::WebPermissionsPlugin::TRACE );
 
     if ( $action ne 'Save' ) {
@@ -408 +396 @@
         # to be quite difficult
         Foswiki::Func::redirectCgiQuery( $query,
-            &Foswiki::Func::getScriptUrl( $web, $topic , 'view' ) );
+            Foswiki::Func::getScriptUrl( $web, $topic , 'view' ) );
         throw Error::Simple('cancel permissions action');
     }
@@ -579 +567 @@
         $topic   = $Foswiki::cfg{WebPrefsTopicName};
     }
-    &Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_getACLs: GET $context $web.$topic" ) if ( $debug );
+    Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_getACLs: GET $context $web.$topic" ) if ( Foswiki::Plugins::WebPermissionsPlugin::TRACE );
     my @knownusers = _getListOfUsers();
     push( @knownusers, _getListOfGroups() );
@@ -602 +590 @@
 
             if (defined $users) {
-                &Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_getACLs: $perm$context$mode=$users" ) if ( $debug );
+                Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_getACLs: $perm$context$mode=$users" ) if ( Foswiki::Plugins::WebPermissionsPlugin::TRACE );
             } else {
-                &Foswiki::Func::writeWarning( "WebPermissionsPlugin::Core::_getACLs: no $perm$context$mode defined" ); 
+                Foswiki::Func::writeWarning( "WebPermissionsPlugin::Core::_getACLs: no $perm$context$mode defined" ); 
             }
 
@@ -621 +609 @@
             while ( scalar(@lusers) ) {
                 my $user = pop(@lusers);
-                my $isGroup;
-                if ( defined &Foswiki::Func::isGroup ) {
-                    $isGroup = Foswiki::Func::isGroup($user);
-                }
-                else {
-                    $isGroup = $user =~ /Group$/;
-                }
-                if ($isGroup) {
+                if (Foswiki::Func::isGroup($user)) {
                     # expand groups and add individual users
                     my $it = Foswiki::Func::eachGroupMember($user);
@@ -644 +625 @@
                 foreach my $user (@knownusers) {
 
-                    &Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_getACLs: Disallow $mode $user" ) if ( $debug );
+                    Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_getACLs: Disallow $mode $user" ) if ( Foswiki::Plugins::WebPermissionsPlugin::TRACE );
                     $acls{$user}->{$mode} = 0;
                 }
                 foreach my $user (@users) {
 
-                    &Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_getACLs: Allow $mode $user" ) if ( $debug );
+                    Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_getACLs: Allow $mode $user" ) if ( Foswiki::Plugins::WebPermissionsPlugin::TRACE );
                     $acls{$user}->{$mode} = 1;
                 }
@@ -656 +637 @@
                 foreach my $user (@users) {
 
-                    &Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_getACLs: Deny $mode $user " ) if ( $debug );
+                    Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_getACLs: Deny $mode $user " ) if ( Foswiki::Plugins::WebPermissionsPlugin::TRACE );
                     $acls{$user}->{$mode} = 0;
                 }
@@ -698 +679 @@
     }
 
-    &Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_setACLs: SET $context $web.$topic " ) if ( $debug );
+    Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_setACLs: SET $context $web.$topic " ) if ( Foswiki::Plugins::WebPermissionsPlugin::TRACE );
     my ( $meta, $text ) = Foswiki::Func::readTopic( $web, $topic );
 
@@ -740 +721 @@
                 );
             }
-            &Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_setACLs: $name = " . join( ' ', @$set ) ) if ( $debug );
+            Foswiki::Func::writeDebug( "WebPermissionsPlugin::Core::_setACLs: $name = " . join( ' ', @$set ) ) if ( Foswiki::Plugins::WebPermissionsPlugin::TRACE );
         }
     }