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

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

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

Revision: 10600
          http://sourceforge.net/p/phpwiki/code/10600
Author:   vargenau
Date:     2021-09-29 15:07:58 +0000 (Wed, 29 Sep 2021)
Log Message:
-----------
lib/WikiDB/backend/PDO.php: fix SQL syntax

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-09-29 09:43:26 UTC (rev 10599)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-09-29 15:07:58 UTC (rev 10600)
@@ -470,7 +470,7 @@
                 . ",$page_tbl.pagedata AS pagedata,"
                 . $this->version_tbl_fields;
         } else {
-            $fields = $this->page_tbl_fields . ", '' AS pagedata"
+            $fields = $this->page_tbl_fields . ", $page_tbl.pagedata AS pagedata"
                 . ", $version_tbl.version AS version, $version_tbl.mtime AS mtime, "
                 . "$version_tbl.minor_edit AS minor_edit, $iscontent AS have_content, "
                 . "$version_tbl.versiondata as versiondata";

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

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

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

Revision: 10599
          http://sourceforge.net/p/phpwiki/code/10599
Author:   vargenau
Date:     2021-09-29 09:43:26 +0000 (Wed, 29 Sep 2021)
Log Message:
-----------
lib/WikiDB/backend/file.php: better test _loadPage

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

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-09-28 15:43:33 UTC (rev 10598)
+++ trunk/lib/WikiDB/backend/file.php	2021-09-29 09:43:26 UTC (rev 10599)
@@ -98,9 +98,16 @@
     protected function _loadPage($type, $pagename, $version, $set_pagename = true)
     {
         $filename = $this->_pagename2filename($type, $pagename, $version);
-        if (!file_exists($filename)) return NULL;
-        if (!filesize($filename)) return array();
-        if ($fd = @fopen($filename, "rb")) {
+        if (!file_exists($filename)) {
+            return NULL;
+        }
+        if (is_dir($filename)) {
+            return array();
+        }
+        if (!filesize($filename)) {
+            return array();
+        }
+        if ($fd = fopen($filename, "rb")) {
             $locked = flock($fd, LOCK_SH); // Read 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:[10598] trunk/lib/plugin/Chart.php

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

Revision: 10598
          http://sourceforge.net/p/phpwiki/code/10598
Author:   vargenau
Date:     2021-09-28 15:43:33 +0000 (Tue, 28 Sep 2021)
Log Message:
-----------
Chart plugin: new argument "legend"

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

Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php	2021-09-28 15:43:02 UTC (rev 10597)
+++ trunk/lib/plugin/Chart.php	2021-09-28 15:43:33 UTC (rev 10598)
@@ -63,7 +63,7 @@
             // 'xlabel' => 'x', // TODO
             // 'ylabel' => 'y', // TODO
             'color' => 'green',
-            // 'legend' => false, // TODO
+            'legend' => '',
             'data' => false // required
         );
     }
@@ -90,7 +90,7 @@
         }
         extract($args);
 
-        $html = HTML();
+        $html = HTML::figure();
         $js = JavaScript('', array('src' => $WikiTheme->_findData('ASCIIsvg.js')));
         $html->pushContent($js);
 
@@ -156,6 +156,9 @@
             'script' => $source);
         $embed = new SVG_HTML("embed", $embedargs);
         $html->pushContent($embed);
+        if (isset($legend) && ($legend != '')) {
+            $html->pushContent(HTML::figcaption($legend));
+        }
         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:[10597] trunk/pgsrc

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

Revision: 10597
          http://sourceforge.net/p/phpwiki/code/10597
Author:   vargenau
Date:     2021-09-28 15:43:02 +0000 (Tue, 28 Sep 2021)
Log Message:
-----------
Chart plugin: new argument "legend"

Modified Paths:
--------------
    trunk/pgsrc/Help%2FChartPlugin
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/Help%2FChartPlugin
===================================================================
--- trunk/pgsrc/Help%2FChartPlugin	2021-09-28 15:24:42 UTC (rev 10596)
+++ trunk/pgsrc/Help%2FChartPlugin	2021-09-28 15:43:02 UTC (rev 10597)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Tue, 28 Sep 2021 17:38:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FChartPlugin;
@@ -16,7 +16,7 @@
 
 == Usage ==
 {{{
-<<Chart width=200 height=200 type=line color=green data="5, 7, 11, 3, 15" >>
+<<Chart width=200 height=200 legend="My legend" type=line color=green data="5, 7, 11, 3, 15" >>
 }}}
 
 == Arguments ==
@@ -35,6 +35,10 @@
 | Graph height in pixels
 | 200
 |-
+| **legend**
+| Legend of the chart
+| //None//
+|-
 | **type**
 | line, bar or pie
 | line
@@ -51,11 +55,13 @@
 {{{
 <<Chart type=line
         data="5, 7, 11, 3, 15"
+        legend="Price evolution"
 >>
 }}}
 
 <<Chart type=line
         data="5, 7, 11, 3, 15"
+        legend="Price evolution"
 >>
 
 === Bar chart ===
@@ -64,6 +70,7 @@
 <<Chart type=bar
         color=red
         data="5, 7, 11, 3, 15"
+        legend="Number of users"
 >>
 }}}
 
@@ -70,6 +77,7 @@
 <<Chart type=bar
         color=red
         data="5, 7, 11, 3, 15"
+        legend="Number of users"
 >>
 
 === Pie chart ===
@@ -78,6 +86,7 @@
 <<Chart type=pie
         color=blue
         data="5, 7, 11, 3, 15"
+        legend="Use per country"
 >>
 }}}
 
@@ -84,6 +93,7 @@
 <<Chart type=pie
         color=blue
         data="5, 7, 11, 3, 15"
+        legend="Use per country"
 >>
 
 == Known Problems ==
