twiki-dev Mailing List for TWiki Enterprise Collaboration Platform (Page 6)

Open Source Enterprise Wiki and Web Application Platform

Brought to you by: georgetrubisky, hjoerg, nicholaslee, peterthoeny, sopan_shewale

twiki-dev — TWiki core SVN commit notices

You can subscribe to this list here.

2000	Jan	Feb	Mar	Apr (4)	May (38)	Jun (3)	Jul (12)	Aug (4)	Sep (12)	Oct (15)	Nov (26)	Dec (8)
2001	Jan (14)	Feb (34)	Mar (105)	Apr (64)	May (56)	Jun (97)	Jul (180)	Aug (103)	Sep (54)	Oct (21)	Nov (44)	Dec (27)
2002	Jan (7)	Feb (10)	Mar (88)	Apr (57)	May (29)	Jun (12)	Jul (13)	Aug (35)	Sep (12)	Oct (16)	Nov (48)	Dec (94)
2003	Jan (36)	Feb (43)	Mar (124)	Apr (63)	May (77)	Jun (12)	Jul (7)	Aug (40)	Sep (41)	Oct (19)	Nov (22)	Dec (46)
2004	Jan (51)	Feb (129)	Mar (82)	Apr (96)	May (34)	Jun (28)	Jul (107)	Aug (87)	Sep (21)	Oct (50)	Nov (202)	Dec (110)
2005	Jan (174)	Feb (159)	Mar (250)	Apr (287)	May (159)	Jun (139)	Jul (305)	Aug (291)	Sep (558)	Oct (628)	Nov (539)	Dec (396)
2006	Jan (828)	Feb (470)	Mar (888)	Apr (524)	May (518)	Jun (424)	Jul (527)	Aug (208)	Sep (257)	Oct (276)	Nov (308)	Dec (342)
2007	Jan (366)	Feb (350)	Mar (265)	Apr (406)	May (481)	Jun (354)	Jul (195)	Aug (219)	Sep (506)	Oct (434)	Nov (467)	Dec (399)
2008	Jan (339)	Feb (185)	Mar (172)	Apr (191)	May (126)	Jun (149)	Jul (424)	Aug (317)	Sep (164)	Oct (246)	Nov (110)	Dec (123)
2009	Jan (82)	Feb (74)	Mar (125)	Apr (133)	May (51)	Jun (52)	Jul (37)	Aug (48)	Sep (60)	Oct (69)	Nov (52)	Dec (60)
2010	Jan (55)	Feb (69)	Mar (55)	Apr (144)	May (309)	Jun (318)	Jul (114)	Aug (128)	Sep (122)	Oct (96)	Nov (274)	Dec (219)
2011	Jan (223)	Feb (241)	Mar (266)	Apr (286)	May (251)	Jun (214)	Jul (308)	Aug (312)	Sep (192)	Oct (61)	Nov (20)	Dec (35)
2012	Jan (165)	Feb (70)	Mar (102)	Apr (96)	May (101)	Jun (125)	Jul (59)	Aug (108)	Sep (246)	Oct (372)	Nov (456)	Dec (374)
2013	Jan (215)	Feb (402)	Mar (386)	Apr (274)	May (117)	Jun (52)	Jul (125)	Aug (106)	Sep (188)	Oct (139)	Nov (74)	Dec (52)
2014	Jan (301)	Feb (62)	Mar (229)	Apr (85)	May (275)	Jun (138)	Jul (143)	Aug (121)	Sep (147)	Oct (278)	Nov (86)	Dec (100)
2015	Jan (113)	Feb (92)	Mar (96)	Apr (273)	May (122)	Jun (128)	Jul (41)	Aug (33)	Sep (161)	Oct (21)	Nov (71)	Dec (18)
2016	Jan (243)	Feb (35)	Mar (98)	Apr (102)	May (29)	Jun (7)	Jul (25)	Aug (25)	Sep (10)	Oct (10)	Nov (19)	Dec (8)
2017	Jan (18)	Feb (8)	Mar (4)	Apr (18)	May (22)	Jun (13)	Jul (12)	Aug (4)	Sep (3)	Oct (6)	Nov (5)	Dec (2)
2018	Jan (6)	Feb (2)	Mar (1)	Apr (4)	May (3)	Jun (2)	Jul (5)	Aug (2)	Sep (4)	Oct (2)	Nov	Dec
2019	Jan (1)	Feb (2)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct (3)	Nov (2)	Dec
2021	Jan	Feb	Mar (1)	Apr	May	Jun	Jul (2)	Aug	Sep	Oct	Nov	Dec
2023	Jan	Feb	Mar	Apr	May	Jun (2)	Jul (3)	Aug	Sep	Oct	Nov	Dec
2024	Jan	Feb	Mar (1)	Apr (4)	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 4 5 6 7 8 .. 1308 > >> (Page 6 of 1308)

[TWiki-Dev] [SVN] HaraldJoerg r30328 - twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin

From: <de...@de...> - 2017-04-10 21:44:06

Author: HaraldJoerg
Date: 2017-04-10 21:43:37 +0000 (Mon, 10 Apr 2017)
New Revision: 30328
Trac url: http://develop.twiki.org/trac/changeset/30328

Modified:
   twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin/Core.pm
Log:
Item7798: Escape left braces in regex (EditTablePlugin #2)

Modified: twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin/Core.pm
===================================================================
--- twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin/Core.pm	2017-04-10 21:33:21 UTC (rev 30327)
+++ twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin/Core.pm	2017-04-10 21:43:37 UTC (rev 30328)
@@ -50,8 +50,8 @@
 my $STUB_VARIABLE                = 'E_T_P_NOP';
 
 my %regex                    = ();
-$regex{edit_table_plugin} = '%EDITTABLE{(.*?)}%';
-$regex{table_plugin}      = '%TABLE(?:{(.*?)})?%';
+$regex{edit_table_plugin} = '%EDITTABLE\{(.*?)}%';
+$regex{table_plugin}      = '%TABLE(?:\{(.*?)})?%';
 $regex{table_row_full}    = '^(\s*)\|.*\|\s*$';
 $regex{table_row}         = '^(\s*)\|(.*)';

[TWiki-Dev] [SVN] HaraldJoerg r30327 - twiki/trunk/core/lib/TWiki/Configure

From: <de...@de...> - 2017-04-10 21:33:51

Author: HaraldJoerg
Date: 2017-04-10 21:33:21 +0000 (Mon, 10 Apr 2017)
New Revision: 30327
Trac url: http://develop.twiki.org/trac/changeset/30327

Modified:
   twiki/trunk/core/lib/TWiki/Configure/TWikiCfg.pm
Log:
Item7799: Unescaped left brace (core)

Modified: twiki/trunk/core/lib/TWiki/Configure/TWikiCfg.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/Configure/TWikiCfg.pm	2017-04-07 19:14:10 UTC (rev 30326)
+++ twiki/trunk/core/lib/TWiki/Configure/TWikiCfg.pm	2017-04-10 21:33:21 UTC (rev 30327)
@@ -334,7 +334,7 @@
         my $txt = Data::Dumper->Dump([$warble]);
         $txt =~ s/VAR1/TWiki::cfg$keys/;
         # Substitute any existing value, or append if not there
-        unless ($this->{content} =~ s/\$(TWiki::)?cfg$keys\s*=.*?;\n/$txt/s) {
+        unless ($this->{content} =~ s/\$(TWiki::)?cfg\Q$keys\E\s*=.*?;\n/$txt/s) {
             $this->{content} .= $txt;
         }
         if( $visitee->{typename} && $visitee->{typename} eq 'PASSWORD' ) {

[TWiki-Dev] [SVN] HaraldJoerg r30326 - in twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins: . TWikiSheetPlugin

From: <de...@de...> - 2017-04-07 19:14:18

Author: HaraldJoerg
Date: 2017-04-07 19:14:10 +0000 (Fri, 07 Apr 2017)
New Revision: 30326
Trac url: http://develop.twiki.org/trac/changeset/30326

Modified:
   twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin.pm
   twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin/Core.pm
Log:
Item7798: Escape left braces in regex (TWikiSheetPlugin)

Modified: twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin/Core.pm
===================================================================
--- twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin/Core.pm	2017-04-07 19:13:44 UTC (rev 30325)
+++ twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin/Core.pm	2017-04-07 19:14:10 UTC (rev 30326)
@@ -380,7 +380,7 @@
     my $this = shift;
     my $webTopic = "$_[2].$_[1]";
     _writeDebug( "protectVariables( $webTopic )");
-    $_[0] =~ s/(\%TWIKISHEET{.*?}\%)(([\n\r]+ *\|[^\n\r]+)*)/$this->_protectVariablesInTable( $1, $2 )/ges;
+    $_[0] =~ s/(\%TWIKISHEET\{.*?}\%)(([\n\r]+ *\|[^\n\r]+)*)/$this->_protectVariablesInTable( $1, $2 )/ges;
 }
 
 # =========================
@@ -390,7 +390,7 @@
     my $this = shift;
     my $webTopic = "$_[2].$_[1]";
     _writeDebug( "processText( $webTopic )" );
-    $_[0] =~ s/\%TWIKISHEET{(.*?)}\%(([\n\r]+ *\|[^\n\r]+)*)/$this->_processTable( $1, $2, $webTopic )/ges;
+    $_[0] =~ s/\%TWIKISHEET\{(.*?)}\%(([\n\r]+ *\|[^\n\r]+)*)/$this->_processTable( $1, $2, $webTopic )/ges;
 }
 
 # =========================
@@ -454,7 +454,7 @@
     }
     my $n = 0;
     my $changed = 0;
