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

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

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

Revision: 10299
          http://sourceforge.net/p/phpwiki/code/10299
Author:   vargenau
Date:     2021-06-17 16:39:59 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
trigger_error has E_USER_NOTICE as default; mkdir has 0777 as default

Modified Paths:
--------------
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/PhpHighlight.php
    trunk/lib/plugin/PhpWeather.php
    trunk/lib/plugin/TeX2png.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/plugin/text2png.php

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2021-06-17 16:28:47 UTC (rev 10298)
+++ trunk/lib/plugin/PhotoAlbum.php	2021-06-17 16:39:59 UTC (rev 10299)
@@ -289,8 +289,7 @@
             if (!$size and !empty($value["src"])) {
                 $size = @getimagesize($value["src"]);
                 if (!$size) {
-                    trigger_error("Unable to getimagesize(" . $value["name"] . ")",
-                        E_USER_NOTICE);
+                    trigger_error("Unable to getimagesize(" . $value["name"] . ")");
                 }
             }
             $newwidth = $this->newSize($size[0], $width);

Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php	2021-06-17 16:28:47 UTC (rev 10298)
+++ trunk/lib/plugin/PhpHighlight.php	2021-06-17 16:39:59 UTC (rev 10299)
@@ -130,8 +130,7 @@
             } elseif (($length < $MAXLEN + 1) && in_array($color, $html4colors)) {
                 // stop checking, ok to go
             } else {
-                trigger_error(sprintf(_("Invalid color: %s"),
-                    $color), E_USER_NOTICE);
+                trigger_error(sprintf(_("Invalid color: %s"), $color));
                 // FIXME: also change color to something valid like "black" or ini_get("highlight.xxx")
             }
         }

Modified: trunk/lib/plugin/PhpWeather.php
===================================================================
--- trunk/lib/plugin/PhpWeather.php	2021-06-17 16:28:47 UTC (rev 10298)
+++ trunk/lib/plugin/PhpWeather.php	2021-06-17 16:39:59 UTC (rev 10299)
@@ -85,8 +85,7 @@
             if (!$w->get_country_code()) {
                 /* The country code couldn't be resolved, so we
                  * shouldn't use the ICAO: */
-                trigger_error(sprintf(_("The ICAO “%s” wasn't recognized."),
-                    $icao), E_USER_NOTICE);
+                trigger_error(sprintf(_("The ICAO “%s” wasn't recognized."), $icao));
                 $icao = '';
             }
         }
@@ -97,8 +96,7 @@
             //if (!in_array($language, array_keys($w->get_languages('text')))) {
             if (!in_array($language, array_keys(get_languages('text')))) {
                 trigger_error(sprintf(_("%s does not know about the language “%s”, using “en” instead."),
-                        $this->getName(), $language),
-                    E_USER_NOTICE);
+                        $this->getName(), $language));
                 $language = 'en';
             }
 

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2021-06-17 16:28:47 UTC (rev 10298)
+++ trunk/lib/plugin/TeX2png.php	2021-06-17 16:39:59 UTC (rev 10299)
@@ -232,7 +232,7 @@
             $error_html = _("Sorry, this version of PHP cannot create PNG image files.");
             $link = "http://www.php.net/manual/pl/ref.image.php";
             $error_html .= sprintf(_("See %s"), $link) . ".";
-            trigger_error($error_html, E_USER_NOTICE);
+            trigger_error($error_html);
             return HTML::p($error_html);
         }
     }

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2021-06-17 16:28:47 UTC (rev 10298)
+++ trunk/lib/plugin/WikiPoll.php	2021-06-17 16:39:59 UTC (rev 10299)
@@ -93,8 +93,7 @@
 
         foreach (array_merge($argstr_args, $argstr_defaults) as $arg => $val) {
             if (!preg_match("/^(answer_|question_)/", $arg))
-                trigger_error(sprintf(_("Argument “%s” not declared by plugin."),
-                    $arg), E_USER_NOTICE);
+                trigger_error(sprintf(_("Argument “%s” not declared by plugin."), $arg));
         }
 
         return $args;

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2021-06-17 16:28:47 UTC (rev 10298)
+++ trunk/lib/plugin/text2png.php	2021-06-17 16:39:59 UTC (rev 10299)
@@ -87,7 +87,7 @@
             $error_html = _("Sorry, this version of PHP cannot create PNG image files.");
             $link = "http://www.php.net/manual/pl/ref.image.php";
             $error_html .= sprintf(_("See %s"), $link) . ".";
-            trigger_error($error_html, E_USER_NOTICE);
+            trigger_error($error_html);
             return HTML::p($error_html);
         }
     }
@@ -137,8 +137,8 @@
             if (!file_exists($filepath)) {
                 $oldumask = umask(0);
                 // permissions affected by user the www server is running as
-                mkdir(getUploadFilePath() . $basedir, 0777);
-                mkdir($filepath, 0777);
+                mkdir(getUploadFilePath() . $basedir);
+                mkdir($filepath);
                 umask($oldumask);
             }
             $filepath .= "/";
@@ -174,7 +174,7 @@
                 //        through it.
                 $link = "http://www.php.net/manual/en/function.imagecreate.php";
                 $error_html .= sprintf(_("See %s"), $link) . ".";
-                trigger_error($error_html, E_USER_NOTICE);
+                trigger_error($error_html);
                 return HTML::p($error_html);
             }
             $rgb = $this->hexcolor($backcolor, array(255, 255, 255));
@@ -215,12 +215,10 @@
                 switch ($success) {
                     case 1:
                         trigger_error(sprintf(_("Image saved to cache file: %s"),
-                                $filepath . $filename),
-                            E_USER_NOTICE);
+                                $filepath . $filename));
                     case 2:
                         trigger_error(sprintf(_("Image loaded from cache file: %s"),
-                                $filepath . $filename),
-                            E_USER_NOTICE);
+                                $filepath . $filename));
                 }
             }
             $url = getUploadDataPath() . "$basedir/" . urlencode($l) . "/" . urlencode($filename);
@@ -229,7 +227,7 @@
                 'title' => '"' . $text . '"' . _(" produced by ") . $this->getName())));
         } else {
             trigger_error(sprintf(_("couldn't open file “%s” for writing"),
-                $filepath . $filename), E_USER_NOTICE);
+                $filepath . $filename));
         }
         return $html;
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10298] trunk/lib/plugin/SqlResult.php

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

Revision: 10298
          http://sourceforge.net/p/phpwiki/code/10298
Author:   vargenau
Date:     2021-06-17 16:28:47 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
Remove dead code

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

Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php	2021-06-17 16:08:11 UTC (rev 10297)
+++ trunk/lib/plugin/SqlResult.php	2021-06-17 16:28:47 UTC (rev 10298)
@@ -214,12 +214,6 @@
                 HTML::tbody($html),
                 HTML::tfoot($paging));
         }
-        if (0 and DEBUG) { // test deferred error/warning/notice collapsing
-            trigger_error("test notice", E_USER_NOTICE);
-            trigger_error("test warning", E_USER_WARNING);
-        }
-
         return $html;
     }
-
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10297] trunk/lib/plugin/Ploticus.php

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

Revision: 10297
          http://sourceforge.net/p/phpwiki/code/10297
Author:   vargenau
Date:     2021-06-17 16:08:11 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
tempnam has only one parameter

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

Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php	2021-06-17 16:04:14 UTC (rev 10296)
+++ trunk/lib/plugin/Ploticus.php	2021-06-17 16:08:11 UTC (rev 10297)
@@ -242,7 +242,7 @@
             $src .= $source;
             $source = $src;
         }