@@ -95,6 +105,7 @@
 * Marc-Etienne Vargenau
 
 == See Also ==
+* [[Help:AsciiSVGPlugin]]
 
 <noinclude>
 ----

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-09-28 15:24:42 UTC (rev 10596)
+++ trunk/pgsrc/ReleaseNotes	2021-09-28 15:43:02 UTC (rev 10597)
@@ -1,4 +1,4 @@
-Date: Fri,  3 Sep 2021 18:58:14 +0000
+Date: Tue, 28 Sep 2021 17:38:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -17,6 +17,9 @@
 * Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
 * Add "Rename" tab in Sidebar theme.
 
+=== Plugins ===
+* Chart plugin: new argument "legend"
+
 == 1.6.0 2021-08-12 Marc-Etienne Vargenau ==
 
 Major release:
@@ -56,7 +59,7 @@
 * Updated pgsrc pages in all languages
 * Adding SPDX-License-Identifier in PHP source files
 
-===  Plugins ===
+=== Plugins ===
 * ~UpLoad plugin: put date and author in history
 * ~UpLoad plugin: don't inline images
 * PhpWeather removed, uses deprecated mysql functions

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

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

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

Revision: 10596
          http://sourceforge.net/p/phpwiki/code/10596
Author:   vargenau
Date:     2021-09-28 15:24:42 +0000 (Tue, 28 Sep 2021)
Log Message:
-----------
Add HTML::figure and HTML::figcaption

Modified Paths:
--------------
    trunk/lib/HtmlElement.php
    trunk/themes/default/phpwiki-common.css

Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2021-09-20 13:23:05 UTC (rev 10595)
+++ trunk/lib/HtmlElement.php	2021-09-28 15:24:42 UTC (rev 10596)
@@ -204,6 +204,18 @@
         return $el->_init2(func_get_args());
     }
 
+    public static function figure( /*...*/)
+    {
+        $el = new HtmlElement('figure');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function figcaption( /*...*/)
+    {
+        $el = new HtmlElement('figcaption');
+        return $el->_init2(func_get_args());
+    }
+
     public static function br( /*...*/)
     {
         $el = new HtmlElement('br');
@@ -585,7 +597,7 @@
     'b big i small tt ' // %fontstyle
         . 's strike u ' // (deprecated)
         . 'abbr acronym cite code dfn em kbd samp strong var ' //%phrase
-        . 'a img object embed br script map q sub sup span bdo ' //%special
+        . 'a img figure object embed br script map q sub sup span bdo ' //%special
         . 'button input label option select textarea label ' //%formctl
 
         // %block elements which contain inline content
@@ -594,7 +606,7 @@
         . 'div fieldset '
 
         // other with inline content
-        . 'caption dt label legend video '
+        . 'caption figcaption dt label legend video '
         // other with either inline or block
         . 'dd del ins li td th colgroup');
 

Modified: trunk/themes/default/phpwiki-common.css
===================================================================
--- trunk/themes/default/phpwiki-common.css	2021-09-20 13:23:05 UTC (rev 10595)
+++ trunk/themes/default/phpwiki-common.css	2021-09-28 15:24:42 UTC (rev 10596)
@@ -60,6 +60,10 @@
     clear: both;
 }
 
+figcaption {
+  font-style: italic;
+}
+
 /* Alert class ======================================================== */
 
 .dialog {

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

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

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

Revision: 10595
          http://sourceforge.net/p/phpwiki/code/10595
Author:   vargenau
Date:     2021-09-20 13:23:05 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
lib/plugin/SystemInfo.php: add PDO

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

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2021-09-20 12:47:14 UTC (rev 10594)
+++ trunk/lib/plugin/SystemInfo.php	2021-09-20 13:23:05 UTC (rev 10595)
@@ -387,7 +387,7 @@
             //TODO: windows only (no cygwin)
             $appsize = `du -s $dir | cut -f1`;
 
-            if (in_array($DBParams['dbtype'], array('SQL'))) {
+            if (in_array($DBParams['dbtype'], array('SQL', 'PDO'))) {
                 //TODO: where is the data is actually stored? see phpMyAdmin
                 $pagesize = 0;
             } elseif ($DBParams['dbtype'] == 'dba') {

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

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

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

Revision: 10594
          http://sourceforge.net/p/phpwiki/code/10594
Author:   vargenau
Date:     2021-09-20 12:47:14 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
Use parameter default value

Modified Paths:
--------------
    trunk/lib/BlockParser.php
    trunk/lib/Captcha.php
    trunk/lib/PageList.php
    trunk/lib/PageType.php
    trunk/lib/Request.php
    trunk/lib/SemanticWeb.php
    trunk/lib/WikiDB.php
    trunk/lib/WikiGroup.php
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser.php
    trunk/lib/XmlElement.php
    trunk/lib/diff.php
    trunk/lib/loadsave.php
    trunk/lib/main.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/prepend.php

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/BlockParser.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -461,7 +461,7 @@
         if ($line === false or $line === '') // allow $line === '0'
             return false;
 
-        trigger_error("Couldn't match block: '$line'", E_USER_NOTICE);
+        trigger_error("Couldn't match block: '$line'");
         return false;
     }
 }

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/Captcha.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -85,7 +85,7 @@
                 'name' => 'edit[captcha_input]',
                 'size' => $this->length + 2,
                 'maxlength' => 256));
