[TWiki-Dev] CVS: twiki/bin rename,1.17,1.18

[John T. <ta...@us...>]

Update of /cvsroot/twiki/twiki/bin
In directory usw-pr-cvs1:/tmp/cvs-serv31075/bin

Modified Files:
	rename 
Log Message:
Added RENAME permission

Index: rename
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/rename,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** rename	2001/07/22 04:38:58	1.17
--- rename	2001/07/23 16:59:39	1.18
***************
*** 308,319 ****
      
      
!     # prevent rename of topics in main web unless user in TWikiAdminGroup
!     # FIXME - generlise to have rename permission
!     if( ! TWiki::Access::userIsInGroup( $wikiUserName, "TWikiAdminGroup" ) && $oldWeb eq "$TWiki::mainWebname" ) {           
!        my $url = &TWiki::getOopsUrl( $oldWeb, $oldTopic, "oopsaccesschange" );
         TWiki::redirect( $query, $url );
!        $ret = "";	
      }
!     
      return $ret;
  }
--- 308,317 ----
      
      
!     if( ! &TWiki::Access::checkAccessPermission( "rename", $wikiUserName, $ret, $oldTopic, $oldWeb ) ) {
!        my $url = &TWiki::getOopsUrl( $oldWeb, $oldTopic, "oopsaccessrename" );
         TWiki::redirect( $query, $url );
!        $ret = "";
      }
! 
      return $ret;
  }