phpwiki-checkins Mailing List for PhpWiki (Page 35)

Brought to you by: carstenklapp, dairiki, rurban, vargenau, wainstead

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

You can subscribe to this list here.

2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (43)	Nov (73)	Dec (10)
2001	Jan (34)	Feb (110)	Mar (24)	Apr (44)	May (37)	Jun (22)	Jul (20)	Aug (28)	Sep (50)	Oct (11)	Nov (132)	Dec (595)
2002	Jan (1099)	Feb (579)	Mar (63)	Apr	May	Jun	Jul	Aug (125)	Sep (101)	Oct (25)	Nov (34)	Dec (47)
2003	Jan (82)	Feb (182)	Mar (71)	Apr (3)	May (1)	Jun (3)	Jul	Aug	Sep (14)	Oct (6)	Nov (124)	Dec (68)
2004	Jan (64)	Feb (191)	Mar (199)	Apr (298)	May (252)	Jun (426)	Jul (134)	Aug (13)	Sep (96)	Oct (75)	Nov (232)	Dec (171)
2005	Jan (205)	Feb (165)	Mar (8)	Apr (74)	May (21)	Jun (19)	Jul (37)	Aug (69)	Sep (141)	Oct (118)	Nov (31)	Dec (7)
2006	Jan (5)	Feb (10)	Mar (35)	Apr (24)	May (34)	Jun (29)	Jul (5)	Aug (38)	Sep (30)	Oct (37)	Nov (30)	Dec (86)
2007	Jan (414)	Feb (40)	Mar (18)	Apr (10)	May (66)	Jun (60)	Jul (105)	Aug (55)	Sep (64)	Oct (7)	Nov (11)	Dec (5)
2008	Jan (26)	Feb (28)	Mar (79)	Apr (34)	May (61)	Jun (24)	Jul (29)	Aug (160)	Sep (62)	Oct (70)	Nov (32)	Dec (14)
2009	Jan (140)	Feb (135)	Mar (153)	Apr (53)	May (24)	Jun (138)	Jul (90)	Aug (46)	Sep (72)	Oct (84)	Nov (32)	Dec (4)
2010	Jan (13)	Feb (7)	Mar (14)	Apr (55)	May (89)	Jun (131)	Jul (41)	Aug (38)	Sep (42)	Oct (11)	Nov (27)	Dec (54)
2011	Jan (127)	Feb (16)	Mar (71)	Apr (52)	May (32)	Jun (31)	Jul (4)	Aug	Sep (45)	Oct (26)	Nov (36)	Dec (10)
2012	Jan (23)	Feb (6)	Mar (13)	Apr (18)	May (1)	Jun (4)	Jul (3)	Aug (12)	Sep (57)	Oct (96)	Nov (163)	Dec (124)
2013	Jan (11)	Feb (17)	Mar (7)	Apr (48)	May (15)	Jun (29)	Jul (12)	Aug	Sep (9)	Oct	Nov	Dec (3)
2014	Jan (4)	Feb (1)	Mar (2)	Apr (1)	May (8)	Jun (90)	Jul (104)	Aug (12)	Sep (81)	Oct (139)	Nov (111)	Dec (64)
2015	Jan (46)	Feb (74)	Mar (56)	Apr (61)	May (3)	Jun (7)	Jul (11)	Aug (5)	Sep (15)	Oct (1)	Nov (1)	Dec (15)
2016	Jan (25)	Feb (33)	Mar (24)	Apr (4)	May (24)	Jun (3)	Jul (75)	Aug	Sep (2)	Oct (38)	Nov (4)	Dec (18)
2017	Jan (8)	Feb (1)	Mar (1)	Apr	May (14)	Jun	Jul (5)	Aug (9)	Sep	Oct (23)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar (9)	Apr (60)	May (1)	Jun	Jul (13)	Aug	Sep (11)	Oct	Nov	Dec
2020	Jan	Feb	Mar (15)	Apr (4)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2021	Jan (24)	Feb (33)	Mar (1)	Apr	May (1)	Jun (64)	Jul (71)	Aug (114)	Sep (82)	Oct (32)	Nov (76)	Dec (86)
2022	Jan (162)	Feb (41)	Mar (11)	Apr (9)	May	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (7)
2023	Jan	Feb (1)	Mar (2)	Apr	May	Jun	Jul (25)	Aug	Sep	Oct	Nov (7)	Dec
2024	Jan (7)	Feb (3)	Mar (3)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2025	Jan	Feb (90)	Mar (19)	Apr	May (6)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 33 34 35 36 37 .. 538 > >> (Page 35 of 538)

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

From: <var...@us...> - 2021-07-15 16:41:42

Revision: 10349
          http://sourceforge.net/p/phpwiki/code/10349
Author:   vargenau
Date:     2021-07-15 16:41:39 +0000 (Thu, 15 Jul 2021)
Log Message:
-----------
lib/WikiDB/backend/file.php: _getLatestVersion --> $this->_getLatestVersion

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

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-07-15 16:35:06 UTC (rev 10348)
+++ trunk/lib/WikiDB/backend/file.php	2021-07-15 16:41:39 UTC (rev 10349)
@@ -404,7 +404,7 @@
      */
     public function rename_page($pagename, $to)
     {
-        $version = _getLatestVersion($pagename);
+        $version = $this->_getLatestVersion($pagename);
         foreach ($this->_dir_names as $type => $path) {
             if (is_dir($path)) {
                 $filename = $this->_pagename2filename($type, $pagename, $version);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10348] trunk/pgsrc/SandBox

From: <var...@us...> - 2021-07-15 16:35:08

Revision: 10348
          http://sourceforge.net/p/phpwiki/code/10348
Author:   vargenau
Date:     2021-07-15 16:35:06 +0000 (Thu, 15 Jul 2021)
Log Message:
-----------
Use predefined icon for the smiley

Modified Paths:
--------------
    trunk/pgsrc/SandBox

Modified: trunk/pgsrc/SandBox
===================================================================
--- trunk/pgsrc/SandBox	2021-07-15 16:31:20 UTC (rev 10347)
+++ trunk/pgsrc/SandBox	2021-07-15 16:35:06 UTC (rev 10348)
@@ -1,4 +1,4 @@
-Date: Mon,  8 Apr 2019 14:45:11 +0000
+Date: Thu, 15 Jul 2021 18:33:53 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=SandBox;
@@ -8,4 +8,4 @@
 
 You can try out Wiki in here.
 
-Have fun :-)
+Have fun {{:)}}

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

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

From: <var...@us...> - 2021-07-15 16:31:22

Revision: 10347
          http://sourceforge.net/p/phpwiki/code/10347
Author:   vargenau
Date:     2021-07-15 16:31:20 +0000 (Thu, 15 Jul 2021)
Log Message:
-----------
vertical-align: middle for img.inlineimage

Modified Paths:
--------------
    trunk/themes/Hawaiian/Hawaiian.css
    trunk/themes/MacOSX/MacOSX.css
    trunk/themes/Portland/portland.css
    trunk/themes/Sidebar/sidebar.css
    trunk/themes/SpaceWiki/SpaceWiki.css
    trunk/themes/Wordpress/Wordpress.css
    trunk/themes/blog/Kubrick.css
    trunk/themes/default/phpwiki-modern.css
    trunk/themes/default/phpwiki.css
    trunk/themes/fusionforge/fusionforge.css
    trunk/themes/shamino_com/shamino_com.css
    trunk/themes/wikilens/wikilens.css

Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css	2021-07-02 17:38:55 UTC (rev 10346)
+++ trunk/themes/Hawaiian/Hawaiian.css	2021-07-15 16:31:20 UTC (rev 10347)
@@ -511,6 +511,11 @@
     vertical-align: middle;
 }
 
+img.inlineimage {
+    display: inline;
+    vertical-align: middle;
+}
+
 div.wikitext {
     width: auto;
     background-image: url("images/tchecker-white.png");

Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css	2021-07-02 17:38:55 UTC (rev 10346)
+++ trunk/themes/MacOSX/MacOSX.css	2021-07-15 16:31:20 UTC (rev 10347)
@@ -218,6 +218,11 @@
     border: 0;
 }
 
+img.inlineimage {
+    display: inline;
+    vertical-align: middle;
+}
+
 img.rssicon {
     vertical-align: middle;
 }

Modified: trunk/themes/Portland/portland.css
===================================================================
--- trunk/themes/Portland/portland.css	2021-07-02 17:38:55 UTC (rev 10346)
+++ trunk/themes/Portland/portland.css	2021-07-15 16:31:20 UTC (rev 10347)
@@ -16,6 +16,11 @@
     border: 0;
 }
 
+img.inlineimage {
+    display: inline;
+    vertical-align: middle;
+}
+
 .wiki-edithelp {
     font-size: smaller;
 }

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2021-07-02 17:38:55 UTC (rev 10346)
+++ trunk/themes/Sidebar/sidebar.css	2021-07-15 16:31:20 UTC (rev 10347)
@@ -93,8 +93,8 @@
 }
 
 img.inlineimage {
-    border: none;
     display: inline;
+    vertical-align: middle;
 }
 
 hr {

Modified: trunk/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- trunk/themes/SpaceWiki/SpaceWiki.css	2021-07-02 17:38:55 UTC (rev 10346)
+++ trunk/themes/SpaceWiki/SpaceWiki.css	2021-07-15 16:31:20 UTC (rev 10347)
@@ -27,6 +27,11 @@
     border: 0;
 }
 
+img.inlineimage {
+    display: inline;
+    vertical-align: middle;
+}
+
 form {
     margin: 0;
 }

Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css	2021-07-02 17:38:55 UTC (rev 10346)
+++ trunk/themes/Wordpress/Wordpress.css	2021-07-15 16:31:20 UTC (rev 10347)
@@ -28,6 +28,11 @@
     border: 0;
 }
 
+img.inlineimage {
+    display: inline;
+    vertical-align: middle;
+}
+
 .wiki-edithelp {
     font-size: smaller;
 }

Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css	2021-07-02 17:38:55 UTC (rev 10346)
+++ trunk/themes/blog/Kubrick.css	2021-07-15 16:31:20 UTC (rev 10347)
@@ -471,6 +471,11 @@
     border: 0;
 }
 
+img.inlineimage {
+    display: inline;
+    vertical-align: middle;
+}
+
 p img {
     padding: 0;
     max-width: 100%;

Modified: trunk/themes/default/phpwiki-modern.css
===================================================================
--- trunk/themes/default/phpwiki-modern.css	2021-07-02 17:38:55 UTC (rev 10346)
+++ trunk/themes/default/phpwiki-modern.css	2021-07-15 16:31:20 UTC (rev 10347)
@@ -484,6 +484,10 @@
     vertical-align: middle;
 }
 