-    $topicText =~ s/(\%TWIKISHEET{.*?}\%)(([\n\r]+ *\|[^\n\r]+)*)/$this->_updateTable( $1, $2, $webTopic, $tn, $n++, $changes, \$changed )/ges;
+    $topicText =~ s/(\%TWIKISHEET\{.*?}\%)(([\n\r]+ *\|[^\n\r]+)*)/$this->_updateTable( $1, $2, $webTopic, $tn, $n++, $changes, \$changed )/ges;
     #_writeDebug( "=========\n$topicText\n========= ($changed)" );
     if( $changed ) {
         TWiki::Func::saveTopic( $web, $topic, $topicMeta, $topicText );

Modified: twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin.pm
===================================================================
--- twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin.pm	2017-04-07 19:13:44 UTC (rev 30325)
+++ twiki/trunk/TWikiSheetPlugin/lib/TWiki/Plugins/TWikiSheetPlugin.pm	2017-04-07 19:14:10 UTC (rev 30326)
@@ -56,7 +56,7 @@
 
 # =========================
 sub beforeCommonTagsHandler {
-    return unless $_[0] =~ /\%TWIKISHEET{.*?}%/os;
+    return unless $_[0] =~ /\%TWIKISHEET\{.*?}%/os;
     unless( $core ) {
         require TWiki::Plugins::TWikiSheetPlugin::Core;
         $core = new TWiki::Plugins::TWikiSheetPlugin::Core( "$web.$topic" );
@@ -66,7 +66,7 @@
 
 # =========================
 sub commonTagsHandler {
-    return unless $_[0] =~ /\%TWIKISHEET{.*?}%/os;
+    return unless $_[0] =~ /\%TWIKISHEET\{.*?}%/os;
     unless( $core ) {
         require TWiki::Plugins::TWikiSheetPlugin::Core;
         $core = new TWiki::Plugins::TWikiSheetPlugin::Core( "$web.$topic" );

[TWiki-Dev] [SVN] HaraldJoerg r30325 - twiki/trunk/TagMePlugin/lib/TWiki/Plugins

From: <de...@de...> - 2017-04-07 19:13:54

Author: HaraldJoerg
Date: 2017-04-07 19:13:44 +0000 (Fri, 07 Apr 2017)
New Revision: 30325
Trac url: http://develop.twiki.org/trac/changeset/30325

Modified:
   twiki/trunk/TagMePlugin/lib/TWiki/Plugins/TagMePlugin.pm
Log:
Item7798: Escape left braces in regex (TagMePlugin)

Modified: twiki/trunk/TagMePlugin/lib/TWiki/Plugins/TagMePlugin.pm
===================================================================
--- twiki/trunk/TagMePlugin/lib/TWiki/Plugins/TagMePlugin.pm	2017-04-07 19:13:25 UTC (rev 30324)
+++ twiki/trunk/TagMePlugin/lib/TWiki/Plugins/TagMePlugin.pm	2017-04-07 19:13:44 UTC (rev 30325)
@@ -2024,7 +2024,7 @@
 
     # very crude hack to remove MAKETEXT{"...."}
     # Note: parameters are _not_ supported!
-    $_[0] =~ s/[%]MAKETEXT{ *\"(.*?)." *}%/$1/go;
+    $_[0] =~ s/[%]MAKETEXT\{ *\"(.*?)." *}%/$1/go;
 }
 
 # =========================

[TWiki-Dev] [SVN] HaraldJoerg r30324 - twiki/trunk/TablePlugin/lib/TWiki/Plugins

From: <de...@de...> - 2017-04-07 19:13:33

Author: HaraldJoerg
Date: 2017-04-07 19:13:25 +0000 (Fri, 07 Apr 2017)
New Revision: 30324
Trac url: http://develop.twiki.org/trac/changeset/30324

Modified:
   twiki/trunk/TablePlugin/lib/TWiki/Plugins/TablePlugin.pm
Log:
Item7798: Escape left braces in regex (TablePlugin)

Modified: twiki/trunk/TablePlugin/lib/TWiki/Plugins/TablePlugin.pm
===================================================================
--- twiki/trunk/TablePlugin/lib/TWiki/Plugins/TablePlugin.pm	2017-04-07 19:13:06 UTC (rev 30323)
+++ twiki/trunk/TablePlugin/lib/TWiki/Plugins/TablePlugin.pm	2017-04-07 19:13:25 UTC (rev 30324)
@@ -61,7 +61,7 @@
 
     my $sort = TWiki::Func::getPreferencesValue( 'TABLEPLUGIN_SORT' );
     return unless ($sort && $sort =~ /^(all|attachments)$/) ||
-      $_[0] =~ /%TABLE{.*?}%/;
+      $_[0] =~ /%TABLE\{.*?}%/;
 
     # on-demand inclusion
     require TWiki::Plugins::TablePlugin::Core;

[TWiki-Dev] [SVN] HaraldJoerg r30323 - twiki/trunk/SlideShowPlugin/lib/TWiki/Plugins/SlideShowPlugin

From: <de...@de...> - 2017-04-07 19:13:14

Author: HaraldJoerg
Date: 2017-04-07 19:13:06 +0000 (Fri, 07 Apr 2017)
New Revision: 30323
Trac url: http://develop.twiki.org/trac/changeset/30323

Modified:
   twiki/trunk/SlideShowPlugin/lib/TWiki/Plugins/SlideShowPlugin/SlideShow.pm
Log:
Item7798: Escape left braces in regex (SlideShowPlugin)

Modified: twiki/trunk/SlideShowPlugin/lib/TWiki/Plugins/SlideShowPlugin/SlideShow.pm
===================================================================
--- twiki/trunk/SlideShowPlugin/lib/TWiki/Plugins/SlideShowPlugin/SlideShow.pm	2017-04-07 19:12:41 UTC (rev 30322)
+++ twiki/trunk/SlideShowPlugin/lib/TWiki/Plugins/SlideShowPlugin/SlideShow.pm	2017-04-07 19:13:06 UTC (rev 30323)
@@ -42,7 +42,7 @@
     if( $text =~ /^(.*)%SLIDESHOWSTART%(.*)$/s ) {
         $textPre = $1;
         $text = $2;
-    } elsif( $text =~ /^(.*)%SLIDESHOWSTART{(.*?)}%(.*)$/s ) {
+    } elsif( $text =~ /^(.*)%SLIDESHOWSTART\{(.*?)}%(.*)$/s ) {
         $textPre = $1;
         $args = $2;
         $text = $3;

[TWiki-Dev] [SVN] HaraldJoerg r30322 - twiki/trunk/RenderListPlugin/lib/TWiki/Plugins

From: <de...@de...> - 2017-04-07 19:12:50

Author: HaraldJoerg
Date: 2017-04-07 19:12:41 +0000 (Fri, 07 Apr 2017)
New Revision: 30322
Trac url: http://develop.twiki.org/trac/changeset/30322

Modified:
   twiki/trunk/RenderListPlugin/lib/TWiki/Plugins/RenderListPlugin.pm
Log:
Item7798: Escape left braces in regex (RenderListPlugin)

Modified: twiki/trunk/RenderListPlugin/lib/TWiki/Plugins/RenderListPlugin.pm
===================================================================
--- twiki/trunk/RenderListPlugin/lib/TWiki/Plugins/RenderListPlugin.pm	2017-04-07 19:12:23 UTC (rev 30321)
+++ twiki/trunk/RenderListPlugin/lib/TWiki/Plugins/RenderListPlugin.pm	2017-04-07 19:12:41 UTC (rev 30322)
@@ -69,9 +69,9 @@
     # Render here, not in commonTagsHandler so that lists produced by
     # Plugins, TOC and SEARCH can be rendered
     if ($_[0] =~/%RENDERLIST/o ) {
-        unless ($_[0] =~ s/%RENDERLIST{(.*?)}%(([\n\r]+[^ ]{3}[^\n\r]*)*?)(([\n\r]+ {3}[^\n\r]*)+)/&handleRenderList($1, $2, $4)/ges ) {
+        unless ($_[0] =~ s/%RENDERLIST\{(.*?)}%(([\n\r]+[^ ]{3}[^\n\r]*)*?)(([\n\r]+ {3}[^\n\r]*)+)/&handleRenderList($1, $2, $4)/ges ) {
             # Cairo compatibility fallback
-            $_[0] =~ s/%RENDERLIST{(.*?)}%(([\n\r]+[^\t]{1}[^\n\r]*)*?)(([\n\r]+\t[^\n\r]*)+)/&handleRenderList($1, $2, $4)/ges;
+            $_[0] =~ s/%RENDERLIST\{(.*?)}%(([\n\r]+[^\t]{1}[^\n\r]*)*?)(([\n\r]+\t[^\n\r]*)+)/&handleRenderList($1, $2, $4)/ges;
         }
     }
 }

[TWiki-Dev] [SVN] HaraldJoerg r30321 - twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin

From: <de...@de...> - 2017-04-07 19:12:32

Author: HaraldJoerg
Date: 2017-04-07 19:12:23 +0000 (Fri, 07 Apr 2017)
New Revision: 30321
Trac url: http://develop.twiki.org/trac/changeset/30321

Modified:
   twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin/Core.pm
Log:
Item7798: Escape left braces in regex (EditTablePlugin)

Modified: twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin/Core.pm
===================================================================
--- twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin/Core.pm	2017-04-07 19:11:53 UTC (rev 30320)
+++ twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin/Core.pm	2017-04-07 19:12:23 UTC (rev 30321)
@@ -1028,7 +1028,7 @@
 
     my $cellFormat = '';
     $theValue =~
-      s/\s*%EDITCELL{(.*?)}%/&parseEditCellFormat( $1, $cellFormat )/eo;
+      s/\s*%EDITCELL\{(.*?)}%/&parseEditCellFormat( $1, $cellFormat )/eo;
 
     # If cell is empty we remove the space to not annoy the user when
     # he needs to add text to empty cell.
@@ -1414,7 +1414,7 @@
         $text .= $theRow;
     }
     else {
-        $theRow =~ s/%EDITCELL{(.*?)}%/viewEditCell($1)/geo;
+        $theRow =~ s/%EDITCELL\{(.*?)}%/viewEditCell($1)/geo;
         $text .= $theRow;
     }
 
@@ -1527,7 +1527,7 @@
 
 sub putTmpTagInTableTagLine {
     $_[0] =~
-s/(%TABLE{.*?)(}%)/$1 "START_EDITTABLEPLUGIN_TMP_TAG""END_EDITTABLEPLUGIN_TMP_TAG"$2/;
+s/(%TABLE\{.*?)(}%)/$1 "START_EDITTABLEPLUGIN_TMP_TAG""END_EDITTABLEPLUGIN_TMP_TAG"$2/;
 }
 
 sub insertTmpTagInTableTagLine {

[TWiki-Dev] [SVN] HaraldJoerg r30320 - twiki/trunk/BackupRestorePlugin/lib/TWiki/Plugins/BackupRestorePlugin

From: <de...@de...> - 2017-04-07 19:12:02

Author: HaraldJoerg
Date: 2017-04-07 19:11:53 +0000 (Fri, 07 Apr 2017)
New Revision: 30320
Trac url: http://develop.twiki.org/trac/changeset/30320

Modified:
   twiki/trunk/BackupRestorePlugin/lib/TWiki/Plugins/BackupRestorePlugin/Core.pm
Log:
Item7798: Escape left braces in regex (BackupRestorePlugin)

Modified: twiki/trunk/BackupRestorePlugin/lib/TWiki/Plugins/BackupRestorePlugin/Core.pm
===================================================================
--- twiki/trunk/BackupRestorePlugin/lib/TWiki/Plugins/BackupRestorePlugin/Core.pm	2017-04-07 19:04:39 UTC (rev 30319)
+++ twiki/trunk/BackupRestorePlugin/lib/TWiki/Plugins/BackupRestorePlugin/Core.pm	2017-04-07 19:11:53 UTC (rev 30320)
@@ -811,7 +811,7 @@
     my $file = "$baseDir/data/$web/$topic.txt";
     my $dest = "$destDir/$topic.txt";
     my $text = _readFile( $file, 1 ); # read topic meta
-    if( $text =~ /\%META\:TOPICINFO{[^\n]* date=\"([0-9]+)\"/ ) {
+    if( $text =~ /\%META\:TOPICINFO\{[^\n]* date=\"([0-9]+)\"/ ) {
         $timestamp = $1; # use timestamp of topic meta if found
     }
     unlink( $dest ) if( -e $dest );

[TWiki-Dev] [SVN] HaraldJoerg r30319 - twiki/trunk/BackupRestorePlugin/bin

From: <de...@de...> - 2017-04-07 19:04:47

Author: HaraldJoerg
Date: 2017-04-07 19:04:39 +0000 (Fri, 07 Apr 2017)
New Revision: 30319
Trac url: http://develop.twiki.org/trac/changeset/30319

Modified:
   twiki/trunk/BackupRestorePlugin/bin/backuprestore
Log:
Item7796: Activate TWiki's lib directories before using CGI::Carp (BackupRestorePlugin)

Modified: twiki/trunk/BackupRestorePlugin/bin/backuprestore
===================================================================
--- twiki/trunk/BackupRestorePlugin/bin/backuprestore	2017-04-07 18:33:47 UTC (rev 30318)
+++ twiki/trunk/BackupRestorePlugin/bin/backuprestore	2017-04-07 19:04:39 UTC (rev 30319)
@@ -26,17 +26,17 @@
 my $params;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( ( $ENV{GATEWAY_INTERFACE} || $ENV{MOD_PERL} ) && ! $ARGV[0] ) {
         $cfg->{ScriptType} = 'cgi';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     } else {
         $cfg->{ScriptType} = 'cli';
         require Carp;
         $SIG{__DIE__} = \&Carp::confess;
     }
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
     do 'LocalSite.cfg';
 }

[TWiki-Dev] [SVN] HaraldJoerg r30318 - in twiki/trunk/core/lib: . TWiki TWiki/Configure TWiki/Store TWiki/Store/SearchAlgorithms TWiki/UI

From: <de...@de...> - 2017-04-07 18:33:55

Author: HaraldJoerg
Date: 2017-04-07 18:33:47 +0000 (Fri, 07 Apr 2017)
New Revision: 30318
Trac url: http://develop.twiki.org/trac/changeset/30318

Modified:
   twiki/trunk/core/lib/TWiki.pm
   twiki/trunk/core/lib/TWiki/Compatibility.pm
   twiki/trunk/core/lib/TWiki/Configure/Load.pm
   twiki/trunk/core/lib/TWiki/Configure/UI.pm
   twiki/trunk/core/lib/TWiki/Render.pm
   twiki/trunk/core/lib/TWiki/Search.pm
   twiki/trunk/core/lib/TWiki/Store.pm
   twiki/trunk/core/lib/TWiki/Store/SearchAlgorithms/Forking.pm
   twiki/trunk/core/lib/TWiki/Store/Subversive.pm
   twiki/trunk/core/lib/TWiki/Templates.pm
   twiki/trunk/core/lib/TWiki/UI/RDiff.pm
Log:
Item7797: Escape left braces in regex (core)

Modified: twiki/trunk/core/lib/TWiki/Compatibility.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/Compatibility.pm	2017-04-07 18:20:37 UTC (rev 30317)
+++ twiki/trunk/core/lib/TWiki/Compatibility.pm	2017-04-07 18:33:47 UTC (rev 30318)
@@ -284,7 +284,7 @@
         my $line = '';
         require TWiki::Attrs;
         foreach $line ( split( /\r?\n/, $atext ) ) {
-            if( $line =~ /%FILEATTACHMENT{\s"([^"]*)"([^}]*)}%/ ) {
+            if( $line =~ /%FILEATTACHMENT\{\s"([^"]*)"([^}]*)}%/ ) {
                 my $name = $1;
                 my $values = new TWiki::Attrs( $2 );
                 $values->{name} = $name;

Modified: twiki/trunk/core/lib/TWiki/Configure/Load.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/Configure/Load.pm	2017-04-07 18:20:37 UTC (rev 30317)
+++ twiki/trunk/core/lib/TWiki/Configure/Load.pm	2017-04-07 18:33:47 UTC (rev 30318)
@@ -108,7 +108,7 @@
         if (ref($_) eq 'HASH') {
             expand(\%$_);
         } else {
-            s/(\$TWiki::cfg{[A-Za-z0-9{}]+})/eval $1||'undef'/ge;
+            s/(\$TWiki::cfg\{[A-Za-z0-9{}]+})/eval $1||'undef'/ge;
         }
     }
 }
@@ -128,7 +128,7 @@
 =cut
 
 sub expandValue {
-    $_[0] =~ s/(\$TWiki::cfg{[A-Za-z0-9{}]+})/eval $1||'undef'/ge;
+    $_[0] =~ s/(\$TWiki::cfg\{[A-Za-z0-9{}]+})/eval $1||'undef'/ge;
 }
 
 =pod

Modified: twiki/trunk/core/lib/TWiki/Configure/UI.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/Configure/UI.pm	2017-04-07 18:20:37 UTC (rev 30317)
+++ twiki/trunk/core/lib/TWiki/Configure/UI.pm	2017-04-07 18:33:47 UTC (rev 30318)
@@ -97,7 +97,7 @@
 sub loadChecker {
     my ($keys, $item) = @_;
     my $id = $keys;
-    $id =~ s/}{/::/g;
+    $id =~ s/}\{/::/g;
     $id =~ s/[}{]//g;
     $id =~ s/'//g;
     $id =~ s/-/_/g;

Modified: twiki/trunk/core/lib/TWiki/Render.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/Render.pm	2017-04-07 18:20:37 UTC (rev 30317)
+++ twiki/trunk/core/lib/TWiki/Render.pm	2017-04-07 18:33:47 UTC (rev 30318)
@@ -2067,7 +2067,7 @@
             $text =~ s/(})%/$1/g;    #        ... }%
         } else {
             # Remove %MAKETEXT{"..."}% but preserve text:
-            $text =~ s/%MAKETEXT{ *"?([^"}]*).*?}%/$1/go; # FIXME: Properly resolve params
+            $text =~ s/%MAKETEXT\{ *"?([^"}]*).*?}%/$1/go; # FIXME: Properly resolve params
             # Remove nested %VAR1{ ... %VAR2{...}% ...}% by
             # first adding nesting level to parenthesis,
             # e.g. "%A{%B{...}%}% ... %C{%D{...}%}%"

