diff -ur orig/bin/register working/bin/register
--- orig/bin/register Thu Nov 1 20:27:01 2001
+++ working/bin/register Fri Jan 25 19:50:18 2002
@@ -154,7 +154,7 @@
my $senderr = &TWiki::Net::sendEmail( $text );
# create user topic if not exist
- if( ! &TWiki::Store::topicExists( $TWiki::mainWebname, $wikiName ) ) {
+ if( ! &TWiki::Store::topicExists( $TWiki::userWebname, $wikiName ) ) {
$text = &TWiki::Store::readTemplate( "register" );
( $before, $after) = split( /%FORMDATA%/, $text );
for( $x = 0; $x < $formLen; $x++ ) {
@@ -239,7 +239,7 @@
my $today = &TWiki::getLocaldate();
my $topicName = $TWiki::userListFilename;
$topicName =~ s/(.*[^\/])\/([a-zA-Z0-9]*)\.txt$/$2/go;
- my( $meta, $text ) = &TWiki::Store::readTopic( $TWiki::mainWebname, $topicName );
+ my( $meta, $text ) = &TWiki::Store::readTopic( $TWiki::userWebname, $topicName );
my $result = "";
my $status = "0";
my $line = "";
@@ -281,6 +281,6 @@
$result .= "$line\n";
}
- &TWiki::Store::saveTopic( $TWiki::mainWebname, $topicName, $result, $meta, "", 1 );
+ &TWiki::Store::saveTopic( $TWiki::userWebname, $topicName, $result, $meta, "", 1 );
return $topicName;
}
diff -ur orig/data/.htpasswd working/data/.htpasswd
--- orig/lib/TWiki.cfg Fri Jan 25 17:31:33 2002
+++ working/lib/TWiki.cfg Fri Jan 25 22:08:11 2002
@@ -41,6 +41,7 @@
# %WIKIUSERNAME% wiki user name
# %WIKITOOLNAME% site name of this TWiki installation (TWiki)
# %MAINWEB% main web name (Main)
+# %USERWEB% user web name (%MAINWEB%)
# %TWIKIWEB% TWiki system web name (TWiki)
# %HOMETOPIC% home topic name (WebHome)
# %NOTIFYTOPIC% notify topic name (WebNotify)
@@ -180,6 +181,8 @@
$siteWebTopicName = "";
# %MAINWEB% : Name of Main web, default "Main" :
$mainWebname = "Main";
+# %USERWEB% : Name of User web, default is the same as mainWebName
+$userWebname = $mainWebname;
# %TWIKIWEB% : Name of TWiki system web, default "TWiki" :
$twikiWebname = "TWiki";
# Pathname of debug file :
diff -ur orig/lib/TWiki.pm working/lib/TWiki.pm
--- orig/lib/TWiki.pm Tue Dec 4 01:59:42 2001
+++ working/lib/TWiki.pm Fri Jan 25 18:56:47 2002
@@ -54,7 +54,7 @@
$debugFilename $warningFilename $htpasswdFilename
$logFilename $remoteUserFilename $wikiUsersTopicname
$userListFilename %userToWikiList %wikiToUserList
- $twikiWebname $mainWebname $mainTopicname $notifyTopicname
+ $twikiWebname $mainWebname $userWebname $mainTopicname $notifyTopicname
$wikiPrefsTopicname $webPrefsTopicname
$statisticsTopicname $statsTopViews $statsTopContrib
$numberOfRevisions $editLockTime
@@ -423,7 +423,7 @@
if( $dontAddWeb ) {
return $wUser;
}
- return "$mainWebname.$wUser";
+ return "$userWebname.$wUser";
}
# =========================
@@ -1360,7 +1360,8 @@
$_[0] =~ s/%WIKIUSERNAME%/$wikiUserName/go;
$_[0] =~ s/%WIKITOOLNAME%/$wikiToolName/go;
$_[0] =~ s/%MAINWEB%/$mainWebname/go;
+ $_[0] =~ s/%USERWEB%/$userWebname/go;
$_[0] =~ s/%TWIKIWEB%/$twikiWebname/go;
$_[0] =~ s/%HOMETOPIC%/$mainTopicname/go;
$_[0] =~ s/%WIKIUSERSTOPIC%/$wikiUsersTopicname/go;
diff -ur orig/lib/TWiki/Access.pm working/lib/TWiki/Access.pm
--- orig/lib/TWiki/Access.pm Sat Jul 28 04:34:42 2001
+++ working/lib/TWiki/Access.pm Fri Jan 25 23:15:37 2002
@@ -160,8 +160,8 @@
{
my( $theUserName, $theGroupTopicName ) = @_;
- my $usrTopic = prvGetWebTopicName( $TWiki::mainWebname, $theUserName );
- my $grpTopic = prvGetWebTopicName( $TWiki::mainWebname, $theGroupTopicName );
+ my $usrTopic = prvGetWebTopicName( $TWiki::userWebname, $theUserName );
+ my $grpTopic = prvGetWebTopicName( $TWiki::userWebname, $theGroupTopicName );
my @grpMembers = ();
if( $grpTopic !~ /.*Group$/ ) {
@@ -193,7 +193,7 @@
my @resultList = ();
# extract web and topic name
my $topic = $theGroupTopicName;
- my $web = $TWiki::mainWebname;
+ my $web = $TWiki::userWebname;
$topic =~ /^([^\.]*)\.(.*)$/;
if( $2 ) {
$web = $1;
@@ -255,8 +255,9 @@
# =========================
sub prvGetWebTopicName
{
- my( $theWebName, $theTopicName ) = @_;
+ my( $theWebName, $theTopicName ) = @_;
$theTopicName =~ s/%MAINWEB%/$theWebName/go;
+ $theTopicName =~ s/%USERWEB%/$theWebName/go;
$theTopicName =~ s/%TWIKIWEB%/$theWebName/go;
if( $theTopicName =~ /[\.]/ ) {
$theWebName = ""; # to suppress warning
@@ -274,7 +275,7 @@
# i.e.: "%MAINWEB%.UserA, UserB, Main.UserC # something else"
$theItems =~ s/(<[^>]*>)//go; # Remove HTML tags
$theItems =~ s/\s*([a-zA-Z0-9_\.\,\s\%]*)\s*(.*)/$1/go; # Limit list
- my @list = map { prvGetWebTopicName( $TWiki::mainWebname, $_ ) }
+ my @list = map { prvGetWebTopicName( $TWiki::userWebname, $_ ) }
split( /[\,\s]+/, $theItems );
return @list;
}
diff -ur orig/templates/oopsaccesschange.tmpl working/templates/oopsaccesschange.tmpl
--- orig/templates/oopsaccesschange.tmpl Wed Aug 1 04:24:10 2001
+++ working/templates/oopsaccesschange.tmpl Fri Jan 25 19:31:41 2002
@@ -9,6 +9,6 @@
%WIKIWEBMASTER%
if you have any questions.
-__Related topics:__ %MAINWEB%.TWikiGroups, %TWIKIWEB%.TWikiAccessControl %TMPL:END%
+__Related topics:__ %USERWEB%.TWikiGroups, %TWIKIWEB%.TWikiAccessControl %TMPL:END%
%TMPL:DEF{"topicaction"}% [[%WEB%.%TOPIC%][OK]] %TMPL:END%
%TMPL:P{"oops"}%
diff -ur orig/templates/oopsaccessgroup.tmpl working/templates/oopsaccessgroup.tmpl
--- orig/templates/oopsaccessgroup.tmpl Wed Aug 1 04:24:34 2001
+++ working/templates/oopsaccessgroup.tmpl Fri Jan 25 19:32:12 2002
@@ -9,6 +9,6 @@
%WIKIWEBMASTER%
if you have any questions.
-__Related topics:__ %MAINWEB%.TWikiGroups, %TWIKIWEB%.TWikiAccessControl %TMPL:END%
+__Related topics:__ %USERWEB%.TWikiGroups, %TWIKIWEB%.TWikiAccessControl %TMPL:END%
%TMPL:DEF{"topicaction"}% [[%MAINWEB%.%HOMETOPIC%][OK]] %TMPL:END%
%TMPL:P{"oops"}%
diff -ur orig/templates/oopsaccessrename.tmpl working/templates/oopsaccessrename.tmpl
--- orig/templates/oopsaccessrename.tmpl Wed Aug 1 04:47:30 2001
+++ working/templates/oopsaccessrename.tmpl Fri Jan 25 19:33:07 2002
@@ -9,6 +9,6 @@
%WIKIWEBMASTER%
if you have any questions.
-__Related topics:__ %MAINWEB%.TWikiGroups, %TWIKIWEB%.TWikiAccessControl %TMPL:END%
+__Related topics:__ %USERWEB%.TWikiGroups, %TWIKIWEB%.TWikiAccessControl %TMPL:END%
%TMPL:DEF{"topicaction"}% [[%WEB%.%TOPIC%][OK]] %TMPL:END%
%TMPL:P{"oops"}%
diff -ur orig/templates/oopsaccessview.tmpl working/templates/oopsaccessview.tmpl
--- orig/templates/oopsaccessview.tmpl Wed Aug 1 04:24:54 2001
+++ working/templates/oopsaccessview.tmpl Fri Jan 25 19:33:27 2002
@@ -9,6 +9,6 @@
%WIKIWEBMASTER%
if you have any questions.
-__Related topics:__ %MAINWEB%.TWikiGroups, %TWIKIWEB%.TWikiAccessControl %TMPL:END%
+__Related topics:__ %USERWEB%.TWikiGroups, %TWIKIWEB%.TWikiAccessControl %TMPL:END%
%TMPL:DEF{"topicaction"}% [[%MAINWEB%.%HOMETOPIC%][OK]] %TMPL:END%
%TMPL:P{"oops"}%
diff -ur orig/templates/oopsnotwikiuser.tmpl working/templates/oopsnotwikiuser.tmpl
--- orig/templates/oopsnotwikiuser.tmpl Wed Aug 1 04:31:26 2001
+++ working/templates/oopsnotwikiuser.tmpl Fri Jan 25 19:34:03 2002
@@ -8,7 +8,7 @@
Make sure you spelled the User Name correctly and try again.
Remember, a %TWIKIWEB%.WikiName is case sensitive.
-See %MAINWEB%.TWikiUsers for a list of existing users or register as new user in
+See %USERWEB%.TWikiUsers for a list of existing users or register as new user in
%TWIKIWEB%.TWikiRegistration. %TMPL:END%
%TMPL:DEF{"topicaction"}% %TMPL:END%
%TMPL:P{"oops"}%
diff -ur orig/templates/oopsregthanks.tmpl working/templates/oopsregthanks.tmpl
--- orig/templates/oopsregthanks.tmpl Wed Aug 1 04:57:15 2001
+++ working/templates/oopsregthanks.tmpl Fri Jan 25 19:31:05 2002
@@ -5,7 +5,7 @@
%TMPL:DEF{"message"}%
* You can review your changes in your personal TWiki topic %TOPIC%
(__Suggestion:__ How about uploading your picture to your topic?)
- * You are also listed in the %MAINWEB%.%WIKIUSERSTOPIC% topic
+ * You are also listed in the %USERWEB%.%WIKIUSERSTOPIC% topic
* A confirmation e-mail has been sent to %PARAM1%
%TMPL:END%
%TMPL:DEF{"topicaction"}% [[%WEB%.%TOPIC%][OK]] %TMPL:END%
diff -ur orig/templates/registernotify.tmpl working/templates/registernotify.tmpl
--- orig/templates/registernotify.tmpl Sat Dec 1 01:46:42 2001
+++ working/templates/registernotify.tmpl Fri Jan 25 19:02:36 2002
@@ -18,7 +18,7 @@
same link.
Your personal %WIKITOOLNAME% topic is located at
-%SCRIPTURL%/view%SCRIPTSUFFIX%/%MAINWEB%/%WIKINAME% .
+%SCRIPTURL%/view%SCRIPTSUFFIX%/%USERWEB%/%WIKINAME% .
You can customize it as you like:
* Some people turn it into a personal portal with favorite