Author: MartinCleaver Date: 2004-12-09 12:39:39 -0800 (Thu, 09 Dec 2004) New Revision: 3393 Added: twiki/branches/DEVELOP/bin/resetpasswd twiki/branches/DEVELOP/data/Main/FirstName.txt twiki/branches/DEVELOP/data/Main/LastName.txt twiki/branches/DEVELOP/data/Main/UserList.txt twiki/branches/DEVELOP/data/TWiki/BulkRegistration.txt twiki/branches/DEVELOP/data/TWiki/BulkResetPassword.txt twiki/branches/DEVELOP/data/TWiki/LoginName.txt twiki/branches/DEVELOP/data/TWiki/RegistrationApprovals.txt twiki/branches/DEVELOP/data/TWiki/UserForm.txt twiki/branches/DEVELOP/data/TestCases/TestCaseBulkRegistration.txt twiki/branches/DEVELOP/data/TestCases/TestCaseInternetRegistration.txt twiki/branches/DEVELOP/pub/favicon.ico twiki/branches/DEVELOP/templates/mailresetpassword.tmpl twiki/branches/DEVELOP/templates/oopsregcode.tmpl twiki/branches/DEVELOP/templates/oopsregconfirm.tmpl twiki/branches/DEVELOP/templates/oopsresetpasswd2.tmpl twiki/branches/DEVELOP/templates/registerconfirm.tmpl twiki/branches/DEVELOP/templates/registernotifyadmin.tmpl twiki/branches/DEVELOP/test/compiletest.pl twiki/branches/DEVELOP/test/unit/TestCaseStdOutCapturer.pm twiki/branches/DEVELOP/test/unit/TestRegister.pm Modified: twiki/branches/DEVELOP/bin/.htaccess.txt twiki/branches/DEVELOP/bin/mailnotify twiki/branches/DEVELOP/bin/oops twiki/branches/DEVELOP/bin/register twiki/branches/DEVELOP/bin/setlib.cfg twiki/branches/DEVELOP/data/Main/FileAttachment.txt twiki/branches/DEVELOP/data/Main/LondonOffice.txt twiki/branches/DEVELOP/data/Main/NobodyGroup.txt twiki/branches/DEVELOP/data/Main/OfficeLocations.txt twiki/branches/DEVELOP/data/Main/SanJoseOffice.txt twiki/branches/DEVELOP/data/Main/TWikiGuest.txt twiki/branches/DEVELOP/data/Main/TWikiPreferences.txt twiki/branches/DEVELOP/data/Main/TWikiUsers.txt twiki/branches/DEVELOP/data/Main/TWikiVariables.txt twiki/branches/DEVELOP/data/Main/TokyoOffice.txt twiki/branches/DEVELOP/data/Main/WebChanges.txt twiki/branches/DEVELOP/data/Main/WebHome.txt twiki/branches/DEVELOP/data/Main/WebIndex.txt twiki/branches/DEVELOP/data/Main/WebSearch.txt twiki/branches/DEVELOP/data/Main/WebSearchAdvanced.txt twiki/branches/DEVELOP/data/Main/WebTopicList.txt twiki/branches/DEVELOP/data/Sandbox/WebChanges.txt twiki/branches/DEVELOP/data/Sandbox/WebHome.txt twiki/branches/DEVELOP/data/Sandbox/WebIndex.txt twiki/branches/DEVELOP/data/Sandbox/WebSearch.txt twiki/branches/DEVELOP/data/Sandbox/WebSearchAdvanced.txt twiki/branches/DEVELOP/data/Sandbox/WebTopicList.txt twiki/branches/DEVELOP/data/TWiki/ATasteOfTWikiTemplate.txt twiki/branches/DEVELOP/data/TWiki/AdminSkillsAssumptions.txt twiki/branches/DEVELOP/data/TWiki/BookView.txt twiki/branches/DEVELOP/data/TWiki/DefaultPlugin.txt twiki/branches/DEVELOP/data/TWiki/DeleteOrRenameATopic.txt twiki/branches/DEVELOP/data/TWiki/DeleteOrRenameAnAttachment.txt twiki/branches/DEVELOP/data/TWiki/DontNotify.txt twiki/branches/DEVELOP/data/TWiki/EditDoesNotIncreaseTheRevision.txt twiki/branches/DEVELOP/data/TWiki/EmptyPlugin.txt twiki/branches/DEVELOP/data/TWiki/ExampleTopicTemplate.txt twiki/branches/DEVELOP/data/TWiki/GoodStyle.txt twiki/branches/DEVELOP/data/TWiki/HiddenAttachment.txt twiki/branches/DEVELOP/data/TWiki/HowToLogOff.txt twiki/branches/DEVELOP/data/TWiki/InstallPassword.txt twiki/branches/DEVELOP/data/TWiki/MainFeatures.txt twiki/branches/DEVELOP/data/TWiki/MetaDataRendering.txt twiki/branches/DEVELOP/data/TWiki/RegularExpression.txt twiki/branches/DEVELOP/data/TWiki/SearchHelp.txt twiki/branches/DEVELOP/data/TWiki/SiteUsageStatistics.txt twiki/branches/DEVELOP/data/TWiki/StandardColors.txt twiki/branches/DEVELOP/data/TWiki/TWikiCategoryTable.txt twiki/branches/DEVELOP/data/TWiki/TWikiFaqTemplate.txt twiki/branches/DEVELOP/data/TWiki/TWikiLogos.txt twiki/branches/DEVELOP/data/TWiki/TWikiRegistration.txt twiki/branches/DEVELOP/data/TWiki/TWikiRegistrationPub.txt twiki/branches/DEVELOP/data/TWiki/TWikiShorthand.txt twiki/branches/DEVELOP/data/TWiki/TWikiSite.txt twiki/branches/DEVELOP/data/TWiki/TWikiUpgradeTo01Dec2000.txt twiki/branches/DEVELOP/data/TWiki/TWikiUpgradeTo01Dec2001.txt twiki/branches/DEVELOP/data/TWiki/TWikiUpgradeTo01May2000.txt twiki/branches/DEVELOP/data/TWiki/TWikiWebsTable.txt twiki/branches/DEVELOP/data/TWiki/WabiSabi.txt twiki/branches/DEVELOP/data/TWiki/WebChanges.txt twiki/branches/DEVELOP/data/TWiki/WebIndex.txt twiki/branches/DEVELOP/data/TWiki/WebTopicEditTemplate.txt twiki/branches/DEVELOP/data/TWiki/WebTopicList.txt twiki/branches/DEVELOP/data/TWiki/WelcomeGuest.txt twiki/branches/DEVELOP/data/TWiki/WikiName.txt twiki/branches/DEVELOP/data/TWiki/WikiNotation.txt twiki/branches/DEVELOP/data/TWiki/WikiSyntax.txt twiki/branches/DEVELOP/data/TWiki/WikiWord.txt twiki/branches/DEVELOP/data/TestCases/AnInvalidGroup.txt twiki/branches/DEVELOP/data/TestCases/CreateNewTestCaseForm.txt twiki/branches/DEVELOP/data/TestCases/IncludeMeTwice.txt twiki/branches/DEVELOP/data/TestCases/RecursiveInclude.txt twiki/branches/DEVELOP/data/TestCases/TestCaseAmISane.txt twiki/branches/DEVELOP/data/TestCases/TestCaseAutoInOutPre.txt twiki/branches/DEVELOP/data/TestCases/TestCaseAutoIncludeAttachment.txt twiki/branches/DEVELOP/data/TestCases/TestCaseAutoIncludes.txt twiki/branches/DEVELOP/data/TestCases/TestCaseAutoTagFromTags.txt twiki/branches/DEVELOP/data/TestCases/TestCaseAutoUnexpandedTagsInSearchResults.txt twiki/branches/DEVELOP/data/TestCases/TestCaseEmbeddedTags.txt twiki/branches/DEVELOP/data/TestCases/TestCaseInternalTags.txt twiki/branches/DEVELOP/data/TestCases/TestCaseNestedVerbatim.txt twiki/branches/DEVELOP/data/TestCases/TestCaseTemplate.txt twiki/branches/DEVELOP/data/TestCases/TestCaseTemplatedTopic.txt twiki/branches/DEVELOP/data/TestCases/TopicWithThreeRevs.txt twiki/branches/DEVELOP/data/TestCases/TopicWithThreeRevs.txt,v twiki/branches/DEVELOP/data/TestCases/WebHome.txt twiki/branches/DEVELOP/data/TestCases/WebLeftBar.txt twiki/branches/DEVELOP/data/TestCases/WebPreferences.txt twiki/branches/DEVELOP/data/Trash/WebChanges.txt twiki/branches/DEVELOP/data/Trash/WebIndex.txt twiki/branches/DEVELOP/data/Trash/WebSearch.txt twiki/branches/DEVELOP/data/Trash/WebSearchAdvanced.txt twiki/branches/DEVELOP/data/Trash/WebTopicList.txt twiki/branches/DEVELOP/data/_default/WebChanges.txt twiki/branches/DEVELOP/data/_default/WebHome.txt twiki/branches/DEVELOP/data/_default/WebIndex.txt twiki/branches/DEVELOP/data/_default/WebSearch.txt twiki/branches/DEVELOP/data/_default/WebSearchAdvanced.txt twiki/branches/DEVELOP/data/_default/WebTopicList.txt twiki/branches/DEVELOP/lib/Error.pm twiki/branches/DEVELOP/lib/TWiki.pm twiki/branches/DEVELOP/lib/TWiki/Templates.pm twiki/branches/DEVELOP/lib/TWiki/UI/Manage.pm twiki/branches/DEVELOP/lib/TWiki/UI/Register.pm twiki/branches/DEVELOP/templates/oopsnotwikiuser.tmpl twiki/branches/DEVELOP/templates/oopsregexist.tmpl twiki/branches/DEVELOP/templates/oopsresetpasswd.tmpl twiki/branches/DEVELOP/templates/registernotify.tmpl twiki/branches/DEVELOP/test/golden/ScriptTestFixture.pm Log: RegisterCgiScriptRewrite: MERGE TIME It turns out that neither Crawford nor I are able to work on the code over the next week yet we have both had large changesets outstanding. As my stuff is largely isolated to Register.pm and RegisterTestSet.pm, and is not too disruptive when broken we've agreed that it is better to get it in where people can look and help troubleshoot. There is something broken on my build - but as the tests worked fine before I merged, I feel it must be a config setting somewhere as even view fails. All the compile tests succeed. I apologise for leaving it in this state - I hope to have time to look on Saturday afternoon. PS. I didn't really change all those files in the TWiki web - this is a consequence of the lineending problem. M. Modified: twiki/branches/DEVELOP/bin/.htaccess.txt =================================================================== --- twiki/branches/DEVELOP/bin/.htaccess.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/bin/.htaccess.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -10,8 +10,7 @@ # part should match the $dataDir setting in TWiki.cfg # !URL_path_to_TWiki! # This is the URL path you put into the webserver for users to use to -# access TWiki. Excludes the http://.../ portion. -# e.g. /twiki +# access TWiki. # # Use CGI & Perl to handle all files in 'bin' directory, i.e. run as scripts @@ -55,6 +54,10 @@ allow from all </Files> +<Files "resetpasswd"> + require valid-user +</Files> + <Files "viewauth"> require valid-user </Files> Modified: twiki/branches/DEVELOP/bin/mailnotify =================================================================== --- twiki/branches/DEVELOP/bin/mailnotify 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/bin/mailnotify 2004-12-09 20:39:39 UTC (rev 3393) @@ -53,7 +53,7 @@ processWeb( $web ); # remove obsolete .lock files - $TWiki::T->{store}->removeObsoleteTopicLocks( $web ); + $TWiki::store->removeObsoleteTopicLocks( $web ); } } $debug && print "End TWiki mail notification\n"; @@ -68,7 +68,7 @@ $debug && print "Checking TWiki.$webName\n"; - if( ! $TWiki::T->{store}->webExists( $webName ) ) { + if( ! $TWiki::store->webExists( $webName ) ) { print STDERR "* ERROR: TWiki mailnotify does not find web $webName\n"; return; } @@ -84,7 +84,7 @@ my $skin = TWiki::Prefs::getPreferencesValue( "SKIN" ); my $text = TWiki::Store::readTemplate( "changes", $skin ); - my $changes= $TWiki::T->{store}->readFile( "$dataDir/$webName/.changes" ); + my $changes= $TWiki::store->readFile( "$dataDir/$webName/.changes" ); my %exclude; @@ -104,11 +104,11 @@ $after = &TWiki::Render::getRenderedVersion( $after ); my $prevLastmodify = - $TWiki::T->{store}->readFile( "$dataDir/$webName/.mailnotify" ) || "0"; + $TWiki::store->readFile( "$dataDir/$webName/.mailnotify" ) || "0"; my $currLastmodify = ""; my $scriptSuffix = $TWiki::scriptSuffix; my $scriptUrlPath = $TWiki::scriptUrlPath; - my $scriptUrl = $TWiki::T->{urlHost}.$scriptUrlPath; + my $scriptUrl = "$TWiki::urlHost$scriptUrlPath"; my $frev = ""; foreach( reverse split( /\n/, $changes ) ) { @@ -120,7 +120,7 @@ $newText = $text; # Repeating text from email template if( ( ! %exclude ) || ( ! $exclude{ $topicName } ) ) { - next unless $TWiki::T->{store}->topicExists( $webName, $topicName ); + next unless $TWiki::store->topicExists( $webName, $topicName ); if( ! $currLastmodify ) { # newest entry @@ -151,16 +151,16 @@ # Create entry in HTML attachment $newText = $text; $newText =~ s/%TOPICNAME%/$topicName/go; - $wikiuser = $TWiki::T->{users}->userToWikiName( $userName ); + $wikiuser = &TWiki::User::userToWikiName( $userName ); $newText =~ s/%AUTHOR%/$wikiuser/go; $newText =~ s/%LOCKED%//go; $time = &TWiki::formatTime( $changeTime ); $newText =~ s/%TIME%/$time/go; $newText =~ s/%REVISION%/$frev/go; - $newText = $TWiki::T->{renderer}->getRenderedVersion( $newText ); + $newText = $TWiki::renderer->getRenderedVersion( $newText ); - $head = $TWiki::T->{store}->readFile( "$dataDir\/$webName\/$topicName.txt", 16 ); + $head = $TWiki::store->readFile( "$dataDir\/$webName\/$topicName.txt", 16 ); $head = TWiki::makeTopicSummary( $head, $topicName, $webName ); $newText =~ s/%TEXTHEAD%/$head/go; @@ -207,7 +207,7 @@ $debug && print "- Sending mail notification to: $notifylist\n"; - my $error = $TWiki::T->{net}->sendEmail( $text ); + my $error = &TWiki::Net::sendEmail( $text ); if( $error ) { print STDERR "* $error\n"; $debug && print "- End TWiki.$webName\n"; @@ -243,7 +243,7 @@ my( $web, $topicname ) = @_; $topicname = $notifyTopicname unless $topicname; - return() unless $TWiki::T->{store}->topicExists( $web, $topicname ); + return() unless $TWiki::store->topicExists( $web, $topicname ); # Allow %MAINWEB% as well as 'Main' in front of users/groups - # non-capturing regex. @@ -292,7 +292,7 @@ my @list = (); # Ignore guest entry and non-existent pages if ( $wikiName ne "TWikiGuest" && - $TWiki::T->{store}->topicExists( $mainWebname, $wikiName ) ) { + $TWiki::store->topicExists( $mainWebname, $wikiName ) ) { if ( $wikiName =~ /Group$/ ) { # Page is for a group, get all users in group ##writeDebug "using group: $mainWebname . $wikiName"; Modified: twiki/branches/DEVELOP/bin/oops =================================================================== --- twiki/branches/DEVELOP/bin/oops 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/bin/oops 2004-12-09 20:39:39 UTC (rev 3393) @@ -31,6 +31,8 @@ use TWiki; use TWiki::UI::Oops; +use IO::Handle; STDOUT->blocking(0); + my $query = new CGI; my $pathInfo = $query->path_info(); my $user = $query->remote_user(); Modified: twiki/branches/DEVELOP/bin/register =================================================================== --- twiki/branches/DEVELOP/bin/register 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/bin/register 2004-12-09 20:39:39 UTC (rev 3393) @@ -52,40 +52,42 @@ if ($action eq 'register') { TWiki::UI::Register::register( - query => $query, - sendActivationCode => $sendActivationCode, - tempUserDir => $tempUserDir - ); - if (!$sendActivationCode) { - die "Need to call verify automatically"; - } + query => $query, + sendActivationCode => $sendActivationCode, + tempUserDir => $tempUserDir + ); + if (!$sendActivationCode) { + die "Need to call verify automatically"; + } } elsif ($action eq 'approve') { TWiki::UI::Register::finish( - query=>$query, - tempUserDir=>$tempUserDir - ); -} + query=>$query, + tempUserDir=>$tempUserDir + ); + + } elsif ($action eq 'verify') { - TWiki::UI::Register::verifyEmailAddress( - query=>$query, - tempUserDir=>$tempUserDir, - needApproval=>$needApproval - ); - # if (! $needApproval) { - # die "Need to call approve automatically"; - # } + TWiki::UI::Register::verifyEmailAddress( + query=>$query, + tempUserDir=>$tempUserDir, + needApproval=>$needApproval + ); +# if (! $needApproval) { +# die "Need to call approve automatically"; +# } TWiki::UI::Register::finish( - query=>$query, - tempUserDir=>$tempUserDir, - approve=>$query->param('code') - ); -} elsif ($action eq 'resetPassword') { #TODO - TWiki::UI::Register::resetPassword( - query => $query - ); -} else { + query=>$query, + tempUserDir=>$tempUserDir, + approve=>$query->param('code') + ); + + } elsif ($action eq 'resetPassword') { #TODO + TWiki::UI::Register::resetPassword( + query => $query + ); + } else { die "invalid action ($action) in register"; -} + } # Output of register: Copied: twiki/branches/DEVELOP/bin/resetpasswd (from rev 3385, twiki/scratch/RegisterCgiScriptRewrite/bin/resetpasswd) Property changes on: twiki/branches/DEVELOP/bin/resetpasswd ___________________________________________________________________ Name: svn:executable + * Modified: twiki/branches/DEVELOP/bin/setlib.cfg =================================================================== --- twiki/branches/DEVELOP/bin/setlib.cfg 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/bin/setlib.cfg 2004-12-09 20:39:39 UTC (rev 3393) @@ -40,9 +40,15 @@ use Cwd qw( abs_path ); ( $twikiLibPath ) = ($twikiLibPath = Cwd::abs_path( "../lib" )) =~ /(.*)/; # CRAP untaint? i dunno, i don't think so... --WN -die "no twikiLibPath: [$twikiLibPath]?" unless $twikiLibPath; +if ($twikiLibPath eq "") { + $twikiLibPath = "../lib"; + warn "using relative path for libs - some plugins may break"; +} +=pod + +# THIS SECTION IS COMMENTED OUT BY THE pod # Path to local Perl modules my $CPANBASE = "$twikiLibPath/CPAN/lib/site_perl"; if ( -e $CPANBASE ) @@ -52,13 +58,15 @@ my $SITEARCH = $Config::Config{archname}; @localPerlLibPath = ( "$CPANBASE/$VER/$SITEARCH/", "$CPANBASE/$VER/", "$CPANBASE/" ); } +=cut - # -------------- Don't change anything below this line # Prepend to @INC, the Perl search path for modules unshift @INC, $twikiLibPath; unshift @INC, @localPerlLibPath if defined @localPerlLibPath; +print join("\n", @INC) unless caller; + 1; # Return success for module loading Modified: twiki/branches/DEVELOP/data/Main/FileAttachment.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/FileAttachment.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/FileAttachment.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,2 +1,2 @@ %META:TOPICINFO{author="PeterThoeny" date="1071644520" format="1.0" version="1.4"}% -See [[%TWIKIWEB%.FileAttachment]] +See [[%TWIKIWEB%.FileAttachment]] Copied: twiki/branches/DEVELOP/data/Main/FirstName.txt (from rev 3385, twiki/scratch/RegisterCgiScriptRewrite/data/Main/FirstName.txt) Copied: twiki/branches/DEVELOP/data/Main/LastName.txt (from rev 3385, twiki/scratch/RegisterCgiScriptRewrite/data/Main/LastName.txt) Modified: twiki/branches/DEVELOP/data/Main/LondonOffice.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/LondonOffice.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/LondonOffice.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,8 +1,8 @@ -Here would stand the information about the London office: - - * Address: - * Phone: - * Fax: - * <a href="%SCRIPTURL%/search%SCRIPTSUFFIX%/%WEB%/?scope=text&search=Location:%20%TOPIC%">List</a> of employees at <nop>%TOPIC%. - -__Related topic:__ OfficeLocations, %WIKIUSERSTOPIC% +Here would stand the information about the London office: + + * Address: + * Phone: + * Fax: + * <a href="%SCRIPTURL%/search%SCRIPTSUFFIX%/%WEB%/?scope=text&search=Location:%20%TOPIC%">List</a> of employees at <nop>%TOPIC%. + +__Related topic:__ OfficeLocations, %WIKIUSERSTOPIC% Modified: twiki/branches/DEVELOP/data/Main/NobodyGroup.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/NobodyGroup.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/NobodyGroup.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,9 +1,9 @@ %META:TOPICINFO{author="JohnTalintyre" date="1042402146" format="1.0" version="1.2"}% -*Nobody Group* - - * Set GROUP = - * Set ALLOWTOPICCHANGE = TWikiAdminGroup - -Used to prevent dangerous actions e.g. renaming %TWIKIWEB%.TWikiPreferences - put NobodyGroup as the only group allowed to rename a topic and it can't be renamed. - -__Related topics:__ %WIKIUSERSTOPIC%, TWikiGroups, %TWIKIWEB%.TWikiAccessControl +*Nobody Group* + + * Set GROUP = + * Set ALLOWTOPICCHANGE = TWikiAdminGroup + +Used to prevent dangerous actions e.g. renaming %TWIKIWEB%.TWikiPreferences - put NobodyGroup as the only group allowed to rename a topic and it can't be renamed. + +__Related topics:__ %WIKIUSERSTOPIC%, TWikiGroups, %TWIKIWEB%.TWikiAccessControl Modified: twiki/branches/DEVELOP/data/Main/OfficeLocations.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/OfficeLocations.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/OfficeLocations.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,9 +1,9 @@ -The <nop>OfficeLocations topic has a list of all your offices. - - * SanJoseOffice - * LondonOffice - * TokyoOffice - -(This is an example of corporate intranet use and is for demonstration purposes only: %TWIKIWEB%.TWikiRegistration asks for an office location. To add/remove an office edit this OfficeLocations topic and the %TWIKIWEB%.TWikiRegistration topic) - -__Related topics:__ %WIKIUSERSTOPIC%, TWikiGroups +The <nop>OfficeLocations topic has a list of all your offices. + + * SanJoseOffice + * LondonOffice + * TokyoOffice + +(This is an example of corporate intranet use and is for demonstration purposes only: %TWIKIWEB%.TWikiRegistration asks for an office location. To add/remove an office edit this OfficeLocations topic and the %TWIKIWEB%.TWikiRegistration topic) + +__Related topics:__ %WIKIUSERSTOPIC%, TWikiGroups Modified: twiki/branches/DEVELOP/data/Main/SanJoseOffice.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/SanJoseOffice.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/SanJoseOffice.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,8 +1,8 @@ -Here would stand the information about the San Jose office: - - * Address: - * Phone: - * Fax: - * <a href="%SCRIPTURL%/search%SCRIPTSUFFIX%/%WEB%/?scope=text&search=Location:%20%TOPIC%">List</a> of employees at <nop>%TOPIC%. - -__Related topic:__ OfficeLocations, %WIKIUSERSTOPIC% +Here would stand the information about the San Jose office: + + * Address: + * Phone: + * Fax: + * <a href="%SCRIPTURL%/search%SCRIPTSUFFIX%/%WEB%/?scope=text&search=Location:%20%TOPIC%">List</a> of employees at <nop>%TOPIC%. + +__Related topic:__ OfficeLocations, %WIKIUSERSTOPIC% Modified: twiki/branches/DEVELOP/data/Main/TWikiGuest.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/TWikiGuest.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/TWikiGuest.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,14 +1,14 @@ -A guest of this TWiki web, not unlike yourself. You can leave your trace behind you, just add your name in %TWIKIWEB%.TWikiRegistration and create your own page. - -__Personal Preferences (details in %TWIKIWEB%.TWikiVariables)__ - * Horizontal size of text edit box: - * Set EDITBOXWIDTH = 70 - * Vertical size of text edit box: - * Set EDITBOXHEIGHT = 17 - * Default state of the __link__ check box in the attach file page: - * Set ATTACHLINKBOX = - -__Related topics__ - * %TWIKIWEB%.%WIKIPREFSTOPIC% has site-level preferences of %WIKITOOLNAME%. - * %WEBPREFSTOPIC% has preferences of the %WIKITOOLNAME%.%WEB% web. - * %WIKIUSERSTOPIC% has a list of other %WIKITOOLNAME% users. +A guest of this TWiki web, not unlike yourself. You can leave your trace behind you, just add your name in %TWIKIWEB%.TWikiRegistration and create your own page. + +__Personal Preferences (details in %TWIKIWEB%.TWikiVariables)__ + * Horizontal size of text edit box: + * Set EDITBOXWIDTH = 70 + * Vertical size of text edit box: + * Set EDITBOXHEIGHT = 17 + * Default state of the __link__ check box in the attach file page: + * Set ATTACHLINKBOX = + +__Related topics__ + * %TWIKIWEB%.%WIKIPREFSTOPIC% has site-level preferences of %WIKITOOLNAME%. + * %WEBPREFSTOPIC% has preferences of the %WIKITOOLNAME%.%WEB% web. + * %WIKIUSERSTOPIC% has a list of other %WIKITOOLNAME% users. Modified: twiki/branches/DEVELOP/data/Main/TWikiPreferences.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/TWikiPreferences.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/TWikiPreferences.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,9 +1,9 @@ %META:TOPICINFO{author="PeterThoeny" date="1071955740" format="1.0" version="1.1"}% -The site-level preferences are located in [[%TWIKIWEB%.%TOPIC%]] -<!-- keep this as a security measure: - * Set ALLOWTOPICCHANGE = TWikiAdminGroup - * Set ALLOWTOPICRENAME = TWikiAdminGroup ---> - - --- Main.PeterThoeny - 20 Dec 2003 +The site-level preferences are located in [[%TWIKIWEB%.%TOPIC%]] +<!-- keep this as a security measure: + * Set ALLOWTOPICCHANGE = TWikiAdminGroup + * Set ALLOWTOPICRENAME = TWikiAdminGroup +--> + + +-- Main.PeterThoeny - 20 Dec 2003 Modified: twiki/branches/DEVELOP/data/Main/TWikiUsers.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/TWikiUsers.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/TWikiUsers.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,41 +1,44 @@ -%META:TOPICINFO{author="PeterThoeny" date="1077314023" format="1.0" version="1.19"}% ----+ List of %WIKITOOLNAME% users - -Please take the time and add yourself to the list. To do that fill out the form in %TWIKIWEB%.TWikiRegistration. This will create an account for you which allows you to edit topics. - -#ListStart -[[#A][A]] [[#B][B]] [[#C][C]] [[#D][D]] [[#E][E]] [[#F][F]] [[#G][G]] [[#H][H]] [[#I][I]] [[#J][J]] [[#K][K]] [[#L][L]] [[#M][M]] [[#N][N]] [[#O][O]] [[#P][P]] [[#Q][Q]] [[#R][R]] [[#S][S]] [[#T][T]] [[#U][U]] [[#V][V]] [[#W][W]] [[#X][X]] [[#Y][Y]] [[#Z][Z]] - - * A - <a name="A">- - - -</a> - * B - <a name="B">- - - -</a> - * C - <a name="C">- - - -</a> - * D - <a name="D">- - - -</a> - * E - <a name="E">- - - -</a> - * F - <a name="F">- - - -</a> - * G - <a name="G">- - - -</a> - * H - <a name="H">- - - -</a> - * I - <a name="I">- - - -</a> - * J - <a name="J">- - - -</a> - * K - <a name="K">- - - -</a> - * L - <a name="L">- - - -</a> - * M - <a name="M">- - - -</a> - * N - <a name="N">- - - -</a> - * O - <a name="O">- - - -</a> - * P - <a name="P">- - - -</a> - * Q - <a name="Q">- - - -</a> - * R - <a name="R">- - - -</a> - * S - <a name="S">- - - -</a> - * T - <a name="T">- - - -</a> - * TWikiGuest - guest - 10 Feb 1999 - * U - <a name="U">- - - -</a> - * V - <a name="V">- - - -</a> - * W - <a name="W">- - - -</a> - * X - <a name="X">- - - -</a> - * Y - <a name="Y">- - - -</a> - * Z - <a name="Z">- - - -</a> - -[[#A][A]] [[#B][B]] [[#C][C]] [[#D][D]] [[#E][E]] [[#F][F]] [[#G][G]] [[#H][H]] [[#I][I]] [[#J][J]] [[#K][K]] [[#L][L]] [[#M][M]] [[#N][N]] [[#O][O]] [[#P][P]] [[#Q][Q]] [[#R][R]] [[#S][S]] [[#T][T]] [[#U][U]] [[#V][V]] [[#W][W]] [[#X][X]] [[#Y][Y]] [[#Z][Z]] - - * Set ALLOWTOPICCHANGE = TWikiAdminGroup - -__Related topics:__ OfficeLocations, TWikiGroups +%META:TOPICINFO{author="guest" date="1102446145" format="1.0" version="1.4"}% +---+ List of %WIKITOOLNAME% users + +Please take the time and add yourself to the list. To do that fill out the form in %TWIKIWEB%.TWikiRegistration. This will create an account for you which allows you to edit topics. + +The format of these lines is TWiki.WikiName - TWiki.LoginName - Date registered + +#ListStart +[[#A][A]] [[#B][B]] [[#C][C]] [[#D][D]] [[#E][E]] [[#F][F]] [[#G][G]] [[#H][H]] [[#I][I]] [[#J][J]] [[#K][K]] [[#L][L]] [[#M][M]] [[#N][N]] [[#O][O]] [[#P][P]] [[#Q][Q]] [[#R][R]] [[#S][S]] [[#T][T]] [[#U][U]] [[#V][V]] [[#W][W]] [[#X][X]] [[#Y][Y]] [[#Z][Z]] + + * A - <a name="A">- - - -</a> + * B - <a name="B">- - - -</a> + * C - <a name="C">- - - -</a> + * D - <a name="D">- - - -</a> + * E - <a name="E">- - - -</a> + * F - <a name="F">- - - -</a> + * G - <a name="G">- - - -</a> + * H - <a name="H">- - - -</a> + * I - <a name="I">- - - -</a> + * J - <a name="J">- - - -</a> + * K - <a name="K">- - - -</a> + * L - <a name="L">- - - -</a> + * M - <a name="M">- - - -</a> + * N - <a name="N">- - - -</a> + * O - <a name="O">- - - -</a> + * P - <a name="P">- - - -</a> + * Q - <a name="Q">- - - -</a> + * R - <a name="R">- - - -</a> + * S - <a name="S">- - - -</a> + * T - <a name="T">- - - -</a> + * TWikiGuest - guest - 10 Feb 1999 + * U - <a name="U">- - - -</a> + * V - <a name="V">- - - -</a> + * W - <a name="W">- - - -</a> + * X - <a name="X">- - - -</a> + * Y - <a name="Y">- - - -</a> + * Z - <a name="Z">- - - -</a> + +[[#A][A]] [[#B][B]] [[#C][C]] [[#D][D]] [[#E][E]] [[#F][F]] [[#G][G]] [[#H][H]] [[#I][I]] [[#J][J]] [[#K][K]] [[#L][L]] [[#M][M]] [[#N][N]] [[#O][O]] [[#P][P]] [[#Q][Q]] [[#R][R]] [[#S][S]] [[#T][T]] [[#U][U]] [[#V][V]] [[#W][W]] [[#X][X]] [[#Y][Y]] [[#Z][Z]] + + * Set ALLOWTOPICCHANGE = TWikiAdminGroup + +__Related topics:__ OfficeLocations, TWikiGroups + Modified: twiki/branches/DEVELOP/data/Main/TWikiVariables.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/TWikiVariables.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/TWikiVariables.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,2 +1,2 @@ %META:TOPICINFO{author="PeterThoeny" date="1042331384" format="1.0" version="1.3"}% -See [[%TWIKIWEB%.TWikiVariables]] +See [[%TWIKIWEB%.TWikiVariables]] Modified: twiki/branches/DEVELOP/data/Main/TokyoOffice.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/TokyoOffice.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/TokyoOffice.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,8 +1,8 @@ -Here would stand the information about the Tokyo office: - - * Address: - * Phone: - * Fax: - * <a href="%SCRIPTURL%/search%SCRIPTSUFFIX%/%WEB%/?scope=text&search=Location:%20%TOPIC%">List</a> of employees at <nop>%TOPIC%. - -__Related topic:__ OfficeLocations, %WIKIUSERSTOPIC% +Here would stand the information about the Tokyo office: + + * Address: + * Phone: + * Fax: + * <a href="%SCRIPTURL%/search%SCRIPTSUFFIX%/%WEB%/?scope=text&search=Location:%20%TOPIC%">List</a> of employees at <nop>%TOPIC%. + +__Related topic:__ OfficeLocations, %WIKIUSERSTOPIC% Copied: twiki/branches/DEVELOP/data/Main/UserList.txt (from rev 3385, twiki/scratch/RegisterCgiScriptRewrite/data/Main/UserList.txt) Modified: twiki/branches/DEVELOP/data/Main/WebChanges.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/WebChanges.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/WebChanges.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,2 +1,2 @@ %META:TOPICINFO{author="PeterThoeny" date="997991791" format="1.0beta2" version="1.2"}% -%INCLUDE{"%TWIKIWEB%.WebChanges"}% +%INCLUDE{"%TWIKIWEB%.WebChanges"}% Modified: twiki/branches/DEVELOP/data/Main/WebHome.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/WebHome.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/WebHome.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,35 +1,35 @@ %META:TOPICINFO{author="PeterThoeny" date="1044153791" format="1.0" version="1.20"}% -<table><tr><td> -*<font size="+1"> %TWIKIWEB%.WelcomeGuest: </font>* TWiki is a flexible, powerful, secure, yet simple web-based collaboration platform. Use TWiki to run a project development space, a document management system, a knowledge base or any other groupware tool on either on an intranet or on the Internet. You can edit any TWiki page. -</td><td> -<a href="http://TWiki.org/"><img src="%PUBURL%/%TWIKIWEB%/TWikiLogos/twikiRobot131x64.gif" width="131" height="64" alt="Powered by TWiki" border="0" /></a> -</td><td> -<b>The TWiki <sup>TM</sup> home is <br> at http://TWiki.org/ </b> -</td></tr> -</table> - -%INCLUDE{"%TWIKIWEB%.SiteMap"}% - -*%WIKITOOLNAME%.%WEB% Web:* - * <b> %WIKIUSERSTOPIC%: </b> List of users of this %WIKITOOLNAME% web. - * TWikiGroups: List of groups. - * OfficeLocations: Corporate offices. - -%INCLUDE{"%TWIKIWEB%.WebSiteTools"}% - -*%WIKITOOLNAME%.%TWIKIWEB% Web:* - * <b> %TWIKIWEB%.WelcomeGuest: </b> Look here first to get you rolling on %WIKITOOLNAME%. - * %TWIKIWEB%.TWikiSite: Explains what a %WIKITOOLNAME% site is. - * %TWIKIWEB%.TWikiRegistration: Create your account in order to edit topics. - * Documentation: - * %TWIKIWEB%.TWikiFAQ has a list of frequently asked questions. - * %TWIKIWEB%.TWikiDocumentation is the implementation documentation of TWiki. - * %TWIKIWEB%.TWikiHistory shows TWiki's implementation history. - * How to edit text: - * %TWIKIWEB%.GoodStyle: Things to consider when changing text. - * %TWIKIWEB%.TextFormattingRules: Easy to learn rules for editing text. - * %TWIKIWEB%.TextFormattingFAQ: Answers to frequently asked questions about text formatting. - * %TWIKIWEB%.%WIKIPREFSTOPIC%: %WIKITOOLNAME% site-level preferences - -*Notes:* -%INCLUDE{"%TWIKIWEB%.YouAreHere"}% +<table><tr><td> +*<font size="+1"> %TWIKIWEB%.WelcomeGuest: </font>* TWiki is a flexible, powerful, secure, yet simple web-based collaboration platform. Use TWiki to run a project development space, a document management system, a knowledge base or any other groupware tool on either on an intranet or on the Internet. You can edit any TWiki page. +</td><td> +<a href="http://TWiki.org/"><img src="%PUBURL%/%TWIKIWEB%/TWikiLogos/twikiRobot131x64.gif" width="131" height="64" alt="Powered by TWiki" border="0" /></a> +</td><td> +<b>The TWiki <sup>TM</sup> home is <br> at http://TWiki.org/ </b> +</td></tr> +</table> + +%INCLUDE{"%TWIKIWEB%.SiteMap"}% + +*%WIKITOOLNAME%.%WEB% Web:* + * <b> %WIKIUSERSTOPIC%: </b> List of users of this %WIKITOOLNAME% web. + * TWikiGroups: List of groups. + * OfficeLocations: Corporate offices. + +%INCLUDE{"%TWIKIWEB%.WebSiteTools"}% + +*%WIKITOOLNAME%.%TWIKIWEB% Web:* + * <b> %TWIKIWEB%.WelcomeGuest: </b> Look here first to get you rolling on %WIKITOOLNAME%. + * %TWIKIWEB%.TWikiSite: Explains what a %WIKITOOLNAME% site is. + * %TWIKIWEB%.TWikiRegistration: Create your account in order to edit topics. + * Documentation: + * %TWIKIWEB%.TWikiFAQ has a list of frequently asked questions. + * %TWIKIWEB%.TWikiDocumentation is the implementation documentation of TWiki. + * %TWIKIWEB%.TWikiHistory shows TWiki's implementation history. + * How to edit text: + * %TWIKIWEB%.GoodStyle: Things to consider when changing text. + * %TWIKIWEB%.TextFormattingRules: Easy to learn rules for editing text. + * %TWIKIWEB%.TextFormattingFAQ: Answers to frequently asked questions about text formatting. + * %TWIKIWEB%.%WIKIPREFSTOPIC%: %WIKITOOLNAME% site-level preferences + +*Notes:* +%INCLUDE{"%TWIKIWEB%.YouAreHere"}% Modified: twiki/branches/DEVELOP/data/Main/WebIndex.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/WebIndex.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/WebIndex.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,4 +1,4 @@ %META:TOPICINFO{author="PeterThoeny" date="1006601794" format="1.0" version="1.2"}% -%SEARCH{"\.*" scope="topic" regex="on" nosearch="on"}% - -See also the faster WebTopicList +%SEARCH{"\.*" scope="topic" regex="on" nosearch="on"}% + +See also the faster WebTopicList Modified: twiki/branches/DEVELOP/data/Main/WebSearch.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/WebSearch.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/WebSearch.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,3 +1,3 @@ %META:TOPICINFO{author="PeterThoeny" date="997250270" format="1.0beta2" version="1.8"}% %META:TOPICPARENT{name="WebHome"}% -%INCLUDE{"%TWIKIWEB%.WebSearch"}% +%INCLUDE{"%TWIKIWEB%.WebSearch"}% Modified: twiki/branches/DEVELOP/data/Main/WebSearchAdvanced.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/WebSearchAdvanced.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/WebSearchAdvanced.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,3 +1,3 @@ %META:TOPICINFO{author="PeterThoeny" date="1074422943" format="1.0" version="1.1"}% %META:TOPICPARENT{name="WebSearch"}% -%INCLUDE{"%TWIKIWEB%.WebSearchAdvanced"}% +%INCLUDE{"%TWIKIWEB%.WebSearchAdvanced"}% Modified: twiki/branches/DEVELOP/data/Main/WebTopicList.txt =================================================================== --- twiki/branches/DEVELOP/data/Main/WebTopicList.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Main/WebTopicList.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,5 +1,5 @@ %META:TOPICINFO{author="PeterThoeny" date="1006601764" format="1.0" version="1.1"}% %META:TOPICPARENT{name="WebHome"}% -%TOPICLIST{" * [[$name]]"}% - -See also the verbose WebIndex. +%TOPICLIST{" * [[$name]]"}% + +See also the verbose WebIndex. Modified: twiki/branches/DEVELOP/data/Sandbox/WebChanges.txt =================================================================== --- twiki/branches/DEVELOP/data/Sandbox/WebChanges.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Sandbox/WebChanges.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,2 +1,2 @@ %META:TOPICINFO{author="PeterThoeny" date="997991760" format="1.0beta2" version="1.2"}% -%INCLUDE{"%TWIKIWEB%.WebChanges"}% +%INCLUDE{"%TWIKIWEB%.WebChanges"}% Modified: twiki/branches/DEVELOP/data/Sandbox/WebHome.txt =================================================================== --- twiki/branches/DEVELOP/data/Sandbox/WebHome.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Sandbox/WebHome.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,14 +1,14 @@ %META:TOPICINFO{author="PeterThoeny" date="1018765129" format="1.0" version="1.7"}% -The <b>%WIKITOOLNAME%.%WEB%</b> web is the sandbox you can use for testing. Everybody is welcome to add or delete some stuff. It is recommended to walk through the %TWIKIWEB%.TWikiTutorial to get a jumpstart on the %WIKITOOLNAME% tool. A good rule of thumb is to add at the end of the page and sign & date it with your %TWIKIWEB%.WikiName. - - * TestTopic1, TestTopic2, TestTopic3, TestTopic4 - * TestTopic5, TestTopic6, TestTopic7, TestTopic8 - ----++ Site Tools of the %WEB% Web - -%INCLUDE{"%TWIKIWEB%.WebSiteTools"}% - -*Notes:* -%INCLUDE{"%TWIKIWEB%.YouAreHere"}% - -%INCLUDE{"%TWIKIWEB%.SiteMap"}% +The <b>%WIKITOOLNAME%.%WEB%</b> web is the sandbox you can use for testing. Everybody is welcome to add or delete some stuff. It is recommended to walk through the %TWIKIWEB%.TWikiTutorial to get a jumpstart on the %WIKITOOLNAME% tool. A good rule of thumb is to add at the end of the page and sign & date it with your %TWIKIWEB%.WikiName. + + * TestTopic1, TestTopic2, TestTopic3, TestTopic4 + * TestTopic5, TestTopic6, TestTopic7, TestTopic8 + +---++ Site Tools of the %WEB% Web + +%INCLUDE{"%TWIKIWEB%.WebSiteTools"}% + +*Notes:* +%INCLUDE{"%TWIKIWEB%.YouAreHere"}% + +%INCLUDE{"%TWIKIWEB%.SiteMap"}% Modified: twiki/branches/DEVELOP/data/Sandbox/WebIndex.txt =================================================================== --- twiki/branches/DEVELOP/data/Sandbox/WebIndex.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Sandbox/WebIndex.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,4 +1,4 @@ %META:TOPICINFO{author="PeterThoeny" date="1006601989" format="1.0" version="1.2"}% -%SEARCH{"\.*" scope="topic" regex="on" nosearch="on"}% - -See also the faster WebTopicList +%SEARCH{"\.*" scope="topic" regex="on" nosearch="on"}% + +See also the faster WebTopicList Modified: twiki/branches/DEVELOP/data/Sandbox/WebSearch.txt =================================================================== --- twiki/branches/DEVELOP/data/Sandbox/WebSearch.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Sandbox/WebSearch.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,3 +1,3 @@ %META:TOPICINFO{author="PeterThoeny" date="997250162" format="1.0beta2" version="1.6"}% %META:TOPICPARENT{name="WebHome"}% -%INCLUDE{"%TWIKIWEB%.WebSearch"}% +%INCLUDE{"%TWIKIWEB%.WebSearch"}% Modified: twiki/branches/DEVELOP/data/Sandbox/WebSearchAdvanced.txt =================================================================== --- twiki/branches/DEVELOP/data/Sandbox/WebSearchAdvanced.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Sandbox/WebSearchAdvanced.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,3 +1,3 @@ %META:TOPICINFO{author="PeterThoeny" date="1074423094" format="1.0" version="1.1"}% %META:TOPICPARENT{name="WebSearch"}% -%INCLUDE{"%TWIKIWEB%.WebSearchAdvanced"}% +%INCLUDE{"%TWIKIWEB%.WebSearchAdvanced"}% Modified: twiki/branches/DEVELOP/data/Sandbox/WebTopicList.txt =================================================================== --- twiki/branches/DEVELOP/data/Sandbox/WebTopicList.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/Sandbox/WebTopicList.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,5 +1,5 @@ %META:TOPICINFO{author="PeterThoeny" date="1006601966" format="1.0" version="1.1"}% %META:TOPICPARENT{name="WebHome"}% -%TOPICLIST{" * [[$name]]"}% - -See also the verbose WebIndex. +%TOPICLIST{" * [[$name]]"}% + +See also the verbose WebIndex. Modified: twiki/branches/DEVELOP/data/TWiki/ATasteOfTWikiTemplate.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/ATasteOfTWikiTemplate.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/TWiki/ATasteOfTWikiTemplate.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,36 +1,36 @@ %META:TOPICINFO{author="PeterThoeny" date="1079598540" format="1.0" version="1.1"}% %META:TOPICPARENT{name="ATasteOfTWiki"}% -Slide template for ATasteOfTWiki presentation - -%STARTINCLUDE% -<font face="Verdana" color="white" size="+2"> -<table width="100%" border="0" cellspacing="0"> - <tr bgcolor="#0069D1"> - <td valign="middle" colspan="2"> - <font size="+4"><b>%SLIDETITLE%</b></font> - </td> - </tr> - <tr bgcolor="#0f87ff"> - <td> - <img src="%ATTACHURL%/sidebar.gif" width="1" height="480" alt="" /> - </td> - <td valign="top" align="left"> - <br /> - %SLIDETEXT% - </td> - </tr> - <tr bgcolor="#4da6ff"> - <td valign="middle" align="center" colspan="2"> - <font size="-1" color="black"> - %SLIDENAVFIRST% %SLIDENAVPREV% - Slide %SLIDENUM% of %SLIDEMAX% - %SLIDENAVNEXT% %SLIDENAVLAST% <br> - Copyright © %SERVERTIME{$year}% by the contributing authors</font> - </td> - </tr> -</table> -</font> -%STOPINCLUDE% - - --- TWiki:Main.CrawfordCurrie - 18 Feb 2004 +Slide template for ATasteOfTWiki presentation + +%STARTINCLUDE% +<font face="Verdana" color="white" size="+2"> +<table width="100%" border="0" cellspacing="0"> + <tr bgcolor="#0069D1"> + <td valign="middle" colspan="2"> + <font size="+4"><b>%SLIDETITLE%</b></font> + </td> + </tr> + <tr bgcolor="#0f87ff"> + <td> + <img src="%ATTACHURL%/sidebar.gif" width="1" height="480" alt="" /> + </td> + <td valign="top" align="left"> + <br /> + %SLIDETEXT% + </td> + </tr> + <tr bgcolor="#4da6ff"> + <td valign="middle" align="center" colspan="2"> + <font size="-1" color="black"> + %SLIDENAVFIRST% %SLIDENAVPREV% + Slide %SLIDENUM% of %SLIDEMAX% + %SLIDENAVNEXT% %SLIDENAVLAST% <br> + Copyright © %SERVERTIME{$year}% by the contributing authors</font> + </td> + </tr> +</table> +</font> +%STOPINCLUDE% + + +-- TWiki:Main.CrawfordCurrie - 18 Feb 2004 Modified: twiki/branches/DEVELOP/data/TWiki/AdminSkillsAssumptions.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/AdminSkillsAssumptions.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/TWiki/AdminSkillsAssumptions.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,22 +1,22 @@ %META:TOPICINFO{author="PeterThoeny" date="1071560891" format="1.0" version="1.3"}% %META:TOPICPARENT{name="TWikiInstallationGuide"}% ----+ Administrator Skills Assumptions - -For each of these, the requirement is either pre-existing knowledge/skill, or the willingness to spend significant time (i.e. from hours to days) learning these. - - * *Operating system administration:* Ability to use Unix/Linux command line tools (or equivalent Windows tools), including ability to move/copy/delete files, change permissions, view web server log files, set environment variables, use a text editor, etc. - * *Web server administration:* Ability to do basic setup, e.g. ability to edit config files or use GUI configuration tools to enable CGI scripts on a directory. - * *Program compilation:* _Where RCS is not pre-installed_ (that is most Unix systems), the ability to download and compile the RCS program from source, including use of =configure=, =make=, etc. This is often *not* necessary on Linux or Windows. - * *Troubleshooting*: Ability to perform tests, inspect error logs, talk to technical support (whether in an IT department or web hosting provider) and read documentation in order to help with diagnosing installation problems. - -Installing TWiki is *not* recommended for people who only know HTML and web design, unless they are willing to learn the above, or team up with someone who can handle the installation. - -Although the TWikiInstallationGuide is quite complete, there will on occasion be parts that don't work in your local environment (particularly with TWiki:Codev/TWikiOnWebHostingSites, which are sometimes challenging even for those with good OS and web server skills). - -There are many excellent resources for learning how to administer your OS and web server, including books, web sites, web forums, IM and email lists. The TWiki:Support web must *not* be depended on as a resource for this purpose - in other words, it is not there to answer basic questions about operating system and web server administration. Asking and answering questions is time consuming for all concerned and is best used for specific _TWiki related_ issues, rather than helping you learn the OS and web server. - -One of the best training courses for Linux is *Basic Linux Training* at http://basiclinux.net/ - this is a 2 month distance-learning course (via email). The course operators are friendly, and all students are newbies. A nice tool for people migrating from Windows is http://www.MidnightCommander.org/. It is already installed on Linux systems: try ==mc -ac== and ==ESC 1== to get help. - --- TWiki:Main.RichardDonkin - 27 Apr 2002 %BR% --- TWiki:Main.GrantBow - 15 Jan 2003 %BR% --- TWiki:Main.PeterMasiar - 28 May 2003 +---+ Administrator Skills Assumptions + +For each of these, the requirement is either pre-existing knowledge/skill, or the willingness to spend significant time (i.e. from hours to days) learning these. + + * *Operating system administration:* Ability to use Unix/Linux command line tools (or equivalent Windows tools), including ability to move/copy/delete files, change permissions, view web server log files, set environment variables, use a text editor, etc. + * *Web server administration:* Ability to do basic setup, e.g. ability to edit config files or use GUI configuration tools to enable CGI scripts on a directory. + * *Program compilation:* _Where RCS is not pre-installed_ (that is most Unix systems), the ability to download and compile the RCS program from source, including use of =configure=, =make=, etc. This is often *not* necessary on Linux or Windows. + * *Troubleshooting*: Ability to perform tests, inspect error logs, talk to technical support (whether in an IT department or web hosting provider) and read documentation in order to help with diagnosing installation problems. + +Installing TWiki is *not* recommended for people who only know HTML and web design, unless they are willing to learn the above, or team up with someone who can handle the installation. + +Although the TWikiInstallationGuide is quite complete, there will on occasion be parts that don't work in your local environment (particularly with TWiki:Codev/TWikiOnWebHostingSites, which are sometimes challenging even for those with good OS and web server skills). + +There are many excellent resources for learning how to administer your OS and web server, including books, web sites, web forums, IM and email lists. The TWiki:Support web must *not* be depended on as a resource for this purpose - in other words, it is not there to answer basic questions about operating system and web server administration. Asking and answering questions is time consuming for all concerned and is best used for specific _TWiki related_ issues, rather than helping you learn the OS and web server. + +One of the best training courses for Linux is *Basic Linux Training* at http://basiclinux.net/ - this is a 2 month distance-learning course (via email). The course operators are friendly, and all students are newbies. A nice tool for people migrating from Windows is http://www.MidnightCommander.org/. It is already installed on Linux systems: try ==mc -ac== and ==ESC 1== to get help. + +-- TWiki:Main.RichardDonkin - 27 Apr 2002 %BR% +-- TWiki:Main.GrantBow - 15 Jan 2003 %BR% +-- TWiki:Main.PeterMasiar - 28 May 2003 Modified: twiki/branches/DEVELOP/data/TWiki/BookView.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/BookView.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/TWiki/BookView.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,2 +1,2 @@ %META:TOPICINFO{author="PeterThoeny" date="1035350940" format="1.0" version="1.2"}% -*BookView* is an option available from the WebSearch topic. It allows you to display the result in "book view", that is, the whole content of topics is shown instead of a topic summary. This allows you to easily see a whole set of pages, which is useful for printing. +*BookView* is an option available from the WebSearch topic. It allows you to display the result in "book view", that is, the whole content of topics is shown instead of a topic summary. This allows you to easily see a whole set of pages, which is useful for printing. Copied: twiki/branches/DEVELOP/data/TWiki/BulkRegistration.txt (from rev 3385, twiki/scratch/RegisterCgiScriptRewrite/data/TWiki/BulkRegistration.txt) =================================================================== --- twiki/scratch/RegisterCgiScriptRewrite/data/TWiki/BulkRegistration.txt 2004-12-09 10:49:01 UTC (rev 3385) +++ twiki/branches/DEVELOP/data/TWiki/BulkRegistration.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -0,0 +1,65 @@ +%META:TOPICINFO{author="TWikiGuest" date="1102436888" format="1.0" version="1.2"}% +%META:TOPICPARENT{name="ManagingUsers"}% +---++ Bulk Registration + +Any fields you define in this table will end up in the User's topic. If a form (such as UserForm) is attached to NewUserTemplate then the data will go in as META:FIELDS, meaning that you can use SEARCH formfield constructs to search. + +If you use the UserForm then ensure that it contains all the fields you define here. Otherwise they will disappear when the user edits their home topic! + +---+++ Mandatory fields + * WikiName + * Email + * !FirstName + * !LastName + +---+++ Optional fields + * LoginName - if not set will register with WikiName + + +---++ Settings + * Set REGISTERTOPIC = %MAINWEB%.UnprocessedRegistrations + * Set LOGTOPIC = %REGISTERTOPIC%Log + + * Set OVERWRITEHOMETOPICS = 0 + +---+++ Example format +The following should be inserted into your REGISTERTOPIC as a table. +<verbatim> +| FirstName | LastName | Email | WikiName | CustomFieldThis | SomeOtherRandomField | WhateverYouLike | +| Test | User | yo...@ex... | TestUser | A | B | C | +</verbatim> + +To use this: + 1 Make sure that the Custom fields appear on the UserForm + 2 Copy the above table to your clipboard + 3 Click through and paste this on %REGISTERTOPIC%, save the topic and return here. + 4 Click the Bulk register button below + 5 Read %LOGTOPIC% + 6 When you are ready, you probably want to use the BulkResetPassword page + +Notes: + 1 The first row of the table dictates the heading format and that the fieldnames must be plain, i.e. *must not contain bolded* entries. + 2 You are responsible for ensuring that the fieldnames appear in the [[TWiki.UserForm]] + 3 Only members of the [[%MAINWEB%.TWikiAdminGroup]] can run this. + + +<FORM name="bulkRegister" action="%SCRIPTURL%/manage%SCRIPTSUFFIX%/%REGISTERTOPIC%" method="post"> +<input type="hidden" name="action" value="bulkRegister"/> +<input type="submit" value="Bulk Register these people" /> +<input type="hidden" name="LogTopic" value="%LOGTOPIC%" /> +<input type="hidden" name="OverwriteHomeTopics" value="%OVERWRITEHOMETOPICS%" /> +<input type="hidden" name="EmailUsersWithDetails" value="0" /> <!-- warning - not actually implemented --> +</FORM> + +---++ %REGISTERTOPIC% + +%INCLUDE{%REGISTERTOPIC%}% + + +---++ %LOGTOPIC% + +%INCLUDE{%LOGTOPIC%}% + + +-- People.MartinCleaver - 18 Oct 2004 + Copied: twiki/branches/DEVELOP/data/TWiki/BulkResetPassword.txt (from rev 3385, twiki/scratch/RegisterCgiScriptRewrite/data/TWiki/BulkResetPassword.txt) Modified: twiki/branches/DEVELOP/data/TWiki/DefaultPlugin.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/DefaultPlugin.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/TWiki/DefaultPlugin.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,52 +1,52 @@ %META:TOPICINFO{author="PeterThoeny" date="1079856725" format="1.0" version="1.6"}% ----+ Default TWiki Plugin - -The default plugin is used for some depreciated rendering of older TWiki versions and of <nop>JosWiki. This plugin can also be used to specify some simple custom rendering rules. __Note:__ Create a new [[%TWIKIWEB%.TWikiPlugins][TWikiPlugin]] based on EmptyPlugin if you plan to offer some complex rendering or other functionality. - ----++ Syntax Rules - -Custom rendering rules of the default plugin: - - * Allow old include syntax ( ==%<nop>INCLUDE:"TopicName"%== ) if Plugin Preferences variable ==OLDINCLUDE== is set to ==1== - * Render depreciated ==*_text_*== as __bold italic__ text. Test if installed: *_This is bold italic_* - * Enable <nop>JosWiki rules if <nop>JosWiki specific code is uncommented - -Modify file ==TWiki/Plugins/DefaultPlugin.pm== to add your own rules or to enable <nop>JosWiki rules. - ----++ Plugin Settings - -Plugin settings are stored as preferences variables. To reference -a plugin setting write ==%<nop><plugin>_<setting>%==, i.e. ==%<nop>DEFAULTPLUGIN_SHORTDESCRIPTION%== - - * One line description, is shown in the %TWIKIWEB%.TextFormattingRules topic: - * Set SHORTDESCRIPTION = This plugin can be used to specify some simple custom rendering rules. It also renders depreciated ==*_text_*== as __bold italic__ text. - - * Allow depreciated ==%<nop>INCLUDE:"TopicName"%== syntax: - * Set OLDINCLUDE = 1 - - * Debug plugin: (See output in =data/debug.txt=) - * Set DEBUG = 0 - - ----++ Plugin Installation Instructions - - * This plugin is preinstalled, you do not need to install it. - ----++ Plugin Info - -| Plugin Author: | TWiki:Main.AndreaSterbini, TWiki:Main.PeterThoeny | -| Plugin Version: | 21 Mar 2004 | -| Change History: | <!-- versions below in reverse order --> | -| 21 Mar 2004: | Added afterSaveHandler | -| 14 Jul 2001: | Changed to plug&play | -| 27 Feb 2001: | Initial version | -| CPAN Dependencies: | none | -| Other Dependencies: | none | -| Perl Version: | 5.0 | -| Plugin Home: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC% | -| Feedback: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Dev | - -__Related Topics:__ %TWIKIWEB%.TWikiPreferences, %TWIKIWEB%.TWikiPlugins, EmptyPlugin - --- TWiki:Main.AndreaSterbini - 27 Feb 2001 %BR% --- TWiki:Main.PeterThoeny - 21 Mar 2004 +---+ Default TWiki Plugin + +The default plugin is used for some depreciated rendering of older TWiki versions and of <nop>JosWiki. This plugin can also be used to specify some simple custom rendering rules. __Note:__ Create a new [[%TWIKIWEB%.TWikiPlugins][TWikiPlugin]] based on EmptyPlugin if you plan to offer some complex rendering or other functionality. + +---++ Syntax Rules + +Custom rendering rules of the default plugin: + + * Allow old include syntax ( ==%<nop>INCLUDE:"TopicName"%== ) if Plugin Preferences variable ==OLDINCLUDE== is set to ==1== + * Render depreciated ==*_text_*== as __bold italic__ text. Test if installed: *_This is bold italic_* + * Enable <nop>JosWiki rules if <nop>JosWiki specific code is uncommented + +Modify file ==TWiki/Plugins/DefaultPlugin.pm== to add your own rules or to enable <nop>JosWiki rules. + +---++ Plugin Settings + +Plugin settings are stored as preferences variables. To reference +a plugin setting write ==%<nop><plugin>_<setting>%==, i.e. ==%<nop>DEFAULTPLUGIN_SHORTDESCRIPTION%== + + * One line description, is shown in the %TWIKIWEB%.TextFormattingRules topic: + * Set SHORTDESCRIPTION = This plugin can be used to specify some simple custom rendering rules. It also renders depreciated ==*_text_*== as __bold italic__ text. + + * Allow depreciated ==%<nop>INCLUDE:"TopicName"%== syntax: + * Set OLDINCLUDE = 1 + + * Debug plugin: (See output in =data/debug.txt=) + * Set DEBUG = 0 + + +---++ Plugin Installation Instructions + + * This plugin is preinstalled, you do not need to install it. + +---++ Plugin Info + +| Plugin Author: | TWiki:Main.AndreaSterbini, TWiki:Main.PeterThoeny | +| Plugin Version: | 21 Mar 2004 | +| Change History: | <!-- versions below in reverse order --> | +| 21 Mar 2004: | Added afterSaveHandler | +| 14 Jul 2001: | Changed to plug&play | +| 27 Feb 2001: | Initial version | +| CPAN Dependencies: | none | +| Other Dependencies: | none | +| Perl Version: | 5.0 | +| Plugin Home: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC% | +| Feedback: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Dev | + +__Related Topics:__ %TWIKIWEB%.TWikiPreferences, %TWIKIWEB%.TWikiPlugins, EmptyPlugin + +-- TWiki:Main.AndreaSterbini - 27 Feb 2001 %BR% +-- TWiki:Main.PeterThoeny - 21 Mar 2004 Modified: twiki/branches/DEVELOP/data/TWiki/DeleteOrRenameATopic.txt =================================================================== --- twiki/branches/DEVELOP/data/TWiki/DeleteOrRenameATopic.txt 2004-12-09 20:20:09 UTC (rev 3392) +++ twiki/branches/DEVELOP/data/TWiki/DeleteOrRenameATopic.txt 2004-12-09 20:39:39 UTC (rev 3393) @@ -1,21 +1,21 @@ %META:TOPICINFO{author="PeterThoeny" date="1071560493" format="1.0" version="1.6"}% ----++ FAQ: - -How do I delete or rename a topic? - ----++ Answer: - -These two questions are answered together because often when you think you want to delete a page, more often it makes sense to rename the page to contain more context, e.g. rename it to include the date. - -You can rename, move and delete topics directly from your browser. Moving lets you transfer a topic from one web to another. The soft delete moves a topic to the special ==Trash== web, where it's hidden but can be "undeleted" with system administrator access. - -Click ==[More]== on the control bar at the bottom of the page you want to change, then choose ==[Rename/move]==, and make your changes to that screen. There's a link that launches to the ManagingTopics reference page in a pop-up window. - -__NOTE:__ The configuration of your site and your own access permissions determine whether you can access these functions. - -Note for site administrators: To remove a topic permanently move it to the Trash web, then with file-level access, delete the =.txt= and =.txt,v= files manually from =/twiki/data/Trash=. - -__Back to:__ TWikiFAQ - --- Main.PeterThoeny - 09 May 2003 +---++ FAQ: + +How do I delete or rename a topic? + +---++ Answer: + +These two questions are answered together because often when you think you want to delete a page, more often it makes sense to rename the page to contain more context, e.g. rename it to include the date. + +You can rename, move and delete topics directly from your browser. Moving lets you transfer a topic from one web to another. The soft delete moves a topic to the special ==Trash== web, where it's hidden but can be "undeleted" with system administrator access. + +Click ==[More]== on the control bar at the bottom of the page you want to change, then choose ==[Rename/move]==, and make your changes to that screen. There's a link that launches to the ManagingTopics reference page in a pop-up window.... [truncated message content] |