diff --git a/modules/gd_security_image.pl b/modules/gd_security_image.pl index 8a6e9f7f..9c3e4a61 100644 --- a/modules/gd_security_image.pl +++ b/modules/gd_security_image.pl @@ -26,7 +26,7 @@ use strict; AddModuleDescription('gd_security_image.pl', 'GD Security Image Extension'); -our ($q, $Now, %Action, $FullUrl, $LinkPattern, $FreeLinks, $FreeLinkPattern, $WikiLinks, $DataDir, $ModuleDir, @MyInitVariables, %CookieParameters, %InvisibleCookieParameters); +our ($q, $Now, %Action, $FullUrl, $LinkPattern, $FreeLinks, $FreeLinkPattern, $WikiLinks, $DataDir, $ModuleDir, @MyInitVariables, %CookieParameters); =head1 DESCRIPTION @@ -396,7 +396,5 @@ sub GdSecurityImageInitVariables { $GdSecurityImagePngToAA = "$ModuleDir/pngtoaa"; $CookieParameters{'gd_security_image_id'} = ''; - $InvisibleCookieParameters{'gd_security_image_id'} = 1; $CookieParameters{'gd_security_image_answer'} = ''; - $InvisibleCookieParameters{'gd_security_image_answer'} = 1; } diff --git a/modules/joiner.pl b/modules/joiner.pl index 9ae0faf1..664d09e1 100644 --- a/modules/joiner.pl +++ b/modules/joiner.pl @@ -31,7 +31,7 @@ use strict; AddModuleDescription('joiner.pl', 'Joiner Extension'); -our ($q, $Now, %Action, @MyAdminCode, @MyInitVariables, $UserGotoBar, $DataDir, $FullUrl, $SiteName, %CookieParameters, %InvisibleCookieParameters, @QuestionaskerQuestions, $QuestionaskerRememberAnswer, $QuestionaskerSecretKey, $ReCaptchaSecretKey, $ReCaptchaRememberAnswer); +our ($q, $Now, %Action, @MyAdminCode, @MyInitVariables, $UserGotoBar, $DataDir, $FullUrl, $SiteName, %CookieParameters, @QuestionaskerQuestions, $QuestionaskerRememberAnswer, $QuestionaskerSecretKey, $ReCaptchaSecretKey, $ReCaptchaRememberAnswer); =head1 DESCRIPTION @@ -1261,7 +1261,5 @@ sub JoinerInitVariables { $JoinerLoggedIn = ''; $CookieParameters{'joiner_session'} = ''; - $InvisibleCookieParameters{'joiner_session'} = 1; $CookieParameters{'joiner_recover'} = ''; - $InvisibleCookieParameters{'joiner_recover'} = 1; } diff --git a/modules/mail.pl b/modules/mail.pl index 190262ab..2f333bd9 100644 --- a/modules/mail.pl +++ b/modules/mail.pl @@ -45,7 +45,7 @@ automatically. AddModuleDescription('mail.pl', 'Mail Extension'); -our ($q, %Action, %IndexHash, $FS, $DataDir, %CookieParameters, %InvisibleCookieParameters, @MyInitVariables, @MyAdminCode, $Message); +our ($q, %Action, %IndexHash, $FS, $DataDir, %CookieParameters, @MyInitVariables, @MyAdminCode, $Message); our ($MailFile, $MailPattern); push (@MyInitVariables, sub { @@ -74,7 +74,6 @@ index file at the end of the subscribe and unsubscribe function. $CookieParameters{mail} = ''; $CookieParameters{sub} = ''; -$InvisibleCookieParameters{sub} = 1; sub MailNewInitCookie { MailOldInitCookie(@_); diff --git a/modules/page-trail.pl b/modules/page-trail.pl index 5bb5636d..8f3db73d 100644 --- a/modules/page-trail.pl +++ b/modules/page-trail.pl @@ -20,13 +20,12 @@ use strict; AddModuleDescription('page-trail.pl', 'Page Trail Extension'); -our ($q, %CookieParameters, %InvisibleCookieParameters); +our ($q, %CookieParameters); our ($PageTrailLength); $PageTrailLength = 10; $CookieParameters{trail} = ''; -$InvisibleCookieParameters{trail} = 1; my @PageTrail; *OldPageTrailBrowsePage = \&BrowsePage; diff --git a/modules/questionasker.pl b/modules/questionasker.pl index a0bfd5ed..432214e1 100644 --- a/modules/questionasker.pl +++ b/modules/questionasker.pl @@ -18,7 +18,7 @@ use strict; AddModuleDescription('questionasker.pl', 'QuestionAsker Extension'); -our ($q, $bol, $FreeLinks, $FreeLinkPattern, $LinkPattern, $WikiLinks, @MyInitVariables, %AdminPages, %CookieParameters, %InvisibleCookieParameters); +our ($q, $bol, $FreeLinks, $FreeLinkPattern, $LinkPattern, $WikiLinks, @MyInitVariables, %AdminPages, %CookieParameters); our (@QuestionaskerQuestions, $QuestionaskerRememberAnswer, $QuestionaskerSecretKey, @@ -61,7 +61,6 @@ sub QuestionaskerInit { $QuestionaskerRequiredList = FreeToNormal($QuestionaskerRequiredList); $AdminPages{$QuestionaskerRequiredList} = 1; $CookieParameters{$QuestionaskerSecretKey} = ''; - $InvisibleCookieParameters{$QuestionaskerSecretKey} = 1; } *OldQuestionaskerDoPost = \&DoPost; diff --git a/modules/recaptcha.pl b/modules/recaptcha.pl index 1d575118..0e7c3ddb 100644 --- a/modules/recaptcha.pl +++ b/modules/recaptcha.pl @@ -37,7 +37,7 @@ file for your Oddmuse Wiki. =cut -our ($q, %AdminPages, $LinkPattern, $FreeLinks, $FreeLinkPattern, $WikiLinks, @MyInitVariables, %CookieParameters, %InvisibleCookieParameters); +our ($q, %AdminPages, $LinkPattern, $FreeLinks, $FreeLinkPattern, $WikiLinks, @MyInitVariables, %CookieParameters); our ($ReCaptchaPrivateKey, $ReCaptchaPublicKey, $ReCaptchaTheme, @@ -140,7 +140,6 @@ sub ReCaptchaInit { $ReCaptchaRequiredList = FreeToNormal($ReCaptchaRequiredList); $AdminPages{$ReCaptchaRequiredList} = 1; $CookieParameters{$ReCaptchaSecretKey} = ''; - $InvisibleCookieParameters{$ReCaptchaSecretKey} = 1; } # ....................{ EDITING }.................... diff --git a/wiki.pl b/wiki.pl index 2c4c8a06..a4e46022 100755 --- a/wiki.pl +++ b/wiki.pl @@ -164,7 +164,6 @@ our $LockExpiration = 60; # How long before expirable locks are expired our %LockExpires = (diff=>1, index=>1, merge=>1, visitors=>1); # locks to expire after some time our %CookieParameters = (username=>'', pwd=>'', homepage=>'', theme=>'', css=>'', msg=>'', lang=>'', embed=>$EmbedWiki, toplinkbar=>$TopLinkBar, topsearchform=>$TopSearchForm, matchingpages=>$MatchingPages, ); -our %InvisibleCookieParameters = (msg=>1, pwd=>1,); our %Action = (rc => \&BrowseRc, rollback => \&DoRollback, browse => \&BrowseResolvedPage, maintain => \&DoMaintain, random => \&DoRandom, pagelock => \&DoPageLock,