-            $url = WikiURL("", array("action" => "captcha", "id" => time()), false);
+            $url = WikiURL("", array("action" => "captcha", "id" => time()));
             $el['CAPTCHA_IMAGE'] = HTML::img(array('src' => $url, 'alt' => 'captcha'));
             $el['CAPTCHA_LABEL'] = HTML::label(array('for' => 'edit-captcha_input'),
                 _("Type word above:"));

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/PageList.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -269,7 +269,7 @@
     function _getSortableValue($page_handle, $revision_handle)
     {
         if (!$revision_handle)
-            $revision_handle = $page_handle->getCurrentRevision(true);
+            $revision_handle = $page_handle->getCurrentRevision();
         return (empty($revision_handle->_data['%content']))
             ? 0 : strlen($revision_handle->_data['%content']);
     }
@@ -405,7 +405,7 @@
         if (!$revision_handle or (!$revision_handle->_data['%content']
             or $revision_handle->_data['%content'] === true)
         ) {
-            $revision_handle = $page_handle->getCurrentRevision(true);
+            $revision_handle = $page_handle->getCurrentRevision();
         }
         if (!empty($revision_handle->_data['%pagedata'])) {
             $revision_handle->_data['%pagedata']['_cached_html'] = '';
@@ -558,7 +558,7 @@
     function _getValue($page_handle, $revision_handle)
     {
         if ($this->dbi->isWikiPage($page_handle->getName()))
-            return WikiLink($page_handle, 'known');
+            return WikiLink($page_handle);
         else
             return WikiLink($page_handle, 'unknown');
     }
@@ -1397,7 +1397,7 @@
                 'averagerating', 'top3recs',
                 'relation', 'linkto');
             if (!in_array($column, $silently_ignore))
-                trigger_error(sprintf("%s: Bad column", $column), E_USER_NOTICE);
+                trigger_error(sprintf("%s: Bad column", $column));
             return false;
         }
         if (!(defined('FUSIONFORGE') && FUSIONFORGE)) {

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/PageType.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -338,7 +338,7 @@
         if (defined('WARN_NONPUBLIC_INTERWIKIMAP') and WARN_NONPUBLIC_INTERWIKIMAP) {
             $error_html = sprintf(_("Loading InterWikiMap from external file %s."),
                 INTERWIKI_MAP_FILE);
-            trigger_error($error_html, E_USER_NOTICE);
+            trigger_error($error_html);
         }
         if (file_exists(INTERWIKI_MAP_FILE)) {
             $filename = INTERWIKI_MAP_FILE;

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/Request.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -414,7 +414,7 @@
             if (ob_get_length()) ob_clean();
             $this->_is_buffering_output = false;
         } else {
-            trigger_error(_("Not buffering output"), E_USER_NOTICE);
+            trigger_error(_("Not buffering output"));
         }
     }
 
@@ -812,8 +812,7 @@
                     . "\n"
                     . sprintf(_("Please ensure that %s is writable, or redefine %s in config/config.ini."),
                         sprintf(_("the file “%s”"), ACCESS_LOG),
-                        'ACCESS_LOG')
-                , E_USER_NOTICE);
+                        'ACCESS_LOG'));
         }
         register_shutdown_function("Request_AccessLogEntry_shutdown_function");
 

Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/SemanticWeb.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -330,8 +330,7 @@
         $value = $val_base;
         if (!is_numeric($value)) {
             $this->workquery = ''; //must return false
-            trigger_error("Cannot match against non-numeric attribute value $x := $ori_value",
-                E_USER_NOTICE);
+            trigger_error("Cannot match against non-numeric attribute value $x := $ori_value");
             return '';
         }
 

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/WikiDB.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -557,7 +557,7 @@
                     ($this,
                     $linked_page->getName(),
                     $lookbehind . $from . $lookahead, $to,
-                    true, true);
+                    true);
             }
             // FIXME: Disabled to avoid recursive modification when renaming
             // a page like 'PageFoo to 'PageFooTwo'
@@ -568,7 +568,7 @@
                     ($this,
                         $linked_page->getName(),
                         $lookbehind . $from . $lookahead, $to,
-                        true, true);
+                        true);
                 }
             }
         }
@@ -978,8 +978,7 @@
             $pdata = $cache->get_versiondata($pagename, $latestversion);
             if ($data['mtime'] < $pdata['mtime']) {
                 trigger_error(sprintf(_("%s: Date of new revision is %s"),
-                        $pagename, "'non-monotonic'"),
-                    E_USER_NOTICE);
+                        $pagename, "'non-monotonic'"));
                 $data['orig_mtime'] = $data['mtime'];
                 $data['mtime'] = $pdata['mtime'];
             }
@@ -1272,7 +1271,7 @@
             return $backend->exists_link($this->_pagename, $link, $reversed);
         //$cache = &$this->_wikidb->_cache;
         // TODO: check cache if it is possible