Modified: twiki/trunk/core/lib/TWiki/Search.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/Search.pm	2017-04-07 18:20:37 UTC (rev 30317)
+++ twiki/trunk/core/lib/TWiki/Search.pm	2017-04-07 18:33:47 UTC (rev 30318)
@@ -556,7 +556,7 @@
 
     # SMELL: the only META tags in a template will be METASEARCH
     # Why the heck are they being filtered????
-    $tmpl =~ s/\%META{.*?}\%//go;    # remove %META{'parent'}%
+    $tmpl =~ s/\%META\{.*?}\%//go;    # remove %META{'parent'}%
 
     # Split template into 5 sections
     my ( $tmplHead, $tmplSearch, $tmplTable, $tmplNumber, $tmplTail ) =
@@ -922,7 +922,7 @@
                         }
                         if ( $topic eq $session->{topicName} ) {
                             # defuse SEARCH in current topic to prevent loop
-                            $text =~ s/%SEARCH{.*?}%/SEARCH{...}/go;
+                            $text =~ s/%SEARCH\{.*?}%/SEARCH{...}/go;
                         }
                         my $textInserted;
                         if ( $textArgs =~ /\bencode:(\w+)/ ) {

Modified: twiki/trunk/core/lib/TWiki/Store/SearchAlgorithms/Forking.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/Store/SearchAlgorithms/Forking.pm	2017-04-07 18:20:37 UTC (rev 30317)
+++ twiki/trunk/core/lib/TWiki/Store/SearchAlgorithms/Forking.pm	2017-04-07 18:33:47 UTC (rev 30318)
@@ -51,14 +51,14 @@
     }
 
     if( $options->{casesensitive} ) {
-        $program =~ s/%CS{(.*?)\|.*?}%/$1/g;
+        $program =~ s/%CS\{(.*?)\|.*?}%/$1/g;
     } else {
-        $program =~ s/%CS{.*?\|(.*?)}%/$1/g;
+        $program =~ s/%CS\{.*?\|(.*?)}%/$1/g;
     }
     if( $options->{files_without_match} ) {
-        $program =~ s/%DET{.*?\|(.*?)}%/$1/g;
+        $program =~ s/%DET\{.*?\|(.*?)}%/$1/g;
     } else {
-        $program =~ s/%DET{(.*?)\|.*?}%/$1/g;
+        $program =~ s/%DET\{(.*?)\|.*?}%/$1/g;
     }
     if ($options->{wordboundaries} ) {
         # Item5529: Can't use quotemeta because $searchString may be UTF8 encoded

Modified: twiki/trunk/core/lib/TWiki/Store/Subversive.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/Store/Subversive.pm	2017-04-07 18:20:37 UTC (rev 30317)
+++ twiki/trunk/core/lib/TWiki/Store/Subversive.pm	2017-04-07 18:33:47 UTC (rev 30318)
@@ -290,8 +290,8 @@
         $program = $TWiki::cfg{RCS}{FgrepCmd};
     }
 