+img.inlineimage {
+    vertical-align: middle;
+}
+
 img.rssicon {
     vertical-align: baseline;
 }

Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css	2021-07-02 17:38:55 UTC (rev 10346)
+++ trunk/themes/default/phpwiki.css	2021-07-15 16:31:20 UTC (rev 10347)
@@ -1013,6 +1013,11 @@
     vertical-align: baseline;
 }
 
+img.inlineimage {
+    display: inline;
+    vertical-align: middle;
+}
+
 input {
     margin: 0.1em;
 }

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2021-07-02 17:38:55 UTC (rev 10346)
+++ trunk/themes/fusionforge/fusionforge.css	2021-07-15 16:31:20 UTC (rev 10347)
@@ -207,6 +207,7 @@
 }
 
 img.inlineimage {
+    display: inline;
     vertical-align: middle;
 }
 

Modified: trunk/themes/shamino_com/shamino_com.css
===================================================================
--- trunk/themes/shamino_com/shamino_com.css	2021-07-02 17:38:55 UTC (rev 10346)
+++ trunk/themes/shamino_com/shamino_com.css	2021-07-15 16:31:20 UTC (rev 10347)
@@ -73,6 +73,11 @@
     padding: 0;
 }
 
+img.inlineimage {
+    display: inline;
+    vertical-align: middle;
+}
+
 table {
     border: 0;;
     padding: 0;

Modified: trunk/themes/wikilens/wikilens.css
===================================================================
--- trunk/themes/wikilens/wikilens.css	2021-07-02 17:38:55 UTC (rev 10346)
+++ trunk/themes/wikilens/wikilens.css	2021-07-15 16:31:20 UTC (rev 10347)
@@ -32,6 +32,11 @@
     border: 0;
 }
 
+img.inlineimage {
+    display: inline;
+    vertical-align: middle;
+}
+
 #logo img {
     margin: 0;
     float: left;

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

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

From: <var...@us...> - 2021-07-02 17:39:02

Revision: 10346
          http://sourceforge.net/p/phpwiki/code/10346