-        $iter = $this->getLinks($reversed, false);
+        $iter = $this->getLinks($reversed);
         while ($page = $iter->next()) {
             if ($page->getName() == $link)
                 return $page;
@@ -1420,7 +1419,7 @@
     {
         if ($this->_wikidb->readonly) {
             if ((int)DEBUG) {
-                trigger_error("readonly database", E_USER_NOTICE);
+                trigger_error("readonly database");
             }
             return;
         }

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/WikiGroup.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -480,16 +480,13 @@
      * Private method to take a WikiDB_Page and parse to determine if the
      * current_user is a member of the group.
      * @param object $group_page WikiDB_Page object for the group's page
-     * @param bool $strict
      * @return boolean True if user is a member, else false.
      */
-    private function _inGroupPage($group_page, $strict = false)
+    private function _inGroupPage($group_page)
     {
         $group_revision = $group_page->getCurrentRevision();
         if ($group_revision->hasDefaultContents()) {
             $group = $group_page->getName();
-            if ($strict) trigger_error(sprintf(_("Group page “%s” does not exist"), $group),
-                E_USER_WARNING);
             return false;
         }
         $contents = $group_revision->getContent();
@@ -935,7 +932,7 @@
                 $info = ldap_get_entries($ldap, $sr);
             else {
                 $info = array('count' => 0);
-                trigger_error("LDAP_SEARCH: base=\"$base_dn\" \"(cn=$group)\" failed", E_USER_NOTICE);
+                trigger_error("LDAP_SEARCH: base=\"$base_dn\" \"(cn=$group)\" failed");
             }
             $base_dn = (LDAP_OU_USERS ? LDAP_OU_USERS : "ou=Users")
                 . ($this->base_dn ? "," . $this->base_dn : '');
@@ -949,7 +946,7 @@
                         $members[] = $info2[$j]["cn"][0];
                     }
                 } else {
-                    trigger_error("LDAP_SEARCH: base=\"$base_dn\" \"(gidNumber=$gid)\" failed", E_USER_NOTICE);
+                    trigger_error("LDAP_SEARCH: base=\"$base_dn\" \"(gidNumber=$gid)\" failed");
                 }
             }
         }

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/WikiPlugin.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -284,7 +284,7 @@
     function handle_plugin_args_cruft($argstr, $args)
     {
         trigger_error(sprintf(_("trailing cruft in plugin args: “%s”"),
-            $argstr), E_USER_NOTICE);
+            $argstr));
     }
 
     /* A plugin can override this to allow undeclared arguments.
@@ -293,7 +293,7 @@
     function allow_undeclared_arg($name, $value)
     {
         trigger_error(sprintf(_("Argument “%s” not declared by plugin."),
-            $name), E_USER_NOTICE);
+            $name));
         return false;
     }
 

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/WikiPluginCached.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -1097,7 +1097,7 @@
         if (!$ok) {
             trigger_error("\n" . $cmd . " failed: $errstr", E_USER_WARNING);
         } elseif ($request->getArg('debug'))
-            trigger_error("\n" . $cmd . ": success\n", E_USER_NOTICE);
+            trigger_error("\n" . $cmd . ": success\n");
         if (!isWindows()) {
             if ($until) {
                 $loop = 100000;

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/WikiTheme.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -301,7 +301,7 @@
         if (isset($this->_default_theme)) {
             return $this->_default_theme->_findFile($file, $missing_okay);
         } elseif (!$missing_okay) {
-            trigger_error("$this->_theme/$file: not found", E_USER_NOTICE);
+            trigger_error("$this->_theme/$file: not found");
             if (DEBUG & _DEBUG_TRACE) {
                 echo "<pre>";
                 printSimpleTrace(debug_backtrace());
@@ -1309,8 +1309,7 @@
         $request->_MoreHeaders[] = $element;
         if (!empty($this->_headers_printed) and $this->_headers_printed) {
             trigger_error(_("Some action(page) wanted to add more headers, but they were already printed.")
-                    . "\n" . $element->asXML(),
-                E_USER_NOTICE);
+                    . "\n" . $element->asXML());
         }
     }
 

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/WikiUser.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -1954,7 +1954,7 @@
         if (!isset($this->_prefs[$name])) {
             if ($name == 'passwd2') return false;
             if ($name == 'passwd') return false;
-            trigger_error("$name: unknown preference", E_USER_NOTICE);
+            trigger_error("$name: unknown preference");
             return false;
         }
         return $this->_prefs[$name];

Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/XmlElement.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -127,10 +127,9 @@
             } elseif (is_array($item)) {
                 // DEPRECATED:
                 // Use XmlContent objects instead of arrays for collections of XmlElements.
-                trigger_error("Passing arrays to printXML() is deprecated: (" . AsXML($item, true) . ")",
-                    E_USER_NOTICE);
+                trigger_error("Passing arrays to printXML() is deprecated: (" . AsXML($item, true) . ")");
                 foreach ($item as $x)
-                    $this->printXML($x);
+                    $this->printXML();
             } else {
                 echo $this->_quote((string)$item);
             }
@@ -148,10 +147,9 @@
                     $xml .= $this->_quote($item->asString()); else
                     $xml .= sprintf("==Object(%s)==", get_class($item));
             } elseif (is_array($item)) {
-                trigger_error("Passing arrays to ->asXML() is deprecated: (" . AsXML($item, true) . ")",
-                    E_USER_NOTICE);
+                trigger_error("Passing arrays to ->asXML() is deprecated: (" . AsXML($item, true) . ")");
                 foreach ($item as $x)
-                    $xml .= $this->asXML($x);
+                    $xml .= $this->asXML();
             } else
                 $xml .= $this->_quote((string)$item);
         }
@@ -622,8 +620,7 @@
     } elseif (is_array($val)) {
         // DEPRECATED:
         // Use XmlContent objects instead of arrays for collections of XmlElements.
-        trigger_error("Passing arrays to PrintXML() is deprecated: (" . AsXML($val, true) . ")",
-            E_USER_NOTICE);
+        trigger_error("Passing arrays to PrintXML() is deprecated: (" . AsXML($val, true) . ")");
         foreach ($val as $x)
             PrintXML($x);
     } else
@@ -650,8 +647,7 @@
         // Use XmlContent objects instead of arrays for collections of XmlElements.
         if (empty($nowarn)) {
             $nowarn = true;
-            trigger_error("Passing arrays to AsXML() is deprecated: (" . AsXML($val) . ")",
-                E_USER_NOTICE);
+            trigger_error("Passing arrays to AsXML() is deprecated: (" . AsXML($val) . ")");
             unset($nowarn);
         }
         $xml = '';
@@ -677,7 +673,7 @@
     } elseif (is_array($val)) {
         // DEPRECATED:
         // Use XmlContent objects instead of arrays for collections of XmlElements.
-        trigger_error("Passing arrays to AsString() is deprecated", E_USER_NOTICE);
+        trigger_error("Passing arrays to AsString() is deprecated");
         $str = '';
         foreach ($val as $x)
             $str .= AsString($x);

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/diff.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -286,7 +286,7 @@
         $html = HTML::div(array('class' => 'wikitext', 'id' => 'difftext'),
             HTML::p(fmt("Page “%s” does not exist.", WikiLink($pagename, 'unknown'))));
         require_once 'lib/Template.php';
-        GeneratePage($html, sprintf(_("Diff: %s"), $pagename), false);
+        GeneratePage($html, sprintf(_("Diff: %s"), $pagename));
         return; //early return
     }
 
@@ -362,7 +362,7 @@
     $html->pushContent(HTML::table(PageInfoRow(_("Newer page:"), $new,
             $request, empty($version)),
         PageInfoRow(_("Older page:"), $old,
-            $request, false)));
+            $request)));
 
     if ($new && $old) {
         $diff = new Diff($old->getContent(), $new->getContent());

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/loadsave.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -1155,8 +1155,7 @@
     }
 
     if (!empty($error_html))
-        trigger_error(_("Default InterWiki map file not loaded.")
-            . $error_html, E_USER_NOTICE);
+        trigger_error(_("Default InterWiki map file not loaded.") . $error_html);
     if ($goback)
         return $content;
 

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/main.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -961,7 +961,7 @@
                 return $en_action;
         }
 
-        trigger_error("$action: Unknown action", E_USER_NOTICE);
+        trigger_error("$action: Unknown action");
         return 'browse';
     }
 
@@ -1070,7 +1070,7 @@
                 return $cache[$action] = $action;
         }
 
-        trigger_error("$action: Cannot find action page", E_USER_NOTICE);
+        trigger_error("$action: Cannot find action page");
         return $cache[$action] = false;
     }
 
@@ -1378,14 +1378,12 @@
                     'SESSION_SAVE_PATH')
                 . "\n"
                 . sprintf(_("Attempting to use the directory “%s” instead."),
-                    $tmpdir)
-            , E_USER_NOTICE);
+                    $tmpdir));
         if (!is_writeable($tmpdir)) {
             trigger_error
             (sprintf(_("%s is not writable."), $tmpdir)
                     . "\n"
-                    . _("Users will not be able to sign in.")
-                , E_USER_NOTICE);
+                    . _("Users will not be able to sign in."));
         } else
             @ini_set('session.save_path', $tmpdir);
     }

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/plugin/SystemInfo.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -155,7 +155,7 @@
         global $request;
         $dbi = $request->getDbh();
         $s = sprintf(_("%d pages"), $dbi->numPages(true));
-        $s .= ", " . sprintf(_("%d not-empty pages"), $dbi->numPages(false));
+        $s .= ", " . sprintf(_("%d not-empty pages"), $dbi->numPages());
         // more bla....
         // $s  .= ", " . sprintf(_("earliest page from %s"), $earliestdate);
         // $s  .= ", " . sprintf(_("latest page from %s"), $latestdate);
@@ -199,8 +199,7 @@
     // TODO: see WhoIsOnline hit stats, and sql accesslogs
     function accessstats()
     {
-        $s = _("not yet");
-        return $s;
+        return _("not yet");
     }
 
     // numeric array

Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2021-09-20 12:39:40 UTC (rev 10593)
+++ trunk/lib/prepend.php	2021-09-20 12:47:14 UTC (rev 10594)
@@ -100,7 +100,7 @@
     {
         if (!isset($this->_times)) {
             // posix_times() not available.
-            return sprintf("real: %.3f", $this->getTime('real'));
+            return sprintf("real: %.3f", $this->getTime());
         }
         $now = posix_times();
         return sprintf("real: %.3f, user: %.3f, sys: %.3f",

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10593] trunk/lib/RssWriter.php

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

Revision: 10593
          http://sourceforge.net/p/phpwiki/code/10593
Author:   vargenau
Date:     2021-09-20 12:39:40 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
function __node has only 3 parameters

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

Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php	2021-09-20 12:34:57 UTC (rev 10592)
+++ trunk/lib/RssWriter.php	2021-09-20 12:39:40 UTC (rev 10593)
@@ -255,7 +255,7 @@
         $attr = array('xmlns' => 'http://www.w3.org/2005/Atom',
             'version' => '0.3', // or 1.0
             'lang' => $LANG);
-        $this->_channel = $this->__node('feed', $attr, $properties, $uri);
+        $this->_channel = $this->__node('feed', $attr, $properties);
     }
 
     /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10592] trunk/lib/TextSearchQuery.php

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

Revision: 10592
          http://sourceforge.net/p/phpwiki/code/10592
Author:   vargenau
Date:     2021-09-20 12:34:57 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
sql_quote has no parameter

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

Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php	2021-09-20 12:26:39 UTC (rev 10591)
+++ trunk/lib/TextSearchQuery.php	2021-09-20 12:34:57 UTC (rev 10592)
@@ -662,7 +662,7 @@
 
     function sql()
     {
-        return '%' . $this->sql_quote($this->word) . '%';
+        return '%' . $this->sql_quote() . '%';
     }
 }
 
@@ -696,7 +696,7 @@
 
     function sql()
     {
-        return $this->sql_quote($this->word) . '%';
+        return $this->sql_quote() . '%';
     }
 }
 
@@ -723,7 +723,7 @@
 
     function sql()
     {
-        return '%' . $this->sql_quote($this->word);
+        return '%' . $this->sql_quote();
     }
 }
 
@@ -767,7 +767,7 @@
 
     function sql()
     {
-        return $this->sql_quote($this->word);
+        return $this->sql_quote();
     }
 }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10591] trunk/lib/WikiGroup.php

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

Revision: 10591
          http://sourceforge.net/p/phpwiki/code/10591
Author:   vargenau
Date:     2021-09-20 12:26:39 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
Constructors have no parameter

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

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2021-09-20 11:42:40 UTC (rev 10590)
+++ trunk/lib/WikiGroup.php	2021-09-20 12:26:39 UTC (rev 10591)
@@ -111,12 +111,12 @@
     {
         switch (GROUP_METHOD) {
             case "NONE":
-                return new GroupNone($not_current);
+                return new GroupNone();
             case "WIKIPAGE":
-                return new GroupWikiPage($not_current);
+                return new GroupWikiPage();
             case "DB":
                 if ($GLOBALS['DBParams']['dbtype'] == 'SQL') {
-                    return new GroupDb_PearDB($not_current);
+                    return new GroupDb_PearDB();
                 } else {
                     trigger_error("GROUP_METHOD = DB: Unsupported dbtype "
                             . $GLOBALS['DBParams']['dbtype'],
@@ -124,9 +124,9 @@
                 }
                 break;
             case "FILE":
-                return new GroupFile($not_current);
+                return new GroupFile();
             case "LDAP":
-                return new GroupLDAP($not_current);
+                return new GroupLDAP();
             default:
                 trigger_error(_("No or unsupported GROUP_METHOD defined"), E_USER_WARNING);
                 return new WikiGroup($not_current);
@@ -520,7 +520,7 @@
 
         global $request;
         $master_page = $request->getPage(CATEGORY_GROUP_PAGE);
-        $master_list = $master_page->getLinks(true);
+        $master_list = $master_page->getLinks();
         while ($group_page = $master_list->next()) {
             $group = $group_page->getName();
             $this->membership[$group] = $this->_inGroupPage($group_page);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10590] trunk/lib/WikiUser/LDAP.php

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

Revision: 10590
          http://sourceforge.net/p/phpwiki/code/10590
Author:   vargenau
Date:     2021-09-20 11:42:40 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
function _stringEscape is private

Modified Paths:
--------------
    trunk/lib/WikiUser/LDAP.php

Modified: trunk/lib/WikiUser/LDAP.php
===================================================================
--- trunk/lib/WikiUser/LDAP.php	2021-09-20 11:32:14 UTC (rev 10589)
+++ trunk/lib/WikiUser/LDAP.php	2021-09-20 11:42:40 UTC (rev 10590)
@@ -86,9 +86,9 @@
      *
      * @see http://www.faqs.org/rfcs/rfc4514.html LDAP String Representation of Distinguished Names
      */