-    $program =~ s/%CS{(.*?)\|(.*?)}%/$options->{casesensitive}?$1:$2/ge;
-    $program =~ s/%DET{(.*?)\|(.*?)}%/$options->{files_without_match}?$2:$1/ge;
+    $program =~ s/%CS\{(.*?)\|(.*?)}%/$options->{casesensitive}?$1:$2/ge;
+    $program =~ s/%DET\{(.*?)\|(.*?)}%/$options->{files_without_match}?$2:$1/ge;
 
     my $sDir = $TWiki::cfg{DataDir}.'/'.$this->{web}.'/';
     my $seen = {};

Modified: twiki/trunk/core/lib/TWiki/Store.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/Store.pm	2017-04-07 18:20:37 UTC (rev 30317)
+++ twiki/trunk/core/lib/TWiki/Store.pm	2017-04-07 18:33:47 UTC (rev 30318)
@@ -1405,7 +1405,7 @@
 
     my $format = $STORE_FORMAT_VERSION;
     # head meta-data
-    $text =~ s(^%META:TOPICINFO{(.*)}%\r?\n)
+    $text =~ s(^%META:TOPICINFO\{(.*)}%\r?\n)
       ($meta->put( 'TOPICINFO', _readKeyValues( $1 ));'')gem;
 
     my $ti = $meta->get( 'TOPICINFO' );

Modified: twiki/trunk/core/lib/TWiki/Templates.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/Templates.pm	2017-04-07 18:20:37 UTC (rev 30317)
+++ twiki/trunk/core/lib/TWiki/Templates.pm	2017-04-07 18:33:47 UTC (rev 30318)
@@ -106,7 +106,7 @@
 sub _expandTrivialTemplate {
     my( $this, $text ) = @_;
 
-    $text =~ /%TMPL\:P{(.*)}%/;
+    $text =~ /%TMPL\:P\{(.*)}%/;
     my $attrs = new TWiki::Attrs( $1 );
     # Can't expand context-dependant templates
     return $text if ( $attrs->{context} );
@@ -181,7 +181,7 @@
                 $val =~ s/%$p%/$params->{$p}/ge;
             }
         }
-        $val =~ s/%TMPL:P{(.*?)}%/$this->expandTemplate($1)/ge;
+        $val =~ s/%TMPL:P\{(.*?)}%/$this->expandTemplate($1)/ge;
     }
 
     return $val;
@@ -228,12 +228,12 @@
     # recursively read template file(s)
     my $text = _readTemplateFile( $this, $name, $skins, $web );
 