Author:   vargenau
Date:     2021-07-02 17:38:55 +0000 (Fri, 02 Jul 2021)
Log Message:
-----------
Add {}

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-07-02 17:17:56 UTC (rev 10345)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-07-02 17:38:55 UTC (rev 10346)
@@ -200,8 +200,9 @@
      */
     function close()
     {
-        if (!$this->_dbh)
+        if (!$this->_dbh) {
             return;
+        }
         if ($this->_lock_count) {
             trigger_error("WARNING: database still locked " .
                     '(lock_count = $this->_lock_count)' . "\n<br />",
@@ -280,7 +281,7 @@
         return $row ? $this->_extract_page_data($row[3], $row[2]) : false;
     }
 
-    public function  _extract_page_data($data, $hits)
+    public function _extract_page_data($data, $hits)
     {
         if (empty($data))
             return array('hits' => $hits);
@@ -957,12 +958,12 @@
     {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
-        $order = "DESC";
         if ($limit < 0) {
             $order = "ASC";
             $limit = -$limit;
             $where = "";
         } else {
+            $order = "DESC";
             $where = " AND hits > 0";
         }
         $orderby = '';

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2021-07-02 17:17:56 UTC (rev 10345)
+++ trunk/lib/WikiDB/backend/PearDB.php	2021-07-02 17:38:55 UTC (rev 10346)
@@ -606,7 +606,9 @@
         $dbh = &$this->_dbh;
         extract($this->_table_names);
         $orderby = $this->sortby($sortby, 'db');
-        if ($orderby) $orderby = ' ORDER BY ' . $orderby;
+        if ($orderby) {
+            $orderby = ' ORDER BY ' . $orderby;
+        }
         if ($exclude) { // array of pagenames
             $exclude = " AND $page_tbl.pagename NOT IN " . $this->_sql_set($exclude);
         } else {
@@ -667,8 +669,9 @@
         $dbh = &$this->_dbh;
         extract($this->_table_names);
         $orderby = $this->sortby($sortby, 'db');
-        if ($orderby) $orderby = ' ORDER BY ' . $orderby;
-
+        if ($orderby) {
+            $orderby = ' ORDER BY ' . $orderby;
+        }
         $searchclass = get_class($this) . "_search";
         // no need to define it everywhere and then fallback. memory!
         if (!class_exists($searchclass))
@@ -752,11 +755,11 @@
         $dbh = &$this->_dbh;
         extract($this->_table_names);
         if ($limit < 0) {
-            $order = "hits ASC";
+            $order = "ASC";
             $limit = -$limit;
             $where = "";
         } else {
-            $order = "hits DESC";
+            $order = "DESC";
             $where = " AND hits > 0";
         }
         $orderby = '';
@@ -764,7 +767,7 @@
             if ($order = $this->sortby($sortby, 'db'))
                 $orderby = " ORDER BY " . $order;
         } else {
-            $orderby = " ORDER BY $order";
+            $orderby = " ORDER BY hits $order";
         }
         $sql = "SELECT "
             . $this->page_tbl_fields
@@ -797,8 +800,9 @@
         extract($this->_table_names);
 
         $pick = array();
-        if ($since)
+        if ($since) {
             $pick[] = "mtime >= $since";
+        }
 
         if ($include_all_revisions) {
             // Include all revisions of each page.
@@ -835,8 +839,9 @@
             $limit = -$limit;
         }
         $where_clause = $join_clause;
-        if ($pick)
+        if ($pick) {
             $where_clause .= " AND " . join(" AND ", $pick);
+        }
         $sql = "SELECT "
             . $this->page_tbl_fields . ", " . $this->version_tbl_fields
             . " FROM $table"
@@ -862,10 +867,12 @@
         if ($orderby = $this->sortby($sortby, 'db', array('pagename', 'wantedfrom')))
             $orderby = 'ORDER BY ' . $orderby;
 
-        if ($exclude_from) // array of pagenames
+        if ($exclude_from) { // array of pagenames
             $exclude_from = " AND pp.pagename NOT IN " . $this->_sql_set($exclude_from);
-        if ($exclude) // array of pagenames
+        }
+        if ($exclude) { // array of pagenames
             $exclude = " AND p.pagename NOT IN " . $this->_sql_set($exclude);
+        }
 
         $sql = "SELECT p.pagename, pp.pagename AS wantedfrom"
             . " FROM $page_tbl p, $link_tbl linked"
@@ -1019,8 +1026,9 @@
      */
     function _serialize($data)
     {
-        if (empty($data))
+        if (empty($data)) {
             return '';
+        }
         assert(is_array($data));
         return serialize($data);
     }

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

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

From: <var...@us...> - 2021-07-02 17:18:03

Revision: 10345
          http://sourceforge.net/p/phpwiki/code/10345
Author:   vargenau
Date:     2021-07-02 17:17:56 +0000 (Fri, 02 Jul 2021)
Log Message:
-----------
PDO: fix fetchColumn call

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-07-02 16:48:08 UTC (rev 10344)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-07-02 17:17:56 UTC (rev 10345)
@@ -346,7 +346,7 @@
         $sth = $dbh->prepare("SELECT cached_html FROM $page_tbl WHERE pagename=? LIMIT 1");
         $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100);
         $sth->execute();
-        return $sth->fetchColumn(PDO::FETCH_NUM);
+        return $sth->fetchColumn(0);
     }
 
     function set_cached_html($pagename, $data)

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

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

From: <var...@us...> - 2021-07-02 16:48:10

Revision: 10344
          http://sourceforge.net/p/phpwiki/code/10344
Author:   vargenau
Date:     2021-07-02 16:48:08 +0000 (Fri, 02 Jul 2021)
Log Message:
-----------
PDO: Only variables should be passed by reference

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-07-02 16:13:10 UTC (rev 10343)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-07-02 16:48:08 UTC (rev 10344)
@@ -327,7 +327,8 @@
             . " WHERE pagename=?"
             . " LIMIT 1");
         $sth->bindParam(1, $hits, PDO::PARAM_INT);
-        $sth->bindParam(2, $this->_serialize($data), PDO::PARAM_LOB);
+        $serialized_data = $this->_serialize($data);
+        $sth->bindParam(2, $serialized_data, PDO::PARAM_LOB);
         $sth->bindParam(3, $pagename, PDO::PARAM_STR, 100);
         if ($sth->execute()) {
             $this->commit();
@@ -564,7 +565,8 @@
             $sth->bindParam(3, $mtime, PDO::PARAM_INT);
             $sth->bindParam(4, $minor_edit, PDO::PARAM_INT);
             $sth->bindParam(5, $content, PDO::PARAM_STR, 100);
-            $sth->bindParam(6, $this->_serialize($data), PDO::PARAM_STR, 100);
+            $serialized_data = $this->_serialize($data);
+            $sth->bindParam(6, $serialized_data, PDO::PARAM_STR, 100);
             $rs = $sth->execute();
         } else {
             $sth = $dbh->prepare("DELETE FROM $version_tbl"
@@ -580,7 +582,8 @@
             $sth->bindParam(3, $mtime, PDO::PARAM_INT);
             $sth->bindParam(4, $minor_edit, PDO::PARAM_INT);
             $sth->bindParam(5, $content, PDO::PARAM_STR, 100);
-            $sth->bindParam(6, $this->_serialize($data), PDO::PARAM_STR, 100);
+            $serialized_data = $this->_serialize($data);
+            $sth->bindParam(6, $serialized_data, PDO::PARAM_STR, 100);
             $rs = $sth->execute();
         }
         $this->_update_recent_table($id);
@@ -1346,7 +1349,8 @@
         $sth->bindParam(5, $entry->request, PDO::PARAM_STR, 255);
         $sth->bindParam(6, $entry->request_args, PDO::PARAM_STR, 255);
         $sth->bindParam(7, $entry->request_uri, PDO::PARAM_STR, 255);
-        $sth->bindParam(8, $entry->_ncsa_time($entry->time), PDO::PARAM_STR, 28);
+        $ncsa_time = _ncsa_time($entry->time);
+        $sth->bindParam(8, $ncsa_time, PDO::PARAM_STR, 28);
         $sth->bindParam(9, $entry->time, PDO::PARAM_INT);
         $sth->bindParam(10, $entry->status, PDO::PARAM_INT);
         $sth->bindParam(11, $entry->size, PDO::PARAM_INT);

Modified: trunk/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_oci8.php	2021-07-02 16:13:10 UTC (rev 10343)
+++ trunk/lib/WikiDB/backend/PDO_oci8.php	2021-07-02 16:48:08 UTC (rev 10344)
@@ -74,7 +74,8 @@
             . "request_file,request_uri,request_time,status,bytes_sent,referer,agent,request_duration)"
             . " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)");
         // Either use unixtime as %d (long), or the native timestamp format.
-        $sth->bindParam(1, date('d-M-Y H:i:s', $entry->time));
+        $datetime = date('d-M-Y H:i:s', $entry->time);
+        $sth->bindParam(1, $datetime);
         $sth->bindParam(2, $entry->host, PDO::PARAM_STR, 100);
         $sth->bindParam(3, $entry->user, PDO::PARAM_STR, 50);
         $sth->bindParam(4, $entry->request_method, PDO::PARAM_STR, 10);
@@ -81,7 +82,8 @@
         $sth->bindParam(5, $entry->request, PDO::PARAM_STR, 255);
         $sth->bindParam(6, $entry->request_args, PDO::PARAM_STR, 255);
         $sth->bindParam(7, $entry->request_uri, PDO::PARAM_STR, 255);
-        $sth->bindParam(8, $entry->_ncsa_time($entry->time), PDO::PARAM_STR, 28);
+        $ncsa_time = _ncsa_time($entry->time);
+        $sth->bindParam(8, $ncsa_time, PDO::PARAM_STR, 28);
         $sth->bindParam(9, $entry->time, PDO::PARAM_INT);
         $sth->bindParam(10, $entry->status, PDO::PARAM_INT);
         $sth->bindParam(11, $entry->size, PDO::PARAM_INT);

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

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

From: <var...@us...> - 2021-07-02 16:13:17

Revision: 10343
          http://sourceforge.net/p/phpwiki/code/10343
Author:   vargenau
Date:     2021-07-02 16:13:10 +0000 (Fri, 02 Jul 2021)
Log Message:
-----------
PDO: allow "mysqli" as well as "mysql" for DSN

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

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-07-02 09:24:10 UTC (rev 10342)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-07-02 16:13:10 UTC (rev 10343)
@@ -31,7 +31,6 @@
 class WikiDB_backend_PDO
     extends WikiDB_backend
 {
-
     function __construct($dbparams)
     {
         $this->_dbparams = $dbparams;
@@ -46,6 +45,9 @@
              * e.g: odbc:DSN=SAMPLE;UID=db2inst1;PWD=ibmdb2, mysql:host=127.0.0.1;dbname=testdb
              */
             $driver = $parsed['phptype'];
+            if ($driver == "mysqli") {
+                $driver = "mysql";
+            }
             unset($parsed['phptype']);
             unset($parsed['dbsyntax']);
             $dbparams['dsn'] = $driver . ":";
@@ -54,8 +56,7 @@
             }
             $this->_dbh->database = $parsed['database'];
             // mysql needs to map database=>dbname, hostspec=>host. TODO for the others.
-            $dsnmap = array('mysql' => array('database' => 'dbname', 'hostspec' => 'host')
-            );
+            $dsnmap = array('mysql' => array('database' => 'dbname', 'hostspec' => 'host'));
             foreach (array('protocol', 'hostspec', 'port', 'socket', 'database') as $option) {
                 if (!empty($parsed[$option])) {
                     $optionname = (isset($dsnmap[$driver][$option]) and !isset($parsed[$optionname]))
@@ -89,14 +90,6 @@
         }
 
         try {
-            // try to load it dynamically (unix only)
-            if (!loadPhpExtension("pdo_$driver")) {
-                echo $GLOBALS['php_errormsg'], "<br>\n";
-                trigger_error(sprintf("dl() problem: Required extension '%s' could not be loaded!",
-                        "pdo_$driver"),
-                    E_USER_WARNING);
-            }
-
             // persistent is defined as DSN option, or with a config value.
             //   phptype://username:password@hostspec/database?persistent=false
             $this->_dbh = new PDO($dbparams['dsn'],
@@ -1505,7 +1498,7 @@
         $parsed['dbsyntax'] = $str;
     }
 
-    if (!count($dsn)) {
+    if ($dsn == null) {
         return $parsed;
     }
 

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

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

From: <var...@us...> - 2021-07-02 09:24:19

Revision: 10342
          http://sourceforge.net/p/phpwiki/code/10342
Author:   vargenau
Date:     2021-07-02 09:24:10 +0000 (Fri, 02 Jul 2021)
Log Message:
-----------
config/config-dist.ini: mysql --> mysqli

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

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-06-29 15:26:44 UTC (rev 10341)
+++ trunk/config/config-dist.ini	2021-07-02 09:24:10 UTC (rev 10342)
@@ -418,17 +418,17 @@
 ;
 ; For a MySQL database, the following should work:
 ;
-;       mysql://user:password@host/databasename
+;       mysqli://user:password@host/databasename
 ;
 ; To connect over a unix socket, use something like
 ;
-;       mysql://user:password@unix(/path/to/socket)/databasename
+;       mysqli://user:password@unix(/path/to/socket)/databasename
 ;
-; Valid values for dbtype are mysql, pgsql, or sqlite.
+; Valid values for dbtype are mysqli, pgsql, or sqlite.
 ;
-DATABASE_DSN = "mysql://guest@unix(/var/lib/mysql/mysql.sock)/test"
+DATABASE_DSN = "mysqli://guest@unix(/var/lib/mysql/mysql.sock)/test"
 
-; Keep persistent connections: (mysql_pconnect, ...)
+; Keep persistent connections: (mysqli_pconnect, ...)
 ; Recommended is false for bigger servers, and true for small servers
 ; with not so many connections. postgresql: Please leave it false. Default: false
 ; Should really be set as database option in the DSN above.
@@ -772,7 +772,7 @@
 ;
 ; A database DSN to connect to.  Defaults to the DSN specified for the Wiki
 ; as a whole.
-;DBAUTH_AUTH_DSN = "mysql://wikiuser:@127.0.0.1/phpwiki"
+;DBAUTH_AUTH_DSN = "mysqli://wikiuser:@127.0.0.1/phpwiki"
 ;
 ; USER/PASSWORD queries
 ;

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

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

From: <var...@us...> - 2021-06-29 15:26:50

Revision: 10341
          http://sourceforge.net/p/phpwiki/code/10341
Author:   vargenau
Date:     2021-06-29 15:26:44 +0000 (Tue, 29 Jun 2021)
Log Message:
-----------
lib/plugin/SystemInfo.php: replace create_function

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

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2021-06-29 14:47:13 UTC (rev 10340)
+++ trunk/lib/plugin/SystemInfo.php	2021-06-29 15:26:44 UTC (rev 10341)
@@ -460,10 +460,9 @@
         $list = $fileset->getFiles();
         natcasesort($list);
         reset($list);
+        $plugin_function = function($f) { return substr($f,0,-4); };
         return sprintf(_("Total %d plugins: "), count($list))
-            . implode(', ', array_map(create_function('$f',
-                    'return substr($f,0,-4);'),
-                $list));
+            . implode(', ', array_map($plugin_function, $list));
     }
 
     function supported_languages()
@@ -623,9 +622,9 @@
 {
     $n = count($hits);
     if (!$total) $total = array_reduce($hits, 'rsum');
+    $mean_function = function($i) { global $mean; return ($i-$mean)*($i-$mean); };
     $GLOBALS['mean'] = $total / $n;
-    $r = array_map(create_function('$i', 'global $mean; return ($i-$mean)*($i-$mean);'),
-        $hits);
+    $r = array_map($mean_function, $hits);
     unset($GLOBALS['mean']);
     return (float)sqrt(mean($r, $total) * ($n / (float)($n - 1)));
 }

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

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

From: <var...@us...> - 2021-06-29 14:47:16

Revision: 10340
          http://sourceforge.net/p/phpwiki/code/10340
Author:   vargenau
Date:     2021-06-29 14:47:13 +0000 (Tue, 29 Jun 2021)
Log Message:
-----------
lib/plugin/SystemInfo.php: replace create_function

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

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2021-06-29 13:38:35 UTC (rev 10339)
+++ trunk/lib/plugin/SystemInfo.php	2021-06-29 14:47:13 UTC (rev 10340)
@@ -518,17 +518,28 @@
         //$args = $this->getArgs($argstr, $request);
         $this->_dbi =& $dbi;
         $args['separator'] = ' ';
+
+        $appname_function = function() { return 'PhpWiki'; };
+        $version_function = function() { return sprintf('%s', PHPWIKI_VERSION); };
+        $LANG_function = function() { return $GLOBALS["LANG"]; };
+        $LC_ALL_function = function() { return setlocale(LC_ALL, 0); };
+        $current_language_function = function() { return $GLOBALS["LANG"]; };
+        $system_language_function = function() { return DEFAULT_LANGUAGE; };
+        $current_theme_function = function() { return $GLOBALS["WikiTheme"]->_name; };
+        $system_theme_function = function() { return THEME; };
+        $dummy_function = function() { return 'dummy'; };
+
         $availableargs = // name => callback + 0 args
-            array('appname' => create_function('', "return 'PhpWiki';"),
-                'version' => create_function('', "return sprintf('%s', PHPWIKI_VERSION);"),
-                'LANG' => create_function('', 'return $GLOBALS["LANG"];'),
-                'LC_ALL' => create_function('', 'return setlocale(LC_ALL, 0);'),
-                'current_language' => create_function('', 'return $GLOBALS["LANG"];'),
-                'system_language' => create_function('', 'return DEFAULT_LANGUAGE;'),
-                'current_theme' => create_function('', 'return $GLOBALS["WikiTheme"]->_name;'),
-                'system_theme' => create_function('', 'return THEME;'),
-                // more here or as method.
-                '' => create_function('', "return 'dummy';")
+            array('appname' => $appname_function,
+                  'version' => $version_function,
+                  'LANG' => $LANG_function,
+                  'LC_ALL' => $LC_ALL_function,
+                  'current_language' => $current_language_function,
+                  'system_language' => $system_language_function,
+                  'current_theme' => $current_theme_function,
+                  'system_theme' => $system_theme_function,
+                  // more here or as method.
+                  '' => $dummy_function
             );
         // split the argument string by any number of commas or space
         // characters, which include " ", \r, \t, \n and \f

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10339] trunk/lib/plugin/SpellCheck.php

From: <var...@us...> - 2021-06-29 13:38:36

Revision: 10339
          http://sourceforge.net/p/phpwiki/code/10339
Author:   vargenau
Date:     2021-06-29 13:38:35 +0000 (Tue, 29 Jun 2021)
Log Message:
-----------
lib/plugin/SpellCheck.php: no $version

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

Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php	2021-06-29 13:11:19 UTC (rev 10338)
+++ trunk/lib/plugin/SpellCheck.php	2021-06-29 13:38:35 UTC (rev 10339)
@@ -162,13 +162,7 @@
         }
         //$html->pushContent(HTML::hr(),HTML::h1(_("Spellcheck")));
         $page = $request->getPage();
-        if ($version) {
-            $revision = $page->getRevision($version);
-            if (!$revision)
-                NoSuchRevision($request, $page, $version);
-        } else {
-            $revision = $page->getCurrentRevision();
-        }
+        $revision = $page->getCurrentRevision();
         $request->setArg('suggestions', $sugg);
         include_once 'lib/BlockParser.php';
         $ori_html = TransformText($revision, $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:[10338] trunk/lib/FileFinder.php

From: <var...@us...> - 2021-06-29 13:11:21

Revision: 10338
          http://sourceforge.net/p/phpwiki/code/10338
Author:   vargenau
Date:     2021-06-29 13:11:19 +0000 (Tue, 29 Jun 2021)
Log Message:
-----------
PHP function implode(): separator must be the first argument

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

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2021-06-29 12:54:19 UTC (rev 10337)
+++ trunk/lib/FileFinder.php	2021-06-29 13:11:19 UTC (rev 10338)
@@ -320,7 +320,7 @@
             array_splice($this->_path, $i, 1);
         }
         array_unshift($this->_path, $dir);
-        $GLOBALS['INCLUDE_PATH'] = implode($this->_path, $this->_get_ini_separator());
+        $GLOBALS['INCLUDE_PATH'] = implode($this->_get_ini_separator(), $this->_path);
         @ini_set('include_path', $GLOBALS['INCLUDE_PATH']);
     }
 

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

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

From: <var...@us...> - 2021-06-29 12:54:21

Revision: 10337
          http://sourceforge.net/p/phpwiki/code/10337
Author:   vargenau
Date:     2021-06-29 12:54:19 +0000 (Tue, 29 Jun 2021)
Log Message:
-----------
php7:notice PHP Deprecated:  Array and string offset access syntax with curly braces is deprecated

Modified Paths:
--------------
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
    trunk/lib/WikiDB.php
    trunk/lib/pear/Cache/Container/imgfile.php
    trunk/lib/pear/JSON.php

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php	2021-06-28 15:17:30 UTC (rev 10336)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php	2021-06-29 12:54:19 UTC (rev 10337)
@@ -120,7 +120,7 @@
 			/*
 			* find the next character of the string
 			*/
-			$c = $sql{$i};
+			$c = $sql[$i];
 
 			if ($c == "'" && !$inString && $escaped==0)
 				/*

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-06-28 15:17:30 UTC (rev 10336)
+++ trunk/lib/WikiDB.php	2021-06-29 12:54:19 UTC (rev 10337)
@@ -157,7 +157,7 @@
      **/
     public static function open($dbparams)
     {
-        $dbtype = $dbparams{'dbtype'};
+        $dbtype = $dbparams['dbtype'];
         include_once("lib/WikiDB/$dbtype.php");
 
         $class = 'WikiDB_' . $dbtype;

Modified: trunk/lib/pear/Cache/Container/imgfile.php
===================================================================
--- trunk/lib/pear/Cache/Container/imgfile.php	2021-06-28 15:17:30 UTC (rev 10336)
+++ trunk/lib/pear/Cache/Container/imgfile.php	2021-06-29 12:54:19 UTC (rev 10337)
@@ -80,7 +80,7 @@
         {
             // make relative paths absolute for use in deconstructor.
             // it looks like the deconstructor has problems with relative paths
-            if (OS_UNIX && '/' != $this->cache_dir{0}  )
+            if (OS_UNIX && '/' != $this->cache_dir[0]  )
                 $this->cache_dir = realpath( getcwd() . '/' . $this->cache_dir) . '/';
 
             // check if a trailing slash is in cache_dir

Modified: trunk/lib/pear/JSON.php
===================================================================
--- trunk/lib/pear/JSON.php	2021-06-28 15:17:30 UTC (rev 10336)
+++ trunk/lib/pear/JSON.php	2021-06-29 12:54:19 UTC (rev 10337)
@@ -169,7 +169,7 @@
             return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
         }
 
-        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+        $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
 
         switch(true) {
             case ((0x7F & $bytes) == $bytes):
@@ -222,17 +222,17 @@
             case 2:
                 // return a UTF-16 character from a 2-byte UTF-8 char
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8{0}) >> 2))
-                     . chr((0xC0 & (ord($utf8{0}) << 6))
-                         | (0x3F & ord($utf8{1})));
+                return chr(0x07 & (ord($utf8[0]) >> 2))
+                     . chr((0xC0 & (ord($utf8[0]) << 6))
+                         | (0x3F & ord($utf8[1])));
 
             case 3:
                 // return a UTF-16 character from a 3-byte UTF-8 char
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8{0}) << 4))
-                         | (0x0F & (ord($utf8{1}) >> 2)))
-                     . chr((0xC0 & (ord($utf8{1}) << 6))
-                         | (0x7F & ord($utf8{2})));
+                return chr((0xF0 & (ord($utf8[0]) << 4))
+                         | (0x0F & (ord($utf8[1]) >> 2)))
+                     . chr((0xC0 & (ord($utf8[1]) << 6))
+                         | (0x7F & ord($utf8[2])));
         }
 
         // ignoring UTF-32 for now, sorry