-    function _stringEscape($name)
+    private function _stringEscape($name)
     {
-        $name = strtr(utf8_encode($name),
+        return strtr(utf8_encode($name),
             array("*" => "\\2a",
                 "?" => "\\3f",
                 "(" => "\\28",
@@ -96,7 +96,6 @@
                 "\\" => "\\5c",
                 '"' => '\"',
                 "\0" => "\\00"));
-        return $name;
     }
 
     /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10589] trunk/lib/editpage.php

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

Revision: 10589
          http://sourceforge.net/p/phpwiki/code/10589
Author:   vargenau
Date:     2021-09-20 11:32:14 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
functions pagesPulldown and templatePulldown need no parameter

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

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2021-09-20 10:43:14 UTC (rev 10588)
+++ trunk/lib/editpage.php	2021-09-20 11:32:14 UTC (rev 10589)
@@ -186,10 +186,9 @@
             return true;
         } elseif ($this->editaction == 'upload') {
             // run plugin UpLoad
-            $plugin = new WikiPluginLoader("UpLoad");
+            $plugin = new WikiPluginLoader();
             $plugin->run();
             // add link to content
-            ;
         }
 
         if ($saveFailed and $this->isConcurrentUpdate()) {
@@ -792,12 +791,12 @@
                                                   'title' => _('Insert Dynamic Template'),
                                                   'onclick' => "insertTags('{{','}}','"._('Template Name')."'); return true;")));
             if (defined('TOOLBAR_TEMPLATE_PULLDOWN') and TOOLBAR_TEMPLATE_PULLDOWN) {
-                $toolbar->pushContent($this->templatePulldown(TOOLBAR_TEMPLATE_PULLDOWN));
+                $toolbar->pushContent($this->templatePulldown());
             }
             $toolbar->pushContent($this->categoriesPulldown());
             $toolbar->pushContent($this->pluginPulldown());
             if (defined('TOOLBAR_PAGELINK_PULLDOWN') and TOOLBAR_PAGELINK_PULLDOWN) {
-                $toolbar->pushContent($this->pagesPulldown(TOOLBAR_PAGELINK_PULLDOWN));
+                $toolbar->pushContent($this->pagesPulldown());
             }
             if (defined('TOOLBAR_IMAGE_PULLDOWN') and TOOLBAR_IMAGE_PULLDOWN) {
                 $toolbar->pushContent($this->imagePulldown());
@@ -904,7 +903,7 @@
         return '';
     }
 
