phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[10424] trunk

[<var...@us...>]

Revision: 10424
          http://sourceforge.net/p/phpwiki/code/10424
Author:   vargenau
Date:     2021-08-04 10:45:01 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
Remove unused MAJOR_MIN_KEEP, MINOR_MIN_KEEP, MAJOR_MAX_AGE, MINOR_MAX_AGE, MAJOR_KEEP, MINOR_KEEP, AUTHOR_MAX_AGE, AUTHOR_MIN_AGE, AUTHOR_KEEP, AUTHOR_MAX_KEEP; we store all

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2021-08-04 09:47:22 UTC (rev 10423)
+++ trunk/config/config-default.ini	2021-08-04 10:45:01 UTC (rev 10424)
@@ -65,20 +65,6 @@
 DATABASE_OPTIMISE_FREQUENCY = 50
 DATABASE_PERSISTENT = false
 
-; let all revisions be stored
-MAJOR_MIN_KEEP = 2147483647
-MINOR_MIN_KEEP = 2147483647
-; older fine-tuned settings for low-storage systems.
-; just comment the two lines above to enable it.
-MAJOR_MAX_AGE = 32
-MAJOR_KEEP = 8
-MINOR_MAX_AGE = 7
-MINOR_KEEP = 4
-AUTHOR_MAX_AGE = 365
-AUTHOR_KEEP = 8
-AUTHOR_MIN_AGE = 7
-AUTHOR_MAX_KEEP = 20
-
 COOKIE_EXPIRATION_DAYS = 365
 COOKIE_DOMAIN = "/"
 

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-08-04 09:47:22 UTC (rev 10423)
+++ trunk/config/config-dist.ini	2021-08-04 10:45:01 UTC (rev 10424)
@@ -168,7 +168,6 @@
 ; Default: false
 ;READONLY = true
 
-
 ;==========================================================================
 ; Part One: Authentication and security settings.
 ;
@@ -543,29 +542,7 @@
 ; revision with the content after the merged minor edit, the rest of
 ; the page metadata for the preceding version (summary, mtime, ...)
 ; is not changed.
-;
-; Let all revisions be stored. Default since 1.3.11
-;MAJOR_MIN_KEEP = 2147483647
-;MINOR_MIN_KEEP = 2147483647
 
-; Keep up to 8 major edits, but keep them no longer than a month.
-MAJOR_MAX_AGE = 32
-MAJOR_KEEP = 8
-
-; Keep up to 4 minor edits, but keep them no longer than a week.
-MINOR_MAX_AGE = 7
-MINOR_KEEP = 4
-
-; Keep the latest contributions of the last 8 authors up to a year.
-; Additionally, (in the case of a particularly active page) try to
-; keep the latest contributions of all authors in the last week (even
-; if there are more than eight of them,) but in no case keep more
-; than twenty unique author revisions.
-AUTHOR_MAX_AGE = 365
-AUTHOR_KEEP = 8
-AUTHOR_MIN_AGE = 7
-AUTHOR_MAX_KEEP = 20
-
 ;========================================================================
 ; Part Three: User Authentication
 ;========================================================================

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 09:47:22 UTC (rev 10423)
+++ trunk/configurator.php	2021-08-04 10:45:01 UTC (rev 10424)
@@ -793,102 +793,6 @@
 $properties["USECACHE"] =
     new boolean_define_commented_optional('USECACHE');
 
