[TWiki-Dev] CVS: twiki/lib TWiki.pm,1.49,1.50 TWiki.cfg,1.18,1.19

[Peter T. <pet...@us...>]

Update of /cvsroot/twiki/twiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv11923

Modified Files:
	TWiki.pm TWiki.cfg 
Log Message:
New  flag to conditionally build  from cgi->url

Index: TWiki.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/lib/TWiki.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** TWiki.pm	2001/07/15 09:32:43	1.49
--- TWiki.pm	2001/07/15 10:01:33	1.50
***************
*** 1,3 ****
- 
  #
  # TWiki WikiClone ($wikiversion has version info)
--- 1,2 ----
***************
*** 62,66 ****
          $attachAsciiPath
          $scriptSuffix $safeEnvPath $mailProgram $wikiversion
!         $doKeepRevIfEditLock $doRemovePortNumber
          $doRememberRemoteUser $doPluralToSingular
          $doHidePasswdInRegistration $doSecureInclude
--- 61,65 ----
          $attachAsciiPath
          $scriptSuffix $safeEnvPath $mailProgram $wikiversion
!         $doKeepRevIfEditLock $doGetScriptUrlFromCgi $doRemovePortNumber
          $doRememberRemoteUser $doPluralToSingular
          $doHidePasswdInRegistration $doSecureInclude
***************
*** 202,207 ****
      $includingWebName = $webName;
  
!     # initialize $urlHost
!     if( ( $theUrl ) && ( $theUrl =~ /^([^\:]*\:\/\/[^\/]*)/ ) && ( $1 ) ) {
          $urlHost = $1;
          if( $doRemovePortNumber ) {
--- 201,209 ----
      $includingWebName = $webName;
  
!     # initialize $urlHost and $scriptUrlPath 
!     if( ( $theUrl ) && ( $theUrl =~ /^([^\:]*\:\/\/[^\/]*)(.*)\/.*$/ ) && ( $2 ) ) {
!         if( $doGetScriptUrlFromCgi ) {
!             $scriptUrlPath = $2;
!         }
          $urlHost = $1;
          if( $doRemovePortNumber ) {

Index: TWiki.cfg
===================================================================
RCS file: /cvsroot/twiki/twiki/lib/TWiki.cfg,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** TWiki.cfg	2001/07/10 13:45:38	1.18
--- TWiki.cfg	2001/07/15 10:01:33	1.19
***************
*** 184,187 ****
--- 184,190 ----
  #                   Keep same revision if topic is saved again within edit lock time. Default "1"
  $doKeepRevIfEditLock = "1";
+ #                   Build $scriptUrlPath from $query->url parameter. Default "0".
+ #                   Note that links are incorrect after failed authentication if "1"
+ $doGetScriptUrlFromCgi = "0";
  #                   Remove port number from URL. Default "0"
  $doRemovePortNumber = "0";