-    private function pagesPulldown($query)
+    private function pagesPulldown()
     {
         /**
          * @var WikiRequest $request
@@ -913,7 +912,7 @@
 
         require_once 'lib/TextSearchQuery.php';
         $dbi =& $request->_dbi;
-        $page_iter = $dbi->titleSearch(new TextSearchQuery($query, false, 'auto'));
+        $page_iter = $dbi->titleSearch(new TextSearchQuery(TOOLBAR_PAGELINK_PULLDOWN, false, 'auto'));
         if ($page_iter->count() > 0) {
             global $WikiTheme;
             $pages = array();
@@ -935,12 +934,12 @@
         return '';
     }
 
-    private function templatePulldown($query)
+    private function templatePulldown()
     {
         global $request;
         require_once 'lib/TextSearchQuery.php';
         $dbi =& $request->_dbi;
-        $page_iter = $dbi->titleSearch(new TextSearchQuery($query, false, 'auto'));
+        $page_iter = $dbi->titleSearch(new TextSearchQuery(TOOLBAR_TEMPLATE_PULLDOWN, false, 'auto'));
         if ($page_iter->count()) {
             global $WikiTheme;
             $pages_js = '';

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10588] trunk/lib/RssWriter2.php

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

Revision: 10588
          http://sourceforge.net/p/phpwiki/code/10588
Author:   vargenau
Date:     2021-09-20 10:43:14 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
RssWriter __construct has no argument

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

Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php	2021-09-20 10:41:03 UTC (rev 10587)
+++ trunk/lib/RssWriter2.php	2021-09-20 10:43:14 UTC (rev 10588)
@@ -42,7 +42,7 @@
 {
     function __construct()
     {
-        parent::__construct('rss', array('version' => "2.0"));
+        parent::__construct();
 
         // not used. no namespaces should be used.
         $this->_modules = array(

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10587] trunk/lib/WysiwygEdit.php

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

Revision: 10587
          http://sourceforge.net/p/phpwiki/code/10587
Author:   vargenau
Date:     2021-09-20 10:41:03 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
Remove useless local variable

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

Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php	2021-09-20 10:37:42 UTC (rev 10586)
+++ trunk/lib/WysiwygEdit.php	2021-09-20 10:41:03 UTC (rev 10587)
@@ -94,8 +94,7 @@
         if (empty($trfm)) {
             $trfm = new HtmlTransformer($this->_transformer_tags);
         }
-        $markup = $trfm->parse($text); // version 2.0
-        return $markup;
+        return $trfm->parse($text);
     }
 }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10586] trunk/lib/main.php

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

Revision: 10586
          http://sourceforge.net/p/phpwiki/code/10586
Author:   vargenau
Date:     2021-09-20 10:37:42 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
function WikiUser has only one argument

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2021-09-20 10:32:58 UTC (rev 10585)
+++ trunk/lib/main.php	2021-09-20 10:37:42 UTC (rev 10586)
@@ -117,7 +117,7 @@
                     or (strtolower(get_class($this->_user)) == '_passuser')
                     or (strtolower(get_class($this->_user)) == '_fusionforgepassuser'))
             ) {
-                $this->_user = WikiUser($userid, $this->_user->_prefs);
+                $this->_user = WikiUser($userid);
             }
             // revive other db handle
             if (isset($this->_user->_prefs->_method)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10585] trunk/lib/PageType.php

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

Revision: 10585
          http://sourceforge.net/p/phpwiki/code/10585
Author:   vargenau
Date:     2021-09-20 10:32:58 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
lib/PageType.php: $filename = INTERWIKI_MAP_FILE

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

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2021-09-20 10:13:23 UTC (rev 10584)
+++ trunk/lib/PageType.php	2021-09-20 10:32:58 UTC (rev 10585)
@@ -340,7 +340,9 @@
                 INTERWIKI_MAP_FILE);
             trigger_error($error_html, E_USER_NOTICE);
         }
-        if (!file_exists(INTERWIKI_MAP_FILE)) {
+        if (file_exists(INTERWIKI_MAP_FILE)) {
+            $filename = INTERWIKI_MAP_FILE;
+        } else {
             $finder = new FileFinder();
             $filename = $finder->findFile(INTERWIKI_MAP_FILE);
         }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10584] trunk/lib/HtmlParser.php

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

Revision: 10584
          http://sourceforge.net/p/phpwiki/code/10584
Author:   vargenau
Date:     2021-09-20 10:13:23 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
Remove useless local variable

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

Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php	2021-09-20 10:11:20 UTC (rev 10583)
+++ trunk/lib/HtmlParser.php	2021-09-20 10:13:23 UTC (rev 10584)
@@ -72,8 +72,7 @@
     {
         if (is_null($this->root))
             $this->root = $GLOBALS['xml_parser_root'];
-        $output = $this->wikify($this->root);
-        return $output;
+        return $this->wikify($this->root);
     }
 
     /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10583] trunk/lib/PageType.php

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

Revision: 10583
          http://sourceforge.net/p/phpwiki/code/10583
Author:   vargenau
Date:     2021-09-20 10:11:20 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
function _getMapFromFile needs no parameter, always INTERWIKI_MAP_FILE

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

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2021-09-20 09:28:21 UTC (rev 10582)
+++ trunk/lib/PageType.php	2021-09-20 10:11:20 UTC (rev 10583)
@@ -174,7 +174,7 @@
             $intermap = $this->_getMapFromWikiText($pagetext);
         }
         if (!$intermap && defined('INTERWIKI_MAP_FILE'))
-            $intermap = $this->_getMapFromFile(INTERWIKI_MAP_FILE);
+            $intermap = $this->_getMapFromFile();
 
         $this->_map = $this->_parseMap($intermap);
         $this->_regexp = $this->_getRegexp();
@@ -333,14 +333,14 @@
         return false;
     }
 
-    private function _getMapFromFile($filename)
+    private function _getMapFromFile()
     {
         if (defined('WARN_NONPUBLIC_INTERWIKIMAP') and WARN_NONPUBLIC_INTERWIKIMAP) {
             $error_html = sprintf(_("Loading InterWikiMap from external file %s."),
-                $filename);
+                INTERWIKI_MAP_FILE);
             trigger_error($error_html, E_USER_NOTICE);
         }
-        if (!file_exists($filename)) {
+        if (!file_exists(INTERWIKI_MAP_FILE)) {
             $finder = new FileFinder();
             $filename = $finder->findFile(INTERWIKI_MAP_FILE);
         }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10582] trunk/lib/PageType.php

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

Revision: 10582
          http://sourceforge.net/p/phpwiki/code/10582
Author:   vargenau
Date:     2021-09-20 09:28:21 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
Remove useless local variable

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

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2021-09-20 09:27:18 UTC (rev 10581)
+++ trunk/lib/PageType.php	2021-09-20 09:28:21 UTC (rev 10582)
@@ -184,8 +184,7 @@
     {
         /*PHP5 Fatal error: Using $this when not in object context */
         if (empty($this->_map)) {
-            $map = new PageType_interwikimap($pagetext);
-            return $map;
+            return new PageType_interwikimap($pagetext);
         } else {
             return $this;
         }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10581] trunk/lib/PageType.php

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

