SF.net SVN: phpwiki:[10731] trunk
vargenau--- via phpwiki-checkins <[email protected]>
| Newsgroups | gmane.comp.web.wiki.phpwiki.checkins |
|---|---|
| Message-ID | <[email protected]> |
Revision: 10731
http://sourceforge.net/p/phpwiki/code/10731
Author: vargenau
Date: 2021-12-06 12:49:15 +0000 (Mon, 06 Dec 2021)
Log Message:
-----------
Remove EDITING_POLICY
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/configurator.php
trunk/lib/IniConfig.php
trunk/locale/it/pgsrc/NoteDiRilascio
trunk/pgsrc/ReleaseNotes
trunk/themes/Crao/templates/signin.tmpl
trunk/themes/Wordpress/templates/signin.tmpl
trunk/themes/default/templates/signin.tmpl
trunk/themes/smaller/templates/signin.tmpl
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/config/config-default.ini 2021-12-06 12:49:15 UTC (rev 10731)
@@ -101,7 +101,6 @@
DBAUTH_IS_MEMBER = "SELECT userid FROM pref WHERE userid='$userid' AND groupname='$groupname'"
DBAUTH_GROUP_MEMBERS = "SELECT userid FROM pref WHERE groupname='$groupname'"
DBAUTH_USER_GROUPS = "SELECT groupname FROM pref WHERE userid='$userid'"
-EDITING_POLICY = "EditingPolicy"
; old WikiUser options:
ALLOW_HTTP_AUTH_LOGIN = false
ALLOW_LDAP_LOGIN = false
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/config/config-dist.ini 2021-12-06 12:49:15 UTC (rev 10731)
@@ -1070,9 +1070,6 @@
; to prevent from external 1 pixel spam.
;DISABLE_GETIMAGESIZE = true
-; A interim page which gets displayed on every edit attempt, if it exists.
-;EDITING_POLICY = EditingPolicy
-
; Enable random quotes from a fortune directory when adding a new page.
; Usually at /usr/share/fortune or /usr/share/games/fortune
; If empty no quotes are inserted.
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/configurator.php 2021-12-06 12:49:15 UTC (rev 10731)
@@ -1457,9 +1457,6 @@
$properties["Disable GETIMAGESIZE"] =
new boolean_define_commented_optional('DISABLE_GETIMAGESIZE');
-$properties["EDITING_POLICY"] =
- new _define_optional('EDITING_POLICY');
-
$properties["TOOLBAR_PAGELINK_PULLDOWN"] =
new _define_commented_optional('TOOLBAR_PAGELINK_PULLDOWN');
$properties["TOOLBAR_TEMPLATE_PULLDOWN"] =
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/lib/IniConfig.php 2021-12-06 12:49:15 UTC (rev 10731)
@@ -89,7 +89,7 @@
'COOKIE_EXPIRATION_DAYS', 'COOKIE_DOMAIN',
'PASSWORD_LENGTH_MINIMUM', 'USER_AUTH_POLICY',
'GROUP_METHOD',
- 'EDITING_POLICY', 'THEME',
+ 'THEME',
'WIKI_PGSRC', 'DEFAULT_WIKI_PGSRC',
'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', /*'KEYWORDS',*/
// extra logic:
Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/locale/it/pgsrc/NoteDiRilascio 2021-12-06 12:49:15 UTC (rev 10731)
@@ -1,4 +1,4 @@
-Date: Tue, 23 Nov 2021 17:01:34 +0000
+Date: Mon, 6 Dec 2021 12:42:19 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=NoteDiRilascio;
@@ -8,7 +8,7 @@
<<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
-== 1.6.1 2021-XX-XX Marc-Etienne Vargenau ==
+== 1.6.1 2021-12-XX Marc-Etienne Vargenau ==
This release makes ~PhpWiki compatible with PHP 8.1.
##READONLY## is renamed as ##ISREADONLY##, since ##readonly## is now a keyword in PHP 8.1.
@@ -20,6 +20,7 @@
* Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
* Add “Rename” tab in Sidebar theme.
* Add sample images for ~PhotoAlbum in blog theme
+* Remove EDITING_POLICY
* More translations
=== Plugins ===
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/pgsrc/ReleaseNotes 2021-12-06 12:49:15 UTC (rev 10731)
@@ -1,4 +1,4 @@
-Date: Tue, 23 Nov 2021 17:01:34 +0000
+Date: Mon, 6 Dec 2021 12:42:19 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -8,7 +8,7 @@
<<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
-== 1.6.1 2021-XX-XX Marc-Etienne Vargenau ==
+== 1.6.1 2021-12-XX Marc-Etienne Vargenau ==
This release makes ~PhpWiki compatible with PHP 8.1.
##READONLY## is renamed as ##ISREADONLY##, since ##readonly## is now a keyword in PHP 8.1.
@@ -20,6 +20,7 @@
* Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
* Add “Rename” tab in Sidebar theme.
* Add sample images for ~PhotoAlbum in blog theme
+* Remove EDITING_POLICY
* More translations
=== Plugins ===
Modified: trunk/themes/Crao/templates/signin.tmpl
===================================================================
--- trunk/themes/Crao/templates/signin.tmpl 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/themes/Crao/templates/signin.tmpl 2021-12-06 12:49:15 UTC (rev 10731)
@@ -37,13 +37,6 @@
?>
<script type="text/javascript"> <!--
function SignIn(form) {
- <?php /* (comment out:)
- if (window.focus) {
- window.open('/EditingPolicy.html',<!-- url -->
- 'PleaseReadThisFirst',<!-- window name -->
- 'width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes');
- }
- */ ?>
form.submit();
}
//-->
Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/themes/Wordpress/templates/signin.tmpl 2021-12-06 12:49:15 UTC (rev 10731)
@@ -48,13 +48,6 @@
?>
<script type="text/javascript"> <!--
function SignIn(form,userid) {
- <?php if (defined('EDITING_POLICY') and $request->_dbi->isWikiPage(EDITING_POLICY)) { ?>
- if (window.focus) {
- window.open('<?php echo WikiURL(EDITING_POLICY) ?>',<!-- url -->
- 'PleaseReadThisFirst',<!-- window name -->
- 'width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes');
- }
- <?php } ?>
if (userid) {
form.elements["auth[userid]"].value = userid;
}
Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/themes/default/templates/signin.tmpl 2021-12-06 12:49:15 UTC (rev 10731)
@@ -41,12 +41,7 @@
}
$editing_policy = (defined('EDITING_POLICY') and $request->_dbi->isWikiPage(EDITING_POLICY));
$SignInJS = JavaScript('
- function SignIn(form,userid) {'.($editing_policy ? '
- if (window.focus) {
- window.open("' . WikiURL(EDITING_POLICY) . '",<!-- url -->
- "PleaseReadThisFirst",<!-- window name -->
- "width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes");
- }':'').'
+ function SignIn(form,userid) {
if (userid) {
form.elements["auth[userid]"].value = userid;
}
Modified: trunk/themes/smaller/templates/signin.tmpl
===================================================================
--- trunk/themes/smaller/templates/signin.tmpl 2021-12-06 10:53:32 UTC (rev 10730)
+++ trunk/themes/smaller/templates/signin.tmpl 2021-12-06 12:49:15 UTC (rev 10731)
@@ -34,12 +34,7 @@
$SignInInput->addTooltip(_("Enter your UserId to sign in"));
$editing_policy = (defined('EDITING_POLICY') and $request->_dbi->isWikiPage(EDITING_POLICY));
$SignInJS = JavaScript('
- function SignIn(form,userid) {'.($editing_policy ? '
- if (window.focus) {
- window.open("' . WikiURL(EDITING_POLICY) . '",<!-- url -->
- "PleaseReadThisFirst",<!-- window name -->
- "width=600,height=430,scrollbars=yes,resizable=yes,toolbar=yes");
- }':'').'
+ function SignIn(form,userid) {
if (userid) {
form.elements["auth[userid]"].value = userid;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
_______________________________________________
phpwiki-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpwiki-checkins