-///////////////////
-
-$properties["Page Revisions"] =
-    new unchangeable_variable('_parttworevisions', "", "
-
-Section 2a: Archive Cleanup
-The next section controls how many old revisions of each page are kept in the database.
-
-There are two basic classes of revisions: major and minor. Which
-class a revision belongs in is determined by whether the author
-checked the \"this is a minor revision\" checkbox when they saved the
-page.
-
-There is, additionally, a third class of revisions: author
-revisions. The most recent non-mergable revision from each distinct
-author is and author revision.
-
-The expiry parameters for each of those three classes of revisions
-can be adjusted separately. For each class there are five
-parameters (usually, only two or three of the five are actually
-set) which control how long those revisions are kept in the
-database.
-<dl>
-   <dt>max_keep:</dt> <dd>If set, this specifies an absolute maximum for the
-            number of archived revisions of that class. This is
-            meant to be used as a safety cap when a non-zero
-            min_age is specified. It should be set relatively high,
-            and it's purpose is to prevent malicious or accidental
-            database overflow due to someone causing an
-            unreasonable number of edits in a short period of time.</dd>
-
-  <dt>min_age:</dt>  <dd>Revisions younger than this (based upon the supplanted
-            date) will be kept unless max_keep is exceeded. The age
-            should be specified in days. It should be a
-            non-negative, real number,</dd>
-
-  <dt>min_keep:</dt> <dd>At least this many revisions will be kept.</dd>
-
-  <dt>keep:</dt>     <dd>No more than this many revisions will be kept.</dd>
-
-  <dt>max_age:</dt>  <dd>No revision older than this age will be kept.</dd>
-</dl>
-Supplanted date: Revisions are timestamped at the instant that they
-cease being the current revision. Revision age is computed using
-this timestamp, not the edit time of the page.
-
-Merging: When a minor revision is deleted, if the preceding
-revision is by the same author, the minor revision is merged with
-the preceding revision before it is deleted. Essentially: this
-replaces the content (and supplanted timestamp) of the previous
-revision with the content after the merged minor edit, the rest of
-the page metadata for the preceding version (summary, mtime, ...)
-is not changed.
-");
-
-// For now the expiration parameters are statically inserted as
-// an unchangeable property. You'll have to edit the resulting
-// config file if you really want to change these from the default.
-
-$properties["Major Edits: keep minimum days"] =
-    new numeric_define('MAJOR_MIN_KEEP', MAJOR_MIN_KEEP, "
-Default: Keep for unlimited time.
-Set to 0 to enable archive cleanup");
-$properties["Minor Edits: keep minumum days"] =
-    new numeric_define('MINOR_MIN_KEEP', MINOR_MIN_KEEP, "
-Default: Keep for unlimited time.
-Set to 0 to enable archive cleanup");
-
-$properties["Major Edits: how many"] =
-    new numeric_define('MAJOR_KEEP', MAJOR_KEEP, "
-Keep up to 8 major edits");
-$properties["Major Edits: how many days"] =
-    new numeric_define('MAJOR_MAX_AGE', MAJOR_MAX_AGE, "
-keep them no longer than a month");
-
-$properties["Minor Edits: how many"] =
-    new numeric_define("MINOR_KEEP", MINOR_KEEP, "
-Keep up to 4 minor edits");
-$properties["Minor Edits: how many days"] =
-    new numeric_define("MINOR_MAX_AGE", "7", "
-keep them no longer than a week");
-
-$properties["per Author: how many"] =
-    new numeric_define("AUTHOR_KEEP", "8", "
-Keep the latest contributions of the last 8 authors,");
-$properties["per Author: how many days"] =
-    new numeric_define("AUTHOR_MAX_AGE", "365", "
-up to a year.");
-$properties["per Author: keep minumum days"] =
-    new numeric_define("AUTHOR_MIN_AGE", "7", "
-Additionally, (in the case of a particularly active page) try to
-keep the latest contributions of all authors in the last week (even if there are more than eight of them,)");
-$properties["per Author: max revisions"] =
-    new numeric_define("AUTHOR_MAX_KEEP", "20", "
-but in no case keep more than twenty unique author revisions.");
-
 /////////////////////////////////////////////////////////////////////
 
 $properties["Part Three"] =

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10423] trunk/config/migrate-phpwiki-config

[<var...@us...>]

Revision: 10423
          http://sourceforge.net/p/phpwiki/code/10423
Author:   vargenau
Date:     2021-08-04 09:47:22 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
Remove config/migrate-phpwiki-config

Removed Paths:
-------------
    trunk/config/migrate-phpwiki-config

Deleted: trunk/config/migrate-phpwiki-config
===================================================================
--- trunk/config/migrate-phpwiki-config	2021-08-04 09:30:41 UTC (rev 10422)
+++ trunk/config/migrate-phpwiki-config	2021-08-04 09:47:22 UTC (rev 10423)
@@ -1,215 +0,0 @@
-#!/usr/bin/perl -w
-#
-# phpwiki configuration file migration script
-# index.php => config.ini
-#
-# Author:   Matt Brown <ma...@ma...>,
-#           Reini Urban <ru...@x-...>
-#
-# Run this script without any arguments for usage information.
-#
-# This script is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PhpWiki is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with PhpWiki; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Store the values
-# In the form $values{$varname} = (value, comment_state)
-# Where value is the value in index.php and comment_state indicates
-# whether the line was commented or not
-use strict;
-use warnings;
-
-my %values = ();
-
-# Check we got a index.php to read from
-if ($#ARGV < 0) {
-  print "Usage: ./phpwiki-migrate-config <../path/to/index.php>\n\n";
-  print "Takes an old style (<= 1.3.9) index.php configuration file\n";
-  print "for phpwiki and outputs a new style (>= 1.3.10) ./config.ini\n";
-  print "configuration file for phpwiki, based on a set of\n";
-  print "./config-{dist,default}.ini files.\n";
-  print "\n";
-  print "The values extracted from the old config file will be\n";
-  print "substituted into a new config.ini file as necessary. Commented\n";
-  print "directives in index.php will remain commented in config.ini\n";
-
-  exit 1;
-}
-
-# Read in values from index.php
-my $infile = shift;
-open INDEXPHP, "< $infile" or die "Cannot read $infile: $!\n";
-my $inifile     = "config.ini";
-my $distfile    = "config-dist.ini";
-my $defaultfile = "config-default.ini";
-die "$inifile already exists.\n" if -e $inifile;
-
-# Write out config.ini, substituting values as needed
-open OUT, "> $inifile"
-  or die "Failed to write $inifile. $!\n";
-open CONFDIST, "< $distfile"
-  or die "Failed to open $distfile: $!\n";
-open CONFDEFAULT, "< $defaultfile"
-  or die "Failed to open $defaultfile: $!\n";
-
-my $epmaj = 0;
-my $epmin = 0;
-
-while (<INDEXPHP>) {
-  my ($name, $value) = ('','');
-  # Check if the line starts with a comment (# or / char)
-  my $is_comment = /^[#\/]/;
-  if (!$is_comment) {
-    $is_comment = 0;
-  }
-
-  # Process expire parameters
-  if (/'keep'/) {
-    ($value) = (/'keep'\s*=>\s*(.*)\)/);
-    if ($epmaj) {
-      $name = "MAJOR_KEEP";
-    } elsif ($epmin) {
-      $name = "MINOR_KEEP";
-    }
-  }
-  $epmaj = 0;
-  $epmin = 0;
-
-  # Skip some known bad options
-  if (/ALLOW_LDAP_LOGIN/) {
-    next;
-  } elsif (/ALLOW_IMAP_LOGIN/) {
-    next;
-
-    # Process defined values
-  } elsif (/define\s*\(/) {
-    # Extract the name of the define and the value of it
-    ($name, $value) = (/define\s*\(\s*['"](.*)['"]\s*,\s*['"]*([^'"]*)['"]*\s*\)/);
-
-    # Process PHP variable values
-  } elsif (/HTML_DUMP_SUFFIX\s*=/) {
-    ($name, $value) = (/\$(\w*)\s*=\s*['"](.*)['"];\s*/);
-  } elsif (/AllowedProtocols\s*=/) {
-    ($value) = (/\$\w*\s*=\s*(.*);\s*/);
-    $name = "ALLOWED_PROTOCOLS";
-  } elsif (/InlineImages\s*=/) {
-    ($value) = (/\$\w*\s*=\s*(.*);\s*/);
-    $name = "INLINE_IMAGES";
-  } elsif (/WikiNameRegexp\s*=/) {
-    ($value) = (/\$\w*\s*=\s*(.*);\s*/);
-    $name = "WIKI_NAME_REGEXP";
-
-    # Process arrays that need to be converted
-  } elsif (/GenericPages\s*=/) {
-    ($value) = (/\$\w*\s*=\s*array\((.*)\)/);
-    $name = "DEFAULT_WIKI_PAGES";
-    $value =~ s/[" ]//g;
-    $value =~ s/,/:/g;
-    $value = "\"$value\""
-  } elsif (/keywords\s*=/) {
-    ($value) = (/\$\w*\s*=\s*array\((.*)\)/);
-    $name = "KEYWORDS";
-    $value =~ s/[" ]//g;
-    $value =~ s/,/:/g;
-    $value = "\"$value\""
-
-      # Process database paramters
-  } elsif (/'dbtype'\s*=>/) {
-    ($value) = (/'dbtype'\s*=>\s*['"](.*)['"]/);
-    $name = "DATABASE_TYPE";
-  } elsif (/'dsn'\s*=>/) {
-    ($value) = (/'dsn'\s*=>\s*['"](.*)['"]/);
-    $name = "DATABASE_DSN";
-  } elsif (/'timeout'\s*=>/) {
-    ($value) = (/'timeout'\s*=>\s*(.*)\s*,/);
-    $name = "DATABASE_TIMEOUT";
-  } elsif (/'db_session_table'\s*=>/) {
-    ($value) = (/'db_session_table'\s*=>\s*['"](.*)['"]/);
-    $name = "DATABASE_SESSION_TABLE";
-  } elsif (/'prefix'\s*=>/) {
-    ($value) = (/'prefix'\s*=>\s*['"](.*)['"]/);
-    $name = "DATABASE_PREFIX";
-  } elsif (/'directory'\s*=>/) {
-    ($value) = (/'directory'\s*=>\s*['"](.*)['"]/);
-    $name = "DATABASE_DIRECTORY";
-  } elsif (/'dba_handler'\s*=>/) {
-    ($value) = (/'dba_handler'\s*=>\s*['"](.*)['"]/);
-    $name = "DATABASE_DBA_HANDLER";
-
-    # Process Expire Parameters
-  } elsif (/\$ExpireParams\['major'\]\s*=/) {
-    ($value) = (/'max_age'\s*=>\s*(.*),/);
-    $name = "MAJOR_MAX_AGE";
-    $epmaj = 1;
-  } elsif (/\$ExpireParams\['minor'\]\s*=/) {
-    ($value) = (/'max_age'\s*=>\s*(.*),/);
-    $name = "MINOR_MAX_AGE";
-    $epmin = 1;
-
-    # Process include path
-  } elsif (/ini_set.*include_path'/) {
-    ($value) = (/ini_set.*include_path'\s*,\s*(.*)\s*\)/);
-    $name = "INCLUDE_PATH";
-
-  }
-  if ($name =~ /^$/) {
-    next;
-  }
-
-  # Put it into the array
-  if (exists $values{$name} && $is_comment) {
-    # If we already have a value and this one is commented, skip it
-    next;
-  }
-  #print "$name => $value ($is_comment)\n";
-  $values{$name} = [$value, $is_comment];
-}
-
-close INDEXPHP;
-
-# Print values we got
-#for my $name ( keys %values ) {
-#    ($value, $is_comment) = @{$values{$name}};
-#    print "$name => $value";
-#    if ($is_comment) { print " (commented)"; }
-#    print "\n";
-#}
-
-select OUT;
-# Write out migration header
-print "; phpwiki 1.3.x configuration automatically generated from $infile\n";
-print "; by migrate-phpwiki-config script\n\n";
-
-while (<CONFDIST>) {
-  # Look for config var lines
-  if (!/\w* = /) {
-    print $_;
-    next;
-  }
-  my ($name, $value, $is_comment);
-  ($name) = (/(\w*) = /);
-  if (!exists $values{$name}) {
-    print $_;
-    next;
-  }
-  ($value, $is_comment) = @{$values{$name}};
-  if ($is_comment) {
-    print "; $name = $value\n";
-  } else {
-    print "$name = $value\n";
-  }
-}
-
-close OUT;
-close CONFDIST;
-close CONFDEFAULT;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10422] trunk/configurator.php

[<var...@us...>]

Revision: 10422
          http://sourceforge.net/p/phpwiki/code/10422
Author:   vargenau
Date:     2021-08-04 09:30:41 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
configurator.php: create function dba_handlers if it does not exist; mysqli in DATABASE_DSN

Modified Paths:
--------------
    trunk/configurator.php

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-04 08:34:15 UTC (rev 10421)
+++ trunk/configurator.php	2021-08-04 09:30:41 UTC (rev 10422)
@@ -78,6 +78,13 @@
 $fs_config_file = dirname(__FILE__) . (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/') . $config_file;
 if (isset($_POST['create'])) header('Location: ' . $configurator . '?show=_part1&create=1#create');
 
+if (!function_exists('dba_handlers')) {
+    function dba_handlers()
+    {
+        return array('none (function dba_handlers does not exist)');
+    }
+}
+
 // helpers from lib/WikiUser/HttpAuth.php
 if (!function_exists('_http_user')) {
     function _http_user()
@@ -665,11 +672,11 @@
 </pre>
 To connect over a Unix socket, use something like
 <pre>
-   mysql://user:password@unix(/path/to/socket)/databasename
+   mysqli://user:password@unix(/path/to/socket)/databasename
 </pre>
 <pre>
-  DATABASE_DSN = mysql://guest@:/var/lib/mysql/mysql.sock/phpwiki
-  DATABASE_DSN = mysql://guest@localhost/phpwiki
+  DATABASE_DSN = mysqli://guest@:/var/lib/mysql/mysql.sock/phpwiki
+  DATABASE_DSN = mysqli://guest@localhost/phpwiki
   DATABASE_DSN = pgsql://localhost/user_phpwiki
 </pre>");
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10421] trunk

[<var...@us...>]

Revision: 10421
          http://sourceforge.net/p/phpwiki/code/10421
Author:   vargenau
Date:     2021-08-04 08:34:15 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
Update instructions, remove old stuff

Modified Paths:
--------------
    trunk/INSTALL
    trunk/README
    trunk/TODO
    trunk/UPGRADING
    trunk/doc/INSTALL.MacOSX
    trunk/doc/INSTALL.flatfile

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2021-08-04 07:55:38 UTC (rev 10420)
+++ trunk/INSTALL	2021-08-04 08:34:15 UTC (rev 10421)
@@ -1,11 +1,8 @@
 REQUIREMENTS
 
-PhpWiki 1.6.0 requires a web server with at least PHP version 5.3.
-PhpWiki 1.6.0 is compatible with the PHP 7.0 series.
+PhpWiki 1.6.0 requires a web server with at least PHP version 5.3.3.
+PhpWiki 1.6.0 should work for all PHP releases from 5.3.3 to 8.0.9.
 
-All users of PHP are strongly encouraged to upgrade to PHP 5.6
-or PHP 7.0.
-
 Visit <http://www.php.net> and <http://php.net/downloads.php>
 for downloads and information.
 
@@ -15,19 +12,6 @@
 installation and configure options.
 <https://www.php.net/manual/en/installation.php>
 
-Since version 1.3.0 PhpWiki uses the 'DB.php' from PEAR, a database
-abstraction layer which is part of PHP. PhpWiki version 1.3.3 and later
-includes the necessary PEAR libraries and will use it if your system
-PEAR library can not be found. For more information about PEAR
-see <http://pear.php.net/>.
-PhpWiki version 1.3.7 and later includes the ADODB libraries and will
-use it for DATABASE_TYPE=ADODB. ADODB has more features, can use yet
-unsupported backends out of the box, and this is where SQL development
-happens. ADODB improvements are then backported to the stable PEAR
-backend (which often suffers from bad upstream PEAR libraries) and to
-PDO for php5.
-
-
 QUICK START INSTRUCTIONS
 
 Copy 'config/config-dist.ini' to 'config/config.ini' and edit the
@@ -112,7 +96,7 @@
 CERT, malicious users can embed HTML in your pages that allow pure
 evil to happen:
 
-    <http://www.cert.org/advisories/CA-2000-02.html>
+    http://www.cert.org/advisories/CA-2000-02.html
 
 Set the ENABLE_RAW_HTML to true in 'config/config.ini' to allow
 embedded HTML, but you should NEVER do this if your Wiki is publicly
@@ -128,12 +112,12 @@
 4. PATCHES
 
 Post patches to:
-    <http://sourceforge.net/tracker/?func=add&group_id=6121&atid=306121>
+    https://sourceforge.net/p/phpwiki/patches/
 
 5. BUGS
 
 Post bugs to:
-    <http://sourceforge.net/tracker/?func=add&group_id=6121&atid=106121>
+    https://sourceforge.net/p/phpwiki/bugs/
 
 6. SUPPORT
 
@@ -141,6 +125,4 @@
     <php...@li...>
 
 You can join this list at:
-    <http://lists.sourceforge.net/lists/listinfo/phpwiki-talk>
-
-FIN
+    http://lists.sourceforge.net/lists/listinfo/phpwiki-talk

Modified: trunk/README
===================================================================
--- trunk/README	2021-08-04 07:55:38 UTC (rev 10420)
+++ trunk/README	2021-08-04 08:34:15 UTC (rev 10421)
@@ -5,16 +5,6 @@
 See ./INSTALL for installation notes.
 Read ./UPGRADING before upgrading from a previous version of PhpWiki.
 
-Supported browsers:
-
-Phpwiki should work with the following browsers:
-* Firefox >= 2
-* Safari >= 5
-* Opera >= 8
-* Chrome >= 6
-* Konqueror >= 3.5
-* Edge
-
 Additional docs:
 
 doc/:
@@ -33,8 +23,7 @@
 CREDITS
 HISTORY
 
-For a list of current bugs see:
-  https://sourceforge.net/bugs/?group_id=6121
+For a list of current bugs see: https://sourceforge.net/p/phpwiki/bugs/
 
 The fastest and out-of-the-box version uses DATABASE_TYPE=dba,
 a dbm file in the /tmp directory; you may wish a more permanent
@@ -44,4 +33,3 @@
 implementations have the full set of features; DBM and mSQL are
 missing only a few, and the flat file implementation is solid
 and waiting for your improvement. All are suitable for production.
-

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2021-08-04 07:55:38 UTC (rev 10420)
+++ trunk/TODO	2021-08-04 08:34:15 UTC (rev 10421)
@@ -1,13 +1,5 @@
-== Blockers ==
-* can no longer save UserPreferences: Warning: "Attempt to assign property of non-object"
-  (partial revert to get in work again)
-* WantedPages give too many pages (from interwiki map)
-  (to be tested in both Pear and ADODB)
-* revert of Patch 3024787 by Sébastien Le Callonnec (caused an SQL syntax error)
-
-----
-
 short-term TODO:
+* WantedPages gives too many pages (from interwiki map)
 * rename should check existing subpages and rename these also.
 * Sidebar: merge AVL theme (internal MonoBook derivate with customizable
   box states) with Sidebar

Modified: trunk/UPGRADING
===================================================================
--- trunk/UPGRADING	2021-08-04 07:55:38 UTC (rev 10420)
+++ trunk/UPGRADING	2021-08-04 08:34:15 UTC (rev 10421)
@@ -1,158 +1,9 @@
 To migrate to a new phpwiki installation you might want to backup your old pages
 (best via a zip dump), configure your new installation, and restore the old
 pages in PhpWikiAdministration.
-UPGRADING from 1.3.7 on requires just ?action=upgrade.
 
-Can't unpack bad cached markup. Probably php_zlib extension not loaded.
-=======================================================================
-Sign in as ADMIN_USER, go to PhpWikiAdministration#Purge_Markup_Cache
-and click on the [Purge Cache] button.
-
 ?action=upgrade
 ===============
-To upgrade default pages, the database and some config settings
+To upgrade default pages and some config settings
 add "?action=upgrade" to your HomePage url and press "Enter", which will
 do most of the upgrades automatically.
-
-You might need to enter the DBADMIN_USER and DBADMIN_PASSWD in
-config/config.ini for SQL databases and default permissions.
-
-The importer looks at the Date header of the page. In your current wikidb
-against the creation date of the pgsrc, you want to import.
-If you changed your pages after I changed the pgsrc pages,
-they will not be upgraded.
-
-Or just upgrade your configuration as described below.
-
-UPGRADING since 1.3.11
-======================
-?action=upgrade should be enough.
-
-UPGRADING since 1.3.10
-======================
-?action=upgrade should be enough.
-
-UPGRADING from 1.3.9
-======================
-At first you have to manually create a config/config.ini based on
-config-dist.ini and your previous index.php. We don't have a script,
-to do that automatically.
-
-mysql:
-  ALTER TABLE page CHANGE id id INT NOT NULL AUTO_INCREMENT;
-NOTE: ?action=upgrade does this also, if your mysql user has the
-ALTER permissions or DBADMIN_USER and DBADMIN_PASSWD are set.
-
-UPGRADING from 1.3.7
-======================
-mysql + postgres:
-  ALTER TABLE session ADD sess_ip CHAR(15) NOT NULL;
-  CREATE INDEX sess_date ON session (sess_date);
-
-postgres:
-  New pref and session tables have been added for more
-  efficiency.
-
-user and themes:
-
-WikiUser and signin.tmpl changed from $user->getId() to
-$user->getAuthenticatedId()
-Authenticated reflects the level (confirmed by password),
-Signed just the username (possibly by cookie only)
-
-pgsrc:
-
-To upgrade not-existing pages add "?action=upgrade" to
-your HomePage url and press "Enter", which will
-add all fresh pages from pgsrc to your pageset.
-If you deleted some pages on purpose, you'll have to removed
-them again with PhpWikiAdministration/Remove then.
-
-There's no smart "Merge Diffs" yet to upgrade existing docs,
-this will come with the next release. Also upgrading the
-database automatically.
-
-UPGRADING from 1.2.x
-======================
-FIXME: WARNING WARNING: The schemas used by the new databases
-are completely incompatible with schemas in any previous version
-(i.e. before release 1.3.1 of PhpWiki).  If you install this new
-PhpWiki, you must start with a new empty database (currently
-either mysql, postgres or dba).  (It will be filled with the
-usual default pages.)
-
-FIXME: add more.
-
-Here's an excerpt from a note I posted on phpwiki-talk with my
-recommendation on how to move a wiki from and older version of
-PhpWiki to a 1.3.x PhpWiki:
-
-From: Jeff Dairiki <da...@da...>
-Cc: php...@li...
-Date: Fri, 9 Nov 2001 11:33:18 -0800
-
-> Now, say I want to migrate all my 1.2.1 pages. I need to do a zip dump
-> (does the admin page let me do that?) and then.... what?
-
-It's still a bit of a messy process at this point.  Here's my suggestion.
-
-1. Start 1.3.x with an empty database.  Browse the FrontPage.  This should
-fill the wiki with the distributed default 1.3.x pgsrc.  (You've probably
-already gotten this far.)
-
-2. Make a zip dump of your 1.2 wiki.  If the contents of
-PhpWikiAdministration are correct there should be a links
-(near the top) which will do that for you.  You need to be
-in admin mode, though.  This means you must have set an
-admin user and passwd in admin.php, and you should be browsing
-through a URL like:
-  http://path.to.your/wiki/admin.php?PhpWikiAdministration
-(If your PhpWikAdministration page is broken, then
-  http://path.to.your/wiki/admin.php?zip=all
-should get you a zip dump.)
-
-WARNING! WARNING! WARNING!  There is a bug in releases 1.2.0
-and 1.2.1 of PhpWiki which results in corrupt zip dumps if
-you are using the DBA, DBM or flat-file backends.  If you
-are using one of those backends you should make sure to
-fix that bug (see note below) before making the zip dump.
-
-
-3. Now upload your zip dump to your new 1.3 wiki.  (First you need to
-have set the admin user/passwd in the new index.php.)  You should
-be able to use the "Upload File" form on the PhpWikiAdministration
-page.
-
-
-If that works, the pages from your 1.2 wiki have now overwritten
-the 1.3 pages (though the 1.3 pages are still saved in the archive).
-This will break a bunch of 1.3 functionality until you restore
-the page contents.  Of the top of my head, some pages for which
-this will be an issue are:
-  MostPopular, RecentChanges, PhpWikiAdministration,
-  MagicPhpWikiURLs, and ReleaseNotes.
-
-To restore these pages to the original (1.3) contents:
-
-4a. Login as the administration user (using the SignIn button at the
-bottom right corner of the page.)  (You need to do this because
-some of the pages which need fixing are locked.)
-
-4b. Browse to a page which needs restoring.  Hit the "History" button
-(at the bottom of the page).  This should get you a list of all
-archived versions of the page.
-
-4c. Browse to the archive 1.3 version of the page (probably version
-number 1) by clicking on the version number of the desired version.
-
-4d. Click the "Edit old revision" button (bottom of page).  This should
-get you to the edit form.
-
-4e. Click the "Save" button.  This should save the archived page contents
-as the current contents.
-
-We really need to figure out a way to simplify this process, but, for now,
-that's what you gotta do.
-
-An older note on the same subject can be found at:
-  http://sourceforge.net/forum/message.php?msg_id=107858

Modified: trunk/doc/INSTALL.MacOSX
===================================================================
--- trunk/doc/INSTALL.MacOSX	2021-08-04 07:55:38 UTC (rev 10420)
+++ trunk/doc/INSTALL.MacOSX	2021-08-04 08:34:15 UTC (rev 10421)
@@ -97,20 +97,6 @@
     <http://versiontracker.com/macosx/>
     <http://fink.sourceforge.net/>
 
-PHP 4.1 and Mac OS X
---------------------
-
-The version of PHP 4.1 from Mark Liyanage's web site requires an
-updated PEAR library. PhpWiki seems to work anyway but it will produce
-warnings about a depreciated user function with each page load.
-
-1.  Move the current contents of '/System/Library/PHP' into a backup
-    folder, such as '/System/Library/PHP/PEAR-4.0.6'.
-
-2.  Take the contents of the 'pear' folder from the official PHP 4.1
-    tarball (php-4.1.0.tar.gz) and move it into '/System/Library/PHP'.
-
-
 PhpWiki Configuration Notes
 ---------------------------
 

Modified: trunk/doc/INSTALL.flatfile
===================================================================
--- trunk/doc/INSTALL.flatfile	2021-08-04 07:55:38 UTC (rev 10420)
+++ trunk/doc/INSTALL.flatfile	2021-08-04 08:34:15 UTC (rev 10421)
@@ -7,7 +7,7 @@
 You should read the main INSTALL file before this one (it's not long
 and complicated so go ahead and we'll wait for you right here).
 
-INSTALLATION NOTES for 1.3
+INSTALLATION NOTES
 
 Set DATABASE_TYPE = file in config/config.ini,
 check DATABASE_DIRECTORY not to start with /tmp,
@@ -15,14 +15,6 @@
 The webserver will then start to create this directory with
 the correct permissions and populate the database.
 
-INSTALLATION NOTES for 1.2
-
-First, edit lib/config.php and set the database to "file":
-
-   $WhichDatabase = 'file'; // use one of "dbm", "mysql", "pgsql", "msql",
-			    // or "file"
-
-
 Now, the key thing is you need a directory that the web server can
 read and write to. This is where it will store current and archived
 pages.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10420] trunk/themes/blog/pgsrc/HomePage

[<var...@us...>]

Revision: 10420
          http://sourceforge.net/p/phpwiki/code/10420
Author:   vargenau
Date:     2021-08-04 07:55:38 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
Ensure blog pgsrc pages have a more recent date that main pgsrc

Modified Paths:
--------------
    trunk/themes/blog/pgsrc/HomePage

Modified: trunk/themes/blog/pgsrc/HomePage
===================================================================
--- trunk/themes/blog/pgsrc/HomePage	2021-08-04 07:51:39 UTC (rev 10419)
+++ trunk/themes/blog/pgsrc/HomePage	2021-08-04 07:55:38 UTC (rev 10420)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:37 +0000
+Date: Wed,  4 Aug 2021 09:54:19 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=HomePage;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10419] trunk

[<var...@us...>]

Revision: 10419
          http://sourceforge.net/p/phpwiki/code/10419
Author:   vargenau
Date:     2021-08-04 07:51:39 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
Ensure Fusionforge pgsrc pages have a more recent date that main pgsrc

Modified Paths:
--------------
    trunk/pgsrc/FindPage
    trunk/pgsrc/FullTextSearch
    trunk/pgsrc/SpecialPages
    trunk/pgsrc/TitleSearch
    trunk/pgsrc/UpLoad
    trunk/themes/fusionforge/pgsrc/FindPage
    trunk/themes/fusionforge/pgsrc/FullTextSearch
    trunk/themes/fusionforge/pgsrc/HomePage
    trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
    trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
    trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
    trunk/themes/fusionforge/pgsrc/SpecialPages
    trunk/themes/fusionforge/pgsrc/TitleSearch
    trunk/themes/fusionforge/pgsrc/UpLoad

Modified: trunk/pgsrc/FindPage
===================================================================
--- trunk/pgsrc/FindPage	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/pgsrc/FindPage	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,8 +1,8 @@
-Date: Thu, 25 Jul 2019 15:34:07 +0000
+Date: Wed,  3 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=FindPage;
-  flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+  flags=PAGE_LOCKED;
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
@@ -20,7 +20,8 @@
   editbox[] name=s text=""
   submit[]
   checkbox[] name=case_exact
-  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">>
+  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql"
+>>
 
 == Full Text Search ==
 
@@ -31,7 +32,8 @@
   editbox[] name=s text=""
   submit[]
   checkbox[] name=case_exact
-  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">>
+  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql"
+>>
 
 == Fuzzy Search ==
 
@@ -41,10 +43,9 @@
 <<WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction
   editbox[] name=s text=""
   submit[]
-  checkbox[] name=case_exact>>
+  checkbox[] name=case_exact
+>>
 
-------
-
 == Tips ==
 
 * Separate words with a space. All words have to match as substrings.

Modified: trunk/pgsrc/FullTextSearch
===================================================================
--- trunk/pgsrc/FullTextSearch	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/pgsrc/FullTextSearch	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Wed,  3 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=FullTextSearch;
@@ -16,18 +16,21 @@
   editbox[] name=s text=""
   submit[]
   checkbox[] name=case_exact
-  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">>
+  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql"
+>>
 
 <<WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction
   editbox[] name=s text=""
   submit[]
   checkbox[] name=case_exact
-  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">>
+  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql"
+>>
 
 <<WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction
   editbox[] name=s text=""
   submit[]
-  checkbox[] name=case_exact>>
+  checkbox[] name=case_exact
+>>
 
 ----
 

Modified: trunk/pgsrc/SpecialPages
===================================================================
--- trunk/pgsrc/SpecialPages	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/pgsrc/SpecialPages	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,8 +1,8 @@
-Date: Fri, 26 Apr 2019 16:12:18 +0000
+Date: Wed,  3 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=SpecialPages;
-  flags=EXTERNAL_PAGE;
+  flags="";
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
@@ -27,6 +27,8 @@
 * [[LeastPopular]]
 * [[WantedPages]]
 * [[RandomPage]]
+* [[RateIt]]
+* [[MyRatings]]
 | style="padding-right: 10px" |
 == Users ==
 * [[AllUsers]]

Modified: trunk/pgsrc/TitleSearch
===================================================================
--- trunk/pgsrc/TitleSearch	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/pgsrc/TitleSearch	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,8 +1,8 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Wed,  3 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=TitleSearch;
-  flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+  flags=PAGE_LOCKED;
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
@@ -16,18 +16,21 @@
   editbox[] name=s text=""
   submit[]
   checkbox[] name=case_exact
-  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">>
+  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql"
+>>
 
 <<WikiFormRich action=FullTextSearch method=GET nobr=1 class=wikiaction
   editbox[] name=s text=""
   submit[]
   checkbox[] name=case_exact
-  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql">>
+  pulldown[] name=regex value="auto,none,glob,posix,pcre,sql"
+>>
 
 <<WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction
   editbox[] name=s text=""
   submit[]
-  checkbox[] name=case_exact>>
+  checkbox[] name=case_exact
+>>
 
 ----
 

Modified: trunk/pgsrc/UpLoad
===================================================================
--- trunk/pgsrc/UpLoad	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/pgsrc/UpLoad	2021-08-04 07:51:39 UTC (rev 10419)
@@ -2,7 +2,7 @@
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=UpLoad;
-  flags=EXTERNAL_PAGE;
+  flags="";
   charset=UTF-8
 Content-Transfer-Encoding: binary
 

Modified: trunk/themes/fusionforge/pgsrc/FindPage
===================================================================
--- trunk/themes/fusionforge/pgsrc/FindPage	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/themes/fusionforge/pgsrc/FindPage	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,4 +1,4 @@
-Date: Tue,  9 Apr 2019 16:49:36 +0000
+Date: Wed,  4 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=FindPage;
@@ -30,7 +30,10 @@
 In a fuzzy pages search the titles of all pages are examined to find
 those which are similarly spelled or similar sounding (English).
 
-<<WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction editbox[] name=s text="" submit[] >>
+<<WikiFormRich action=FuzzyPages method=GET nobr=1 class=wikiaction
+  editbox[] name=s text=""
+  submit[]
+>>
 
 == Tips ==
 
@@ -55,3 +58,6 @@
   </verbatim>
 * Search can be done in any language.
 * You can search titles in “Title Search” section, and search wiki contents in “Full Text Search” section.
+
+----
+[[PhpWikiDocumentation]]

Modified: trunk/themes/fusionforge/pgsrc/FullTextSearch
===================================================================
--- trunk/themes/fusionforge/pgsrc/FullTextSearch	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/themes/fusionforge/pgsrc/FullTextSearch	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:36 +0000
+Date: Wed,  4 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=FullTextSearch;

Modified: trunk/themes/fusionforge/pgsrc/HomePage
===================================================================
--- trunk/themes/fusionforge/pgsrc/HomePage	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/themes/fusionforge/pgsrc/HomePage	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:36 +0000
+Date: Wed,  4 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=HomePage;

Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:36 +0000
+Date: Wed,  4 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration;

Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:36 +0000
+Date: Wed,  4 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration%2FSetAclSimple;

Modified: trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:36 +0000
+Date: Wed,  4 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=SetGlobalAccessRightsSimple;

Modified: trunk/themes/fusionforge/pgsrc/SpecialPages
===================================================================
--- trunk/themes/fusionforge/pgsrc/SpecialPages	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/themes/fusionforge/pgsrc/SpecialPages	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,4 +1,4 @@
-Date: Fri, 26 Apr 2019 16:12:18 +0000
+Date: Wed,  4 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=SpecialPages;

Modified: trunk/themes/fusionforge/pgsrc/TitleSearch
===================================================================
--- trunk/themes/fusionforge/pgsrc/TitleSearch	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/themes/fusionforge/pgsrc/TitleSearch	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:36 +0000
+Date: Wed,  4 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=TitleSearch;

Modified: trunk/themes/fusionforge/pgsrc/UpLoad
===================================================================
--- trunk/themes/fusionforge/pgsrc/UpLoad	2021-08-03 17:18:02 UTC (rev 10418)
+++ trunk/themes/fusionforge/pgsrc/UpLoad	2021-08-04 07:51:39 UTC (rev 10419)
@@ -1,7 +1,8 @@
-Date: Thu, 13 Oct 2016 15:09:36 +0000
+Date: Wed,  4 Aug 2021 09:27:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=UpLoad;
+  flags=EXTERNAL_PAGE;
   charset=UTF-8
 Content-Transfer-Encoding: binary
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10418] trunk/lib/plugin

[<var...@us...>]

Revision: 10418
          http://sourceforge.net/p/phpwiki/code/10418
Author:   vargenau
Date:     2021-08-03 17:18:02 +0000 (Tue, 03 Aug 2021)
Log Message:
-----------
Allow XHTML dump of pages LdapSearch and UriResolver

Modified Paths:
--------------
    trunk/lib/plugin/LdapSearch.php
    trunk/lib/plugin/UriResolver.php

Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php	2021-08-03 16:59:09 UTC (rev 10417)
+++ trunk/lib/plugin/LdapSearch.php	2021-08-03 17:18:02 UTC (rev 10418)
@@ -79,6 +79,12 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
+
+        global $WikiTheme;
+        if ($WikiTheme->DUMP_MODE) {
+            return HTML::p();
+        }
+
         $args = $this->getArgs($argstr, $request);
         extract($args);
         //include_once("lib/WikiUser/LDAP.php");

Modified: trunk/lib/plugin/UriResolver.php
===================================================================
--- trunk/lib/plugin/UriResolver.php	2021-08-03 16:59:09 UTC (rev 10417)
+++ trunk/lib/plugin/UriResolver.php	2021-08-03 17:18:02 UTC (rev 10418)
@@ -59,6 +59,10 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
+        global $WikiTheme;
+        if ($WikiTheme->DUMP_MODE) {
+            return '';
+        }
         $args = $request->getArgs();
         unset($args['pagename']);
         unset($args['action']);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10417] trunk/lib/upgrade.php

[<var...@us...>]

Revision: 10417
          http://sourceforge.net/p/phpwiki/code/10417
Author:   vargenau
Date:     2021-08-03 16:59:09 +0000 (Tue, 03 Aug 2021)
Log Message:
-----------
We must be compatible with PHP 5

Modified Paths:
--------------
    trunk/lib/upgrade.php

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2021-08-03 16:12:35 UTC (rev 10416)
+++ trunk/lib/upgrade.php	2021-08-03 16:59:09 UTC (rev 10417)
@@ -341,11 +341,11 @@
     public $method_cb;
     public $check_cb;
     public $reason;
-    public array $applicable_args;
-    public object $parent;
-    private array $check_args;
-    private string $notice;
-    private string $_db_key;
+    public /* array */ $applicable_args;
+    public /* object */ $parent;
+    private /* array */ $check_args;
+    private /* string */ $notice;
+    private /* string */ $_db_key;
     private $upgrade;
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10416] trunk/lib/plugin/WantedPages.php

[<var...@us...>]

Revision: 10416
          http://sourceforge.net/p/phpwiki/code/10416
Author:   vargenau
Date:     2021-08-03 16:12:35 +0000 (Tue, 03 Aug 2021)
Log Message:
-----------
lib/plugin/WantedPages.php: fix $pagename variable

Modified Paths:
--------------
    trunk/lib/plugin/WantedPages.php

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2021-08-03 15:47:08 UTC (rev 10415)
+++ trunk/lib/plugin/WantedPages.php	2021-08-03 16:12:35 UTC (rev 10416)
@@ -205,7 +205,7 @@
     {
         $pagename = $page_handle->getName();
         $count = count($this->parentobj->_wpagelist[$pagename]);
-        return LinkURL(WikiURL($page, array('action' => 'BackLinks')),
+        return LinkURL(WikiURL($pagename, array('action' => 'BackLinks')),
             fmt("(%d Links)", $count));
     }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10415] trunk/lib/loadsave.php

[<var...@us...>]

Revision: 10415
          http://sourceforge.net/p/phpwiki/code/10415
Author:   vargenau
Date:     2021-08-03 15:47:08 +0000 (Tue, 03 Aug 2021)
Log Message:
-----------
DumpToDir: better error handling

Modified Paths:
--------------
    trunk/lib/loadsave.php

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2021-08-03 11:11:27 UTC (rev 10414)
+++ trunk/lib/loadsave.php	2021-08-03 15:47:08 UTC (rev 10415)
@@ -292,18 +292,36 @@
 function DumpToDir(&$request)
 {
     $directory = $request->getArg('directory');
-    if (empty($directory))
-        $directory = DEFAULT_DUMP_DIR; // See lib/plugin/WikiForm.php:87
-    if (empty($directory))
-        $request->finish(_("You must specify a directory to dump to"));
+    if (empty($directory)) {
+        $directory = DEFAULT_DUMP_DIR;
+    }
+    if (empty($directory)) {
+        $html = HTML::p(array('class' => 'error'),
+                        _("You must specify a directory to dump to"));
+        StartLoadDump($request, _("Dumping Pages"), $html);
+        EndLoadDump($request);
+        return;
+    }
 
     // see if we can access the directory the user wants us to use
     if (!file_exists($directory)) {
-        if (!mkdir($directory, 0755))
-            $request->finish(fmt("Cannot create directory “%s”", $directory));
-        else
+        if (!mkdir_p($directory, 0755)) {
+            $html = HTML::p(array('class' => 'error'),
+                            fmt("Cannot create directory “%s”", $directory));
+            StartLoadDump($request, _("Dumping Pages"), $html);
+            EndLoadDump($request);
+            return;
+        } else {
             $html = HTML::p(fmt("Created directory “%s” for the page dump...",
                 $directory));
+        }
+    } elseif (!is_writable($directory)) {
+        $html = HTML::p(array('class' => 'error'),
+                        fmt("Cannot use directory “%s”, it is not writable",
+                             $directory));
+        StartLoadDump($request, _("Dumping Pages"), $html);
+        EndLoadDump($request);
+        return;
     } else {
         $html = HTML::p(fmt("Using directory “%s”", $directory));
     }
@@ -389,15 +407,16 @@
         return mkdir($pathname, $permission);
     }
     $s = array_shift($arr);
-    $ok = TRUE;
+    $ok = true;
     foreach ($arr as $p) {
         $curr = "$s/$p";
         if (!is_dir($curr))
             $ok = mkdir($curr, $permission);
         $s = $curr;
-        if (!$ok) return FALSE;
+        if (!$ok)
+            return false;
     }
-    return TRUE;
+    return true;
 }
 
 /**
@@ -422,7 +441,7 @@
 
     // See if we can access the directory the user wants us to use
     if (!file_exists($directory)) {
-        if (!mkdir($directory, 0755))
+        if (!mkdir_p($directory, 0755))
             $request->finish(fmt("Cannot create directory “%s”", $directory));
         else
             $html = HTML::p(fmt("Created directory “%s” for the page dump...",

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10414] trunk/lib/WikiDB/backend/file.php

[<var...@us...>]

Revision: 10414
          http://sourceforge.net/p/phpwiki/code/10414
Author:   vargenau
Date:     2021-08-03 11:11:27 +0000 (Tue, 03 Aug 2021)
Log Message:
-----------
Better test existence of _page_data

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/file.php

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-08-03 11:09:52 UTC (rev 10413)
+++ trunk/lib/WikiDB/backend/file.php	2021-08-03 11:11:27 UTC (rev 10414)
@@ -190,7 +190,7 @@
     // Load/Save Page-Data
     function _loadPageData($pagename)
     {
-        if ($this->_page_data != NULL) {
+        if (isset($this->_page_data)) {
             if ($this->_page_data['pagename'] == $pagename) {
                 return $this->_page_data;
             }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10413] trunk/lib/WikiCallback.php

[<var...@us...>]

Revision: 10413
          http://sourceforge.net/p/phpwiki/code/10413
Author:   vargenau
Date:     2021-08-03 11:09:52 +0000 (Tue, 03 Aug 2021)
Log Message:
-----------
Remove unused class WikiAnonymousCb

Modified Paths:
--------------
    trunk/lib/WikiCallback.php

Modified: trunk/lib/WikiCallback.php
===================================================================
--- trunk/lib/WikiCallback.php	2021-07-30 16:48:02 UTC (rev 10412)
+++ trunk/lib/WikiCallback.php	2021-08-03 11:09:52 UTC (rev 10413)
@@ -118,31 +118,3 @@
         return array($this->object, $this->methodName);
     }
 }
-
-/**
- * Anonymous function callback.
- */
-class WikiAnonymousCb
-    extends WikiCallback
-{
-    /**
-     * @param string $args Argument declarations
-     * @param string $code Function body
-     * @see create_function().
-     */
-    function __construct($args, $code)
-    {
-        $this->function = create_function($args, $code);
-    }
-
-    function call_array($args)
-    {
-        return call_user_func_array($this->function, $args);
-    }
-
-    function toPearCb()
-    {
-        trigger_error("Can't convert WikiAnonymousCb to Pear callback",
-            E_USER_ERROR);
-    }
-}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10412] trunk/pgsrc/Template%2FExample

[<var...@us...>]

Revision: 10412
          http://sourceforge.net/p/phpwiki/code/10412
Author:   vargenau
Date:     2021-07-30 16:48:02 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
pgsrc/Template%2FExample: table layout

Modified Paths:
--------------
    trunk/pgsrc/Template%2FExample

Modified: trunk/pgsrc/Template%2FExample
===================================================================
--- trunk/pgsrc/Template%2FExample	2021-07-30 16:30:56 UTC (rev 10411)
+++ trunk/pgsrc/Template%2FExample	2021-07-30 16:48:02 UTC (rev 10412)
@@ -9,16 +9,18 @@
 <noinclude>
 The following predefined variables are automatically expanded by
 the [[Help:CreatePagePlugin|CreatePage]] plugin if existing:
-  PAGENAME
-  MTIME     - last modified date + time
-  CTIME     - creation date + time
-  AUTHOR    - last author
-  OWNER
-  CREATOR   - first author
-  SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL
+|= PAGENAME
+|= MTIME      | last modified date + time
+|= CTIME      | creation date + time
+|= AUTHOR     | last author
+|= OWNER
+|= CREATOR    | first author
+|= SERVER_URL
+|= DATA_PATH
+|= SCRIPT_NAME
+|= PHPWIKI_BASE_URL
+|= BASE_URL
 </noinclude>
-
----
 * Pagename: %%PAGENAME%%
 * Author: %%AUTHOR%%
 * Last modified time: %%MTIME%%
@@ -25,7 +27,6 @@
 * Created time: %%CTIME%%
 * Owner: %%OWNER%%
 * Creator: %%CREATOR%%
-
 * SERVER_URL: %%SERVER_URL%%
 * DATA_PATH: %%DATA_PATH%%
 * SCRIPT_NAME: %%SCRIPT_NAME%%

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10411] trunk/lib/wikilens/RatingsDb.php

[<var...@us...>]

Revision: 10411
          http://sourceforge.net/p/phpwiki/code/10411
Author:   vargenau
Date:     2021-07-30 16:30:56 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
lib/wikilens/RatingsDb.php: check row exists

Modified Paths:
--------------
    trunk/lib/wikilens/RatingsDb.php

Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php	2021-07-30 16:28:34 UTC (rev 10410)
+++ trunk/lib/wikilens/RatingsDb.php	2021-07-30 16:30:56 UTC (rev 10411)
@@ -430,9 +430,10 @@
             $result = $dbi->_dbh->query($query);
             $iter = new $this->iter_class($this, $result);
             $row = $iter->next();
-            return $row['avg'];
+            return is_array($row) ? $row['avg'] : 0;
         } else {
-            if (!$pagename) return 0;
+            if (!$pagename) 
+                return 0;
             $page = $this->_dbi->getPage($pagename);
             $data = $page->get('rating');
             if (!empty($data[$dimension]))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10410] trunk/themes

[<var...@us...>]

Revision: 10410
          http://sourceforge.net/p/phpwiki/code/10410
Author:   vargenau
Date:     2021-07-30 16:28:34 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
templates/ratings.tmpl: $dbi is null in PHP 8

Modified Paths:
--------------
    trunk/themes/Sidebar/templates/ratings.tmpl
    trunk/themes/fusionforge/templates/ratings.tmpl
    trunk/themes/wikilens/templates/ratings.tmpl

Modified: trunk/themes/Sidebar/templates/ratings.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/ratings.tmpl	2021-07-30 16:24:07 UTC (rev 10409)
+++ trunk/themes/Sidebar/templates/ratings.tmpl	2021-07-30 16:28:34 UTC (rev 10410)
@@ -1,5 +1,6 @@
 <?php // Ratings ?>
 <?php if (!$WikiTheme->DUMP_MODE) {
   $loader = new WikiPluginLoader();
+  $dbi = $request->getDbh(); // Needed in PHP 8
   printXML($loader->expandPI("<"."?plugin RateIt show=top ?".">", $request, $dbi->_markup));
 } ?>

Modified: trunk/themes/fusionforge/templates/ratings.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/ratings.tmpl	2021-07-30 16:24:07 UTC (rev 10409)
+++ trunk/themes/fusionforge/templates/ratings.tmpl	2021-07-30 16:28:34 UTC (rev 10410)
@@ -1,4 +1,5 @@
 <?php if (!$WikiTheme->DUMP_MODE) {
   $loader = new WikiPluginLoader();
+  $dbi = $request->getDbh(); // Needed in PHP 8
   printXML($loader->expandPI("<"."?plugin RateIt show=top imgPrefix=BStar ?".">", $request, $dbi->_markup));
 } ?>

Modified: trunk/themes/wikilens/templates/ratings.tmpl
===================================================================
--- trunk/themes/wikilens/templates/ratings.tmpl	2021-07-30 16:24:07 UTC (rev 10409)
+++ trunk/themes/wikilens/templates/ratings.tmpl	2021-07-30 16:28:34 UTC (rev 10410)
@@ -1,5 +1,6 @@
 <?php // Ratings ?>
 <?php if (!$WikiTheme->DUMP_MODE) {
   $loader = new WikiPluginLoader();
+  $dbi = $request->getDbh(); // Needed in PHP 8
   printXML($loader->expandPI("<"."?plugin RateIt show=top imgPrefix=BStar ?".">", $request, $dbi->_markup));
 } ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10409] trunk/lib/WikiPlugin.php

[<var...@us...>]

Revision: 10409
          http://sourceforge.net/p/phpwiki/code/10409
Author:   vargenau
Date:     2021-07-30 16:24:07 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
lib/WikiPlugin.php: PHP Doc

Modified Paths:
--------------
    trunk/lib/WikiPlugin.php

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2021-07-30 16:23:06 UTC (rev 10408)
+++ trunk/lib/WikiPlugin.php	2021-07-30 16:24:07 UTC (rev 10409)
@@ -84,7 +84,7 @@
      *
      * @param  string $argstr   The plugin argument string.
      * @param  string $basepage The pagename the plugin is invoked from.
-     * @return array  List of pagenames linked to (or false).
+     * @return array|false  List of pagenames linked to (or false).
      */
     function getWikiPageLinks($argstr, $basepage)
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10408] trunk/config/config-dist.ini

[<var...@us...>]

Revision: 10408
          http://sourceforge.net/p/phpwiki/code/10408
Author:   vargenau
Date:     2021-07-30 16:23:06 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
config/config-dist.ini: mysqli_pconnect does not exist

Modified Paths:
--------------
    trunk/config/config-dist.ini

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-07-30 14:16:22 UTC (rev 10407)
+++ trunk/config/config-dist.ini	2021-07-30 16:23:06 UTC (rev 10408)
@@ -428,7 +428,7 @@
 ;
 DATABASE_DSN = "mysqli://guest@unix(/var/lib/mysql/mysql.sock)/test"
 
-; Keep persistent connections: (mysqli_pconnect, ...)
+; Keep persistent connections:
 ; Recommended is false for bigger servers, and true for small servers
 ; with not so many connections. postgresql: Please leave it false. Default: false
 ; Should really be set as database option in the DSN above.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10407] trunk/lib/wikilens/RatingsUser.php

[<var...@us...>]

Revision: 10407
          http://sourceforge.net/p/phpwiki/code/10407
Author:   vargenau
Date:     2021-07-30 14:16:22 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
lib/wikilens/RatingsUser.php: make <<AllPages info=top3recs>> work

Modified Paths:
--------------
    trunk/lib/wikilens/RatingsUser.php

Modified: trunk/lib/wikilens/RatingsUser.php
===================================================================
--- trunk/lib/wikilens/RatingsUser.php	2021-07-30 14:09:05 UTC (rev 10406)
+++ trunk/lib/wikilens/RatingsUser.php	2021-07-30 14:16:22 UTC (rev 10407)
@@ -289,8 +289,10 @@
         $total = 0;
         $total_sim = 0;
 
-        // foreach($neighbors as $nbor)
-        // {
+        if ($neighbors == null) {
+            return 0;
+        }
+
         for ($i = 0; $i < count($neighbors); $i++) {
             // more silly PHP references...
             $nbor =& $neighbors[$i];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10406] trunk/lib/PageList.php

[<var...@us...>]

Revision: 10406
          http://sourceforge.net/p/phpwiki/code/10406
Author:   vargenau
Date:     2021-07-30 14:09:05 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
lib/PageList.php: make <<AllPages info=content>> work

Modified Paths:
--------------
    trunk/lib/PageList.php

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2021-07-30 13:12:14 UTC (rev 10405)
+++ trunk/lib/PageList.php	2021-07-30 14:09:05 UTC (rev 10406)
@@ -407,11 +407,12 @@
         ) {
             $revision_handle = $page_handle->getCurrentRevision(true);
         }
+        if (!empty($revision_handle->_data['%pagedata'])) {
+            $revision_handle->_data['%pagedata']['_cached_html'] = '';
+        }
+        $c =&$revision_handle->getPackedContent();
 
         if ($this->_field == 'hi_content') {
-            if (!empty($revision_handle->_data['%pagedata'])) {
-                $revision_handle->_data['%pagedata']['_cached_html'] = '';
-            }
             $search = $this->search;
             $score = '';
             if (is_object($page_handle) and !empty($page_handle->score))
@@ -435,7 +436,6 @@
             // Remove special characters so that highlighting works
             $search = preg_replace('/^[\^\*]/', '', $search);
             $search = preg_replace('/[\^\*]$/', '', $search);
-            $c =& $revision_handle->getPackedContent();
             if ($search and ($i = strpos(strtolower($c), strtolower($search))) !== false) {
                 $l = strlen($search);
                 $j = max(0, $i - ($this->bytes / 2));
@@ -453,8 +453,11 @@
                 return HTML::div(array('class' => 'align-center'),
                     $c . " " . ($score ? sprintf("[%0.1f]", $score) : ""));
             }
-        } elseif (($len = strlen($c)) > $this->bytes) {
-            $c = substr($c, 0, $this->bytes);
+        } else {
+            $len = strlen($c);
+            if ($len > $this->bytes) {
+                $c = substr($c, 0, $this->bytes);
+            }
         }
         include_once 'lib/BlockParser.php';
         // false --> don't bother processing hrefs for embedded WikiLinks

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10405] trunk

[<var...@us...>]

Revision: 10405
          http://sourceforge.net/p/phpwiki/code/10405
Author:   vargenau
Date:     2021-07-30 13:12:14 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
Remove %%TITLE%% and %%YEAR%%, not expanded

Modified Paths:
--------------
    trunk/locale/de/pgsrc/Vorlage%2FBeispiel
    trunk/pgsrc/Template%2FExample

Modified: trunk/locale/de/pgsrc/Vorlage%2FBeispiel
===================================================================
--- trunk/locale/de/pgsrc/Vorlage%2FBeispiel	2021-07-30 10:57:49 UTC (rev 10404)
+++ trunk/locale/de/pgsrc/Vorlage%2FBeispiel	2021-07-30 13:12:14 UTC (rev 10405)
@@ -1,4 +1,4 @@
-Date: Fri, 12 Apr 2019 10:36:59 +0000
+Date: Fri, 30 Jul 2021 15:10:38 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Vorlage%2FBeispiel;
@@ -18,7 +18,6 @@
   SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL
 </noinclude>
 
-Titel: %%TITLE%%   Jahr: %%YEAR%%
 ---
 * Seitenname: %%PAGENAME%%
 * Autor: %%AUTHOR%%

Modified: trunk/pgsrc/Template%2FExample
===================================================================
--- trunk/pgsrc/Template%2FExample	2021-07-30 10:57:49 UTC (rev 10404)
+++ trunk/pgsrc/Template%2FExample	2021-07-30 13:12:14 UTC (rev 10405)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Fri, 30 Jul 2021 15:10:38 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Template%2FExample;
@@ -18,7 +18,6 @@
   SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL
 </noinclude>
 
-Title: %%TITLE%%   Year: %%YEAR%%
 ---
 * Pagename: %%PAGENAME%%
 * Author: %%AUTHOR%%

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10404] trunk/pgsrc/Help%2FPageList

[<var...@us...>]

Revision: 10404
          http://sourceforge.net/p/phpwiki/code/10404
Author:   vargenau
Date:     2021-07-30 10:57:49 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
Update pgsrc/Help%2FPageList

Modified Paths:
--------------
    trunk/pgsrc/Help%2FPageList

Modified: trunk/pgsrc/Help%2FPageList
===================================================================
--- trunk/pgsrc/Help%2FPageList	2021-07-30 10:57:11 UTC (rev 10403)
+++ trunk/pgsrc/Help%2FPageList	2021-07-30 10:57:49 UTC (rev 10404)
@@ -1,4 +1,4 @@
-Date: Mon, 22 Feb 2021 19:16:32 +0000
+Date: Fri, 30 Jul 2021 12:55:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPageList;
@@ -121,11 +121,11 @@
 |= remove              | Remove
 |= renamed_pagename    | Rename to
 |= ratingwidget        | wikilens theme specific.
-|= custom              | See plugin/WikiTranslation
+|= custom              | See plugin ~WikiTranslation
 
 Symbolic 'info=' arguments:
 |= all  | All columns except the special columns
-|= most | pagename, mtime, author, size, hits, ...
+|= most | pagename, mtime, author, hits
 |= some | pagename, mtime, author
 
 <noinclude>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10403] trunk/pgsrc/ReleaseNotes

[<var...@us...>]

Revision: 10403
          http://sourceforge.net/p/phpwiki/code/10403
Author:   vargenau
Date:     2021-07-30 10:57:11 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
pgsrc/ReleaseNotes: PHP 8!

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-07-30 09:00:18 UTC (rev 10402)
+++ trunk/pgsrc/ReleaseNotes	2021-07-30 10:57:11 UTC (rev 10403)
@@ -1,4 +1,4 @@
-Date: Thu, 29 Jul 2021 21:08:16 +0000
+Date: Fri, 30 Jul 2021 12:55:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -8,10 +8,10 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
-== 1.6.0 2021-02-XX Marc-Etienne Vargenau ==
+== 1.6.0 2021-08-XX Marc-Etienne Vargenau ==
 
 Major release:
-* PHP 7 compatible (works from PHP 5.3.3 to PHP 7)
+* PHP 7 and 8 compatible (works from PHP 5.3.3 to PHP 8)
 * Full HTML 5: Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
 * Flash is dead
 * Internet Explorer is dead

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10402] trunk/lib/WikiDB/backend/PearDB.php

[<var...@us...>]

Revision: 10402
          http://sourceforge.net/p/phpwiki/code/10402
Author:   vargenau
Date:     2021-07-30 09:00:18 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
Remove unused function _pear_notice_filter

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PearDB.php

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2021-07-30 08:59:36 UTC (rev 10401)
+++ trunk/lib/WikiDB/backend/PearDB.php	2021-07-30 09:00:18 UTC (rev 10402)
@@ -1110,22 +1110,6 @@
         return str_replace($this->_dsn, $safe_dsn, $message);
     }
 
-    /*
-     * Filter PHP errors notices from PEAR DB code.
-     *
-     * The PEAR DB code which ships with PHP 4.0.6 produces spurious
-     * errors and notices.  This is an error callback (for use with
-     * ErrorManager which will filter out those spurious messages.)
-     * @see _is_false_error, ErrorManager
-     */
-    function _pear_notice_filter($err)
-    {
-        return ($err->isNotice()
-            && preg_match('|DB[/\\\\]common.php$|', $err->errfile)
-            && $err->errline == 126
-            && preg_match('/Undefined offset: +0\b/', $err->errstr));
-    }
-
     /* some variables and functions for DB backend abstraction (action=upgrade) */
     function database()
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10401] trunk/lib/WikiDB/backend

[<var...@us...>]

Revision: 10401
          http://sourceforge.net/p/phpwiki/code/10401
Author:   vargenau
Date:     2021-07-30 08:59:36 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
No need for default value

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiDB/backend/PearDB_ffpgsql.php

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2021-07-29 19:44:34 UTC (rev 10400)
+++ trunk/lib/WikiDB/backend/PearDB.php	2021-07-30 08:59:36 UTC (rev 10401)
@@ -192,7 +192,7 @@
             return;
         }
 
-        $this->lock(array($page_tbl), true);
+        $this->lock(array($page_tbl));
         $data = $this->get_pagedata($pagename);
         if (!$data) {
             $data = array();
@@ -271,7 +271,7 @@
 
         $id = $dbh->getOne($query);
         if (empty($id)) {
-            $this->lock(array($page_tbl), true); // write lock
+            $this->lock(array($page_tbl)); // write lock
             $max_id = $dbh->getOne("SELECT MAX(id) FROM $page_tbl");
             $id = $max_id + 1;
             // requires createSequence and on mysql lock the interim table ->getSequenceName
@@ -458,7 +458,7 @@
         extract($this->_table_names);
 
         $this->lock();
-        if (($id = $this->_get_pageid($pagename, false))) {
+        if (($id = $this->_get_pageid($pagename))) {
             $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id");
             $dbh->query("DELETE FROM $recent_tbl   WHERE id=$id");
             $dbh->query("DELETE FROM $version_tbl  WHERE id=$id");
@@ -910,8 +910,8 @@
         extract($this->_table_names);
 
         $this->lock();
-        if (($id = $this->_get_pageid($pagename, false))) {
-            if ($new = $this->_get_pageid($to, false)) {
+        if (($id = $this->_get_pageid($pagename))) {
+            if ($new = $this->_get_pageid($to)) {
                 // Cludge Alert!
                 // This page does not exist (already verified before), but exists in the page table.
                 // So we delete this page.

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2021-07-29 19:44:34 UTC (rev 10400)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2021-07-30 08:59:36 UTC (rev 10401)
@@ -117,7 +117,7 @@
             return;
         }
 
-        $this->lock(array($page_tbl), true);
+        $this->lock(array($page_tbl));
         $data = $this->get_pagedata($pagename);
         if (!$data) {
             $data = array();
@@ -254,7 +254,7 @@
 
         $id = $dbh->getOne($query);
         if (empty($id)) {
-            $this->lock(array($page_tbl), true); // write lock
+            $this->lock(array($page_tbl)); // write lock
             $max_id = $dbh->getOne("SELECT MAX(id) FROM $page_tbl");
             $id = $max_id + 1;
             // requires createSequence and on mysql lock the interim table ->getSequenceName
@@ -277,7 +277,7 @@
         extract($this->_table_names);
 
         $this->lock();
-        if (($id = $this->_get_pageid($pagename, false))) {
+        if (($id = $this->_get_pageid($pagename))) {
             $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id");
             $dbh->query("DELETE FROM $recent_tbl   WHERE id=$id");
             $dbh->query("DELETE FROM $version_tbl  WHERE id=$id");
@@ -583,8 +583,8 @@
         extract($this->_table_names);
 
         $this->lock();
-        if (($id = $this->_get_pageid($pagename, false))) {
-            if ($new = $this->_get_pageid($to, false)) {
+        if (($id = $this->_get_pageid($pagename))) {
+            if ($new = $this->_get_pageid($to)) {
                 // Cludge Alert!
                 // This page does not exist (already verified before), but exists in the page table.
                 // So we delete this page.
@@ -757,8 +757,6 @@
         // $word = str_replace(" ", "&", $word); // phrase fix
 
         // @alu: use _quote maybe instead of direct pg_escape_string
-        $word = pg_escape_string($word);
-
-        return $word;
+        return pg_escape_string($word);
     }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10400] trunk/lib/upgrade.php

[<var...@us...>]

Revision: 10400
          http://sourceforge.net/p/phpwiki/code/10400
Author:   vargenau
Date:     2021-07-29 19:44:34 +0000 (Thu, 29 Jul 2021)
Log Message:
-----------
lib/upgrade.php: remove unused error_caught

Modified Paths:
--------------
    trunk/lib/upgrade.php

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2021-07-29 19:32:25 UTC (rev 10399)
+++ trunk/lib/upgrade.php	2021-07-29 19:44:34 UTC (rev 10400)
@@ -54,7 +54,6 @@
 class Upgrade
 {
     public $current_db_version;
-    public $error_caught;
     public $_configUpdates;
     public $check_args;
     public $dbi;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.