Revision: 10581
          http://sourceforge.net/p/phpwiki/code/10581
Author:   vargenau
Date:     2021-09-20 09:27:18 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
Remove unnecessary cast

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

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2021-09-20 09:25:22 UTC (rev 10580)
+++ trunk/lib/PageType.php	2021-09-20 09:27:18 UTC (rev 10581)
@@ -80,7 +80,7 @@
     {
         if (!$name)
             $name = 'wikitext';
-        $class = "PageType_" . (string)$name;
+        $class = "PageType_" . $name;
         if (class_exists($class))
             return new $class;
         trigger_error(sprintf("PageType “%s” unknown", (string)$name),

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10580] trunk/lib/PagePerm.php

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

Revision: 10580
          http://sourceforge.net/p/phpwiki/code/10580
Author:   vargenau
Date:     2021-09-20 09:25:22 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
No break after a return

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

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2021-09-20 09:24:11 UTC (rev 10579)
+++ trunk/lib/PagePerm.php	2021-09-20 09:25:22 UTC (rev 10580)
@@ -204,7 +204,6 @@
                 return 'create';
             else
                 return 'view';
-            break;
         case 'upload':
         case 'loadfile':
             // probably create/edit but we cannot check all page permissions, can we?

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10579] trunk/lib/plugin/YouTube.php

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