@@ -315,7 +315,7 @@
                 */
                 for ($c = 0; $c < $strlen_var; ++$c) {
 
-                    $ord_var_c = ord($var{$c});
+                    $ord_var_c = ord($var[$c]);
 
                     switch (true) {
                         case $ord_var_c == 0x08:
@@ -338,12 +338,12 @@
                         case $ord_var_c == 0x2F:
                         case $ord_var_c == 0x5C:
                             // double quote, slash, slosh
-                            $ascii .= '\\'.$var{$c};
+                            $ascii .= '\\'.$var[$c];
                             break;
 
                         case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
                             // characters U-00000000 - U-0000007F (same as ASCII)
-                            $ascii .= $var{$c};
+                            $ascii .= $var[$c];
                             break;
 
                         case (($ord_var_c & 0xE0) == 0xC0):
@@ -355,7 +355,7 @@
                                 break;
                             }
                             
-                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
+                            $char = pack('C*', $ord_var_c, ord($var[$c + 1]));
                             $c += 1;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -370,8 +370,8 @@
                             // characters U-00000800 - U-0000FFFF, mask 1110XXXX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                             $char = pack('C*', $ord_var_c,
-                                         @ord($var{$c + 1}),
-                                         @ord($var{$c + 2}));
+                                         @ord($var[$c + 1]),
+                                         @ord($var[$c + 2]));
                             $c += 2;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -386,9 +386,9 @@
                             // characters U-00010000 - U-001FFFFF, mask 11110XXX
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                             $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}));
+                                         ord($var[$c + 1]),
+                                         ord($var[$c + 2]),
+                                         ord($var[$c + 3]));
                             $c += 3;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -403,10 +403,10 @@
                                 break;
                             }
                             $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}));
+                                         ord($var[$c + 1]),
+                                         ord($var[$c + 2]),
+                                         ord($var[$c + 3]),
+                                         ord($var[$c + 4]));
                             $c += 4;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -421,11 +421,11 @@
                             // characters U-04000000 - U-7FFFFFFF, mask 1111110X
                             // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                             $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}),
-                                         ord($var{$c + 5}));
+                                         ord($var[$c + 1]),
+                                         ord($var[$c + 2]),
+                                         ord($var[$c + 3]),
+                                         ord($var[$c + 4]),
+                                         ord($var[$c + 5]));
                             $c += 5;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -618,7 +618,7 @@
                     for ($c = 0; $c < $strlen_chrs; ++$c) {
 
                         $substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
-                        $ord_chrs_c = ord($chrs{$c});
+                        $ord_chrs_c = ord($chrs[$c]);
 
                         switch (true) {
                             case $substr_chrs_c_2 == '\b':
@@ -648,7 +648,7 @@
                             case $substr_chrs_c_2 == '\\/':
                                 if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
                                    ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
-                                    $utf8 .= $chrs{++$c};
+                                    $utf8 .= $chrs[++$c];
                                 }
                                 break;
 
@@ -661,7 +661,7 @@
                                 break;
 
                             case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs{$c};
+                                $utf8 .= $chrs[$c];
                                 break;
 
                             case ($ord_chrs_c & 0xE0) == 0xC0:
@@ -708,7 +708,7 @@
                 } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
                     // array, or object notation
 
-                    if ($str{0} == '[') {
+                    if ($str[0] == '[') {
                         $stk = array(SERVICES_JSON_IN_ARR);
                         $arr = array();
                     } else {
@@ -747,7 +747,7 @@
                         $top = end($stk);
                         $substr_chrs_c_2 = $this->substr8($chrs, $c, 2);
 
-                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
+                        if (($c == $strlen_chrs) || (($chrs[$c] == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
                             // found a comma that is not inside a string, array, etc.,
                             // OR we've reached the end of the character list
                             $slice = $this->substr8($chrs, $top['where'], ($c - $top['where']));
@@ -788,12 +788,12 @@
 
                             }
 
-                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
+                        } elseif ((($chrs[$c] == '"') || ($chrs[$c] == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
                             // found a quote, and we are not inside a string
-                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
+                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]));
                             //print("Found start of string at {$c}\n");
 
-                        } elseif (($chrs{$c} == $top['delim']) &&
+                        } elseif (($chrs[$c] == $top['delim']) &&
                                  ($top['what'] == SERVICES_JSON_IN_STR) &&
                                  (($this->strlen8($this->substr8($chrs, 0, $c)) - $this->strlen8(rtrim($this->substr8($chrs, 0, $c), '\\'))) % 2 != 1)) {
                             // found a quote, we're in a string, and it's not escaped
@@ -802,24 +802,24 @@
                             array_pop($stk);
                             //print("Found end of string at {$c}: ".$this->substr8($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
 
-                        } elseif (($chrs{$c} == '[') &&
+                        } elseif (($chrs[$c] == '[') &&
                                  in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
                             // found a left-bracket, and we are in an array, object, or slice
                             array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
                             //print("Found start of array at {$c}\n");
 
-                        } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
+                        } elseif (($chrs[$c] == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
                             // found a right-bracket, and we're in an array
                             array_pop($stk);
                             //print("Found end of array at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 
-                        } elseif (($chrs{$c} == '{') &&
+                        } elseif (($chrs[$c] == '{') &&
                                  in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
                             // found a left-brace, and we are in an array, object, or slice
                             array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
                             //print("Found start of object at {$c}\n");
 
-                        } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
+                        } elseif (($chrs[$c] == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
                             // found a right-brace, and we're in an object
                             array_pop($stk);
                             //print("Found end of object at {$c}: ".$this->substr8($chrs, $top['where'], (1 + $c - $top['where']))."\n");

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10336] trunk/lib/plugin/text2png.php

From: <var...@us...> - 2021-06-28 15:17:32

Revision: 10336
          http://sourceforge.net/p/phpwiki/code/10336
Author:   vargenau
Date:     2021-06-28 15:17:30 +0000 (Mon, 28 Jun 2021)
Log Message:
-----------
lib/plugin/text2png.php: factor code

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

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2021-06-28 14:45:46 UTC (rev 10335)
+++ trunk/lib/plugin/text2png.php	2021-06-28 15:17:30 UTC (rev 10336)
@@ -86,8 +86,8 @@
             $error_html = _("Sorry, this version of PHP cannot create PNG image files.");
             $error_html .= " ";
             $error_html .= _("See") . _(": ");
-            $link = HTML::a(array('href' => "https://www.php.net/manual/en/ref.image.php"),
-                            "https://www.php.net/manual/en/ref.image.php") ;
+            $url = "https://www.php.net/manual/en/ref.image.php";
+            $link = HTML::a(array('href' => $url), $url);
             return HTML::span(array('class' => 'error'), $error_html, $link);
         }
     }
