Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[10601] trunk
|
From: <var...@us...> - 2021-09-30 11:00:28
|
Revision: 10601
http://sourceforge.net/p/phpwiki/code/10601
Author: vargenau
Date: 2021-09-30 11:00:26 +0000 (Thu, 30 Sep 2021)
Log Message:
-----------
READONLY is renamed as ISREADONLY, since "readonly" is now a keyword in PHP 8.1
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/configurator.php
trunk/lib/DbaDatabase.php
trunk/lib/IniConfig.php
trunk/lib/PagePerm.php
trunk/lib/WikiDB.php
trunk/lib/main.php
trunk/locale/it/pgsrc/NoteDiRilascio
trunk/pgsrc/ReleaseNotes
trunk/themes/default/templates/login.tmpl
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/config/config-default.ini 2021-09-30 11:00:26 UTC (rev 10601)
@@ -9,7 +9,7 @@
ENABLE_XHTML_XML = false
ENABLE_OPEN_GRAPH = false
USECACHE = true
-READONLY = false
+ISREADONLY = false
; calculated dynamically, but need a default
WIKIDB_NOCACHE_MARKUP = false
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/config/config-dist.ini 2021-09-30 11:00:26 UTC (rev 10601)
@@ -166,7 +166,7 @@
; Enable this for system maintainance (e.g. read-only mount) or a general
; read-only database.
; Default: false
-;READONLY = true
+;ISREADONLY = true
;==========================================================================
; Part One: Authentication and security settings.
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/configurator.php 2021-09-30 11:00:26 UTC (rev 10601)
@@ -501,8 +501,8 @@
$properties["ENABLE_PAGE_PUBLIC"] =
new boolean_define_commented_optional('ENABLE_PAGE_PUBLIC');
-$properties["READONLY"] =
- new boolean_define_commented_optional('READONLY');
+$properties["ISREADONLY"] =
+ new boolean_define_commented_optional('ISREADONLY');
$properties["Part One"] =
new part('_part1', $SEPARATOR . "\n", "
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/lib/DbaDatabase.php 2021-09-30 11:00:26 UTC (rev 10601)
@@ -91,7 +91,7 @@
echo "You don't seem to have DBA support compiled into PHP.";
}
- if (READONLY) {
+ if (ISREADONLY) {
$mode = 'r';
}
@@ -109,13 +109,13 @@
and (isWindows() or !is_writable($this->_file))
) {
// try to continue with read-only
- if (!defined("READONLY"))
- define("READONLY", true);
+ if (!defined("ISREADONLY"))
+ define("ISREADONLY", true);
$request->_dbi->readonly = true;
$this->readonly = true;
$mode = "r";
}
- if (substr($mode, 0, 1) == "c" and file_exists($this->_file) and !READONLY)
+ if (substr($mode, 0, 1) == "c" and file_exists($this->_file) and !ISREADONLY)
$mode = "w";
// conflict: wait some random time to unlock (as with ethernet)
$secs = 0.5 + ((double)rand(1, 32767) / 32767);
@@ -132,8 +132,8 @@
. "\nmode: " . $mode
. "\nhandler: " . $this->_handler;
// try to continue with read-only
- if (!defined("READONLY"))
- define("READONLY", true);
+ if (!defined("ISREADONLY"))
+ define("ISREADONLY", true);
$request->_dbi->readonly = true;
$this->readonly = true;
if (!file_exists($this->_file)) {
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/lib/IniConfig.php 2021-09-30 11:00:26 UTC (rev 10601)
@@ -211,7 +211,7 @@
'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY',
'ENABLE_MAILNOTIFY', 'ENABLE_RECENTCHANGESBOX', 'ENABLE_PAGE_PUBLIC',
'ENABLE_AJAX', 'ENABLE_EXTERNAL_PAGES',
- 'READONLY'
+ 'ISREADONLY'
);
$rs = @parse_ini_file($file);
@@ -276,7 +276,7 @@
'ALLOW_IMAP_LOGIN', 'ALLOW_USER_LOGIN',
'REQUIRE_SIGNIN_BEFORE_EDIT',
'WIKIDB_NOCACHE_MARKUP',
- 'COMPRESS_OUTPUT', 'USE_BYTEA', 'READONLY',
+ 'COMPRESS_OUTPUT', 'USE_BYTEA', 'ISREADONLY',
))
) {
;
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php 2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/lib/PagePerm.php 2021-09-30 11:00:26 UTC (rev 10601)
@@ -248,7 +248,7 @@
return 0;
}
}
- if ((READONLY or $request->_dbi->readonly)
+ if ((ISREADONLY or $request->_dbi->readonly)
and in_array($access, array('edit', 'create', 'change'))
) {
return 0;
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/lib/WikiDB.php 2021-09-30 11:00:26 UTC (rev 10601)
@@ -99,7 +99,7 @@
$this->_backend->check();
}
// might be changed when opening the database fails
- $this->readonly = defined("READONLY") ? READONLY : false;
+ $this->readonly = defined("ISREADONLY") ? ISREADONLY : false;
}
/**
@@ -146,7 +146,7 @@
* Which dba handler to use.
*
* <dt> readonly
- * <dd> Either set by config.ini: READONLY = true or detected automatically
+ * <dd> Either set by config.ini: ISREADONLY = true or detected automatically
* when a database can be read but cannot be updated.
* </dl>
*
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/lib/main.php 2021-09-30 11:00:26 UTC (rev 10601)
@@ -81,7 +81,7 @@
if (USE_DB_SESSION) {
include_once 'lib/DbSession.php';
$dbi =& $this->_dbi;
- if (defined('READONLY') and !READONLY) // READONLY might be set later
+ if (defined('ISREADONLY') and !ISREADONLY) // ISREADONLY might be set later
$this->_dbsession = new DbSession($dbi, $dbi->getParam('prefix')
. $dbi->getParam('db_session_table'));
}
Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio 2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/locale/it/pgsrc/NoteDiRilascio 2021-09-30 11:00:26 UTC (rev 10601)
@@ -1,4 +1,4 @@
-Date: Wed, 11 Aug 2021 10:03:04 +0000
+Date: Thu, 30 Sep 2021 12:58:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=NoteDiRilascio;
@@ -8,6 +8,21 @@
<<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
+== 1.6.1 2021-XX-XX Marc-Etienne Vargenau ==
+
+This release makes PhpWiki compatable with PHP 8.1.
+READONLY is renamed as ISREADONLY, since //readonly// is now a keyword in PHP 8.1.
+
+=== Fixes ===
+* Make list of pages work with PDO (~AllPages, ~MostPopular...)
+
+=== Changes ===
+* Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
+* Add "Rename" tab in Sidebar theme.
+
+=== Plugins ===
+* Chart plugin: new argument "legend"
+
== 1.6.0 2021-08-12 Marc-Etienne Vargenau ==
Major release:
@@ -47,7 +62,7 @@
* Updated pgsrc pages in all languages
* Adding SPDX-License-Identifier in PHP source files
-=== Plugins ===
+=== Plugins ===
* ~UpLoad plugin: put date and author in history
* ~UpLoad plugin: don't inline images
* PhpWeather removed, uses deprecated mysql functions
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/pgsrc/ReleaseNotes 2021-09-30 11:00:26 UTC (rev 10601)
@@ -1,4 +1,4 @@
-Date: Tue, 28 Sep 2021 17:38:55 +0000
+Date: Thu, 30 Sep 2021 12:58:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -10,6 +10,9 @@
== 1.6.1 2021-XX-XX Marc-Etienne Vargenau ==
+This release makes PhpWiki compatable with PHP 8.1.
+READONLY is renamed as ISREADONLY, since //readonly// is now a keyword in PHP 8.1.
+
=== Fixes ===
* Make list of pages work with PDO (~AllPages, ~MostPopular...)
Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl 2021-09-29 15:07:58 UTC (rev 10600)
+++ trunk/themes/default/templates/login.tmpl 2021-09-30 11:00:26 UTC (rev 10601)
@@ -6,7 +6,7 @@
<?php
$dbh = $request->getDbh();
-if (READONLY) {
+if (ISREADONLY) {
echo asXML(HTML::p(array('class' => 'warning_msg'), _("System is locked as read-only for maintenance")));
} elseif ($dbh->readonly) {
echo asXML(HTML::p(array('class' => 'warning_msg'), _("Database is locked as read-only for maintenance")));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