-        $tempfile = $this->tempnam('Ploticus', 'plo');
+        $tempfile = $this->tempnam('Ploticus');
         @unlink($tempfile);
         $args = "-$device -o $tempfile.$device";
         if (!empty($argarray['-csmap'])) {

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

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

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

Revision: 10296
          http://sourceforge.net/p/phpwiki/code/10296
Author:   vargenau
Date:     2021-06-17 16:04:14 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
Use same parameter name in subclasses

Modified Paths:
--------------
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/Ploticus.php
    trunk/lib/plugin/RecentChangesCached.php
    trunk/lib/plugin/VisualWiki.php

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2021-06-17 15:44:38 UTC (rev 10295)
+++ trunk/lib/plugin/GraphViz.php	2021-06-17 16:04:14 UTC (rev 10296)
@@ -166,7 +166,7 @@
      * This gives an alternative text description of
      * the image.
      */
-    function getAlt($dbi, $argstr, $request)
+    function getAlt($dbi, $argarray, $request)
     {
         return (!empty($this->_args['alt'])) ? $this->_args['alt']
             : $this->getDescription();

Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php	2021-06-17 15:44:38 UTC (rev 10295)
+++ trunk/lib/plugin/Ploticus.php	2021-06-17 16:04:14 UTC (rev 10296)
@@ -161,7 +161,7 @@
      * This gives an alternative text description of
      * the image.
      */
-    function getAlt($dbi, $argstr, $request)
+    function getAlt($dbi, $argarray, $request)
     {
         return (!empty($this->_args['alt'])) ? $this->_args['alt']
             : $this->getDescription();

Modified: trunk/lib/plugin/RecentChangesCached.php
===================================================================
--- trunk/lib/plugin/RecentChangesCached.php	2021-06-17 15:44:38 UTC (rev 10295)
+++ trunk/lib/plugin/RecentChangesCached.php	2021-06-17 16:04:14 UTC (rev 10296)
@@ -67,16 +67,16 @@
      * better plugin methods.
      *
      * @param WikiDB $dbi
-     * @param string $args
+     * @param string $argarray
      * @param WikiRequest $request
      * @param string $basepage
      * @return mixed
      */
-    protected function getHtml($dbi, $args, $request, $basepage)
+    protected function getHtml($dbi, $argarray, $request, $basepage)
     {
         $plugin = new WikiPlugin_RecentChanges();
-        $changes = $plugin->getChanges($dbi, $args);
-        return $plugin->format($changes, $args);
+        $changes = $plugin->getChanges($dbi, $argarray);
+        return $plugin->format($changes, $argarray);
         /*
         $loader = new WikiPluginLoader();
         return $loader->expandPI('<?plugin RecentChanges '

Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php	2021-06-17 15:44:38 UTC (rev 10295)
+++ trunk/lib/plugin/VisualWiki.php	2021-06-17 16:04:14 UTC (rev 10296)
@@ -407,9 +407,8 @@
      * Creates the text file description of the graph needed to invoke
      * <code>dot</code>.
      *
-     * @param string $filename
+     * @param string $tempfile
      * @param array $argarray
-     * @internal param string $filename name of the dot file to be created
      * @internal param float $width width of the output graph in inches
      * @internal param float $height height of the graph in inches
      * @internal param string $colorby color sceme beeing used ('age', 'revtime',
@@ -419,10 +418,10 @@
      *                          'number': label by unique number
      * @return bool error status; true=ok; false=error
      */
-    function createDotFile($filename = '', $argarray = array())
+    function createDotFile($tempfile = '', $argarray = array())
     {
         extract($argarray);
-        if (!$fp = fopen($filename, 'w'))
+        if (!$fp = fopen($tempfile, 'w'))
             return false;
 
         $fillstring = ($fillnodes == 'on') ? 'style=filled,' : '';

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

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

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

Revision: 10295
          http://sourceforge.net/p/phpwiki/code/10295
Author:   vargenau
Date:     2021-06-17 15:44:38 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
Use same parameter name in subclasses

Modified Paths:
--------------
    trunk/lib/plugin/BackLinks.php
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/LinkDatabase.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/ListPages.php
    trunk/lib/plugin/ListSubpages.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/WantedPages.php
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/lib/plugin/WikiTranslation.php

Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php	2021-06-17 14:34:02 UTC (rev 10294)
+++ trunk/lib/plugin/BackLinks.php	2021-06-17 15:44:38 UTC (rev 10295)
@@ -211,9 +211,9 @@
 // how many links from this backLink to other pages
 class _PageList_Column_BackLinks_count extends _PageList_Column
 {
-    function _getValue($page, $revision_handle)
+    function _getValue($page_handle, $revision_handle)
     {
-        $iter = $page->getPageLinks();
+        $iter = $page_handle->getPageLinks();
         $count = $iter->count();
         return $count;
     }

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2021-06-17 14:34:02 UTC (rev 10294)
+++ trunk/lib/plugin/FullTextSearch.php	2021-06-17 15:44:38 UTC (rev 10295)
@@ -205,11 +205,11 @@
         parent::__construct($params[0], $params[1], $params[2]);
     }
 
-    function _getValue($page, $revision_handle)
+    function _getValue($page_handle, $revision_handle)
     {
-        $pagename = $page->getName();
+        $pagename = $page_handle->getName();
         $count = count($this->parentobj->_wpagelist[$pagename]);
-        return LinkURL(WikiURL($page, array('action' => 'BackLinks'), false),
+        return LinkURL(WikiURL($page_handle, array('action' => 'BackLinks'), false),
             fmt("(%d Links)", $count));
     }
 }

Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2021-06-17 14:34:02 UTC (rev 10294)
+++ trunk/lib/plugin/LinkDatabase.php	2021-06-17 15:44:38 UTC (rev 10295)
@@ -224,10 +224,10 @@
 
 class _PageList_Column_LinkDatabase_links extends _PageList_Column
 {
-    function _getValue($page, $revision_handle)
+    function _getValue($page_handle, $revision_handle)
     {
         $out = HTML();
-        $links = $page->getPageLinks();
+        $links = $page_handle->getPageLinks();
         while ($link = $links->next()) {
             $out->pushContent(" ", WikiLink($link));
         }

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2021-06-17 14:34:02 UTC (rev 10294)
+++ trunk/lib/plugin/LinkSearch.php	2021-06-17 15:44:38 UTC (rev 10295)
@@ -198,10 +198,12 @@
         $this->_pagelist =& $pagelist;
     }
 
-    function _getValue($page, $revision_handle)
+    function _getValue($page_handle, $revision_handle)
     {
-        if (is_object($page)) $text = $page->getName();
-        else $text = $page;
+        if (is_object($page_handle))
+            $text = $page_handle->getName();
+        else
+            $text = $page_handle;
         $link = $this->_pagelist->_links[$this->current_row];
         return WikiLink($link['linkvalue'], 'if_known');
     }

Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php	2021-06-17 14:34:02 UTC (rev 10294)
+++ trunk/lib/plugin/ListPages.php	2021-06-17 15:44:38 UTC (rev 10295)
@@ -146,9 +146,9 @@
         parent::__construct($field, $display, 'center');
     }
 
-    function _getValue($page, $revision_handle)
+    function _getValue($page_handle, $revision_handle)
     {
-        $iter = $page->getLinks($this->_direction);
+        $iter = $page_handle->getLinks($this->_direction);
         $count = $iter->count();
         return $count;
     }

Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php	2021-06-17 14:34:02 UTC (rev 10294)
+++ trunk/lib/plugin/ListSubpages.php	2021-06-17 15:44:38 UTC (rev 10295)
@@ -136,9 +136,9 @@
 // how many backlinks for this subpage
 class _PageList_Column_ListSubpages_count extends _PageList_Column
 {
-    function _getValue($page, $revision_handle)
+    function _getValue($page_handle, $revision_handle)
     {
-        $iter = $page->getBackLinks();
+        $iter = $page_handle->getBackLinks();
         $count = $iter->count();
         return $count;
     }

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2021-06-17 14:34:02 UTC (rev 10294)
+++ trunk/lib/plugin/SemanticSearch.php	2021-06-17 15:44:38 UTC (rev 10295)
@@ -472,7 +472,7 @@
         $this->_pagelist =& $pagelist;
     }
 
-    function _getValue($page, $revision_handle)
+    function _getValue($page_handle, $revision_handle)
     {
         $link = $this->_pagelist->_links[$this->current_row];
         return WikiLink($link['linkname'], 'if_known');
@@ -482,7 +482,7 @@
 class _PageList_Column_SemanticSearch_link
     extends _PageList_Column_SemanticSearch_relation
 {
-    function _getValue($page, $revision_handle)
+    function _getValue($page_handle, $revision_handle)
     {
         $link = $this->_pagelist->_links[$this->current_row];
         if ($this->_field != 'value')

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2021-06-17 14:34:02 UTC (rev 10294)
+++ trunk/lib/plugin/WantedPages.php	2021-06-17 15:44:38 UTC (rev 10295)
@@ -176,10 +176,10 @@
         parent::__construct($params[0], $params[1], $params[2]);
     }
 
-    function _getValue($page, $revision_handle)
+    function _getValue($page_handle, $revision_handle)
     {
         $html = false;
-        $pagename = $page->getName();
+        $pagename = $page_handle->getName();
         foreach ($this->parentobj->_wpagelist[$pagename] as $page) {
             if ($html)
                 $html->pushContent(', ', WikiLink($page));
@@ -201,9 +201,9 @@
         parent::__construct($params[0], $params[1], $params[2]);
     }
 
-    function _getValue($page, $revision_handle)
+    function _getValue($page_handle, $revision_handle)
     {
-        $pagename = $page->getName();
+        $pagename = $page_handle->getName();
         $count = count($this->parentobj->_wpagelist[$pagename]);
         return LinkURL(WikiURL($page, array('action' => 'BackLinks'), false),
             fmt("(%d Links)", $count));

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-06-17 14:34:02 UTC (rev 10294)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-06-17 15:44:38 UTC (rev 10295)
@@ -315,9 +315,9 @@
 class _PageList_Column_email
     extends _PageList_Column
 {
-    function _getValue($prefs, $dummy)
+    function _getValue($page_handle, $revision_handle)
     {
-        return $prefs->get('email');
+        return $page_handle->get('email');
     }
 }
 
@@ -324,15 +324,15 @@
 class _PageList_Column_emailVerified
     extends _PageList_Column
 {
-    function _getValue($prefs, $status)
+    function _getValue($page_handle, $revision_handle)
     {
-        $name = $prefs->get('userid');
+        $name = $page_handle->get('userid');
         $input = HTML::input(array('type' => 'checkbox',
             'name' => 'wikiadminutils[verified][' . $name . ']',
             'value' => 1));
-        if ($prefs->get('emailVerified'))
+        if ($page_handle->get('emailVerified'))
             $input->setAttr('checked', '1');
-        if ($status)
+        if ($revision_handle)
             $input->setAttr('disabled', '1');
         return HTML($input, HTML::input
         (array('type' => 'hidden',

Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2021-06-17 14:34:02 UTC (rev 10294)
+++ trunk/lib/plugin/WikiTranslation.php	2021-06-17 15:44:38 UTC (rev 10295)
@@ -516,10 +516,12 @@
         _PageList_Column_base::__construct($this->_field);
     }
 
-    function _getValue($page, $revision_handle)
+    function _getValue($page_handle, $revision_handle)
     {
-        if (is_object($page)) $text = $page->getName();
-        else $text = $page;
+        if (is_object($page_handle))
+            $text = $page_handle->getName();
+        else
+            $text = $page_handle;
         $trans = $this->_plugin->fast_translate($text, $this->_field,
             $this->_from_lang);
         // how to markup untranslated words and not existing pages?
@@ -547,10 +549,10 @@
                 $text->setAttr('style', 'text-decoration:line-through');
                 $link->pushContent($text);
                 return $link;
-            } elseif (is_object($page))
+            } elseif (is_object($page_handle))
                 return ''; else // not existing: empty
                 return '';
-        } elseif (is_object($page)) {
+        } elseif (is_object($page_handle)) {
             if (!$this->_nolinks)
                 return WikiLink($trans, 'auto');
             else

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

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

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

Revision: 10294
          http://sourceforge.net/p/phpwiki/code/10294
Author:   vargenau
Date:     2021-06-17 14:34:02 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
Unneccessary return

Modified Paths:
--------------
    trunk/lib/plugin/CurrentTime.php
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/RecentComments.php
    trunk/lib/plugin/RssFeed.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/WikiFormRich.php
    trunk/lib/plugin/WikicreoleTable.php

Modified: trunk/lib/plugin/CurrentTime.php
===================================================================
--- trunk/lib/plugin/CurrentTime.php	2021-06-17 14:31:12 UTC (rev 10293)
+++ trunk/lib/plugin/CurrentTime.php	2021-06-17 14:34:02 UTC (rev 10294)
@@ -68,7 +68,6 @@
 
     function handle_plugin_args_cruft($argstr, $args)
     {
-        return;
     }
 
     /**

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2021-06-17 14:31:12 UTC (rev 10293)
+++ trunk/lib/plugin/IncludePage.php	2021-06-17 14:34:02 UTC (rev 10294)
@@ -71,7 +71,6 @@
     // <<IncludePages pages=<!plugin-list BackLinks page=CategoryWikiPlugin !> >>
     function handle_plugin_args_cruft($argstr, $args)
     {
-        return;
     }
 
     /**

Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2021-06-17 14:31:12 UTC (rev 10293)
+++ trunk/lib/plugin/OldStyleTable.php	2021-06-17 14:34:02 UTC (rev 10294)
@@ -65,7 +65,6 @@
 
     function handle_plugin_args_cruft($argstr, $args)
     {
-        return;
     }
 
     /**

Modified: trunk/lib/plugin/RecentComments.php
===================================================================
--- trunk/lib/plugin/RecentComments.php	2021-06-17 14:31:12 UTC (rev 10293)
+++ trunk/lib/plugin/RecentComments.php	2021-06-17 14:34:02 UTC (rev 10294)
@@ -96,7 +96,6 @@
 
     function title()
     {
-        return;
     }
 
     function format_revision($rev)

Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php	2021-06-17 14:31:12 UTC (rev 10293)
+++ trunk/lib/plugin/RssFeed.php	2021-06-17 14:34:02 UTC (rev 10294)
@@ -50,7 +50,6 @@
 
     function handle_plugin_args_cruft($argstr, $args)
     {
-        return;
     }
 
     /**

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2021-06-17 14:31:12 UTC (rev 10293)
+++ trunk/lib/plugin/UpLoad.php	2021-06-17 14:34:02 UTC (rev 10294)
@@ -278,6 +278,5 @@
                     . "<td>&nbsp;&nbsp;<em>" . $user->getId() . "</em></td></tr>");
             fclose($log_handle);
         }
-        return;
     }
 }

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2021-06-17 14:31:12 UTC (rev 10293)
+++ trunk/lib/plugin/WikiFormRich.php	2021-06-17 14:34:02 UTC (rev 10294)
@@ -172,7 +172,6 @@
                     E_USER_WARNING);
             }
         }
-        return;
     }
 
     /**

Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php	2021-06-17 14:31:12 UTC (rev 10293)
+++ trunk/lib/plugin/WikicreoleTable.php	2021-06-17 14:34:02 UTC (rev 10294)
@@ -65,7 +65,6 @@
 
     function handle_plugin_args_cruft($argstr, $args)
     {
-        return;
     }
 
     /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10293] trunk/lib/plugin/DebugGroupInfo.php

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

Revision: 10293
          http://sourceforge.net/p/phpwiki/code/10293
Author:   vargenau
Date:     2021-06-17 14:31:12 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
No sprintf needed

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

Modified: trunk/lib/plugin/DebugGroupInfo.php
===================================================================
--- trunk/lib/plugin/DebugGroupInfo.php	2021-06-17 14:28:47 UTC (rev 10292)
+++ trunk/lib/plugin/DebugGroupInfo.php	2021-06-17 14:31:12 UTC (rev 10293)
@@ -31,7 +31,7 @@
 {
     function getDescription()
     {
-        return sprintf(_("Show Group Information."));
+        return _("Show Group Information.");
     }
 
     function getDefaultArguments()

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10292] trunk/lib/plugin/AuthorHistory.php

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

Revision: 10292
          http://sourceforge.net/p/phpwiki/code/10292
Author:   vargenau
Date:     2021-06-17 14:28:47 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
No sprintf needed

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

Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php	2021-06-17 13:29:29 UTC (rev 10291)
+++ trunk/lib/plugin/AuthorHistory.php	2021-06-17 14:28:47 UTC (rev 10292)
@@ -58,7 +58,7 @@
 
     function getDescription()
     {
-        return sprintf(_("List all page revisions edited by one user with diff links, or show a PageHistory-like list of a single page for only one user."));
+        return _("List all page revisions edited by one user with diff links, or show a PageHistory-like list of a single page for only one user.");
     }
 
     function getDefaultArguments()

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10291] trunk/lib/plugin/LinkSearch.php

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

Revision: 10291
          http://sourceforge.net/p/phpwiki/code/10291
Author:   vargenau
Date:     2021-06-17 13:29:29 +0000 (Thu, 17 Jun 2021)
Log Message:
-----------
method get in lower case

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

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2021-06-16 18:53:31 UTC (rev 10290)
+++ trunk/lib/plugin/LinkSearch.php	2021-06-17 13:29:29 UTC (rev 10291)
@@ -113,7 +113,7 @@
         $submit = Button('submit:search', _("LinkSearch"), false);
         $instructions = _("Search in pages for links with the matching name.");
         $form = HTML::form(array('action' => $action,
-                'method' => 'GET',
+                'method' => 'get',
                 'accept-charset' => 'UTF-8'),
             $dirsign_switch,
             $hiddenfield,

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10290] trunk/lib/plugin/SystemInfo.php

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

Revision: 10290
          http://sourceforge.net/p/phpwiki/code/10290
Author:   vargenau
Date:     2021-06-16 18:53:31 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
lib/plugin/SystemInfo.php: fix sprintf syntax

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

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2021-06-16 18:47:30 UTC (rev 10289)
+++ trunk/lib/plugin/SystemInfo.php	2021-06-16 18:53:31 UTC (rev 10290)
@@ -433,8 +433,9 @@
         }
 
         $s = sprintf(_("Application size: %d KiB"), $appsize);
-        if ($pagesize)
-            $s .= ", " . sprintf(_("Pagedata size: %d KiB", $pagesize));
+        if ($pagesize) {
+            $s .= ", " . sprintf(_("Pagedata size: %d KiB"), $pagesize);
+        }
         return $s;
     }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10289] trunk/lib/WikiPluginCached.php

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

Revision: 10289
          http://sourceforge.net/p/phpwiki/code/10289
Author:   vargenau
Date:     2021-06-16 18:47:30 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
class WikiPluginCached is a "fake" abstract class so that it can be instantiated

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

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2021-06-16 17:21:22 UTC (rev 10288)
+++ trunk/lib/WikiPluginCached.php	2021-06-16 18:47:30 UTC (rev 10289)
@@ -57,7 +57,7 @@
  *
  * @author  Johannes Große, Reini Urban
  */
-abstract class WikiPluginCached extends WikiPlugin
+class WikiPluginCached extends WikiPlugin
 {
     public $_static;
 
@@ -255,6 +255,11 @@
 
     /* --------------------- abstract functions ----------- */
 
+    protected function getDescription()
+    {
+        trigger_error('pure virtual', E_USER_ERROR);
+    }
+
     /**
      * Sets the type of the plugin to html, image or map
      * production
@@ -269,8 +274,12 @@
      *             <li>PLUGIN_CACHED_MAP</li>
      *             </ul>
      */
-    abstract protected function getPluginType();
 
+    protected function getPluginType()
+    {
+        trigger_error('pure virtual', E_USER_ERROR);
+    }
+
     /**
      * Creates an image handle from the given user arguments.
      * This method is only called if the return value of
@@ -285,7 +294,10 @@
      * @return mixed imagehandle image handle if successful
      *                                false if an error occured
      */
-    abstract protected function getImage($dbi, $argarray, $request);
+    protected function getImage($dbi, $argarray, $request)
+    {
+        trigger_error('pure virtual', E_USER_ERROR);
+    }
 
     /**
      * Sets the life time of a cache entry in seconds.
@@ -357,7 +369,10 @@
      * @return string html to be printed in place of the plugin command
      *                                false if an error occured
      */
-    abstract protected function getHtml($dbi, $argarray, $request, $basepage);
+    protected function getHtml($dbi, $argarray, $request, $basepage)
+    {
+        trigger_error('pure virtual', E_USER_ERROR);
+    }
 
     /**
      * Creates HTML output to be cached.
@@ -375,7 +390,10 @@
      *                                image.
      *                                array(false,false) if an error occured
      */
-    abstract protected function getMap($dbi, $argarray, $request);
+    protected function getMap($dbi, $argarray, $request)
+    {
+        trigger_error('pure virtual', E_USER_ERROR);
+    }
 
     /* --------------------- produce Html ----------------------------- */
 

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

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

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

Revision: 10288
          http://sourceforge.net/p/phpwiki/code/10288
Author:   vargenau
Date:     2021-06-16 17:21:22 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
Internet Explorer is dead; new URL for big-buck-bunny_trailer.webm

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

Modified: trunk/pgsrc/Help%2FVideoPlugin
===================================================================
--- trunk/pgsrc/Help%2FVideoPlugin	2021-06-16 17:03:02 UTC (rev 10287)
+++ trunk/pgsrc/Help%2FVideoPlugin	2021-06-16 17:21:22 UTC (rev 10288)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Wed, 16 Jun 2021 19:20:34 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FVideoPlugin;
@@ -65,9 +65,9 @@
 === Big Buck Bunny ===
 
 {{{
-{{http://video.webmfiles.org/big-buck-bunny_trailer.webm}}
+{{https://wiki.yoctoproject.org/wiki/images/a/a6/Big-buck-bunny_trailer.webm}}
 }}}
-{{http://video.webmfiles.org/big-buck-bunny_trailer.webm}}
+{{https://wiki.yoctoproject.org/wiki/images/a/a6/Big-buck-bunny_trailer.webm}}
 
 == Authors ==
 
@@ -77,7 +77,6 @@
 == See Also ==
 * [[Help:Images]]
 * [[Help:Wikicreole]]
-* [[http://tools.google.com/dlpage/webmmf/|WebM Video for Internet Explorer 9+]]
 
 <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:[10287] trunk/pgsrc/Help%2FPhpWeatherPlugin

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

Revision: 10287
          http://sourceforge.net/p/phpwiki/code/10287
Author:   vargenau
Date:     2021-06-16 17:03:02 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
PhpWeather: no call in the help page, as it does not work through a proxy

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

Modified: trunk/pgsrc/Help%2FPhpWeatherPlugin
===================================================================
--- trunk/pgsrc/Help%2FPhpWeatherPlugin	2021-06-16 16:53:46 UTC (rev 10286)
+++ trunk/pgsrc/Help%2FPhpWeatherPlugin	2021-06-16 17:03:02 UTC (rev 10287)
@@ -1,4 +1,4 @@
-Date: Fri,  5 Apr 2019 10:48:21 +0000
+Date: Wed, 16 Jun 2021 18:59:47 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhpWeatherPlugin;
@@ -7,11 +7,14 @@
 Content-Transfer-Encoding: binary
 
 The **~PhpWeather** [[Help:WikiPlugin|plugin]] is a plugin that uses ~PhpWeather to display
-a block of text with the current weather for some airport in the
-world. It looks like this:
+a block of text with the current weather for some airport in the world.
 
-<<PhpWeather menu=true>>
+== Usage ==
 
+{{{
+<<PhpWeather arguments>>
+}}}
+
 == Arguments ==
 
 {| class="bordered"
@@ -82,9 +85,6 @@
 <<PhpWeather cc=FR icao=LFRN language=en units=only_metric>>
 }}}
 
-which is now :
-<<PhpWeather cc=FR icao=LFRN language=fr units=only_metric>>
-
 == Known Problems ==
 
 The plugin does not work through a proxy.

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10286] trunk/lib/phpweather-2.2.2

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

Revision: 10286
          http://sourceforge.net/p/phpwiki/code/10286
Author:   vargenau
Date:     2021-06-16 16:53:46 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
phpweather: use __construct

Modified Paths:
--------------
    trunk/lib/phpweather-2.2.2/base_object.php
    trunk/lib/phpweather-2.2.2/config/pw_dependency.php
    trunk/lib/phpweather-2.2.2/config/pw_dependency_and.php
    trunk/lib/phpweather-2.2.2/config/pw_dependency_equal.php
    trunk/lib/phpweather-2.2.2/config/pw_dependency_not.php
    trunk/lib/phpweather-2.2.2/config/pw_dependency_or.php
    trunk/lib/phpweather-2.2.2/config/pw_option.php
    trunk/lib/phpweather-2.2.2/config/pw_option_boolean.php
    trunk/lib/phpweather-2.2.2/config/pw_option_integer.php
    trunk/lib/phpweather-2.2.2/config/pw_option_multi_select.php
    trunk/lib/phpweather-2.2.2/config/pw_option_select.php
    trunk/lib/phpweather-2.2.2/config/pw_option_text.php
    trunk/lib/phpweather-2.2.2/config/pw_optiongroup.php
    trunk/lib/phpweather-2.2.2/config/pw_validator.php
    trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php
    trunk/lib/phpweather-2.2.2/config/pw_validator_range.php
    trunk/lib/phpweather-2.2.2/db/pw_db_adodb.php
    trunk/lib/phpweather-2.2.2/db/pw_db_common.php
    trunk/lib/phpweather-2.2.2/db/pw_db_dba.php
    trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php
    trunk/lib/phpweather-2.2.2/db/pw_db_null.php
    trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php
    trunk/lib/phpweather-2.2.2/db_layer.php
    trunk/lib/phpweather-2.2.2/output/pw_images.php
    trunk/lib/phpweather-2.2.2/output/pw_output.php
    trunk/lib/phpweather-2.2.2/output/pw_text.php
    trunk/lib/phpweather-2.2.2/output/pw_text_cs.php
    trunk/lib/phpweather-2.2.2/output/pw_text_da.php
    trunk/lib/phpweather-2.2.2/output/pw_text_de.php
    trunk/lib/phpweather-2.2.2/output/pw_text_en.php
    trunk/lib/phpweather-2.2.2/output/pw_text_en_GB.php
    trunk/lib/phpweather-2.2.2/output/pw_text_en_US.php
    trunk/lib/phpweather-2.2.2/output/pw_text_es.php
    trunk/lib/phpweather-2.2.2/output/pw_text_fi.php
    trunk/lib/phpweather-2.2.2/output/pw_text_fr.php
    trunk/lib/phpweather-2.2.2/output/pw_text_hu.php
    trunk/lib/phpweather-2.2.2/output/pw_text_it.php
    trunk/lib/phpweather-2.2.2/output/pw_text_nl.php
    trunk/lib/phpweather-2.2.2/output/pw_text_no.php
    trunk/lib/phpweather-2.2.2/output/pw_text_pl.php
    trunk/lib/phpweather-2.2.2/output/pw_text_pt.php
    trunk/lib/phpweather-2.2.2/output/pw_text_sk.php
    trunk/lib/phpweather-2.2.2/output/pw_text_sv.php
    trunk/lib/phpweather-2.2.2/output/pw_text_tr.php

Modified: trunk/lib/phpweather-2.2.2/base_object.php
===================================================================
--- trunk/lib/phpweather-2.2.2/base_object.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/base_object.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -160,5 +160,3 @@
   }
 
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/config/pw_dependency.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_dependency.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_dependency.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -23,7 +23,7 @@
    *
    * @param  string  $dep  Other dependencies.
    */
-  function pw_dependency($dep) {
+  function __construct($dep) {
     $this->dep = $dep;
   }
 
@@ -37,4 +37,3 @@
     trigger_error('Abstract method', E_USER_ERROR);
   }
 }
-?>

Modified: trunk/lib/phpweather-2.2.2/config/pw_dependency_and.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_dependency_and.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_dependency_and.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -23,8 +23,8 @@
    * dependency is satisfied if and only if all the dependencies
    * satisfied.
    */
-  function pw_dependency_and() {
-    $this->pw_dependency(func_get_args());
+  function __construct() {
+    parent::__construct(func_get_args());
   }
 
   /**
@@ -43,4 +43,3 @@
     return true;
   }
 }
-?>
\ No newline at end of file

Modified: trunk/lib/phpweather-2.2.2/config/pw_dependency_equal.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_dependency_equal.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_dependency_equal.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -27,9 +27,9 @@
    * @param  string  $dep The required value of the option.
    *
    */
-  function pw_dependency_equal($option, $dep) {
+  function __construct($option, $dep) {
     $this->option = $option;
-    $this->pw_dependency($dep);
+    parent::__construct($dep);
   }
 
   /**
@@ -49,4 +49,3 @@
   }
 
 }
-?>
\ No newline at end of file

Modified: trunk/lib/phpweather-2.2.2/config/pw_dependency_not.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_dependency_not.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_dependency_not.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -19,8 +19,8 @@
    *
    * @param  object  $dependency  The dependency that should be negated.
    */
-  function pw_dependency_not($dependency) {
-    $this->pw_dependency($dependency);
+  function __construct($dependency) {
+    parent::__construct($dependency);
   }
 
   /**
@@ -33,4 +33,3 @@
     return !$this->dep->check();
   }
 }
-?>

Modified: trunk/lib/phpweather-2.2.2/config/pw_dependency_or.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_dependency_or.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_dependency_or.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -24,8 +24,8 @@
    * dependency is satisfied if at least one of the dependencies
    * satisfied.
    */
-  function pw_dependency_or() {
-    $this->pw_dependency(func_get_args());
+  function __construct() {
+    parent::__construct(func_get_args());
   }
 
   /**
@@ -45,5 +45,3 @@
   }
 
 }
-
-?>
\ No newline at end of file

Modified: trunk/lib/phpweather-2.2.2/config/pw_option.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_option.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -69,8 +69,8 @@
    */
   var $validator;
 
-  function pw_option($name, $description, $dependency = false,
-                     $validator = false, $default = false) {
+  function __construct($name, $description, $dependency = false,
+                       $validator = false, $default = false) {
     $this->name = $name;
     $this->description = $description;
     $this->dependency = $dependency;
@@ -185,7 +185,4 @@
     }
   }
 
-
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/config/pw_option_boolean.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option_boolean.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_option_boolean.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -11,5 +11,3 @@
   }
 
 }
-
-?>
\ No newline at end of file

Modified: trunk/lib/phpweather-2.2.2/config/pw_option_integer.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option_integer.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_option_integer.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -1,14 +1,14 @@
 <?php
 class pw_option_integer extends pw_option_text {
 
-  function pw_option_integer($name, $description, $dependency = false,
-                          $validator = false, $default = false) {
+  function __construct($name, $description, $dependency = false,
+                       $validator = false, $default = false) {
     if (!$validator) {
       $validator = new pw_validator_ereg("Sorry, '%s' is not an integer.",
                                          '^[-+]?[0-9]+$');
     }
-    $this->pw_option_text($name, $description, $dependency,
-                          $validator, $default);
+    parent::__construct($name, $description, $dependency,
+                        $validator, $default);
   }
 
   function get_config() {
@@ -20,8 +20,4 @@
       return '';
     }
   }
-
-
-
 }
-?>
\ No newline at end of file

Modified: trunk/lib/phpweather-2.2.2/config/pw_option_multi_select.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option_multi_select.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_option_multi_select.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -4,8 +4,8 @@
 
   var $choices = array();
 
-  function pw_option_multi_select($name, $description, $dependency = false, $choices) {
-    $this->pw_option($name, $description, $dependency);
+  function __construct($name, $description, $dependency = false, $choices) {
+    parent::__construct($name, $description, $dependency);
     $this->choices = $choices;
   }
 
@@ -62,4 +62,3 @@
     }
   }
 } /* class multi_select */
-?>
\ No newline at end of file

Modified: trunk/lib/phpweather-2.2.2/config/pw_option_select.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option_select.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_option_select.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -4,12 +4,12 @@
 
   var $choices = array();
 
-  function pw_option_select($name, $description, $dependency = false,
-                            $choices, $default = false) {
+  function __construct($name, $description, $dependency = false,
+                       $choices, $default = false) {
     if ($default && isset($choices[$default])) {
-      $this->pw_option($name, $description, $dependency, false, $default);
+      parent::__construct($name, $description, $dependency, false, $default);
     } else {
-      $this->pw_option($name, $description, $dependency, false, key($choices));
+      parent::__construct($name, $description, $dependency, false, key($choices));
     }
     $this->choices = $choices;
   }
@@ -45,5 +45,3 @@
   }
 
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/config/pw_option_text.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option_text.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_option_text.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -1,9 +1,9 @@
 <?php
 class pw_option_text extends pw_option {
 
-  function pw_option_text($name, $description, $dependency,
-                          $validator = false, $default = false) {
-    $this->pw_option($name, $description, $dependency, $validator, $default);
+  function __construct($name, $description, $dependency,
+                       $validator = false, $default = false) {
+    parent::__construct($name, $description, $dependency, $validator, $default);
   }
 
   function show() {
@@ -27,4 +27,3 @@
   }
 
 }
-?>

Modified: trunk/lib/phpweather-2.2.2/config/pw_optiongroup.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_optiongroup.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_optiongroup.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -59,7 +59,7 @@
    * @param  array   $options  The names of the options in the group.
    *
    */
-  function pw_optiongroup($id, $title, $description, $options, $visible = true) {
+  function __construct($id, $title, $description, $options, $visible = true) {
     $this->id = $id;
     $this->title = $title;
     $this->description = $description;
@@ -132,5 +132,3 @@
   }
 
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/config/pw_validator.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_validator.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_validator.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -32,7 +32,7 @@
    * @param  string  $error  The message displayed when the input is
    *                         invalid.
    */
-  function pw_validator($error) {
+  function __construct($error) {
     $this->error = $error;
   }
 
@@ -78,6 +78,3 @@
   }
 
 }
-
-
-?>
\ No newline at end of file

Modified: trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -22,8 +22,8 @@
    *                         invalid.
    * @param  string  $regex  The regular expression used when validating.
    */
-  function pw_validator_ereg($error, $regex) {
-    $this->pw_validator($error);
+  function __construct($error, $regex) {
+    parent::__construct($error);
     $this->regex = $regex;
   }
 
@@ -58,6 +58,4 @@
       "', '$this->regex', '$id', this)";
   }
 
-
 }
-?>

Modified: trunk/lib/phpweather-2.2.2/config/pw_validator_range.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_validator_range.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_validator_range.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -2,7 +2,7 @@
 /**
  * Validates an integer.
  *
- * This class checks that an interger is in a given range. This is
+ * This class checks that an integer is in a given range. This is
  * usefull for testing port-numbers (range 1--65536) or peoples age
  * (range 1--120) etc.
  *
@@ -40,8 +40,8 @@
    * @param  integer  $high      The upper bound of the range.
    * @param  boolean  $empty_ok  Is the empty string valid?
    */
-  function pw_validator_range($error, $low, $high, $empty_ok = false) {
-    $this->pw_validator($error);
+  function __construct($error, $low, $high, $empty_ok = false) {
+    parent::__construct($error);
     $this->low = $low;
     $this->high = $high;
     $this->empty_ok = $empty_ok;
@@ -81,4 +81,3 @@
   }
 
 }
-?>

Modified: trunk/lib/phpweather-2.2.2/db/pw_db_adodb.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_adodb.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_adodb.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -23,8 +23,8 @@
    *
    * @param  array  the initial properties of the object
    */
-  function pw_db_adodb($input) {
-    $this->pw_db_common($input);
+  function __construct($input) {
+    parent::__construct($input);
   }
 
   /**
@@ -560,5 +560,3 @@
   }
 
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/db/pw_db_common.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_common.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_common.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -73,9 +73,9 @@
    * @param  array  the initial properties of the object
    * @see    $is_connected, $link_id, $result_id
    */
-  function pw_db_common($input) {
+  function __construct($input) {
     /* We start by calling the parent constructor. */
-    $this->base_object($input);
+    parent::__construct($input);
 
     /* We're not connected at first, so we set these variables to
        indicate that. */
@@ -214,7 +214,4 @@
     }
   }
 
-
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/db/pw_db_dba.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_dba.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_dba.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -43,7 +43,7 @@
    *
    * @param  array  the initial properties of the object
    */
-  function pw_db_dba($input) {
+  function __construct($input) {
     /* We have to load the DBA extension on some systems: */
     if (!extension_loaded('dba')) {
       if (preg_match('/win/', PHP_OS)) {
@@ -52,7 +52,7 @@
         dl('dba.so');
       }
     }
-    $this->pw_db_common($input);
+    parent::__construct($input);
   }
 
   /**
@@ -387,5 +387,3 @@
   }
 
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -20,7 +20,7 @@
    *
    * @param  array  the initial properties of the object
    */
-  function pw_db_mysql($input) {
+  function __construct($input) {
     /* We have to load the MySQL extension on some systems: */
     if (!extension_loaded('mysql')) {
       if (preg_match('/win/', PHP_OS)) {
@@ -29,7 +29,7 @@
         dl('mysql.so');
       }
     }
-    $this->pw_db_common($input);
+    parent::__construct($input);
   }
 
   /**
@@ -536,5 +536,3 @@
   }
 
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/db/pw_db_null.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_null.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_null.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -29,8 +29,8 @@
    *
    * @param  array  the initial properties of the object
    */
-  function pw_db_null($input) {
-    $this->pw_db_common($input);
+  function __construct($input) {
+    parent::__construct($input);
   }
 
   /**
@@ -295,5 +295,3 @@
   }
 
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -32,7 +32,7 @@
    *
    * @param  array  the initial properties of the object
    */
-  function pw_db_pgsql($input = array()) {
+  function __construct($input = array()) {
     /* We have to load the PgSQL extension on some systems: */
     if (!extension_loaded('pgsql')) {
       if (preg_match('/win/', PHP_OS)) {
@@ -41,7 +41,7 @@
         dl('pgsql.so');
       }
     }
-    $this->pw_db_common($input);
+    parent::__construct($input);
   }
 
 
@@ -392,5 +392,3 @@
   }
 
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/db_layer.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db_layer.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db_layer.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -88,6 +88,3 @@
   }
 
 }
-
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_images.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_images.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_images.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -224,9 +224,9 @@
    * @param   phpweather  The object with the weather.
    * @access  public
    */
-  function pw_images($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     /* We just call the parent constructor. */
-    $this->pw_output($weather, $input);
+    parent::__construct($weather, $input);
   }
 
 
@@ -450,5 +450,3 @@
   // ------------------------------------------------------------------------
 
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_output.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_output.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_output.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -15,7 +15,7 @@
 
   var $weather = null;
 
-  function pw_output($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->weather = $weather;
 
     $this->properties = $weather->properties;
@@ -31,5 +31,3 @@
   }
 
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -39,9 +39,9 @@
    * @param   phpweather  The object with the weather.
    * @access  public
    */
-  function pw_text($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     /* We just call the parent constructor. */
-    $this->pw_output($weather, $input);
+    parent::__construct($weather, $input);
   }
 
   /**

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_cs.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_cs.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_cs.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -25,7 +25,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_cs($weather, $input = array())
+  function __construct($weather, $input = array())
     {
       $this->strings['charset']                  = 'UTF-8';
       $this->strings['no_data']                  = 'Lituji, nejsou dostupné žádné informace pro %s%s%s.';
@@ -181,7 +181,7 @@
       $this->strings['runway_for_runway']        = ' for runway ';
 
       /* We run the parent constructor */
-      $this->pw_text($weather, $input);
+      parent::__construct($weather, $input);
     }
 
   function print_pretty_wind($wind)

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_da.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_da.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_da.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -16,7 +16,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_da($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Desv&aelig;rre! Der er ingen data for %s%s%s.';
     $this->strings['list_sentences_and']       = ' og ';
@@ -43,7 +43,7 @@
     $this->strings['wind_with_gusts']          = ' med vindst&oslash;d p&aring; up til ';
     $this->strings['wind_from']                = ' fra ';
     $this->strings['wind_variable']            = ' fra %svarierende%s retninger.';
-+    $this->strings['wind_varying']             = ', varierende mellem %s%s%s (%s%s&deg;%s) og %s%s%s (%s%s&deg;%s)';
+    $this->strings['wind_varying']             = ', varierende mellem %s%s%s (%s%s&deg;%s) og %s%s%s (%s%s&deg;%s)';
     $this->strings['wind_calm']                = 'Vinden var %sstille%s';
     $this->strings['wind_dir'] = array(
       'nord',
@@ -164,9 +164,7 @@
     $this->strings['runway_for_runway']        = ' for bane ';
 
     /* We run the parent constructor */
-    $this->pw_text($weather, $input);
+    parent::__construct($weather, $input);
 
   }
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_de.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_de.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_de.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,7 +17,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_de($weather, $input = array())
+  function __construct($weather, $input = array())
      {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Für  %s%s%s stehen keine DATEN zur Verfügung.';
@@ -168,8 +168,6 @@
     $this->strings['runway_for_runway']        = ' für die Landebahn ';
 
     /* We run the parent constructor */
-    $this->pw_text($weather, $input);
+    parent::__construct($weather, $input);
   }
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_en.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_en.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_en.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -16,12 +16,10 @@
    *
    * @param  array  This is just passed on to pw_text_en_US().
    */
-  function pw_text_en($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     /* We run the parent constructor, this gives us American English
      * output strings --- change this to pw_get_en_GB for British
      * English strings. */
-    $this->pw_text_en_US($weather, $input);
+    parent::__construct($weather, $input);
   }
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_en_GB.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_en_GB.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_en_GB.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,9 +17,9 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_en_GB($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     /* We run the parent constructor */
-    $this->pw_text_en($weather, $input);
+    parent::__construct($weather, $input);
 
     /* Now override the strings with the British English spellings: */
     $this->strings['meters_per_second']        = ' metres per second';

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_en_US.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_en_US.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_en_US.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,7 +17,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_en_US($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Sorry! There\'s no data available for %s%s%s.';
     $this->strings['list_sentences_and']       = ' and ';
@@ -167,8 +167,6 @@
     $this->strings['runway_for_runway']        = ' for runway ';
 
     /* We run the parent constructor */
-    $this->pw_text($weather, $input);
+    parent::__construct($weather, $input);
   }
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_es.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_es.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_es.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,7 +17,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_es($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Datos no disponibles para %s%s%s.';
     $this->strings['list_sentences_and']       = ' y ';
@@ -168,7 +168,7 @@
     $this->strings['runway_for_runway']        = ' para la pista ';
 
     /* We run the parent constructor */
-    $this->pw_text($weather, $input);
+    parent::__construct($weather, $input);
   }
  /**
    * Function used to parse a weather-group. This one puts adjective after noun.
@@ -244,5 +244,3 @@
   }
 
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_fi.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_fi.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_fi.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,7 +17,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_fi($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Valitan! Ei tietoja saatavilla %s%s%s sääasemalle.';
     $this->strings['list_sentences_and']       = ' ja ';
@@ -167,7 +167,7 @@
     $this->strings['runway_for_runway']        = ' kiitotiellä ';
 
     /* We run the parent constructor */
-    $this->pw_text($weather, $input);
+    parent::__construct($weather, $input);
   }
 }
 

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_fr.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_fr.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_fr.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -19,7 +19,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_fr($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Désolé! Pas d\'infos disponibles pour %s%s%s.';
     $this->strings['list_sentences_and']       = ' et ';
@@ -169,8 +169,6 @@
     $this->strings['runway_for_runway']        = ' pour la piste ';
 
     /* We run the parent constructor */
-    $this->pw_text($weather, $input);
+    parent::__construct($weather, $input);
   }
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_hu.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_hu.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_hu.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -20,7 +20,7 @@
    * @param  array   This is just passed on to pw_text().
    *		     Ezt a paramétert átadjuk pw_text() -nek.
    */
-  function pw_text_hu($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Sajnos nincs adat %s%s%s számára.';
     $this->strings['list_sentences_and']       = ' és ';
@@ -176,11 +176,8 @@
     $this->strings['runway_visibility']        = 'A láthatóság ';
     $this->strings['runway_for_runway']        = ' a kifutópályán ';
 
-  /* We run the parent constructor */
+    /* We run the parent constructor */
+    parent::__construct($weather, $input);
 
-  $this->pw_text($weather, $input);
-
   }
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_it.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_it.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_it.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,7 +17,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_it($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Spiacente! Nessun dato disponibile per %s%s%s.';
     $this->strings['list_sentences_and']       = ' e ';
@@ -167,8 +167,6 @@
     $this->strings['runway_for_runway']        = ' per la pista d\'atterraggio runway ';
 
     /* We run the parent constructor */
-    $this->pw_text($weather, $input);
+    parent::__construct($weather, $input);
   }
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_nl.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_nl.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_nl.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -21,7 +21,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_nl($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Sorry! Er is geen informatie beschikbaar voor %s%s%s.';
     $this->strings['list_sentences_and']       = ' en ';
@@ -177,7 +177,7 @@
     $this->strings['runway_for_runway']        = ' voor de start- landingsbaan ';
 
     /* We run the parent constructor */
-    $this->pw_text($weather, $input);
+    parent::__construct($weather, $input);
   }
 }
 

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_no.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_no.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_no.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -16,7 +16,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_no($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Beklager! Det var ingen ingen data tilgjengelig for %s%s%s.';
     $this->strings['list_sentences_and']       = ' og ';
@@ -164,9 +164,7 @@
     $this->strings['runway_for_runway']        = ' for rullebane ';
 
     /* We run the parent constructor */
-    $this->pw_text($weather, $input);
+    parent::__construct($weather, $input);
 
   }
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_pl.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_pl.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_pl.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,7 +17,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_pl($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Przepraszamy! Nie ma danych dostępnych dla %s%s%s.';
     $this->strings['list_sentences_and']       = ' i ';
@@ -167,8 +167,6 @@
     $this->strings['runway_for_runway']        = ' dla pasa ';
 
     /* We run the parent constructor */
-    $this->pw_text($weather, $input);
+    parent::__construct($weather, $input);
   }
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_pt.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_pt.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_pt.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,7 +17,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_pt($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Dado não disponiveis para %s%s%s.';
     $this->strings['list_sentences_and']       = ' e ';
@@ -168,9 +168,7 @@
     $this->strings['runway_for_runway']        = ' para a estrada ';
 
     /* We run the parent constructor */
-    $this->pw_text_es($weather, $input);
+    parent::__construct($weather, $input);
   }
 
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_sk.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_sk.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_sk.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -22,7 +22,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_sk($weather, $input = array())
+  function __construct($weather, $input = array())
     {
       $this->strings['charset']                  = 'UTF-8';
       $this->strings['no_data']                  = 'Ľutujem, momentálne nie sú dostupné žiadne informácie pre %s%s%s.';
@@ -178,7 +178,7 @@
       $this->strings['runway_for_runway']        = ' pre pristávaciu dráhu číslo ';
 
       /* We run the parent constructor */
-      $this->pw_text($weather, $input);
+      parent::__construct($weather, $input);
     }
 
   function print_pretty_wind($wind)

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_sv.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_sv.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_sv.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,7 +17,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_sv($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Beklagar! Det finns ingen data tillgänglig för %s%s%s.';
     $this->strings['list_sentences_and']       = ' och ';
@@ -165,9 +165,7 @@
     $this->strings['runway_for_runway']        = ' för landningsbanan ';
 
     /* We run the parent constructor */
-    $this->pw_text($weather, $input);
+    parent::__construct($weather, $input);
 
   }
 }
-
-?>

Modified: trunk/lib/phpweather-2.2.2/output/pw_text_tr.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_tr.php	2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_tr.php	2021-06-16 16:53:46 UTC (rev 10286)
@@ -16,7 +16,7 @@
    *
    * @param  array  This is just passed on to pw_text().
    */
-  function pw_text_tr($weather, $input = array()) {
+  function __construct($weather, $input = array()) {
     $this->strings['charset']                  = 'UTF-8';
     $this->strings['no_data']                  = 'Üzgünüz! %s%s%s için veri bulunmuyor.';
     $this->strings['list_sentences_and']       = ' ve ';
@@ -166,8 +166,6 @@
     $this->strings['runway_for_runway']        = ' uçak pisti için ';
 
     /* We run the parent constructor */
-    $this->pw_text($weather, $input);
+    parent::__construct($weather, $input);
   }
 }
-
-?>

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

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

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

Revision: 10285
          http://sourceforge.net/p/phpwiki/code/10285
Author:   vargenau
Date:     2021-06-16 15:49:41 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
Remove "limit_by_db"

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2021-06-16 15:48:56 UTC (rev 10284)
+++ trunk/lib/PageList.php	2021-06-16 15:49:41 UTC (rev 10285)
@@ -945,7 +945,7 @@
                 $this->addPage($page);
             }
         }
-        if (!is_array($page_iter->_options) || !array_key_exists('limit_by_db', $page_iter->_options) || !$page_iter->_options['limit_by_db'])
+        if (!is_array($page_iter->_options))
             $this->_options['slice'] = 1;
         if ($i and empty($this->_options['count']))
             $this->_options['count'] = $i;

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2021-06-16 15:48:56 UTC (rev 10284)
+++ trunk/lib/WikiDB/backend/PearDB.php	2021-06-16 15:49:41 UTC (rev 10285)
@@ -652,10 +652,8 @@
             // extract from,count from limit
             list($from, $count) = $this->limit($limit);
             $result = $dbh->limitQuery($sql, $from, $count);
-            $options = array('limit_by_db' => 1);
         } else {
             $result = $dbh->query($sql);
-            $options = array('limit_by_db' => 0);
         }
         return new WikiDB_backend_PearDB_iter($this, $result, $options);
     }

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2021-06-16 15:48:56 UTC (rev 10284)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2021-06-16 15:49:41 UTC (rev 10285)
@@ -414,10 +414,8 @@
             // extract from,count from limit
             list($from, $count) = $this->limit($limit);
             $result = $dbh->limitQuery($sql, $from, $count);
-            $options = array('limit_by_db' => 1);
         } else {
             $result = $dbh->query($sql);
-            $options = array('limit_by_db' => 0);
         }
         return new WikiDB_backend_PearDB_iter($this, $result, $options);
     }

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-06-16 15:48:56 UTC (rev 10284)
+++ trunk/lib/WikiDB.php	2021-06-16 15:49:41 UTC (rev 10285)
@@ -320,9 +320,8 @@
             $exclude);
         return new WikiDB_PageIterator($this, $result,
             array('include_empty' => $include_empty,
-                'exclude' => $exclude,
-                'limit_by_db' => $result->_options['limit_by_db'],
-                'limit' => $result->limit()));
+                  'exclude' => $exclude,
+                  'limit' => $result->limit()));
     }
 
     /**

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

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

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

Revision: 10284
          http://sourceforge.net/p/phpwiki/code/10284
Author:   vargenau
Date:     2021-06-16 15:48:56 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
DebugRetransform: argument is "page", not "pagename"

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

Modified: trunk/pgsrc/Help%2FDebugRetransformPlugin
===================================================================
--- trunk/pgsrc/Help%2FDebugRetransformPlugin	2021-06-10 12:52:12 UTC (rev 10283)
+++ trunk/pgsrc/Help%2FDebugRetransformPlugin	2021-06-16 15:48:56 UTC (rev 10284)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Wed, 16 Jun 2021 17:47:58 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FDebugRetransformPlugin;
@@ -22,7 +22,7 @@
 ! Description
 ! Default value
 |-
-| **pagename**
+| **page**
 | The page to show markup retransformation from.
 | current pagename
 |}
@@ -29,7 +29,7 @@
 
 == Example ==
 
-<<DebugRetransform pagename=HomePage>>
+<<DebugRetransform page=HomePage>>
 
 == Author ==
 * [[Help:Reini Urban|Reini Urban]]

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

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

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

Revision: 10283
          http://sourceforge.net/p/phpwiki/code/10283
Author:   vargenau
Date:     2021-06-10 12:52:12 +0000 (Thu, 10 Jun 2021)
Log Message:
-----------
Recursive includes are trapped

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

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-06-10 08:45:50 UTC (rev 10282)
+++ trunk/pgsrc/ReleaseNotes	2021-06-10 12:52:12 UTC (rev 10283)
@@ -23,9 +23,7 @@
 * Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen)
 * Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael.
 * Better check arguments for ~GoogleMaps plugin
-* Revert Subversion commit 9111, bad side effects:
-** Bug#607 BackLinks do not work inside a RichTable
-** Bug#636 Recursive include is not trapped
+* Revert Subversion commit 9111, bad side effects; re-opening Bug#607 BackLinks do not work inside a RichTable
 * Security fixes
 
 === Changes ===

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

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

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

Revision: 10282
          http://sourceforge.net/p/phpwiki/code/10282
Author:   vargenau
Date:     2021-06-10 08:45:50 +0000 (Thu, 10 Jun 2021)
Log Message:
-----------
Add function reset in lib/WikiDB/backend/file.php

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

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-06-10 08:07:22 UTC (rev 10281)
+++ trunk/lib/WikiDB/backend/file.php	2021-06-10 08:45:50 UTC (rev 10282)
@@ -763,6 +763,10 @@
         return $rec;
     }
 
+    function reset()
+    {
+    }
+
     function asArray()
     {
         reset($this->_result);

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

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

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

Revision: 10281
          http://sourceforge.net/p/phpwiki/code/10281
Author:   vargenau
Date:     2021-06-10 08:07:22 +0000 (Thu, 10 Jun 2021)
Log Message:
-----------
Revert Subversion commit 9111, bad side effects; Bug#607 BackLinks do not work inside a RichTable; Bug#636 Recursive include is not trapped

Modified Paths:
--------------
    trunk/lib/InlineParser.php
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/MediawikiTable.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/RichTable.php
    trunk/lib/plugin/Template.php
    trunk/lib/plugin/WikicreoleTable.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/InlineParser.php	2021-06-10 08:07:22 UTC (rev 10281)
@@ -443,10 +443,6 @@
             $pagename = $link;
             $anchor = false;
         }
-
-        global $backlinks;
-        $backlinks[] = array('linkto' => $pagename);
-
         return new Cached_WikiLink($pagename, $label, $anchor);
     }
 }

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/IncludePage.php	2021-06-10 08:07:22 UTC (rev 10281)
@@ -64,14 +64,7 @@
         if (!$page or !$page->name)
             return false;
 
-        global $backlinks;
-        if (empty($backlinks)) {
-            global $request;
-            $this->run($request->_dbi, $argstr, $request, $basepage);
-        }
-
-        $backlinks[] = array('linkto' => $page->name);
-        return $backlinks;
+        return array(array('linkto' => $page->name));
     }
 
     // Avoid warning in:

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/MediawikiTable.php	2021-06-10 08:07:22 UTC (rev 10281)
@@ -65,16 +65,6 @@
         return array();
     }
 
-    function getWikiPageLinks($argstr, $basepage)
-    {
-        global $backlinks;
-        if (empty($backlinks)) {
-            global $request;
-            $this->run($request->_dbi, $argstr, $request, $basepage);
-        }
-        return $backlinks;
-    }
-
     /**
      * @param WikiDB $dbi
      * @param string $argstr
@@ -84,10 +74,6 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-        global $backlinks;
-
-        $backlinks = array();
-
         include_once 'lib/BlockParser.php';
 
         // We allow the compact Mediawiki syntax with:

Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/OldStyleTable.php	2021-06-10 08:07:22 UTC (rev 10281)
@@ -68,16 +68,6 @@
         return;
     }
 
-    function getWikiPageLinks($argstr, $basepage)
-    {
-        global $backlinks;
-        if (empty($backlinks)) {
-            global $request;
-            $this->run($request->_dbi, $argstr, $request, $basepage);
-        }
-        return $backlinks;
-    }
-
     /**
      * @param WikiDB $dbi
      * @param string $argstr
@@ -87,10 +77,6 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-        global $backlinks;
-
-        $backlinks = array();
-
         include_once 'lib/InlineParser.php';
 
         $args = $this->getArgs($argstr, $request);

Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php	2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/RichTable.php	2021-06-10 08:07:22 UTC (rev 10281)
@@ -42,16 +42,6 @@
         return array();
     }
 
-    function getWikiPageLinks($argstr, $basepage)
-    {
-        global $backlinks;
-        if (empty($backlinks)) {
-            global $request;
-            $this->run($request->_dbi, $argstr, $request, $basepage);
-        }
-        return $backlinks;
-    }
-
     /**
      * @param WikiDB $dbi
      * @param string $argstr
@@ -61,10 +51,6 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-        global $backlinks;
-
-        $backlinks = array();
-
         include_once 'lib/BlockParser.php';
 
         $lines = preg_split('/\n/', $argstr);

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/Template.php	2021-06-10 08:07:22 UTC (rev 10281)
@@ -96,14 +96,7 @@
         if (!$page or !$page->name)
             return false;
 
-        global $backlinks;
-        if (empty($backlinks)) {
-            global $request;
-            $this->run($request->_dbi, $argstr, $request, $basepage);
-        }
-
-        $backlinks[] = array('linkto' => $page->name);
-        return $backlinks;
+        return array(array('linkto' => $page->name));
     }
 
     /**

Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php	2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/lib/plugin/WikicreoleTable.php	2021-06-10 08:07:22 UTC (rev 10281)
@@ -68,16 +68,6 @@
         return;
     }
 
-    function getWikiPageLinks($argstr, $basepage)
-    {
-        global $backlinks;
-        if (empty($backlinks)) {
-            global $request;
-            $this->run($request->_dbi, $argstr, $request, $basepage);
-        }
-        return $backlinks;
-    }
-
     /**
      * @param WikiDB $dbi
      * @param string $argstr
@@ -87,10 +77,6 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-        global $backlinks;
-
-        $backlinks = array();
-
         include_once 'lib/InlineParser.php';
 
         $table = array();

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-06-09 17:18:16 UTC (rev 10280)
+++ trunk/pgsrc/ReleaseNotes	2021-06-10 08:07:22 UTC (rev 10281)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Wed,  9 Jun 2021 19:50:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -23,6 +23,9 @@
 * Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen)
 * Importing a ZIP from an old wiki in Latin 1 (ISO 8859-1) failed. Reported by Frank Michael.
 * Better check arguments for ~GoogleMaps plugin
+* Revert Subversion commit 9111, bad side effects:
+** Bug#607 BackLinks do not work inside a RichTable
+** Bug#636 Recursive include is not trapped
 * Security fixes
 
 === Changes ===

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

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

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

Revision: 10280
          http://sourceforge.net/p/phpwiki/code/10280
Author:   vargenau
Date:     2021-06-09 17:18:16 +0000 (Wed, 09 Jun 2021)
Log Message:
-----------
Stricter tests in lib/WikiDB/backend/file.php

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

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-06-09 15:24:58 UTC (rev 10279)
+++ trunk/lib/WikiDB/backend/file.php	2021-06-09 17:18:16 UTC (rev 10280)
@@ -559,8 +559,9 @@
         foreach ($pagenames as $key => $val) {
             $links = $this->_loadPageLinks($key);
             foreach ($links as $key2 => $val2) {
-                if ($val2['linkto'] == $pagename)
+                if (is_array($val2) and isset($val2['linkto']) and ($val2['linkto'] == $pagename)) {
                     array_push($out, $key);
+                }
             }
         }
         return new WikiDB_backend_file_iter($this, $out);
@@ -754,7 +755,7 @@
         unset($pagedata['pagename']);
         $rec = array('pagename' => $pn,
             'pagedata' => $pagedata);
-        if (is_array($e[1])) {
+        if (is_array($e[1]) and isset($e[1]['relation'])) {
             $rec['linkrelation'] = $e[1]['relation'];
         }
         //$rec['version'] = $backend->get_latest_version($pn);

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

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

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

Revision: 10279
          http://sourceforge.net/p/phpwiki/code/10279
Author:   vargenau
Date:     2021-06-09 15:24:58 +0000 (Wed, 09 Jun 2021)
Log Message:
-----------
Use LOCK_SH & LOCK_EX instead of numbers

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

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-06-09 14:08:42 UTC (rev 10278)
+++ trunk/lib/WikiDB/backend/file.php	2021-06-09 15:24:58 UTC (rev 10279)
@@ -99,7 +99,7 @@
         if (!file_exists($filename)) return NULL;
         if (!filesize($filename)) return array();
         if ($fd = @fopen($filename, "rb")) {
-            $locked = flock($fd, 1); // Read lock
+            $locked = flock($fd, LOCK_SH); // Read lock
             if (!$locked) {
                 ExitWiki("Timeout while obtaining lock. Please try again");
             }
@@ -124,7 +124,7 @@
     {
         $filename = $this->_pagename2filename($type, $pagename, $version);
         if ($fd = fopen($filename, 'a+b')) {
-            $locked = flock($fd, 2); // Exclusive blocking lock
+            $locked = flock($fd, LOCK_EX); // Exclusive blocking lock
             if (!$locked) {
                 ExitWiki("Timeout while obtaining lock. Please try again");
             }

Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php	2021-06-09 14:08:42 UTC (rev 10278)
+++ trunk/lib/WikiDB/backend/flatfile.php	2021-06-09 15:24:58 UTC (rev 10279)
@@ -64,7 +64,7 @@
         if (!file_exists($filename)) return NULL;
         if (!filesize($filename)) return array();
         if ($fd = @fopen($filename, "rb")) {
-            $locked = flock($fd, 1); // Read lock
+            $locked = flock($fd, LOCK_SH); // Read lock
             if (!$locked) {
                 ExitWiki("Timeout while obtaining lock. Please try again");
             }
@@ -174,7 +174,7 @@
         $pagedata .= MimeifyPageRevision($page, $current);
 
         if ($fd = fopen($filename, 'a+b')) {
-            $locked = flock($fd, 2); // Exclusive blocking lock
+            $locked = flock($fd, LOCK_EX); // Exclusive blocking lock
             if (!$locked) {
                 ExitWiki("Timeout while obtaining lock. Please try again");
             }

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

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

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

Revision: 10278
          http://sourceforge.net/p/phpwiki/code/10278
Author:   vargenau
Date:     2021-06-09 14:08:42 +0000 (Wed, 09 Jun 2021)
Log Message:
-----------
This file is part of PhpWiki.

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/ADODB_postgres7.php
    trunk/lib/WikiDB/backend/PearDB_mysqli.php
    trunk/lib/WikiDB/backend/PearDB_oci8.php
    trunk/lib/plugin/AnalyseAccessLogSql.php
    trunk/lib/plugin/SearchHighlight.php

Modified: trunk/lib/WikiDB/backend/ADODB_postgres7.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_postgres7.php	2021-05-07 11:02:55 UTC (rev 10277)
+++ trunk/lib/WikiDB/backend/ADODB_postgres7.php	2021-06-09 14:08:42 UTC (rev 10278)
@@ -2,6 +2,8 @@
 /**
  * Copyright © 2005-2007 Reini Urban
  *
+ * This file is part of PhpWiki.
+ *
  * PhpWiki 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

Modified: trunk/lib/WikiDB/backend/PearDB_mysqli.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysqli.php	2021-05-07 11:02:55 UTC (rev 10277)
+++ trunk/lib/WikiDB/backend/PearDB_mysqli.php	2021-06-09 14:08:42 UTC (rev 10278)
@@ -3,6 +3,8 @@
  * Copyright © 2001 Jeff Dairiki
  * Copyright © 2004-2006 Reini Urban
  *
+ * This file is part of PhpWiki.
+ *
  * PhpWiki 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

Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_oci8.php	2021-05-07 11:02:55 UTC (rev 10277)
+++ trunk/lib/WikiDB/backend/PearDB_oci8.php	2021-06-09 14:08:42 UTC (rev 10278)
@@ -3,6 +3,8 @@
  * Copyright © 2004 Philippe Vanhaesendonck
  * Copyright © 2004-2007 Reini Urban
  *
+ * This file is part of PhpWiki.
+ *
  * PhpWiki 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

Modified: trunk/lib/plugin/AnalyseAccessLogSql.php
===================================================================
--- trunk/lib/plugin/AnalyseAccessLogSql.php	2021-05-07 11:02:55 UTC (rev 10277)
+++ trunk/lib/plugin/AnalyseAccessLogSql.php	2021-06-09 14:08:42 UTC (rev 10278)
@@ -2,7 +2,7 @@
 /**
  * Copyright © 2005 Charles Corrigan and $ThePhpWikiProgrammingTeam
  *
- * This file is (not yet) part of PhpWiki.
+ * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Modified: trunk/lib/plugin/SearchHighlight.php
===================================================================
--- trunk/lib/plugin/SearchHighlight.php	2021-05-07 11:02:55 UTC (rev 10277)
+++ trunk/lib/plugin/SearchHighlight.php	2021-06-09 14:08:42 UTC (rev 10278)
@@ -2,7 +2,7 @@
 /**
  * Copyright © 2004,2007 $ThePhpWikiProgrammingTeam
  *
- * This file is NOT part of PhpWiki.
+ * This file is part of PhpWiki.
  *
  * PhpWiki is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10277] trunk/lib/HttpClient.php

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

Revision: 10277
          http://sourceforge.net/p/phpwiki/code/10277
Author:   vargenau
Date:     2021-05-07 11:02:55 +0000 (Fri, 07 May 2021)
Log Message:
-----------
SPDX-License-Identifier: Artistic-1.0+

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

Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php	2021-03-01 13:47:42 UTC (rev 10276)
+++ trunk/lib/HttpClient.php	2021-05-07 11:02:55 UTC (rev 10277)
@@ -5,7 +5,7 @@
  *
  * This file is part of PhpWiki.
  *
- * SPDX-License-Identifier: (Artistic-1.0 OR Artistic-2.0)
+ * SPDX-License-Identifier: Artistic-1.0+
  *
  */
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10276] trunk/lib/plugin/UserPreferences.php

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

Revision: 10276
          http://sourceforge.net/p/phpwiki/code/10276
Author:   vargenau
Date:     2021-03-01 13:47:42 +0000 (Mon, 01 Mar 2021)
Log Message:
-----------
Use class "error" when appropriate

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

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2021-02-23 19:00:50 UTC (rev 10275)
+++ trunk/lib/plugin/UserPreferences.php	2021-03-01 13:47:42 UTC (rev 10276)
@@ -78,6 +78,7 @@
         $args = $this->getArgs($argstr, $request);
         $user =& $request->_user;
         $user->_request = $request;
+        $iserror = false;
         if (defined('FUSIONFORGE') && FUSIONFORGE) {
             if (!($user->isAuthenticated())) {
                 return HTML::p(array('class' => 'error'),
@@ -129,6 +130,7 @@
                 } elseif ($rp = $request->getArg('pref')) {
                     // replace only changed prefs in $pref with those from request
                     if (!empty($rp['passwd']) and ($rp['passwd2'] != $rp['passwd'])) {
+                        $iserror = true;
                         $errmsg = _("Wrong password. Try again.");
                     } else {
                         if (empty($rp['passwd'])) unset($rp['passwd']);
@@ -148,9 +150,11 @@
                                 if ($passchanged) {
                                     $errmsg = _("Password updated.") . " ";
                                 } else {
+                                    $iserror = true;
                                     $errmsg = _("Password was not changed.") . " ";
                                 }
                             } else {
+                                $iserror = true;
                                 $errmsg = _("Password cannot be changed.");
                             }
                         }
@@ -167,7 +171,11 @@
                             }
                         }
                     }
-                    $args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
+                    if ($iserror) {
+                        $args['errmsg'] = HTML::div(array('class' => 'error'), HTML::p($errmsg));
+                    } else {
+                        $args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
+                    }
 
                 }
             }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10275] trunk/lib/plugin/WikiForum.php

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

Revision: 10275
          http://sourceforge.net/p/phpwiki/code/10275
Author:   vargenau
Date:     2021-02-23 19:00:50 +0000 (Tue, 23 Feb 2021)
Log Message:
-----------
plugin WikiForum: better test boolean argument "noheader"

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

Modified: trunk/lib/plugin/WikiForum.php
===================================================================
--- trunk/lib/plugin/WikiForum.php	2021-02-23 18:03:47 UTC (rev 10274)
+++ trunk/lib/plugin/WikiForum.php	2021-02-23 19:00:50 UTC (rev 10275)
@@ -75,10 +75,20 @@
     function run($dbi, $argstr, &$request, $basepage)
     {
         $args = $this->getArgs($argstr, $request);
+
         if (!$args['pagename']) {
             return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename'));
         }
 
+        $noheader = $args['noheader'];
+        if (($noheader == '0') || ($noheader == 'false')) {
+            $noheader = false;
+        } elseif (($noheader == '1') || ($noheader == 'true')) {
+            $noheader = true;
+        } else {
+            return $this->error(sprintf(_("Argument '%s' must be a boolean"), "noheader"));
+        }
+
         // Get our form args.
         $forum = $request->getArg('forum');
         $request->setArg('forum', false);

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