[TWiki-Dev] [SVN] r5950 - in twiki/branches/DEVELOP: data/TWiki lib

[<Cra...@nt...>]

Author: CrawfordCurrie
Date: 2005-07-30 16:50:05 -0700 (Sat, 30 Jul 2005)
New Revision: 5950

Modified:
   twiki/branches/DEVELOP/data/TWiki/TWikiVariablesAtoM.txt
   twiki/branches/DEVELOP/data/TWiki/TWikiVariablesNtoZ.txt
   twiki/branches/DEVELOP/lib/TWiki.pm
Log:
Item175: Added %LOCALSITEPREFS% variable

Modified: twiki/branches/DEVELOP/data/TWiki/TWikiVariablesAtoM.txt
===================================================================
--- twiki/branches/DEVELOP/data/TWiki/TWikiVariablesAtoM.txt	2005-07-30 23:48:49 UTC (rev 5949)
+++ twiki/branches/DEVELOP/data/TWiki/TWikiVariablesAtoM.txt	2005-07-30 23:50:05 UTC (rev 5950)
@@ -53,8 +53,9 @@
 	* Syntax: =%<nop>BASEWEB%=
 	* Related: [[#VarBASETOPIC][BASETOPIC]], [[#VarINCLUDINGWEB][INCLUDINGWEB]], [[#VarINCLUDE][INCLUDE]], [[#VarWEB][WEB]]
 
+#VarCANLOGIN
 ---+++ CANLOGIN -- are logins supported in this TWiki?
-   * Syntax: =%<nop>CANLOGIN%
+   * Syntax: =%<nop>CANLOGIN%=
    * Expand to: %CANLOGIN%
 	* Syntax: =%<nop>CANLOGIN{then="THEN" else="ELSE"}%=
 	* Expand to: %CANLOGIN{then="THEN" else="ELSE"}%
@@ -196,13 +197,21 @@
 	* Syntax: =%<nop>INCLUDINGWEB%=
 	* Related: [[#VarBASEWEB][BASEWEB]], [[#VarINCLUDINGTOPIC][INCLUDINGTOPIC]], [[#VarINCLUDE][INCLUDE]], [[#VarWEB][WEB]]
 
+#VarLOCALSITEPREFS
+---+++ LOCALSITEPREFS - web.topicname of site preferences topic
+   * The full name of the local site preferences topic. This topic is read for preferences before %TWIKIWEB%.<nop>%TWIKIPREFSTOPIC% is read.
+   * Syntax: =%<nop>LOCALSITEPREFS%=
+   * Expands to: <nop>%LOCALSITEPREFS%
+
+#VarLOGIN
 ---+++ LOGIN -- present a full login link
-   * Syntax: =%<nop>LOGIN%
+   * Syntax: =%<nop>LOGIN%=
    * Expand to: %LOGIN%
 	* Related: TWikiUserAuthentication,[[#VarAUTHENTICATED][AUTHENTICATED]],[[#VarCANLOGIN][CANLOGIN]],[[#VarSESSIONID][SESSIONID]],[[#VarSESSIONVAR][SESSIONVAR]],[[#VarLOGOUT][LOGOUT]],[[#VarSESSION_VARIABLE][SESSION_VARIABLE]]
 
+#VarLOGOUT
 ---+++ LOGOUT -- present a full logout link
-   * Syntax: =%<nop>LOGOUT%
+   * Syntax: =%<nop>LOGOUT%=
    * Expand to: %LOGOUT%
 	* Related: TWikiUserAuthentication,[[#VarAUTHENTICATED][AUTHENTICATED]],[[#VarCANLOGIN][CANLOGIN]],[[#VarSESSIONID][SESSIONID]],[[#VarSESSIONVAR][SESSIONVAR]],[[#VarLOGIN][LOGIN]],[[#VarSESSION_VARIABLE][SESSION_VARIABLE]]
 

Modified: twiki/branches/DEVELOP/data/TWiki/TWikiVariablesNtoZ.txt
===================================================================
--- twiki/branches/DEVELOP/data/TWiki/TWikiVariablesNtoZ.txt	2005-07-30 23:48:49 UTC (rev 5949)
+++ twiki/branches/DEVELOP/data/TWiki/TWikiVariablesNtoZ.txt	2005-07-30 23:50:05 UTC (rev 5950)
@@ -95,23 +95,23 @@
 	* Example: =%<nop>REVINFO{"$date - $wikiusername" rev="1.1"}%= returns revision info of first revision
 	* Related: [[#VarREVINFO][REVINFO]]
 
-#VarSESSION_VARIABLE
+#VarSESSIONVARIABLE
 ---+++ SESSION_VARIABLE -- get, set or clear a session variable
-   * Syntax: =%<nop>SESSION_VARIABLE{"name"}%
-   * Syntax: =%<nop>SESSION_VARIABLE{"name" set="value"}%
-   * Syntax: =%<nop>SESSION_VARIABLE{"name" clear=""}%
+   * Syntax: =%<nop>SESSION_VARIABLE{"name"}%=
+   * Syntax: =%<nop>SESSION_VARIABLE{"name" set="value"}%=
+   * Syntax: =%<nop>SESSION_VARIABLE{"name" clear=""}%=
 	* Related: TWikiUserAuthentication, [[#VarAUTHENTICATED][AUTHENTICATED]], [[#VarAUTHREALM][AUTHREALM]], [[#VarCANLOGIN][CANLOGIN]], [[#VarSESSIONID][SESSIONID]], [[#VarSESSIONVAR][SESSIONVAR]], [[#VarLOGIN][LOGIN]], [[#VarLOGOUT][LOGOUT]]
 %H% The users ID is in the =AUTHUSER= session variable, and is read-only.
 
 #VarSESSIONID
 ---+++ SESSIONID -- The unique ID for this session | %SESSIONID% |
-   * Syntax: =%<nop>SESSIONID%
+   * Syntax: =%<nop>SESSIONID%=
    * Expand to: %SESSIONID%
 	* Related: TWikiUserAuthentication,[[#VarAUTHENTICATED][AUTHENTICATED]], [[#VarAUTHREALM][AUTHREALM]], [[#VarCANLOGIN][CANLOGIN]], [[#VarSESSIONVAR][SESSIONVAR]], [[#VarLOGIN][LOGIN]], [[#VarLOGOUT][LOGOUT]], [[#VarSESSION_VARIABLE][SESSION_VARIABLE]]
 
 #VarSESSIONVAR
 ---+++ SESSIONVAR -- The name of CGI and session variable that stores the session ID
-   * Syntax: =%<nop>SESSIONVAR%
+   * Syntax: =%<nop>SESSIONVAR%=
    * Expand to: %SESSIONVAR%
 	* Related: TWikiUserAuthentication, [[#VarAUTHENTICATED][AUTHENTICATED]], [[#VarAUTHREALM][AUTHREALM]], [[#VarCANLOGIN][CANLOGIN]], [[#VarSESSIONID][SESSIONID]], [[#VarLOGIN][LOGIN]], [[#VarLOGOUT][LOGOUT]], [[#VarSESSION_VARIABLE][SESSION_VARIABLE]]
 

Modified: twiki/branches/DEVELOP/lib/TWiki.pm
===================================================================
--- twiki/branches/DEVELOP/lib/TWiki.pm	2005-07-30 23:48:49 UTC (rev 5949)
+++ twiki/branches/DEVELOP/lib/TWiki.pm	2005-07-30 23:50:05 UTC (rev 5950)
@@ -254,6 +254,7 @@
     $constantTags{PUBURLPATH}      = $TWiki::cfg{PubUrlPath};
     $constantTags{SCRIPTSUFFIX}    = $TWiki::cfg{ScriptSuffix};
     $constantTags{SCRIPTURLPATH}   = $TWiki::cfg{DispScriptUrlPath};
+    $constantTags{LOCALSITEPREFS}  = $TWiki::cfg{LocalSitePreferences};
     $constantTags{STATISTICSTOPIC} = $TWiki::cfg{Stats}{TopicName};
     $constantTags{TWIKIWEB}        = $TWiki::cfg{SystemWebName};
     $constantTags{WEBPREFSTOPIC}   = $TWiki::cfg{WebPrefsTopicName};