@@ -162,22 +162,19 @@
              */
 
             // get ready to draw
+
+            $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");
+            $error_html .= " ";
+            $error_html .= _("See") . _(": ");
+            $url = "https://www.php.net/manual/en/function.imagecreate.php";
+            $link = HTML::a(array('href' => $url), $url);
+
             $s = imagettfbbox($fontsize, 0, $ttfont, $text);
             if ($s === false) {
-                $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");
-                $error_html .= " ";
-                $error_html .= _("See") . _(": ");
-                $link = HTML::a(array('href' => "https://www.php.net/manual/en/function.imagecreate.php"),
-                                "https://www.php.net/manual/en/function.imagecreate.php") ;
                 return HTML::span(array('class' => 'error'), $error_html, $link);
             }
             $im = imagecreate(abs($s[4]) + 20, abs($s[7]) + 10);
             if (empty($im)) {
-                $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");
-                $error_html .= " ";
-                $error_html .= _("See") . _(": ");
-                $link = HTML::a(array('href' => "https://www.php.net/manual/en/function.imagecreate.php"),
-                                "https://www.php.net/manual/en/function.imagecreate.php") ;
                 return HTML::span(array('class' => 'error'), $error_html, $link);
             }
             $rgb = $this->hexcolor($backcolor, array(255, 255, 255));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10335] trunk/lib/plugin/text2png.php

From: <var...@us...> - 2021-06-28 14:45:45

Revision: 10335
          http://sourceforge.net/p/phpwiki/code/10335
Author:   vargenau
Date:     2021-06-28 14:45:46 +0000 (Mon, 28 Jun 2021)
Log Message:
-----------
lib/plugin/text2png.php: better error handling

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

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2021-06-28 14:17:34 UTC (rev 10334)
+++ trunk/lib/plugin/text2png.php	2021-06-28 14:45:46 UTC (rev 10335)
@@ -84,10 +84,11 @@
         } else {
             // we don't have png and/or gd.
             $error_html = _("Sorry, this version of PHP cannot create PNG image files.");
-            $link = "https://www.php.net/manual/pl/ref.image.php";
-            $error_html .= sprintf(_("See %s"), $link) . ".";
-            trigger_error($error_html);
-            return HTML::p($error_html);
+            $error_html .= " ";
+            $error_html .= _("See") . _(": ");
+            $link = HTML::a(array('href' => "https://www.php.net/manual/en/ref.image.php"),
+                            "https://www.php.net/manual/en/ref.image.php") ;
+            return HTML::span(array('class' => 'error'), $error_html, $link);
         }
     }
 
@@ -147,7 +148,8 @@
             if (defined('TTFONT'))
                 $ttfont = TTFONT;
             elseif (PHP_OS == "Darwin") // Mac OS X
