[TWiki-Dev] [SVN] PeterThoeny r22814 - in twiki/branches/TWikiRelease05x01/WebPermissionsPlugin/lib/TWiki/Plugins: . WebPermissionsPlugin

[<de...@de...>]

Author: PeterThoeny
Date: 2012-04-16 22:42:57 -0500 (Mon, 16 Apr 2012)
New Revision: 22814
Trac url: http://develop.twiki.org/trac/changeset/22814

Modified:
   twiki/branches/TWikiRelease05x01/WebPermissionsPlugin/lib/TWiki/Plugins/WebPermissionsPlugin.pm
   twiki/branches/TWikiRelease05x01/WebPermissionsPlugin/lib/TWiki/Plugins/WebPermissionsPlugin/Core.pm
Log:
Item6868: Fixing apache error_log issue: Use of uninitialized value cell in concatenation (.) or string at twiki/lib/TWiki/Plugins/WebPermissionsPlugin/Core.pm line 139

Modified: twiki/branches/TWikiRelease05x01/WebPermissionsPlugin/lib/TWiki/Plugins/WebPermissionsPlugin/Core.pm
===================================================================
--- twiki/branches/TWikiRelease05x01/WebPermissionsPlugin/lib/TWiki/Plugins/WebPermissionsPlugin/Core.pm	2012-04-17 03:42:35 UTC (rev 22813)
+++ twiki/branches/TWikiRelease05x01/WebPermissionsPlugin/lib/TWiki/Plugins/WebPermissionsPlugin/Core.pm	2012-04-17 03:42:57 UTC (rev 22814)
@@ -2,7 +2,7 @@
 #
 # Copyright (C) Evolved Media Network 2005
 # Copyright (C) Spanlink Communications 2006
-# Copyright (C) 2006-2011 TWiki:TWiki.TWikiContributor
+# Copyright (C) 2006-2012 TWiki:TWiki.TWikiContributor
 # All Rights Reserved. TWiki Contributors are listed in the
 # AUTHORS file in the root of this distribution.
 # NOTE: Please extend that file, not this notice.
@@ -38,6 +38,7 @@
 # especially as we don't want to continue to presume that ACLs are topic based
 # the advantage with save, is that it will re-direct to view on success (and
 # resolve permissions issues)
+# =====================================================================
 sub WEBPERMISSIONS {
     my( $session, $params, $topic, $web ) = @_;
     my $query = $session->{request} || $session->{cgiQuery};
@@ -126,7 +127,7 @@
         $repeater--;
         $row = CGI::th( "$user " );
         foreach $web ( sort @webs ) {
-            my $cell;
+            my $cell = '';
             foreach my $op ( @modes ) {
                 if( $editing ) {
                     my %attrs = ( type => 'checkbox', name => $user.':'.$web.':'.$op );
@@ -163,6 +164,8 @@
     $page .= $tab . CGI::end_form();
     return $page;
 }
+
+# =====================================================================
 sub TOPICPERMISSIONS {
     my( $session, $params, $topic, $web ) = @_;
 
@@ -231,6 +234,7 @@
     return $templateText;
 }
 
+# =====================================================================
 sub beforeSaveHandler {
     my ( $text, $topic, $web, $meta ) = @_;
     my $query = TWiki::Func::getCgiQuery();
@@ -246,7 +250,7 @@
     return if ($TWiki::Plugins::WebPermissionsPlugin::antiBeforeSaveRecursion == 1);
     $TWiki::Plugins::WebPermissionsPlugin::antiBeforeSaveRecursion = 1;
 
-    #these lists only contain seelcted users (by using javascript to select the changed ones in save onclick)
+    #these lists only contain selected users (by using javascript to select the changed ones in save onclick)
     my @topicEditors = $query->param('topiceditors');
     my @topicViewers = $query->param('topicviewers');
     my @disallowedUsers = $query->param('disallowedusers');
@@ -285,6 +289,7 @@
 }
 
 # Filter a list of strings based on the filter expression passed in
+# =====================================================================
 sub _filterList {
     my $filter = shift;
     my %included;
@@ -307,6 +312,7 @@
     return keys %included;
 }
 
+# =====================================================================
 sub USERSLIST {
     my( $this, $params ) = @_;
     my $format = $params->{_DEFAULT} || $params->{'format'} || '$wikiname';
@@ -339,6 +345,7 @@
 }
 
 # Get a list of all registered users
+# =====================================================================
 sub _getListOfUsers {
     my @list;
     if (defined(&TWiki::Func::eachUser)) {
@@ -372,6 +379,7 @@
 }
 
 # Get a list of all groups
+# =====================================================================
 sub _getListOfGroups {
     my @list;
     if (defined(&TWiki::Func::eachGroup)) {
@@ -419,8 +427,10 @@
     return @list;
 }
 
-# Gets all users which have access to the given topic. This functions respects hierchical webs and climbs up the ladder
-# if a web does not set any access permissions
+# Gets all users which have access to the given topic. This functions 
+# respects hierchical webs and climbs up the ladder if a web does not
+# set any access permissions
+# =====================================================================
 sub getUsersByWebPreferenceValue {
     my( $mode, $web, $topic, $perm ) = @_;
     if($TWiki::cfg{EnableHierarchicalWebs}) {
@@ -468,6 +478,7 @@
 # *WARNING* when you use =setACLs= to set the ACLs of a web or topic, the change is not committed to the database until the current session exits. After =setACLs= has been called on a web or topic, the results of =getACLS= for that web/topic are *undefined* within the same session.
 #
 
+# =====================================================================
 sub _getACLs {
     my( $modes, $web, $topic ) = @_;
 
@@ -584,6 +595,7 @@
 # 
 # *WARNING* when you use =setACLs= to set the ACLs of a web or topic, the change is not committed to the database until the current session exist. After =setACLs= has been called on a web or topic, the results of =getACLS= for that web/topic are *undefined*.
 
+# =====================================================================
 sub _setACLs {
     my( $modes, $acls, $web, $topic, $plainText ) = @_;
 
@@ -641,4 +653,5 @@
                             $meta, $text, { minor => 1 } );
 }
 
+# =====================================================================
 1;

Modified: twiki/branches/TWikiRelease05x01/WebPermissionsPlugin/lib/TWiki/Plugins/WebPermissionsPlugin.pm
===================================================================
--- twiki/branches/TWikiRelease05x01/WebPermissionsPlugin/lib/TWiki/Plugins/WebPermissionsPlugin.pm	2012-04-17 03:42:35 UTC (rev 22813)
+++ twiki/branches/TWikiRelease05x01/WebPermissionsPlugin/lib/TWiki/Plugins/WebPermissionsPlugin.pm	2012-04-17 03:42:57 UTC (rev 22814)
@@ -2,7 +2,7 @@
 #
 # Copyright (C) Evolved Media Network 2005
 # Copyright (C) Spanlink Communications 2006
-# Copyright (C) 2006-2011 TWiki:TWiki.TWikiContributor
+# Copyright (C) 2006-2012 TWiki:TWiki.TWikiContributor
 # All Rights Reserved. TWiki Contributors are listed in the AUTHORS
 # file in the root of this distribution.
 # NOTE: Please extend that file, not this notice.
@@ -38,7 +38,7 @@
 $pluginName = 'WebPermissionsPlugin';
 
 $VERSION = '$Rev$';
-$RELEASE = '2010-03-06';
+$RELEASE = '2012-04-16';
 
 sub initPlugin {
     my( $topic, $web, $user, $installWeb ) = @_;