# HG changeset patch
# User Colas Nahaboo <colas@nahaboo.net>
# Date 1201369604 -3600
# Node ID f4a6132182ff6f6138f9ef9f3bb5c112a094f97b
# Parent  afa93cdecb02c503a514452f2145b08001f39a82
v1

diff -r afa93cdecb02 -r f4a6132182ff bin/rest
--- a/bin/rest	Sat Jan 26 15:53:13 2008 +0100
+++ b/bin/rest	Sat Jan 26 18:46:44 2008 +0100
@@ -86,7 +86,7 @@ else {
 else {
 
     # Point it somewhere innocent
-    $topic = $TWiki::cfg{UsersWebName} . '.' . $TWiki::cfg{HomeTopicName};
+    $topic = $TWiki::cfg{HomeWebName} . '.' . $TWiki::cfg{HomeTopicName};
     $query->param( -name => 'topic', -value => $topic );
 }
 
diff -r afa93cdecb02 -r f4a6132182ff lib/MANIFEST
--- a/lib/MANIFEST	Sat Jan 26 15:53:13 2008 +0100
+++ b/lib/MANIFEST	Sat Jan 26 18:46:44 2008 +0100
@@ -243,6 +243,7 @@ data/TWiki/VarLOGOUT.txt 0644
 data/TWiki/VarLOGOUT.txt 0644
 data/TWiki/VarM.txt 0644
 data/TWiki/VarMAINWEB.txt 0644
+data/TWiki/VarHOMEWEB.txt 0644
 data/TWiki/VarMAKETEXT.txt 0644
 data/TWiki/VarMAROON.txt 0644
 data/TWiki/VarMETA.txt 0644
diff -r afa93cdecb02 -r f4a6132182ff lib/TWiki.pm
--- a/lib/TWiki.pm	Sat Jan 26 15:53:13 2008 +0100
+++ b/lib/TWiki.pm	Sat Jan 26 18:46:44 2008 +0100
@@ -40,7 +40,7 @@ with CGI accelerators such as mod_perl.
    * =user=             Unique user ID of logged-in user
    * =users=            TWiki::Users singleton
    * =webName=          Name of web found in URL path, or =web= URL parameter,
-                        or {UsersWebName}
+                        or {HomeWebName}
 
 =cut
 
@@ -292,6 +292,7 @@ BEGIN {
     $functionTags{TRASHWEB}        = sub { $TWiki::cfg{TrashWebName} };
     $functionTags{TWIKIADMINLOGIN} = sub { $TWiki::cfg{AdminUserLogin} };
     $functionTags{USERSWEB}        = sub { $TWiki::cfg{UsersWebName} };
+    $functionTags{HOMEWEB}        = sub { $TWiki::cfg{HomeWebName} };
     $functionTags{WEBPREFSTOPIC}   = sub { $TWiki::cfg{WebPrefsTopicName} };
     $functionTags{WIKIPREFSTOPIC}  = sub { $TWiki::cfg{SitePrefsTopicName} };
     $functionTags{WIKIUSERSTOPIC}  = sub { $TWiki::cfg{UsersTopicName} };
@@ -832,7 +833,7 @@ sub redirect {
          # goto oops if URL is trying to take us somewhere dangerous
          $url = $this->getScriptUrl(
              1, 'oops',
-             $this->{web} || $TWiki::cfg{UsersWebName},
+             $this->{web} || $TWiki::cfg{HomeWebName},
              $this->{topic} || $TWiki::cfg{HomeTopicName},
              template => 'oopsaccessdenied',
              def => 'topic_access',
@@ -1211,7 +1212,7 @@ here)
 here)
 
 *WARNING* if there is no web specification (in the web or topic parameters)
-the web defaults to $TWiki::cfg{UsersWebName}. If there is no topic
+the web defaults to $TWiki::cfg{HomeWebName}. If there is no topic
 specification, or the topic is '0', the topic defaults to the web home topic
 name.
 
@@ -1226,7 +1227,7 @@ sub normalizeWebTopicName {
         $web = $1;
         $topic = $2;
     }
-    $web ||= $cfg{UsersWebName};
+    $web ||= $cfg{HomeWebName};
     $topic ||= $cfg{HomeTopicName};
     while( $web =~ s/%((MAIN|TWIKI|USERS|SYSTEM|DOC)WEB)%/_expandTagOnTopicRendering( $this,$1)||''/e ) {
     }
@@ -1356,7 +1357,7 @@ sub new {
 
     $web   =~ s/$TWiki::cfg{NameFilter}//go;
     $this->{requestedWebName} = TWiki::Sandbox::untaintUnchecked( $web ); #can be an empty string
-    $web = $TWiki::cfg{UsersWebName} unless $web;
+    $web = $TWiki::cfg{HomeWebName} unless $web;
     $this->{webName} = TWiki::Sandbox::untaintUnchecked( $web );
 
     # Convert UTF-8 web and topic name from URL into site charset if necessary 
diff -r afa93cdecb02 -r f4a6132182ff lib/TWiki.spec
--- a/lib/TWiki.spec	Sat Jan 26 15:53:13 2008 +0100
+++ b/lib/TWiki.spec	Sat Jan 26 18:46:44 2008 +0100
@@ -993,6 +993,11 @@ my $OS = $TWiki::cfg{OS} || '';
 # you are doing!)
 $TWiki::cfg{UsersWebName} = 'Main';
 
+# **STRING 20 **
+# Name of the Home web (aka landing, root, frontpage) web
+# If you change this setting, you must make sure the web exists.
+$TWiki::cfg{HomeWebName} = 'Home';
+
 #---+ Mail and Proxies
 # **BOOLEAN**
 # Enable email globally.
diff -r afa93cdecb02 -r f4a6132182ff lib/TWiki/Func.pm
--- a/lib/TWiki/Func.pm	Sat Jan 26 15:53:13 2008 +0100
+++ b/lib/TWiki/Func.pm	Sat Jan 26 18:46:44 2008 +0100
@@ -145,7 +145,7 @@ sub getViewUrl {
     my( $web, $topic ) = @_;
     ASSERT($TWiki::Plugins::SESSION) if DEBUG;
 
-    $web ||= $TWiki::Plugins::SESSION->{webName} || $TWiki::cfg{UsersWebName};
+    $web ||= $TWiki::Plugins::SESSION->{webName} || $TWiki::cfg{HomeWebName};
     return getScriptUrl( $web, $topic, 'view' );
 }
 
@@ -599,6 +599,22 @@ Return: =$name= Name, e.g. ='Main'=
 =cut
 
 sub getMainWebname {
+    return $TWiki::cfg{UsersWebName};
+}
+
+=pod
+
+---+++ getHomeWebname( ) -> $name
+
+Get name of Home web as defined in TWiki.cfg
+
+Return: =$name= Name, e.g. ='Home'=
+
+*Since:* TWiki::Plugins::VERSION 1.000 (27 Feb 2001)
+
+=cut
+
+sub getHomeWebname {
     return $TWiki::cfg{UsersWebName};
 }
 
@@ -3051,6 +3067,7 @@ As per the GPL, removal of this notice i
    * =getDataDir() -> $dir=
    * =getDefaultUserName() -> $loginName=
    * =getMainWebname() -> $name=
+   * =getHomeWebname() -> $name=
    * =getOopsUrl($web, $topic, $template, @theParams) -> $url=
    * =getPreferencesFlag($key) -> $boolean=
    * =getPreferencesValue($key, $web) -> $value=
diff -r afa93cdecb02 -r f4a6132182ff lib/TWiki/Plugins/RenderListPlugin.pm
--- a/lib/TWiki/Plugins/RenderListPlugin.pm	Sat Jan 26 15:53:13 2008 +0100
+++ b/lib/TWiki/Plugins/RenderListPlugin.pm	Sat Jan 26 18:46:44 2008 +0100
@@ -179,6 +179,8 @@ sub renderIconList
     $theParams =~ s/%ATTACHURL%/$attachUrl/go;
     $theParams =~ s/%WEB%/$installWeb/go;
     $theParams =~ s/%MAINWEB%/TWiki::Func::getMainWebname()/geo;
+    $theParams =~ s/%USERSWEB%/TWiki::Func::getUsersWebname()/geo;
+    $theParams =~ s/%HOMEWEB%/TWiki::Func::getHomeWebname()/geo;
     $theParams =~ s/%TWIKIWEB%/TWiki::Func::getTwikiWebname()/geo;
     my ( $showLead, $width, $height, $iconSp, $iconT, $iconI, $iconL, $iconImg )
        = split( /, */, $theParams );
diff -r afa93cdecb02 -r f4a6132182ff lib/TWiki/UI/Manage.pm
--- a/lib/TWiki/UI/Manage.pm	Sat Jan 26 15:53:13 2008 +0100
+++ b/lib/TWiki/UI/Manage.pm	Sat Jan 26 18:46:44 2008 +0100
@@ -709,7 +709,7 @@ sub _renameweb {
                 $oldParentWeb, $TWiki::cfg{HomeTopicName} );
         } else {
             $new_url = $session->getScriptUrl( 0, 'view',
-                $TWiki::cfg{UsersWebName}, $TWiki::cfg{HomeTopicName} );
+                $TWiki::cfg{HomeWebName}, $TWiki::cfg{HomeTopicName} );
         }
     } else {
         # redirect to new web
diff -r afa93cdecb02 -r f4a6132182ff lib/TWiki/UI/Statistics.pm
--- a/lib/TWiki/UI/Statistics.pm	Sat Jan 26 15:53:13 2008 +0100
+++ b/lib/TWiki/UI/Statistics.pm	Sat Jan 26 18:46:44 2008 +0100
@@ -71,7 +71,7 @@ sub statistics {
 
     my $tmp = '';
     # web to redirect to after finishing
-    my $destWeb = $TWiki::cfg{UsersWebName};
+    my $destWeb = $TWiki::cfg{HomeWebName};
     my $logDate = $session->{cgiQuery}->param( 'logdate' ) || '';
     $logDate =~ s/[^0-9]//g;  # remove all non numerals
     $debug = $session->{cgiQuery}->param( 'debug' );
diff -r afa93cdecb02 -r f4a6132182ff templates/oopsaccessdenied.classic.tmpl
--- a/templates/oopsaccessdenied.classic.tmpl	Sat Jan 26 15:53:13 2008 +0100
+++ b/templates/oopsaccessdenied.classic.tmpl	Sat Jan 26 18:46:44 2008 +0100
@@ -3,7 +3,7 @@
 %TMPL:DEF{"titleaction"}%%MAKETEXT{"(oops)"}% %TMPL:END%
 %TMPL:DEF{"webaction"}% *%MAKETEXT{"Attention"}%* %TMPL:END%
 %TMPL:DEF{"heading"}%%MAKETEXT{"Access Denied"}%%TMPL:END%
-%TMPL:DEF{"topicaction"}% [[%MAINWEB%.%HOMETOPIC%][%MAKETEXT{"OK"}%]] %TMPL:END%
+%TMPL:DEF{"topicaction"}% [[%HOMEWEB%.%HOMETOPIC%][%MAKETEXT{"OK"}%]] %TMPL:END%
 %TMPL:INCLUDE{"messages"}%
 %TMPL:DEF{"message"}%%INSTANTIATE%
 %TMPL:END%
diff -r afa93cdecb02 -r f4a6132182ff templates/twiki.classic.tmpl
--- a/templates/twiki.classic.tmpl	Sat Jan 26 15:53:13 2008 +0100
+++ b/templates/twiki.classic.tmpl	Sat Jan 26 18:46:44 2008 +0100
@@ -74,7 +74,7 @@
    <a href="%WEBLOGOURL%" rel='nofollow'><img src="%WEBLOGOIMG%" border="0" alt="%WEBLOGOALT%" /></a>
    </noautolink>
   </td><td>
-   <a href="%SCRIPTURLPATH{"view"}%/%MAINWEB%/%HOMETOPIC%">%WIKITOOLNAME%</a>
+   <a href="%SCRIPTURLPATH{"view"}%/%HOMEWEB%/%HOMETOPIC%">%WIKITOOLNAME%</a>
    &gt; <a href="%SCRIPTURLPATH{"view"}%/%WEB%/%HOMETOPIC%">%WEB%</a>
    &gt; %META{"parent" nowebhome="on" suffix=" &gt;"}%
    <font size="+1"><b>%TOPIC%</b> %TMPL:P{"titleaction"}%</font>
diff -r afa93cdecb02 -r f4a6132182ff templates/view.pattern.tmpl
--- a/templates/view.pattern.tmpl	Sat Jan 26 15:53:13 2008 +0100
+++ b/templates/view.pattern.tmpl	Sat Jan 26 18:46:44 2008 +0100
@@ -34,7 +34,7 @@
 
 %TMPL:DEF{"breadcrumb:title"}%<span class="patternHomePathTitle">%MAKETEXT{"You are here:"}% </span> %TMPL:END%
 
-%TMPL:DEF{"breadcrumb:wikitoolname"}%[[%MAINWEB%.%HOMETOPIC%][%WIKITOOLNAME%]]%TMPL:P{"breadcrumb:separator"}%%TMPL:END%
+%TMPL:DEF{"breadcrumb:wikitoolname"}%[[%HOMEWEB%.%HOMETOPIC%][%WIKITOOLNAME%]]%TMPL:P{"breadcrumb:separator"}%%TMPL:END%
 
 %TMPL:DEF{"breadcrumb:currentweb"}%<img src="%ICONURLPATH{web-bg-small}%" border="0" alt="" width="13" height="13" style="background-color:%WEBBGCOLOR%" />&nbsp;<a href="%SCRIPTURLPATH{"view"}%/%WEB%/%HOMETOPIC%">%MAKETEXT{"[_1] Web" args="<nop>%WEB%"}%</a>%TMPL:END%
 
@@ -67,4 +67,4 @@
 %TMPL:DEF{"footernote"}%%TMPL:P{"topicinfo"}%%TMPL:END%
 %TMPL:DEF{"topicinfo"}%<div class="patternInfo twikiGrayText"><div class="patternRevInfo">%MAKETEXT{"Topic revision:"}% %REVINFO%</div><!-- /patternRevInfo--><div class="patternMoved">%META{"moved"}%</div><!-- /patternMoved--></div><!-- /patternInfo-->%TMPL:END%
 
-%TMPL:DEF{"sig_textareabuttons"}%<div class="patternSigLine">%TMPL:P{"textareabuttons"}%<br class="twikiClear" /></div><!-- /patternSigLine-->%TMPL:END%
\ No newline at end of file
+%TMPL:DEF{"sig_textareabuttons"}%<div class="patternSigLine">%TMPL:P{"textareabuttons"}%<br class="twikiClear" /></div><!-- /patternSigLine-->%TMPL:END%
diff -r afa93cdecb02 -r f4a6132182ff tools/extender.pl
--- a/tools/extender.pl	Sat Jan 26 15:53:13 2008 +0100
+++ b/tools/extender.pl	Sat Jan 26 18:46:44 2008 +0100
@@ -137,7 +137,7 @@ sub remap {
     if (defined $cfg{UsersTopicName}) {
         $file =~ s#(Main)/TWikiUsers\.txt(.*)$#$1/$cfg{UsersTopicName}.txt$2#;
     }
-    foreach my $w qw( SystemWebName TrashWebName UsersWebName ) {
+    foreach my $w qw( SystemWebName TrashWebName UsersWebName HomeWebName ) {
         if (defined $cfg{$w}) {
             $file =~ s#^data/$w/#data/$cfg{$w}/#;
             $file =~ s#^pub/$w/#pub/$cfg{$w}/#;
# HG changeset patch
# User Colas Nahaboo <colas@nahaboo.net>
# Date 1201370522 -3600
# Node ID 89976d67478ef6e25e89d2992464853d41fd6c0a
# Parent  f4a6132182ff6f6138f9ef9f3bb5c112a094f97b
[mq]: first.patch