-                $ttfont = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf"; elseif (isWindows()) {
+                $ttfont = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf";
+            elseif (isWindows()) {
                 $ttfont = $_ENV['windir'] . '\Fonts\Arial.ttf';
             } else {
                 $ttfont = 'luximr'; // This is the only what sourceforge offered.
@@ -161,15 +163,22 @@
 
             // get ready to draw
             $s = imagettfbbox($fontsize, 0, $ttfont, $text);
-            $im = @imagecreate(abs($s[4]) + 20, abs($s[7]) + 10);
+            if ($s === false) {
+                $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");
+                $error_html .= " ";
+                $error_html .= _("See") . _(": ");
+                $link = HTML::a(array('href' => "https://www.php.net/manual/en/function.imagecreate.php"),
+                                "https://www.php.net/manual/en/function.imagecreate.php") ;
+                return HTML::span(array('class' => 'error'), $error_html, $link);
+            }
+            $im = imagecreate(abs($s[4]) + 20, abs($s[7]) + 10);
             if (empty($im)) {
                 $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");
-                // FIXME: Error manager does not transform URLs passed
-                //        through it.
-                $link = "https://www.php.net/manual/en/function.imagecreate.php";
-                $error_html .= sprintf(_("See %s"), $link) . ".";
-                trigger_error($error_html);
-                return HTML::p($error_html);
+                $error_html .= " ";
+                $error_html .= _("See") . _(": ");
+                $link = HTML::a(array('href' => "https://www.php.net/manual/en/function.imagecreate.php"),
+                                "https://www.php.net/manual/en/function.imagecreate.php") ;
+                return HTML::span(array('class' => 'error'), $error_html, $link);
             }
             $rgb = $this->hexcolor($backcolor, array(255, 255, 255));
             $bg_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
@@ -220,8 +229,9 @@
                 'alt' => $text,
                 'title' => '"' . $text . '"' . _(" produced by ") . $this->getName())));
         } else {
-            trigger_error(sprintf(_("couldn't open file “%s” for writing"),
-                $filepath . $filename));
+            return HTML::span(array('class' => 'error'),
+                              sprintf(_("couldn't open file “%s” for writing"),
+                                      $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:[10334] trunk

From: <var...@us...> - 2021-06-28 14:17:35

Revision: 10334
          http://sourceforge.net/p/phpwiki/code/10334
Author:   vargenau
Date:     2021-06-28 14:17:34 +0000 (Mon, 28 Jun 2021)
Log Message:
-----------
http://www.php.net --> https://www.php.net

Modified Paths:
--------------
    trunk/INSTALL
    trunk/configurator.php
    trunk/doc/README.coding
    trunk/lib/FileFinder.php
    trunk/lib/HttpClient.php
    trunk/lib/Request.php
    trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
    trunk/lib/WikiDB/adodb/adodb-lib.inc.php
    trunk/lib/WikiDB/adodb/adodb-time.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
    trunk/lib/WikiTheme.php
    trunk/lib/interwiki.map
    trunk/lib/plugin/FuzzyPages.php
    trunk/lib/plugin/text2png.php
    trunk/lib/stdlib.php
    trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik
    trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica
    trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques
    trunk/locale/fr/pgsrc/Aide%2FGreffonPagesFloues
    trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento
    trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken
    trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna
    trunk/passencrypt.php
    trunk/pgsrc/Help%2FAtomFeedPlugin
    trunk/pgsrc/Help%2FFuzzyPagesPlugin
    trunk/pgsrc/Help%2FMoreAboutMechanics
    trunk/themes/Crao/themeinfo.php
    trunk/themes/Hawaiian/themeinfo.php
    trunk/themes/MacOSX/themeinfo.php
    trunk/themes/MonoBook/themeinfo.php
    trunk/themes/Portland/themeinfo.php
    trunk/themes/Sidebar/themeinfo.php
    trunk/themes/Wordpress/themeinfo.php
    trunk/themes/blog/themeinfo.php
    trunk/themes/fusionforge/interwiki.map
    trunk/themes/fusionforge/themeinfo.php
    trunk/themes/shamino_com/themeinfo.php
    trunk/themes/wikilens/themeinfo.php

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/INSTALL	2021-06-28 14:17:34 UTC (rev 10334)
@@ -13,7 +13,7 @@
 want to use, i.e. --with-gdbm, --with-db2, --with-db3, --with-msql,
 --with-pgsql.  Consult the PHP installation manual for specific
 installation and configure options.
-<http://www.php.net/manual/en/installation.php>
+<https://www.php.net/manual/en/installation.php>
 
 Since version 1.3.0 PhpWiki uses the 'DB.php' from PEAR, a database
 abstraction layer which is part of PHP. PhpWiki version 1.3.3 and later
@@ -121,7 +121,7 @@
 3. ETC
 
 Installing PHP is beyond the scope of this document :-) You should
-visit <http://www.php.net/> if you don't have PHP. Note that you
+visit <https://www.php.net/> if you don't have PHP. Note that you
 should have the web server configured to allow index.php as the root
 document of a directory.
 

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/configurator.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -2480,7 +2480,7 @@
     $d = str_replace("<p>", "", $d);
     $d = str_replace("</p>", "", $d);
     //restore html entities into characters
-    // http://www.php.net/manual/en/function.htmlentities.php
+    // https://www.php.net/manual/en/function.htmlentities.php
     $trans = get_html_translation_table(HTML_ENTITIES);
     $trans = array_flip($trans);
     $d = strtr($d, $trans);

Modified: trunk/doc/README.coding
===================================================================
--- trunk/doc/README.coding	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/doc/README.coding	2021-06-28 14:17:34 UTC (rev 10334)
@@ -4,7 +4,7 @@
 
 We follow, for the most part, the PEAR coding standards:
 
-    <http://www.php.net/manual/en/pear.standards.php>
+    <https://www.php.net/manual/en/pear.standards.php>
 
 There's code snippets for configuring Emacs and Vim as well as several
 other text editors at the above URL.

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/lib/FileFinder.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -589,7 +589,7 @@
     static $winnt;
     if (isset($winnt)) return $winnt;
     // FIXME: Do this using PHP_OS instead of php_uname().
-    // $winnt = (PHP_OS == "WINNT"); // example from http://www.php.net/manual/en/ref.readline.php
+    // $winnt = (PHP_OS == "WINNT"); // example from https://www.php.net/manual/en/ref.readline.php
     if (function_usable('php_uname'))
         $winnt = preg_match('/^Windows NT/', php_uname());
     else

Modified: trunk/lib/HttpClient.php
===================================================================
--- trunk/lib/HttpClient.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/lib/HttpClient.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -215,7 +215,7 @@
         // If data is compressed, uncompress it
         if (isset($this->headers['content-encoding']) && $this->headers['content-encoding'] == 'gzip') {
             $this->debug('Content is gzip encoded, unzipping it');
-            $this->content = substr($this->content, 10); // See http://www.php.net/manual/en/function.gzencode.php
+            $this->content = substr($this->content, 10); // See https://www.php.net/manual/en/function.gzencode.php
             $this->content = gzinflate($this->content);
         }
         // If $persist_cookies, deal with any cookies

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/lib/Request.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -377,7 +377,7 @@
             $compress = false;
 
         // "output handler 'ob_gzhandler' cannot be used twice"
-        // http://www.php.net/ob_gzhandler
+        // https://www.php.net/ob_gzhandler
         if ($compress and ini_get("zlib.output_compression"))
             $compress = false;
 

Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -264,7 +264,7 @@
 	*/
 	function adodb_write_file($filename, $contents,$debug=false)
 	{
-	# http://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
+	# https://www.php.net/bugs.php?id=9203 Bug that flock fails on Windows
 	# So to simulate locking, we assume that rename is an atomic operation.
 	# First we delete $filename, then we create a $tempfile write to it and
 	# rename to the desired $filename. If the rename works, then we successfully

Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -119,7 +119,7 @@
 }
 
 // Force key to upper.
-// See also http://www.php.net/manual/en/function.array-change-key-case.php
+// See also https://www.php.net/manual/en/function.array-change-key-case.php
 function _array_change_key_case($an_array)
 {
 	if (is_array($an_array)) {

Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -64,7 +64,7 @@
 
 (c) 2003-2014 John Lim and released under BSD-style license except for code by
 jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
-and originally found at http://www.php.net/manual/en/function.mktime.php
+and originally found at https://www.php.net/manual/en/function.mktime.php
 
 
 =============================================================================

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -157,7 +157,7 @@
 	}
 
 	/**
-	 * Warning from http://www.php.net/manual/function.pg-getlastoid.php:
+	 * Warning from https://www.php.net/manual/function.pg-getlastoid.php:
 	 * Using a OID as a unique identifier is not generally wise.
 	 * Unless you are very careful, you might end up with a tuple having
 	 * a different OID if a database must be reloaded.

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/lib/WikiTheme.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -1472,7 +1472,7 @@
          * You may adjust the formats used for formatting dates and times
          * below.  (These examples give the default formats.)
          * Formats are given as format strings to PHP strftime() function See
-         * http://www.php.net/manual/en/function.strftime.php for details.
+         * https://www.php.net/manual/en/function.strftime.php for details.
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          *

Modified: trunk/lib/interwiki.map
===================================================================
--- trunk/lib/interwiki.map	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/lib/interwiki.map	2021-06-28 14:17:34 UTC (rev 10334)
@@ -86,8 +86,8 @@
 PPR http://c2.com/cgi/wiki?
 PangalacticOrg http://www.pangalactic.org/Wiki/
 PersonalTelco http://www.personaltelco.net/index.cgi/
-php-function http://www.php.net/%s
-php-lookup http://www.php.net/manual-lookup.php?pattern=
+php-function https://www.php.net/%s
+php-lookup https://www.php.net/manual-lookup.php?pattern=
 PhpWiki http://phpwiki.demo.free.fr/index.php/
 PhpWikiSvn https://sourceforge.net/p/phpwiki/code/HEAD/tree/trunk/
 Pikie http://pikie.darktech.org/cgi/pikie?

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/lib/plugin/FuzzyPages.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -31,8 +31,8 @@
  * title in the database (php's metaphone() is an improved soundex
  * function).
  *
- * http://www.php.net/manual/en/function.similar-text.php
- * http://www.php.net/manual/en/function.metaphone.php
+ * https://www.php.net/manual/en/function.similar-text.php
+ * https://www.php.net/manual/en/function.metaphone.php
  */
 class WikiPlugin_FuzzyPages
     extends WikiPlugin

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/lib/plugin/text2png.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -41,7 +41,7 @@
  *
  * ./configure --with-gd
  *
- * See <http://www.php.net/manual/pl/ref.image.php> for more info.
+ * See <https://www.php.net/manual/pl/ref.image.php> for more info.
  */
 
 // define('text2png_debug', DEBUG & _DEBUG_VERBOSE);
@@ -84,7 +84,7 @@
         } else {
             // we don't have png and/or gd.
             $error_html = _("Sorry, this version of PHP cannot create PNG image files.");
-            $link = "http://www.php.net/manual/pl/ref.image.php";
+            $link = "https://www.php.net/manual/pl/ref.image.php";
             $error_html .= sprintf(_("See %s"), $link) . ".";
             trigger_error($error_html);
             return HTML::p($error_html);
@@ -166,7 +166,7 @@
                 $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");
                 // FIXME: Error manager does not transform URLs passed
                 //        through it.
-                $link = "http://www.php.net/manual/en/function.imagecreate.php";
+                $link = "https://www.php.net/manual/en/function.imagecreate.php";
                 $error_html .= sprintf(_("See %s"), $link) . ".";
                 trigger_error($error_html);
                 return HTML::p($error_html);

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/lib/stdlib.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -1382,7 +1382,7 @@
      * Subdirectories are not traversed.
      *
      * (This was a function LoadDir in lib/loadsave.php)
-     * See also http://www.php.net/manual/en/function.readdir.php
+     * See also https://www.php.net/manual/en/function.readdir.php
      */
     public function getFiles($exclude = '', $sortby = '', $limit = '')
     {
@@ -1572,7 +1572,7 @@
  * Recursively count all non-empty elements
  * in array of any dimension or mixed - i.e.
  * array('1' => 2, '2' => array('1' => 3, '2' => 4))
- * See http://www.php.net/manual/en/function.count.php
+ * See https://www.php.net/manual/en/function.count.php
  */
 function count_all($arg)
 {
@@ -1936,7 +1936,7 @@
  * @return integer
  * @desc Feed a sorted array to $haystack and a value to search for to $needle.
 It will return false if not found or the index where it was found.
-From den...@mo... http://www.php.net/array_search
+From den...@mo... https://www.php.net/array_search
  */
 function binary_search($needle, $haystack)
 {
@@ -2185,7 +2185,7 @@
  * @param   string  $str the string to analyze
  * @return bool
  *
- * From http://www.php.net/manual/en/function.mb-detect-encoding.php#85294
+ * From https://www.php.net/manual/en/function.mb-detect-encoding.php#85294
  */
 function is_utf8($str) {
     $c=0; $b=0;

Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik	2021-06-28 14:17:34 UTC (rev 10334)
@@ -7,7 +7,7 @@
 Content-Transfer-Encoding: binary
 
 ~PhpWiki ist in der serverseitigen Skriptsprache PHP
-([[http://www.php.net/]]) geschrieben. PHP hat eine ähnliche Syntax wie
+([[https://www.php.net/]]) geschrieben. PHP hat eine ähnliche Syntax wie
 Perl oder C und funktioniert ähnlich wie ASP, ~EmbPerl oder JSP.
 
 ~PhpWiki besteht aus etwa einem Dutzend Dateien mit gemischtem PHP und HTML. Die

Modified: trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica	2021-06-28 14:17:34 UTC (rev 10334)
@@ -7,7 +7,7 @@
 Content-Transfer-Encoding: binary
 
 ~PhpWiki está escrito con el lenguaje de servidor PHP,
-disponible en [[http://www.php.net/]]. El PHP se asemeja a C y Perl en su
+disponible en [[https://www.php.net/]]. El PHP se asemeja a C y Perl en su
 sintaxis, y funciona muy parecido a ASP, ~EmbPerl o JSP.
 
 ~PhpWiki consiste en mas o menos de una docena de ficheros mixtos PHP y HTML. Las páginas web

Modified: trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques	2021-06-28 14:17:34 UTC (rev 10334)
@@ -7,7 +7,7 @@
 Content-Transfer-Encoding: binary
 
 ~PhpWiki est écrit en PHP, langage de scripting côté serveur, disponible
-sur http://www.php.net/. PHP ressemble au C et à Perl dans sa syntaxe, et
+sur https://www.php.net/. PHP ressemble au C et à Perl dans sa syntaxe, et
 fonctionne comme ASP, ~EmbPerl ou JSP.
 
 ~PhpWiki est constitué d'une douzaine de fichiers environ de PHP mélangé à du HTML.

Modified: trunk/locale/fr/pgsrc/Aide%2FGreffonPagesFloues
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FGreffonPagesFloues	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/locale/fr/pgsrc/Aide%2FGreffonPagesFloues	2021-06-28 14:17:34 UTC (rev 10334)
@@ -14,8 +14,8 @@
 title in the database (PHP's metaphone() is an improved soundex
 function).
 
-* http://www.php.net/manual/en/function.similar-text.php
-* http://www.php.net/manual/en/function.metaphone.php
+* https://www.php.net/manual/en/function.similar-text.php
+* https://www.php.net/manual/en/function.metaphone.php
 
 == Usage ==
 {{{

Modified: trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento
===================================================================
--- trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento	2021-06-28 14:17:34 UTC (rev 10334)
@@ -7,7 +7,7 @@
 Content-Transfer-Encoding: binary
 
 ~PhpWiki è scritto in PHP, linguaggio di scripting lato-server,
-disponibile su [[http://www.php.net/]]. PHP riassume nella sua sintassi il C
+disponibile su [[https://www.php.net/]]. PHP riassume nella sua sintassi il C
 e il Perl, e funziona molto similmente a ASP, ~EmbPerl e JPS.
 
 ~PhpWiki consiste in una dozzina di file PHP misti HTML. La pagina web

Modified: trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken
===================================================================
--- trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken	2021-06-28 14:17:34 UTC (rev 10334)
@@ -7,7 +7,7 @@
 Content-Transfer-Encoding: binary
 
 ~PhpWiki is geschreven in de server-zijde scripttaal PHP, die
-verkrijgbaar is op [[http://www.php.net/]].  PHP lijkt kwa syntax op C en
+verkrijgbaar is op [[https://www.php.net/]].  PHP lijkt kwa syntax op C en
 Perl en functioneert goed vergelijkbaar met ASP, ~EmbPerl of JSP.
 
 PhpWiki bestaat uit een tal bestanden met een mengsel van PHP en HTML.

Modified: trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna
===================================================================
--- trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna	2021-06-28 14:17:34 UTC (rev 10334)
@@ -7,7 +7,7 @@
 Content-Transfer-Encoding: binary
 
 ~PhpWiki är skriven i skriptspråket PHP, tillgängligt på
-[[http://www.php.net/]]. PHP liknar C och Perl till syntaxen och fungerar
+[[https://www.php.net/]]. PHP liknar C och Perl till syntaxen och fungerar
 som ASP, ~EmbPerl eller JSP.
 
 ~PhpWiki består av dussin filer med en blandning av PHP och

Modified: trunk/passencrypt.php
===================================================================
--- trunk/passencrypt.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/passencrypt.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -87,7 +87,7 @@
 ) {
     $password = $posted['password'];
     /**
-     * http://www.php.net/manual/en/function.crypt.php
+     * https://www.php.net/manual/en/function.crypt.php
      */
     // Use the maximum salt length the system can handle.
     $salt_length = max(CRYPT_SALT_LENGTH,

Modified: trunk/pgsrc/Help%2FAtomFeedPlugin
===================================================================
--- trunk/pgsrc/Help%2FAtomFeedPlugin	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/pgsrc/Help%2FAtomFeedPlugin	2021-06-28 14:17:34 UTC (rev 10334)
@@ -49,7 +49,7 @@
 
 {{{
 <<AtomFeed feed=PHPNews description="PHP News"
-           url=http://www.php.net/feed.atom titleonly=true maxitem=5>>
+           url=https://www.php.net/feed.atom titleonly=true maxitem=5>>
 }}}
 
 == Author ==

Modified: trunk/pgsrc/Help%2FFuzzyPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FFuzzyPagesPlugin	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/pgsrc/Help%2FFuzzyPagesPlugin	2021-06-28 14:17:34 UTC (rev 10334)
@@ -13,8 +13,8 @@
 title in the database (PHP's metaphone() is an improved soundex
 function).
 
-* http://www.php.net/manual/en/function.similar-text.php
-* http://www.php.net/manual/en/function.metaphone.php
+* https://www.php.net/manual/en/function.similar-text.php
+* https://www.php.net/manual/en/function.metaphone.php
 
 == Usage ==
 {{{

Modified: trunk/pgsrc/Help%2FMoreAboutMechanics
===================================================================
--- trunk/pgsrc/Help%2FMoreAboutMechanics	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/pgsrc/Help%2FMoreAboutMechanics	2021-06-28 14:17:34 UTC (rev 10334)
@@ -7,7 +7,7 @@
 Content-Transfer-Encoding: binary
 
 ~PhpWiki is written in the server-side scripting language PHP,
-available from [[http://www.php.net/]]. PHP resembles C and Perl in its
+available from [[https://www.php.net/]]. PHP resembles C and Perl in its
 syntax, and functions much like ASP, ~EmbPerl or JSP.
 
 ~PhpWiki consists of a dozen or so files of mixed PHP and HTML. The web

Modified: trunk/themes/Crao/themeinfo.php
===================================================================
--- trunk/themes/Crao/themeinfo.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/themes/Crao/themeinfo.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -81,7 +81,7 @@
          * You may adjust the formats used for formatting dates and times
          * below.  (These examples give the default formats.)
          * Formats are given as format strings to PHP strftime() function See
-         * http://www.php.net/manual/en/function.strftime.php for details.
+         * https://www.php.net/manual/en/function.strftime.php for details.
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */

Modified: trunk/themes/Hawaiian/themeinfo.php
===================================================================
--- trunk/themes/Hawaiian/themeinfo.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/themes/Hawaiian/themeinfo.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -106,7 +106,7 @@
          * You may adjust the formats used for formatting dates and times
          * below.  (These examples give the default formats.)
          * Formats are given as format strings to PHP strftime() function See
-         * http://www.php.net/manual/en/function.strftime.php for details.
+         * https://www.php.net/manual/en/function.strftime.php for details.
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */

Modified: trunk/themes/MacOSX/themeinfo.php
===================================================================
--- trunk/themes/MacOSX/themeinfo.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/themes/MacOSX/themeinfo.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -172,7 +172,7 @@
          * You may adjust the formats used for formatting dates and times
          * below.  (These examples give the default formats.)
          * Formats are given as format strings to PHP strftime() function See
-         * http://www.php.net/manual/en/function.strftime.php for details.
+         * https://www.php.net/manual/en/function.strftime.php for details.
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */

Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/themes/MonoBook/themeinfo.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -134,7 +134,7 @@
          * You may adjust the formats used for formatting dates and times
          * below.  (These examples give the default formats.)
          * Formats are given as format strings to PHP strftime() function See
-         * http://www.php.net/manual/en/function.strftime.php for details.
+         * https://www.php.net/manual/en/function.strftime.php for details.
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */

Modified: trunk/themes/Portland/themeinfo.php
===================================================================
--- trunk/themes/Portland/themeinfo.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/themes/Portland/themeinfo.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -120,7 +120,7 @@
          * You may adjust the formats used for formatting dates and times
          * below.  (These examples give the default formats.)
          * Formats are given as format strings to PHP strftime() function See
-         * http://www.php.net/manual/en/function.strftime.php for details.
+         * https://www.php.net/manual/en/function.strftime.php for details.
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */

Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/themes/Sidebar/themeinfo.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -193,7 +193,7 @@
          * You may adjust the formats used for formatting dates and times
          * below.  (These examples give the default formats.)
          * Formats are given as format strings to PHP strftime() function See
-         * http://www.php.net/manual/en/function.strftime.php for details.
+         * https://www.php.net/manual/en/function.strftime.php for details.
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */

Modified: trunk/themes/Wordpress/themeinfo.php
===================================================================
--- trunk/themes/Wordpress/themeinfo.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/themes/Wordpress/themeinfo.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -119,7 +119,7 @@
          * You may adjust the formats used for formatting dates and times
          * below.  (These examples give the default formats.)
          * Formats are given as format strings to PHP strftime() function See
-         * http://www.php.net/manual/en/function.strftime.php for details.
+         * https://www.php.net/manual/en/function.strftime.php for details.
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */

Modified: trunk/themes/blog/themeinfo.php
===================================================================
--- trunk/themes/blog/themeinfo.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/themes/blog/themeinfo.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -179,7 +179,7 @@
          * You may adjust the formats used for formatting dates and times
          * below.  (These examples give the default formats.)
          * Formats are given as format strings to PHP strftime() function See
-         * http://www.php.net/manual/en/function.strftime.php for details.
+         * https://www.php.net/manual/en/function.strftime.php for details.
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */

Modified: trunk/themes/fusionforge/interwiki.map
===================================================================
--- trunk/themes/fusionforge/interwiki.map	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/themes/fusionforge/interwiki.map	2021-06-28 14:17:34 UTC (rev 10334)
@@ -17,8 +17,8 @@
 MetaWiki http://sunir.org/apps/meta.pl?
 MetaWikiPedia http://meta.wikipedia.com/wiki/
 MoinMoin http://moinmoin.wikiwikiweb.de/
-php-function http://www.php.net/%s
-php-lookup http://www.php.net/manual-lookup.php?pattern=
+php-function https://www.php.net/%s
+php-lookup https://www.php.net/manual-lookup.php?pattern=
 PhpWiki http://phpwiki.demo.free.fr/index.php/
 PhpWikiSvn https://sourceforge.net/p/phpwiki/code/HEAD/tree/trunk/
 SourceForge http://sourceforge.net/

Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/themes/fusionforge/themeinfo.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -183,7 +183,7 @@
          * You may adjust the formats used for formatting dates and times
          * below.  (These examples give the default formats.)
          * Formats are given as format strings to PHP strftime() function See
-         * http://www.php.net/manual/en/function.strftime.php for details.
+         * https://www.php.net/manual/en/function.strftime.php for details.
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */

Modified: trunk/themes/shamino_com/themeinfo.php
===================================================================
--- trunk/themes/shamino_com/themeinfo.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/themes/shamino_com/themeinfo.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -118,7 +118,7 @@
          * You may adjust the formats used for formatting dates and times
          * below.  (These examples give the default formats.)
          * Formats are given as format strings to PHP strftime() function See
-         * http://www.php.net/manual/en/function.strftime.php for details.
+         * https://www.php.net/manual/en/function.strftime.php for details.
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */

Modified: trunk/themes/wikilens/themeinfo.php
===================================================================
--- trunk/themes/wikilens/themeinfo.php	2021-06-28 13:50:16 UTC (rev 10333)
+++ trunk/themes/wikilens/themeinfo.php	2021-06-28 14:17:34 UTC (rev 10334)
@@ -101,7 +101,7 @@
          * You may adjust the formats used for formatting dates and times
          * below.  (These examples give the default formats.)
          * Formats are given as format strings to PHP strftime() function See
-         * http://www.php.net/manual/en/function.strftime.php for details.
+         * https://www.php.net/manual/en/function.strftime.php for details.
          * Do not include the server's zone (%Z), times are converted to the
          * user's time zone.
          */

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

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

From: <var...@us...> - 2021-06-28 13:50:14

Revision: 10333
          http://sourceforge.net/p/phpwiki/code/10333
Author:   vargenau
Date:     2021-06-28 13:50:16 +0000 (Mon, 28 Jun 2021)
Log Message:
-----------
lib/plugin/text2png.php: no need for language subdirectory

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

Modified: trunk/pgsrc/Help%2Ftext2pngPlugin
===================================================================
--- trunk/pgsrc/Help%2Ftext2pngPlugin	2021-06-28 13:44:54 UTC (rev 10332)
+++ trunk/pgsrc/Help%2Ftext2pngPlugin	2021-06-28 13:50:16 UTC (rev 10333)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
+Date: Mon, 28 Jun 2021 15:49:58 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2Ftext2pngPlugin;
@@ -7,7 +7,7 @@
 Content-Transfer-Encoding: binary
 
 Convert text into a png image using GD without using [[Help:WikiPlugin|WikiPluginCached]].
-The images are stored in a private <PHPWIKI_DIR>/images/<LANG> subdirectory instead,
+The images are stored in a private <PHPWIKI_DIR>/images/ subdirectory instead,
 which are not timestamp checked at all. Delete the .png file(s) if you change anything.
 
 This is a really simple and stupid plugin, which might need some work.

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10332] trunk/lib/plugin/text2png.php

From: <var...@us...> - 2021-06-28 13:44:51

Revision: 10332
          http://sourceforge.net/p/phpwiki/code/10332
Author:   vargenau
Date:     2021-06-28 13:44:54 +0000 (Mon, 28 Jun 2021)
Log Message:
-----------
lib/plugin/text2png.php: no need for language subdirectory

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

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2021-06-28 13:42:18 UTC (rev 10331)
+++ trunk/lib/plugin/text2png.php	2021-06-28 13:44:54 UTC (rev 10332)
@@ -125,13 +125,8 @@
          *        user's locale preferences.
          */
 
-        if ($l == "C") {
-            $l = "en"; //english=C
-        } else {
-            $l = urlencode($l); // who on earth forgot his?
-        }
         $basedir = "text2png-image";
-        $filepath = getUploadFilePath() . "$basedir/$l";
+        $filepath = getUploadFilePath() . "$basedir";
         if ($_force or !file_exists($filepath . $filename)) {
             if (!file_exists($filepath)) {
                 $oldumask = umask(0);
@@ -220,7 +215,7 @@
                                 $filepath . $filename));
                 }
             }
-            $url = getUploadDataPath() . "$basedir/" . urlencode($l) . "/" . urlencode($filename);
+            $url = getUploadDataPath() . "$basedir/" . urlencode($filename);
             $html->pushContent(HTML::img(array('src' => $url,
                 'alt' => $text,
                 'title' => '"' . $text . '"' . _(" produced by ") . $this->getName())));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10331] trunk/lib/plugin/text2png.php

From: <var...@us...> - 2021-06-28 13:42:16

Revision: 10331
          http://sourceforge.net/p/phpwiki/code/10331
Author:   vargenau
Date:     2021-06-28 13:42:18 +0000 (Mon, 28 Jun 2021)
Log Message:
-----------
lib/plugin/text2png.php: no debug by default

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

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2021-06-28 12:16:29 UTC (rev 10330)
+++ trunk/lib/plugin/text2png.php	2021-06-28 13:42:18 UTC (rev 10331)
@@ -44,8 +44,7 @@
  * See <http://www.php.net/manual/pl/ref.image.php> for more info.
  */
 
-if (!defined('text2png_debug'))
-    define('text2png_debug', DEBUG & _DEBUG_VERBOSE);
+// define('text2png_debug', DEBUG & _DEBUG_VERBOSE);
 
 class WikiPlugin_text2png
     extends WikiPlugin

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10330] trunk/lib/plugin/TeX2png.php

From: <var...@us...> - 2021-06-28 12:16:27

Revision: 10330
          http://sourceforge.net/p/phpwiki/code/10330
Author:   vargenau
Date:     2021-06-28 12:16:29 +0000 (Mon, 28 Jun 2021)
Log Message:
-----------
lib/plugin/TeX2png.php: use DATA_PATH

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

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2021-06-28 10:36:36 UTC (rev 10329)
+++ trunk/lib/plugin/TeX2png.php	2021-06-28 12:16:29 UTC (rev 10330)
@@ -174,7 +174,7 @@
     {
         // the name of the png cached file
         $imagename = md5($text) . ".png";
-        $url = '/' . $this->imagepath . "/$imagename";
+        $url = DATA_PATH . '/' . $this->imagepath . "/$imagename";
 
         if (!file_exists($url)) {
             if (is_writable($this->imagepath)) {

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

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

From: <var...@us...> - 2021-06-28 10:36:35

Revision: 10329
          http://sourceforge.net/p/phpwiki/code/10329
Author:   vargenau
Date:     2021-06-28 10:36:36 +0000 (Mon, 28 Jun 2021)
Log Message:
-----------
"each" is deprecated

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

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2021-06-28 09:25:09 UTC (rev 10328)
+++ trunk/lib/WikiDB/backend/file.php	2021-06-28 10:36:36 UTC (rev 10329)
@@ -260,10 +260,11 @@
     function _loadPageLinks($pagename)
     {
         $pd = $this->_loadPage('links', $pagename, 0, false);
-        if ($pd != NULL)
+        if ($pd != NULL) {
             return $pd;
-        ;
-        return array(); // no values found
+        } else {
+            return array(); // no values found
+        }
     }
 
     function _savePageLinks($pagename, $links)
@@ -739,10 +740,12 @@
         if (count($this->_result) <= 0)
             return false;
 
-        $e = each($this->_result);
-        if ($e == false) {
+        $key = key($this->_result);
+        if ($key === null) {
             return false;
         }
+        $e = [$key, current($this->_result), 'key' => $key, 'value' => current($this->_result)];
+        next($this->_result);
 
         $pn = $e[1];
         if (is_array($pn) and isset($pn['linkto'])) { // support relation link iterator

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

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

From: <var...@us...> - 2021-06-28 09:25:09

Revision: 10328
          http://sourceforge.net/p/phpwiki/code/10328
Author:   vargenau
Date:     2021-06-28 09:25:09 +0000 (Mon, 28 Jun 2021)
Log Message:
-----------
php7:notice PHP Deprecated:  Array and string offset access syntax with curly braces is deprecated

Modified Paths:
--------------
    trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
    trunk/lib/plugin/text2png.php

Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php	2021-06-28 07:37:34 UTC (rev 10327)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php	2021-06-28 09:25:09 UTC (rev 10328)
@@ -880,7 +880,7 @@
 				return($node_1);
 			} elseif (isset($sym['func'])) { //added 2006-9-7 David Lippman
 				$expr = ltrim($this->getCurrExpr());
-				$st = $expr{0};
+				$st = $expr[0];
 				$node_0 = $this->parseSmplExpr();
 				//$node_0->removeBrackets();
 				if ($st=='^' || $st == '_' || $st=='/' || $st=='|' || $st==',') {
@@ -905,7 +905,7 @@
 					$end_brckt = '"';
 					$txt = substr($expr,0,strpos($expr,$end_brckt));
 				} else {
-					switch($expr{0}) {
+					switch($expr[0]) {
 						case '(':
 							$end_brckt = ')';
 							break;
@@ -929,7 +929,7 @@
 				$node_0->setName('mrow');
 
 				if ($len > 0) {
-					if ($txt{0} == " ") {
+					if ($txt[0] == " ") {
 						$node_1 = $this->createNode();
 						$node_1->setName('mspace');
 						$node_1->setAttr('width','1ex');
@@ -943,7 +943,7 @@
 
 					$node_0->addChild($node_3);
 
-					if ($len > 1 && $txt{$len-1} == " ") {
+					if ($len > 1 && $txt[$len-1] == " ") {
 						$node_2 = $this->createNode();
 						$node_2->setName('mspace');
 						$node_2->setAttr('width','1ex');

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2021-06-28 07:37:34 UTC (rev 10327)
+++ trunk/lib/plugin/text2png.php	2021-06-28 09:25:09 UTC (rev 10328)
@@ -102,7 +102,7 @@
         if ($h[0] != '#') return $default;
         $rgb = substr($h, 1);
         if (strlen($rgb) == 3)
-            return array(hexdec($rgb{0}), hexdec($rgb{1}), hexdec($rgb{2}));
+            return array(hexdec($rgb[0]), hexdec($rgb[1]), hexdec($rgb[2]));
         elseif (strlen($rgb) == 6)
             return array(hexdec(substr($rgb, 0, 2)), hexdec(substr($rgb, 2, 2)), hexdec(substr($rgb, 4, 2)));
         return $default;

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

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

From: <var...@us...> - 2021-06-28 07:37:39

Revision: 10327
          http://sourceforge.net/p/phpwiki/code/10327
Author:   vargenau
Date:     2021-06-28 07:37:34 +0000 (Mon, 28 Jun 2021)
Log Message:
-----------
PEAR: use __construct for File_Passwd and Services_JSON

Modified Paths:
--------------
    trunk/lib/pear/File_Passwd.php
    trunk/lib/pear/JSON.php

Modified: trunk/lib/pear/File_Passwd.php
===================================================================
--- trunk/lib/pear/File_Passwd.php	2021-06-24 19:27:56 UTC (rev 10326)
+++ trunk/lib/pear/File_Passwd.php	2021-06-28 07:37:34 UTC (rev 10327)
@@ -80,7 +80,7 @@
     * @see close()
     */
 
-    function File_Passwd($file, $lock = 0, $lockfile = "") {
+    function __construct($file, $lock = 0, $lockfile = "") {
         $this->filename = $file;
         if( !empty( $lockfile) ) {
             $this->lockfile = $lockfile;

Modified: trunk/lib/pear/JSON.php
===================================================================
--- trunk/lib/pear/JSON.php	2021-06-24 19:27:56 UTC (rev 10326)
+++ trunk/lib/pear/JSON.php	2021-06-28 07:37:34 UTC (rev 10327)
@@ -139,7 +139,7 @@
     *                                   strings or numbers, if you return an object, make sure it does
     *                                   not have a toJSON method, otherwise an error will occur.
     */
-    function Services_JSON($use = 0)
+    function __construct($use = 0)
     {
         $this->use = $use;
         $this->_mb_strlen            = function_exists('mb_strlen');

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

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

From: <var...@us...> - 2021-06-24 19:27:57

Revision: 10326
          http://sourceforge.net/p/phpwiki/code/10326
Author:   vargenau
Date:     2021-06-24 19:27:56 +0000 (Thu, 24 Jun 2021)
Log Message:
-----------
PearDB_ffpgsql.php: remove undefined variable $options

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

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2021-06-24 17:14:05 UTC (rev 10325)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2021-06-24 19:27:56 UTC (rev 10326)
@@ -417,7 +417,7 @@
         } else {
             $result = $dbh->query($sql);
         }
-        return new WikiDB_backend_PearDB_iter($this, $result, $options);
+        return new WikiDB_backend_PearDB_iter($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:[10325] trunk/lib/plugin/TexToPng.php

From: <var...@us...> - 2021-06-24 17:14:06

Revision: 10325
          http://sourceforge.net/p/phpwiki/code/10325
Author:   vargenau
Date:     2021-06-24 17:14:05 +0000 (Thu, 24 Jun 2021)
Log Message:
-----------
TexToPng.php: check thet file exists before unlinking it

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

Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php	2021-06-24 17:13:14 UTC (rev 10324)
+++ trunk/lib/plugin/TexToPng.php	2021-06-24 17:14:05 UTC (rev 10325)
@@ -299,13 +299,24 @@
 
         if (!TexToPng_debug || (TexToPng_debug && $ok)) {
             if ($tempfiles) {
-                unlink($tempfiles);
-                unlink($tempfiles . '.ps');
-                unlink($tempfiles . '.tex');
-                //unlink($tempfiles . '.aux');
-                unlink($tempfiles . '.dvi');
-                unlink($tempfiles . '.log');
-                unlink($tempfiles . '.png');
+                if (file_exists($tempfiles)) {
+                    unlink($tempfiles);
+                }
+                if (file_exists($tempfiles . '.ps')) {
+                    unlink($tempfiles . '.ps');
+                }
+                if (file_exists($tempfiles . '.tex')) {
+                    unlink($tempfiles . '.tex');
+                }
+                if (file_exists($tempfiles . '.dvi')) {
+                    unlink($tempfiles . '.dvi');
+                }
+                if (file_exists($tempfiles . '.log')) {
+                    unlink($tempfiles . '.log');
+                }
+                if (file_exists($tempfiles . '.png')) {
+                    unlink($tempfiles . '.png');
+                }
             }
         }
 

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

286 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 33 34 35 36 37 .. 538 > >> (Page 35 of 538)