-    while( $text =~ /%TMPL\:INCLUDE{[\s\"]*(.*?)[\"\s]*}%/s ) {
-        $text =~ s/%TMPL\:INCLUDE{[\s\"]*(.*?)[\"\s]*}%/_readTemplateFile( $this, $1, $skins, $web )/geo;
+    while( $text =~ /%TMPL\:INCLUDE\{[\s\"]*(.*?)[\"\s]*}%/s ) {
+        $text =~ s/%TMPL\:INCLUDE\{[\s\"]*(.*?)[\"\s]*}%/_readTemplateFile( $this, $1, $skins, $web )/geo;
     }
 
     # Kill comments, marked by %{ ... }%
-    $text =~ s/%{.*?}%//sg;
+    $text =~ s/%\{.*?}%//sg;
 
     if( ! ( $text =~ /%TMPL\:/s ) ) {
         # no template processing
@@ -248,7 +248,7 @@
     foreach( split( /(%TMPL\:)/, $text ) ) {
         if( /^(%TMPL\:)$/ ) {
             $delim = $1;
-        } elsif( ( /^DEF{[\s\"]*(.*?)[\"\s]*}%(.*)/s ) && ( $1 ) ) {
+        } elsif( ( /^DEF\{[\s\"]*(.*?)[\"\s]*}%(.*)/s ) && ( $1 ) ) {
             # handle %TMPL:DEF{key}%
             if( $key ) {
                 $this->{VARS}->{$key} = $val;
@@ -272,7 +272,7 @@
     }
 
     # handle %TMPL:P{"..."}% recursively
-    $result =~ s/(%TMPL\:P{.*?}%)/_expandTrivialTemplate( $this, $1)/geo;
+    $result =~ s/(%TMPL\:P\{.*?}%)/_expandTrivialTemplate( $this, $1)/geo;
 
     $result =~ s|^(( {3})+)|"\t" x (length($1)/3)|geom;  # leading spaces to tabs
     return $result;

Modified: twiki/trunk/core/lib/TWiki/UI/RDiff.pm
===================================================================
--- twiki/trunk/core/lib/TWiki/UI/RDiff.pm	2017-04-07 18:20:37 UTC (rev 30317)
+++ twiki/trunk/core/lib/TWiki/UI/RDiff.pm	2017-04-07 18:33:47 UTC (rev 30318)
@@ -68,7 +68,7 @@
     my( $session, $data, $web, $topic ) = @_;
     ASSERT($topic) if DEBUG;
     if ( $data ){
-        $data =~ s(^%META:FIELD{(.*)}%.*$)
+        $data =~ s(^%META:FIELD\{(.*)}%.*$)
           (_renderAttrs($1,'|*FORM FIELD $title*|$name|$value|'))gem;
         $data =~ s(^%META:([A-Z]+){(.*)}%$)
           ('|*META '.$1.'*|'._renderAttrs($2).'|')gem;
@@ -436,7 +436,7 @@
 
     my $skin = $session->getSkin();
     my $tmpl = $session->templates->readTemplate( 'rdiff', $skin );
-    $tmpl =~ s/\%META{.*?}\%//go;  # remove %META{'parent'}%
+    $tmpl =~ s/\%META\{.*?}\%//go;  # remove %META{'parent'}%
 
     my( $before, $difftmpl, $after, $tail) = split( /%REPEAT%/, $tmpl);
 

Modified: twiki/trunk/core/lib/TWiki.pm
===================================================================
--- twiki/trunk/core/lib/TWiki.pm	2017-04-07 18:20:37 UTC (rev 30317)
+++ twiki/trunk/core/lib/TWiki.pm	2017-04-07 18:33:47 UTC (rev 30318)
@@ -1673,7 +1673,7 @@
                 foreach my $line (split(/[\n\r]+/, $text)) {
                     # sample line:
                     # | %ICON{help}% | =%<nop>ICON{help}%=, =%<nop>H%= | Help | gif | 16x16 | info |
-                    if( $line =~ / %ICON{[ "']*([^ "'}]+)[^\|]*\|[^\|]*\| *(.*?) *\| *(.*?) *\| *([0-9]+)x([0-9]+)([^\|]*\| *(.*?) *\|)?/ ) {
+                    if( $line =~ / %ICON\{[ "']*([^ "'}]+)[^\|]*\|[^\|]*\| *(.*?) *\| *(.*?) *\| *([0-9]+)x([0-9]+)([^\|]*\| *(.*?) *\|)?/ ) {
                         my $name = $1;
                         $this->{_ICONDATA}->{$name} = {
                             name => $name,
@@ -4982,7 +4982,7 @@
         $value = '' unless defined $value;
     }
     # Block expansion of %URLPARAM in the value to prevent recursion
-    $value =~ s/%URLPARAM{/%<nop>URLPARAM{/g;
+    $value =~ s/%URLPARAM\{/%<nop>URLPARAM{/g;
     return $value;
 }

[TWiki-Dev] [SVN] HaraldJoerg r30317 - twiki/trunk/core/bin

From: <de...@de...> - 2017-04-07 18:20:48

Author: HaraldJoerg
Date: 2017-04-07 18:20:37 +0000 (Fri, 07 Apr 2017)
New Revision: 30317
Trac url: http://develop.twiki.org/trac/changeset/30317

Modified:
   twiki/trunk/core/bin/attach
   twiki/trunk/core/bin/changes
   twiki/trunk/core/bin/copy
   twiki/trunk/core/bin/edit
   twiki/trunk/core/bin/login
   twiki/trunk/core/bin/logon
   twiki/trunk/core/bin/manage
   twiki/trunk/core/bin/mdrepo
   twiki/trunk/core/bin/oops
   twiki/trunk/core/bin/preview
   twiki/trunk/core/bin/rdiff
   twiki/trunk/core/bin/rdiffauth
   twiki/trunk/core/bin/register
   twiki/trunk/core/bin/rename
   twiki/trunk/core/bin/resetpasswd
   twiki/trunk/core/bin/rest
   twiki/trunk/core/bin/save
   twiki/trunk/core/bin/search
   twiki/trunk/core/bin/statistics
   twiki/trunk/core/bin/twiki_cgi
   twiki/trunk/core/bin/upload
   twiki/trunk/core/bin/view
   twiki/trunk/core/bin/viewauth
   twiki/trunk/core/bin/viewfile
Log:
Item7796: Activate TWiki's lib directories before using CGI::Carp

Modified: twiki/trunk/core/bin/attach
===================================================================
--- twiki/trunk/core/bin/attach	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/attach	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'attach';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/changes
===================================================================
--- twiki/trunk/core/bin/changes	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/changes	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'changes';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/copy
===================================================================
--- twiki/trunk/core/bin/copy	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/copy	2017-04-07 18:20:37 UTC (rev 30317)
@@ -2,7 +2,7 @@
 #
 # TWiki Enterprise Collaboration Platform, http://TWiki.org/
 #
-# Copyright (C) 1999-2012 Peter Thoeny, peter[at]thoeny.org and
+# Copyright (C) 1999-2017 Peter Thoeny, peter[at]thoeny.org and
 # TWiki Contributors. All Rights Reserved. TWiki Contributors are
 # listed in the AUTHORS file in the root of this distribution.
 #
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'copy';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/edit
===================================================================
--- twiki/trunk/core/bin/edit	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/edit	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'edit';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/login
===================================================================
--- twiki/trunk/core/bin/login	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/login	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'login';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/logon
===================================================================
--- twiki/trunk/core/bin/logon	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/logon	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'logon';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/manage
===================================================================
--- twiki/trunk/core/bin/manage	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/manage	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'manage';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/mdrepo
===================================================================
--- twiki/trunk/core/bin/mdrepo	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/mdrepo	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'mdrepo';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/oops
===================================================================
--- twiki/trunk/core/bin/oops	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/oops	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'oops';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/preview
===================================================================
--- twiki/trunk/core/bin/preview	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/preview	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'preview';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/rdiff
===================================================================
--- twiki/trunk/core/bin/rdiff	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/rdiff	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'rdiff';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/rdiffauth
===================================================================
--- twiki/trunk/core/bin/rdiffauth	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/rdiffauth	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'rdiffauth';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/register
===================================================================
--- twiki/trunk/core/bin/register	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/register	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'register';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/rename
===================================================================
--- twiki/trunk/core/bin/rename	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/rename	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'rename';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/resetpasswd
===================================================================
--- twiki/trunk/core/bin/resetpasswd	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/resetpasswd	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'resetpasswd';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/rest
===================================================================
--- twiki/trunk/core/bin/rest	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/rest	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'rest';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/save
===================================================================
--- twiki/trunk/core/bin/save	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/save	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'save';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/search
===================================================================
--- twiki/trunk/core/bin/search	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/search	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'search';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/statistics
===================================================================
--- twiki/trunk/core/bin/statistics	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/statistics	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'statistics';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/twiki_cgi
===================================================================
--- twiki/trunk/core/bin/twiki_cgi	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/twiki_cgi	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -33,8 +35,6 @@
         exit(1);
     }
     delete $ENV{TWIKI_ACTION} if exists $ENV{TWIKI_ACTION};
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/upload
===================================================================
--- twiki/trunk/core/bin/upload	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/upload	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'upload';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/view
===================================================================
--- twiki/trunk/core/bin/view	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/view	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'view';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/viewauth
===================================================================
--- twiki/trunk/core/bin/viewauth	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/viewauth	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'viewauth';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

Modified: twiki/trunk/core/bin/viewfile
===================================================================
--- twiki/trunk/core/bin/viewfile	2017-04-03 20:59:36 UTC (rev 30316)
+++ twiki/trunk/core/bin/viewfile	2017-04-07 18:20:37 UTC (rev 30317)
@@ -23,9 +23,11 @@
 use warnings;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( defined $ENV{GATEWAY_INTERFACE} or defined $ENV{MOD_PERL} ) {
         $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     }
     else {
@@ -34,8 +36,6 @@
         $SIG{__DIE__} = \&Carp::confess;
     }
     $ENV{TWIKI_ACTION} = 'viewfile';
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
 }
 
 use TWiki;

[TWiki-Dev] TWiki Kampala Release Meeting, 2017-04-06, 22:00 GMT

From: Peter T. <pe...@th...> - 2017-04-05 18:06:46

All:

Please join our TWiki Kampala Release Meeting, http://twiki.org/cgi-bin/view/Codev/KampalaReleaseMeeting2017x04x06 scheduled for 2017-04-06 22:00 GMT [1] on IRC channel #twiki_release on the irc.freenode.net IRC network [2] - in about 28 hours from now.

Proposed agenda:

   1. Feature Requests for Kampala Release
   2. Review Urgent and Not So Urgent Bugs
   3. Extensions
   4. TWiki Release Discussion
   5. Miscellaneous

The meeting is on Thursday or Friday, depending on your time zone. Meeting time in different time zones, tomorrow:

   * USA Pacific Time Zone: 03:00pm on Thu
   * USA Eastern Time Zone: 06:00pm on Thu
   * Central Europe: 24:00 on Thu/Fri night
   * Japan: 07:00 on Fri

Please show up in time to save everybody's time. And remember that the release meeting is where decisions are made. We invite all TWiki.org contributors to join, as well as people with interest in the TWiki project in general.

Cheers,
Peter


[1]: http://www.timeanddate.com/worldclock/converter.html?iso=20170406T220000&p1=tz_gmt&p2=248&p3=268&p4=224&p5=179
[2]: http://twiki.org/cgi-bin/view/Codev/TWikiIRC

--
> Peter Thoeny     - Peter09[at]Thoeny.org
> http://TWiki.org/Mr.TWiki - consulting on enterprise collaboration
> http://TWiki.org - is your team already TWiki enabled?
> http://qualityHDR.com - Quality HDR Photography
> Knowledge cannot be managed, it can be discovered and shared
> This e-mail is:   (_) private    (_) ask first    (x) public

[TWiki-Dev] [SVN] HaraldJoerg r30316 - twiki/branches/TWikiRelease06x00/TWikiUserMappingContrib/data/Main

From: <de...@de...> - 2017-04-03 21:00:05

Author: HaraldJoerg
Date: 2017-04-03 20:59:36 +0000 (Mon, 03 Apr 2017)
New Revision: 30316
Trac url: http://develop.twiki.org/trac/changeset/30316

Modified:
   twiki/branches/TWikiRelease06x00/TWikiUserMappingContrib/data/Main/TWikiGroupTemplate.txt
Log:
Item7793: Typo in link in TWikiGroupTemplate

Modified: twiki/branches/TWikiRelease06x00/TWikiUserMappingContrib/data/Main/TWikiGroupTemplate.txt
===================================================================
--- twiki/branches/TWikiRelease06x00/TWikiUserMappingContrib/data/Main/TWikiGroupTemplate.txt	2017-04-03 20:59:11 UTC (rev 30315)
+++ twiki/branches/TWikiRelease06x00/TWikiUserMappingContrib/data/Main/TWikiGroupTemplate.txt	2017-04-03 20:59:36 UTC (rev 30316)
@@ -15,7 +15,7 @@
    * Persons/group who can change the list: 
       * Set ALLOWTOPICCHANGE = %URLPARAM{"topic"}%
 
-%T% The GROUP and ALLOWTOPICCHANGE settings accept a comma-space delimited list of users and groups in [[%SYSTEMWEB%.WikiWord][WikiFord]] format. Groups may be nested.
+%T% The GROUP and ALLOWTOPICCHANGE settings accept a comma-space delimited list of users and groups in [[%SYSTEMWEB%.WikiWord][WikiWord]] format. Groups may be nested.
 
 <!--
    * Set READONLYSKINMODE = 1

[TWiki-Dev] [SVN] HaraldJoerg r30315 - twiki/trunk/TWikiUserMappingContrib/data/Main

From: <de...@de...> - 2017-04-03 20:59:40

Author: HaraldJoerg
Date: 2017-04-03 20:59:11 +0000 (Mon, 03 Apr 2017)
New Revision: 30315
Trac url: http://develop.twiki.org/trac/changeset/30315

Modified:
   twiki/trunk/TWikiUserMappingContrib/data/Main/TWikiGroupTemplate.txt
Log:
Item7793: Typo in link in TWikiGroupTemplate

Modified: twiki/trunk/TWikiUserMappingContrib/data/Main/TWikiGroupTemplate.txt
===================================================================
--- twiki/trunk/TWikiUserMappingContrib/data/Main/TWikiGroupTemplate.txt	2017-03-27 21:53:45 UTC (rev 30314)
+++ twiki/trunk/TWikiUserMappingContrib/data/Main/TWikiGroupTemplate.txt	2017-04-03 20:59:11 UTC (rev 30315)
@@ -15,7 +15,7 @@
    * Persons/group who can change the list: 
       * Set ALLOWTOPICCHANGE = %URLPARAM{"topic"}%
 
-%T% The GROUP and ALLOWTOPICCHANGE settings accept a comma-space delimited list of users and groups in [[%SYSTEMWEB%.WikiWord][WikiFord]] format. Groups may be nested.
+%T% The GROUP and ALLOWTOPICCHANGE settings accept a comma-space delimited list of users and groups in [[%SYSTEMWEB%.WikiWord][WikiWord]] format. Groups may be nested.
 
 <!--
    * Set READONLYSKINMODE = 1

[TWiki-Dev] [SVN] HaraldJoerg r30314 - twiki/trunk/PublishContrib/lib/TWiki/Contrib

From: <de...@de...> - 2017-03-27 21:54:15

Author: HaraldJoerg
Date: 2017-03-27 21:53:45 +0000 (Mon, 27 Mar 2017)
New Revision: 30314
Trac url: http://develop.twiki.org/trac/changeset/30314

Modified:
   twiki/trunk/PublishContrib/lib/TWiki/Contrib/Publish.pm
Log:
Item7784: PublishContrib -Fix compilation error in Perl >= 5.020

Modified: twiki/trunk/PublishContrib/lib/TWiki/Contrib/Publish.pm
===================================================================
--- twiki/trunk/PublishContrib/lib/TWiki/Contrib/Publish.pm	2017-03-12 18:52:03 UTC (rev 30313)
+++ twiki/trunk/PublishContrib/lib/TWiki/Contrib/Publish.pm	2017-03-27 21:53:45 UTC (rev 30314)
@@ -450,7 +450,7 @@
     my $tmpl = TWiki::Func::readTemplate('view', 'plain');
 
     $tmpl =~ s/%META{.*?}%//g;
-    for my $tag qw( REVTITLE REVARG REVISIONS MAXREV CURRREV ) {
+    for my $tag (qw( REVTITLE REVARG REVISIONS MAXREV CURRREV )) {
         $tmpl =~ s/%$tag%//g;
     }
     my ($header, $footer) = split(/%TEXT%/, $tmpl);

[TWiki-Dev] TWiki Kampala Release Meeting, 2017-03-16, 22:00 GMT

From: Peter T. <pe...@th...> - 2017-03-15 22:55:08

All:

ATTENTION: GMT time shift by -1 hour due to daylight savings time change!

Please join our TWiki Kampala Release Meeting, http://twiki.org/cgi-bin/view/Codev/KampalaReleaseMeeting2017x03x16 scheduled for 2017-03-16 22:00 GMT [1] on IRC channel #twiki_release on the irc.freenode.net IRC network [2] - in about 23.5 hours from now.

Proposed agenda:

   1. Feature Requests for Kampala Release
   2. Review Urgent and Not So Urgent Bugs
   3. Extensions
   4. TWiki Release Discussion
   5. Miscellaneous

The meeting is on Thursday or Friday, depending on your time zone. Meeting time in different time zones, tomorrow:

   * USA Pacific Time Zone: 03:00pm on Thu
   * USA Eastern Time Zone: 06:00pm on Thu
   * Central Europe: 23:00 on Thu/Fri night
   * Japan: 07:00 on Fri

Please show up in time to save everybody's time. And remember that the release meeting is where decisions are made. We invite all TWiki.orgcontributors to join, as well as people with interest in the TWiki project in general.

Cheers,
Peter


[1]: http://www.timeanddate.com/worldclock/converter.html?iso=20170316T220000&p1=tz_gmt&p2=248&p3=268&p4=224&p5=179
[2]: http://twiki.org/cgi-bin/view/Codev/TWikiIRC


--
> Peter Thoeny     - Peter09[at]Thoeny.org
> http://TWiki.org/Mr.TWiki - consulting on enterprise collaboration
> http://TWiki.org - is your team already TWiki enabled?
> http://qualityHDR.com - Quality HDR Photography
> Knowledge cannot be managed, it can be discovered and shared
> This e-mail is:   (_) private    (_) ask first    (x) public

[TWiki-Dev] [SVN] HaraldJoerg r30313 - twiki/trunk/TWikiUserMappingContrib/data/TWiki

From: <de...@de...> - 2017-03-12 18:52:17

Author: HaraldJoerg
Date: 2017-03-12 18:52:03 +0000 (Sun, 12 Mar 2017)
New Revision: 30313
Trac url: http://develop.twiki.org/trac/changeset/30313

Modified:
   twiki/trunk/TWikiUserMappingContrib/data/TWiki/ResetPassword.txt
Log:
Item7776: Workaround for bad mailto link before < character

Modified: twiki/trunk/TWikiUserMappingContrib/data/TWiki/ResetPassword.txt
===================================================================
--- twiki/trunk/TWikiUserMappingContrib/data/TWiki/ResetPassword.txt	2017-02-12 01:21:45 UTC (rev 30312)
+++ twiki/trunk/TWikiUserMappingContrib/data/TWiki/ResetPassword.txt	2017-03-12 18:52:03 UTC (rev 30313)
@@ -10,7 +10,7 @@
 %IF{
   "context passwords_modifyable"
   then="<strong>%MAKETEXT{"After submitting this form, you will receive an e-mail with your new, *system-generated* password, and a link to a page where you can change it."}%</strong>"
-  else="<strong>%MAKETEXT{"Sorry, the password system is currently read only, please contact [_1]" args="%WIKIWEBMASTER%"}%</strong>"
+  else="<strong>%MAKETEXT{"Sorry, the password system is currently read only, please contact [_1]" args="%WIKIWEBMASTER%"}%.</strong>"
 }%
 <!--
    * Set NOTMODIFYABLE = %IF{"context passwords_modifyable" then="" else="DISABLED"}%

[TWiki-Dev] TWiki Kampala Release Meeting, 2017-03-02, 23:00 GMT

From: Peter T. <pe...@th...> - 2017-03-01 19:03:42

All:

Please join our TWiki Kampala Release Meeting, http://twiki.org/cgi-bin/view/Codev/KampalaReleaseMeeting2017x03x02 scheduled for 2017-03-02 23:00 GMT [1] on IRC channel #twiki_release on the irc.freenode.net IRC network [2] - in about 28 hours from now.

Proposed agenda:

   1. Feature Requests for Kampala Release
   2. Review Urgent and Not So Urgent Bugs
   3. Extensions
   4. TWiki Release Discussion
   5. Miscellaneous

The meeting is on Thursday or Friday, depending on your time zone. Meeting time in different time zones, tomorrow:

   * USA Pacific Time Zone: 03:00pm on Thu
   * USA Eastern Time Zone: 06:00pm on Thu
   * Central Europe: 24:00 on Thu/Fri night
   * Japan: 08:00 on Fri

Please show up in time to save everybody's time. And remember that the release meeting is where decisions are made. We invite all TWiki.org contributors to join, as well as people with interest in the TWiki project in general.

Cheers,
Peter

[1]: http://www.timeanddate.com/worldclock/converter.html?iso=20170302T230000&p1=tz_gmt&p2=248&p3=268&p4=224&p5=179
[2]: http://twiki.org/cgi-bin/view/Codev/TWikiIRC


--
> Peter Thoeny     - Peter09[at]Thoeny.org
> http://TWiki.org/Mr.TWiki - consulting on enterprise collaboration
> http://TWiki.org - is your team already TWiki enabled?
> http://qualityHDR.com - Quality HDR Photography
> Knowledge cannot be managed, it can be discovered and shared
> This e-mail is:   (_) private    (_) ask first    (x) public

[TWiki-Dev] TWiki Kampala Release Meeting, 2017-02-16, 23:00 GMT

From: Peter T. <pe...@th...> - 2017-02-16 04:58:49

All:

Please join our TWiki Kampala Release Meeting, http://twiki.org/cgi-bin/view/Codev/KampalaReleaseMeeting2017x02x16 scheduled for 2017-02-16 23:00 GMT [1] on IRC channel #twiki_release on the irc.freenode.net IRC network [2] - in about 18 hours from now.

Proposed agenda:

   1. Feature Requests for Kampala Release
   2. Review Urgent and Not So Urgent Bugs
   3. Extensions
   4. Miscellaneous

The meeting is on Thursday or Friday, depending on your time zone. Meeting time in different time zones, tomorrow:

   * USA Pacific Time Zone: 03:00pm on Thu
   * USA Eastern Time Zone: 06:00pm on Thu
   * Central Europe: 24:00 on Thu/Fri night
   * Japan: 08:00 on Fri

Please show up in time to save everybody's time. And remember that the release meeting is where decisions are made. We invite all TWiki.org contributors to join, as well as people with interest in the TWiki project in general.

Cheers,
Peter


[1]: http://www.timeanddate.com/worldclock/converter.html?iso=20170216T230000&p1=tz_gmt&p2=248&p3=268&p4=224&p5=179
[2]: http://twiki.org/cgi-bin/view/Codev/TWikiIRC

--
> Peter Thoeny     - Peter09[at]Thoeny.org
> http://TWiki.org/Mr.TWiki - consulting on enterprise collaboration
> http://TWiki.org - is your team already TWiki enabled?
> http://qualityHDR.com - Quality HDR Photography
> Knowledge cannot be managed, it can be discovered and shared
> This e-mail is:   (_) private    (_) ask first    (x) public

[TWiki-Dev] [SVN] PeterThoeny r30312 - twiki/branches/TWikiRelease06x00/core/data/TWiki

From: <de...@de...> - 2017-02-12 01:23:27

Author: PeterThoeny
Date: 2017-02-12 01:21:45 +0000 (Sun, 12 Feb 2017)
New Revision: 30312
Trac url: http://develop.twiki.org/trac/changeset/30312

Modified:
   twiki/branches/TWikiRelease06x00/core/data/TWiki/VarWEBLIST.txt
Log:
Item7775: New exclude parameter for WEBLIST variable - updating docs - sync to 6.0 branch

Modified: twiki/branches/TWikiRelease06x00/core/data/TWiki/VarWEBLIST.txt
===================================================================
--- twiki/branches/TWikiRelease06x00/core/data/TWiki/VarWEBLIST.txt	2017-02-12 01:20:18 UTC (rev 30311)
+++ twiki/branches/TWikiRelease06x00/core/data/TWiki/VarWEBLIST.txt	2017-02-12 01:21:45 UTC (rev 30312)
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="TWikiContributor" date="1361155323" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="TWikiContributor" date="1486862407" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{name="TWikiVariables"}%
 #VarWEBLIST
 ---+++ WEBLIST{"format"} -- index of all webs
@@ -33,6 +33,7 @@
      __NOTE 2:__ If MetadataRepository is used and webs are required to be registered, then =cancopyto=, =canmoveto=, and =webtemplate= behave differently.\
      <ul><li> =cancopyto= and =canmoveto= results include all top level webs and subwebs of the current webs are listed regardless of accessibility - subwebs of non-current webs are excluded. They also include [[UserSubwebs][the user's subweb]]. </li>\
      <li> =webtemplate= result has top level template webs only.</li></ul> | ="public"= |
+     | =exclude="Legacy*, Sandbox"= | Comma separated list of webs to exclude. Wildcards can be used, such as =Legacy*= to exclude all webs starting with Legacy. | =""= |
      | =marker="selected"= | Text for =$marker= if the item matches =selection= | ="selected"= |
      | =selection="%<nop>WEB%"= | Current value to be selected in list | =selection="%<nop>WEB%"= |
      | =subwebs="Sandbox"= | Show webs that are a sub-web of this one (recursivly) | =""= |

[TWiki-Dev] [SVN] PeterThoeny r30311 - twiki/trunk/core/data/TWiki

From: <de...@de...> - 2017-02-12 01:22:00

Author: PeterThoeny
Date: 2017-02-12 01:20:18 +0000 (Sun, 12 Feb 2017)
New Revision: 30311
Trac url: http://develop.twiki.org/trac/changeset/30311

Modified:
   twiki/trunk/core/data/TWiki/VarWEBLIST.txt
Log:
Item7775: New exclude parameter for WEBLIST variable - updating docs

Modified: twiki/trunk/core/data/TWiki/VarWEBLIST.txt
===================================================================
--- twiki/trunk/core/data/TWiki/VarWEBLIST.txt	2017-02-12 01:19:08 UTC (rev 30310)
+++ twiki/trunk/core/data/TWiki/VarWEBLIST.txt	2017-02-12 01:20:18 UTC (rev 30311)
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="TWikiContributor" date="1361155323" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="TWikiContributor" date="1486862407" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{name="TWikiVariables"}%
 #VarWEBLIST
 ---+++ WEBLIST{"format"} -- index of all webs
@@ -33,6 +33,7 @@
      __NOTE 2:__ If MetadataRepository is used and webs are required to be registered, then =cancopyto=, =canmoveto=, and =webtemplate= behave differently.\
      <ul><li> =cancopyto= and =canmoveto= results include all top level webs and subwebs of the current webs are listed regardless of accessibility - subwebs of non-current webs are excluded. They also include [[UserSubwebs][the user's subweb]]. </li>\
      <li> =webtemplate= result has top level template webs only.</li></ul> | ="public"= |
+     | =exclude="Legacy*, Sandbox"= | Comma separated list of webs to exclude. Wildcards can be used, such as =Legacy*= to exclude all webs starting with Legacy. | =""= |
      | =marker="selected"= | Text for =$marker= if the item matches =selection= | ="selected"= |
      | =selection="%<nop>WEB%"= | Current value to be selected in list | =selection="%<nop>WEB%"= |
      | =subwebs="Sandbox"= | Show webs that are a sub-web of this one (recursivly) | =""= |

[TWiki-Dev] [SVN] PeterThoeny r30310 - twiki/branches/TWikiRelease06x00/core/lib

From: <de...@de...> - 2017-02-12 01:20:51

Author: PeterThoeny
Date: 2017-02-12 01:19:08 +0000 (Sun, 12 Feb 2017)
New Revision: 30310
Trac url: http://develop.twiki.org/trac/changeset/30310

Modified:
   twiki/branches/TWikiRelease06x00/core/lib/TWiki.pm
Log:
Item7775: New exclude parameter for WEBLIST variable - sync to 6.0 branch

Modified: twiki/branches/TWikiRelease06x00/core/lib/TWiki.pm
===================================================================
--- twiki/branches/TWikiRelease06x00/core/lib/TWiki.pm	2017-02-12 01:15:01 UTC (rev 30309)
+++ twiki/branches/TWikiRelease06x00/core/lib/TWiki.pm	2017-02-12 01:19:08 UTC (rev 30310)
@@ -4777,6 +4777,7 @@
     my $separator = expandStandardEscapes($params->{separator} || "\n");
     my $web       = $params->{web} || '';
     my $webs      = $params->{webs} || 'public';
+    my $exclude   = $params->{exclude} || '';
     my $selection = $params->{selection} || '';
     $selection =~ s/\,/ /g;
     $selection = " $selection ";
@@ -4811,10 +4812,19 @@
         }
     }
 
+    if( $exclude ) {
+        # turn exclude into a regex:
+        $exclude =~ s/,\s*/|/g;                               # change comma list to regex "or"
+        $exclude =~ s/[^$regex{mixedAlphaNum}\_\.\/\*\|]//g;  # filter out illegal chars
+        $exclude =~ s/\*/.*/g;                                # change wildcard to regex
+    }
     my @items;
     my $indent = CGI::span({class=>'twikiWebIndent'},'');
     my $i = 0;
     foreach my $item ( @list ) {
+        if( $exclude && $item =~ /^($exclude)$/ ) {
+            next;
+        }
         if( $i++ >= $limit ) {
             push( @items, $overlimit ) if $overlimit;
             last;

[TWiki-Dev] [SVN] PeterThoeny r30309 - twiki/trunk/core/lib

From: <de...@de...> - 2017-02-12 01:16:43

Author: PeterThoeny
Date: 2017-02-12 01:15:01 +0000 (Sun, 12 Feb 2017)
New Revision: 30309
Trac url: http://develop.twiki.org/trac/changeset/30309

Modified:
   twiki/trunk/core/lib/TWiki.pm
Log:
Item7775: New exclude parameter for WEBLIST variable

Modified: twiki/trunk/core/lib/TWiki.pm
===================================================================
--- twiki/trunk/core/lib/TWiki.pm	2017-02-12 00:36:54 UTC (rev 30308)
+++ twiki/trunk/core/lib/TWiki.pm	2017-02-12 01:15:01 UTC (rev 30309)
@@ -4792,6 +4792,7 @@
     my $separator = expandStandardEscapes($params->{separator} || "\n");
     my $web       = $params->{web} || '';
     my $webs      = $params->{webs} || 'public';
+    my $exclude   = $params->{exclude} || '';
     my $selection = $params->{selection} || '';
     $selection =~ s/\,/ /g;
     $selection = " $selection ";
@@ -4826,10 +4827,19 @@
         }
     }
 
+    if( $exclude ) {
+        # turn exclude into a regex:
+        $exclude =~ s/,\s*/|/g;                               # change comma list to regex "or"
+        $exclude =~ s/[^$regex{mixedAlphaNum}\_\.\/\*\|]//g;  # filter out illegal chars
+        $exclude =~ s/\*/.*/g;                                # change wildcard to regex
+    }
     my @items;
     my $indent = CGI::span({class=>'twikiWebIndent'},'');
     my $i = 0;
     foreach my $item ( @list ) {
+        if( $exclude && $item =~ /^($exclude)$/ ) {
+            next;
+        }
         if( $i++ >= $limit ) {
             push( @items, $overlimit ) if $overlimit;
             last;

[TWiki-Dev] [SVN] PeterThoeny r30308 - twiki/branches/TWikiRelease06x00/core/data/TWiki

From: <de...@de...> - 2017-02-12 00:38:36

Author: PeterThoeny
Date: 2017-02-12 00:36:54 +0000 (Sun, 12 Feb 2017)
New Revision: 30308
Trac url: http://develop.twiki.org/trac/changeset/30308

Modified:
   twiki/branches/TWikiRelease06x00/core/data/TWiki/TWikiPreferences.txt
Log:
Item7774: PARENTBC setting: Omit double-angle separator if no parent - sync to branch

Modified: twiki/branches/TWikiRelease06x00/core/data/TWiki/TWikiPreferences.txt
===================================================================
--- twiki/branches/TWikiRelease06x00/core/data/TWiki/TWikiPreferences.txt	2017-02-12 00:35:49 UTC (rev 30307)
+++ twiki/branches/TWikiRelease06x00/core/data/TWiki/TWikiPreferences.txt	2017-02-12 00:36:54 UTC (rev 30308)
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="TWikiContributor" date="1456811560" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="TWikiContributor" date="1486858790" format="1.1" version="$Rev$"}%
 ---+!! <nop>%WIKITOOLNAME% Site-Level Preferences
 
 This topic defines __site-level__ settings that apply to all users and webs on this TWikiSite.
@@ -315,7 +315,7 @@
       * Add =%<nop>PARENTBC%= to a heading of a topic to show the breadcrumb of its parents. Parent topics are linked, topic names are shown spaced out in a smaller font, and are separated by =&#187;= quotes. In addition, a =parentlist= SetGetPlugin variable is set to the parent list, and a =parent= variable is set to the immediate parent. This can be retrieved later in the topic using =%<nop>GET{parentlist}%= and =%<nop>GET{parent}%=, respectively.
       * Example raw text:%BR% =---+ %<nop>PARENTBC% Myself and me=
       * Expands to: <h1> <span style="font-size: 58%"> [[%TOPIC%][Grandma And Granpa]] &#187; [[%TOPIC%][Mother And Father]] &#187; </span> Myself and me</h1>
-      * Set PARENTBC = <span style="font-size: 58%"> %SET{ "parentlist" value="%META{ "parent" nowebhome="on" format="$topic" separator=", " }%" }%%SET{ "parent" value="%CALCULATE{$LISTITEM(-1, %GET{parentlist}%)}%" }%%CALCULATE{$LISTJOIN($sp&#187;$sp, $LISTMAP([[$item][$PROPERSPACE($item)]], %GET{parentlist}%))}% &#187; </span>
+      * Set PARENTBC = <span style="font-size: 58%"> %SET{ "parentlist" value="%META{ "parent" nowebhome="on" format="$topic" separator=", " }%" }%%SET{ "parent" value="%CALCULATE{$LISTITEM(-1, %GET{parentlist}%)}%" }%%CALCULATE{$LISTJOIN($sp&#187;$sp, $LISTMAP([[$item][$PROPERSPACE($item)]], %GET{parentlist}%)) $IF($LENGTH(%GET{parentlist}%)>0, &#187;)}% </span>
 
    * [[VarREG][Registered trademark symbol]]:
       * Set REG = &reg;

98 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 4 5 6 7 8 .. 1308 > >> (Page 6 of 1308)