[TWiki-Dev] CVS: twiki/bin edit,1.59,1.60

[Richard D. <rd...@pr...>]

Update of /cvsroot/twiki/twiki/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv29078

Modified Files:
	edit 
Log Message:
Added comments and writeDebug/warning support from 'view'.


Index: edit
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/edit,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** edit	10 Nov 2002 08:39:45 -0000	1.59
--- edit	18 Nov 2002 11:45:31 -0000	1.60
***************
*** 26,31 ****
  BEGIN { unshift @INC, '.'; require 'setlib.cfg'; }
  
- use CGI::Carp qw(fatalsToBrowser);
  use CGI;
  use TWiki;
  
--- 26,31 ----
  BEGIN { unshift @INC, '.'; require 'setlib.cfg'; }
  
  use CGI;
+ use CGI::Carp qw(fatalsToBrowser);
  use TWiki;
  
***************
*** 38,41 ****
--- 38,54 ----
  &main();
  
+ # Uncomment the body of either routine to enable debugging
+ sub writeDebug
+ {
+     my( $text ) = @_;
+     #TWiki::writeDebug( $text );
+ }
+ 
+ sub writeDebugTimes
+ {
+     my( $text ) = @_;
+     #TWiki::writeDebugTimes( $text );
+ }
+ 
  sub main
  {
***************
*** 80,87 ****
      }
  
!     # read topic and check access permission
      if( &TWiki::Store::topicExists( $webName, $topic ) ) {
          ( $meta, $text ) = &TWiki::Store::readTopic( $webName, $topic );
      }
      if( ! &TWiki::Access::checkAccessPermission( "change", $wikiUserName, $text, $topic, $webName ) ) {
          # user has not permission to change the topic
--- 93,102 ----
      }
  
!     # Read topic 
      if( &TWiki::Store::topicExists( $webName, $topic ) ) {
          ( $meta, $text ) = &TWiki::Store::readTopic( $webName, $topic );
      }
+ 
+     # Check access controls
      if( ! &TWiki::Access::checkAccessPermission( "change", $wikiUserName, $text, $topic, $webName ) ) {
          # user has not permission to change the topic
***************
*** 90,93 ****
--- 105,110 ----
          return;
      }
+ 
+     # Special save command
      if( ( $saveCmd ) &&
          ( ! &TWiki::Access::userIsInGroup( $wikiUserName, $TWiki::superAdminGroup ) ) ) {
***************
*** 98,101 ****
--- 115,119 ----
      }
  
+     # Check for locks
      my( $lockUser, $lockTime ) = &TWiki::Store::topicIsLockedBy( $webName, $topic );
      if( ( ! $breakLock ) && ( $lockUser ) ) {
***************
*** 117,121 ****
      my $templateWeb = $webName;
  
!     # get edit template, standard or a different skin
      my $skin = $query->param( "skin" ) || &TWiki::Prefs::getPreferencesValue( "SKIN" );
      $tmpl = &TWiki::Store::readTemplate( "edit", $skin );
--- 135,139 ----
      my $templateWeb = $webName;
  
!     # Get edit template, standard or a different skin
      my $skin = $query->param( "skin" ) || &TWiki::Prefs::getPreferencesValue( "SKIN" );
      $tmpl = &TWiki::Store::readTemplate( "edit", $skin );