Revision: 10579
          http://sourceforge.net/p/phpwiki/code/10579
Author:   vargenau
Date:     2021-09-20 09:24:11 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
Remove useless local variable

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

Modified: trunk/lib/plugin/YouTube.php
===================================================================
--- trunk/lib/plugin/YouTube.php	2021-09-20 09:22:59 UTC (rev 10578)
+++ trunk/lib/plugin/YouTube.php	2021-09-20 09:24:11 UTC (rev 10579)
@@ -177,13 +177,12 @@
                 $height = 60;
             }
             // img: http://img.youtube.com/vi/KKTDRqQtPO8/2.jpg or 0.jpg
-            $link = HTML::a(array('href' => $url),
+            return HTML::a(array('href' => $url),
                 HTML::img(array('src' => "http://img.youtube.com/vi/" .
                     $v . "/" . (($size == 'large') ? "0" : "2") . ".jpg",
                     'width' => $width,
                     'height' => $height,
                     'alt' => "YouTube video $v")));
-            return $link;
         }
         $object = HTML::object(array('class' => 'inlineobject',
             'width' => $width,

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10578] trunk/lib/Request.php

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

Revision: 10578
          http://sourceforge.net/p/phpwiki/code/10578
Author:   vargenau
Date:     2021-09-20 09:22:59 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
Cases 1 and 2 are the same

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

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2021-09-20 09:19:42 UTC (rev 10577)
+++ trunk/lib/Request.php	2021-09-20 09:22:59 UTC (rev 10578)
@@ -692,8 +692,6 @@
             // errmsgs by Shilad Sen
             switch ($err) {
                 case 1:
-                    trigger_error(_("Upload error: file too big"), E_USER_WARNING);
-                    break;
                 case 2:
                     trigger_error(_("Upload error: file too big"), E_USER_WARNING);
                     break;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10577] trunk/lib/pdf.php

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

Revision: 10577
          http://sourceforge.net/p/phpwiki/code/10577
Author:   vargenau
Date:     2021-09-20 09:19:42 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
No return needed at end of function

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

Modified: trunk/lib/pdf.php
===================================================================
--- trunk/lib/pdf.php	2021-09-20 09:14:32 UTC (rev 10576)
+++ trunk/lib/pdf.php	2021-09-20 09:19:42 UTC (rev 10577)
@@ -54,7 +54,6 @@
         new WikiDB_Array_generic_iter($pagelist->_pages),
         $request->getArg('exclude'));
     $WikiTheme->DUMP_MODE = false;
-    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:[10576] trunk/lib/display.php

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

Revision: 10576
          http://sourceforge.net/p/phpwiki/code/10576
Author:   vargenau
Date:     2021-09-20 09:14:32 +0000 (Mon, 20 Sep 2021)
Log Message:
-----------
Simpler test

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

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2021-09-20 09:12:29 UTC (rev 10575)
+++ trunk/lib/display.php	2021-09-20 09:14:32 UTC (rev 10576)
@@ -208,7 +208,7 @@
             $rdf = new OwlWriter($request, $pagelist);
             $rdf->format();
         } else {
-            if (!in_array($pagename, array(_("LinkDatabase"))))
+            if ($pagename != _("LinkDatabase"))
                 trigger_error(sprintf(_("Unsupported argument: %s=%s"), "format", $format),
                     E_USER_WARNING);
             $template = Template('browse', array('CONTENT' => $transformedContent));
@@ -441,7 +441,7 @@
             header("Content-Type: application/json");
             die($json_enc);
         } else {
-            if (!in_array($pagename, array(_("LinkDatabase"))))
+            if ($pagename != _("LinkDatabase"))
                 trigger_error(sprintf(_("Unsupported argument: %s=%s"), "format", $format),
                     E_USER_WARNING);
             $template->printExpansion($toks);

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