PHP 7.2対応。

diff --git a/widgets/wiki_main/include/lib/config.php b/widgets/wiki_main/include/lib/config.php
index 05cf3ab..5fd08a1 100644 (file)
--- a/widgets/wiki_main/include/lib/config.php
+++ b/widgets/wiki_main/include/lib/config.php
@@ -39,7 +39,8 @@ class Config
        var $name, $page; // Page name
        var $objs = array();
 
-       function Config($name)
+//     function Config($name)
+       function __construct($name)
        {
                $this->name = $name;
                $this->page = PKWK_CONFIG_PREFIX . $name;
@@ -147,7 +148,8 @@ class ConfigTable
        var $after  = array();  // Page contents (except table ones)
        var $values = array();  // Table contents
 
-       function ConfigTable($title, $obj = NULL)
+//     function ConfigTable($title, $obj = NULL)
+       function __construct($title, $obj = NULL)
        {
                if ($obj !== NULL) {
                        $this->title  = $obj->title;

diff --git a/widgets/wiki_main/include/lib/convert_html.php b/widgets/wiki_main/include/lib/convert_html.php
index a4e79b3..673eaa9 100644 (file)
--- a/widgets/wiki_main/include/lib/convert_html.php
+++ b/widgets/wiki_main/include/lib/convert_html.php
@@ -48,7 +48,8 @@ class Element
        var $elements; // References of childs
        var $last;     // Insert new one at the back of the $last
 
-       function Element()
+//     function Element()
+       function __construct()
        {
                $this->elements = array();
                $this->last     = $this;
@@ -180,9 +181,11 @@ function Factory_Div($root, $text)
 // Inline elements
 class Inline extends Element
 {
-       function Inline($text)
+//     function Inline($text)
+       function __construct($text)
        {
-               parent::Element();
+//             parent::Element();
+               parent::__construct();
                $this->elements[] = trim((substr($text, 0, 1) == "\n") ?
                        $text : make_link($text));
        }
@@ -217,9 +220,11 @@ class Paragraph extends Element
 {
        var $param;
 
-       function Paragraph($text, $param = '')
+//     function Paragraph($text, $param = '')
+       function __construct($text, $param = '')
        {
-               parent::Element();
+               //parent::Element();
+               parent::__construct();
                $this->param = $param;
                if ($text == '') return;
 
@@ -249,9 +254,11 @@ class Heading extends Element
        var $id;
        var $msg_top;
 
-       function Heading($root, $text)
+//     function Heading($root, $text)
+       function __construct($root, $text)
        {
-               parent::Element();
+               //parent::Element();
+               parent::__construct();
 
                $this->level = min(3, strspn($text, '*'));
                list($text, $this->msg_top, $this->id) = $root->getAnchor($text, $this->level);
@@ -293,9 +300,11 @@ class Heading extends Element
 // Horizontal Rule
 class HRule extends Element
 {
-       function HRule($root, $text)
+//     function HRule($root, $text)
+       function __construct($root, $text)
        {
-               parent::Element();
+               //parent::Element();
+               parent::__construct();
        }
 
        function canContain($obj)
@@ -320,9 +329,11 @@ class ListContainer extends Element
        var $margin;
        var $left_margin;
 
-       function ListContainer($tag, $tag2, $head, $text)
+//     function ListContainer($tag, $tag2, $head, $text)
+       function __construct($tag, $tag2, $head, $text)
        {
-               parent::Element();
+               //parent::Element();
+               parent::__construct();
 
                $var_margin      = '_' . $tag . '_margin';
                $var_left_margin = '_' . $tag . '_left_margin';
@@ -388,9 +399,11 @@ class ListContainer extends Element
 
 class ListElement extends Element
 {
-       function ListElement($level, $head)
+//     function ListElement($level, $head)
+       function __construct($level, $head)
        {
-               parent::Element();
+               //parent::Element();
+               parent::__construct();
                $this->level = $level;
                $this->head  = $head;
        }
@@ -411,9 +424,11 @@ class ListElement extends Element
 // - Three
 class UList extends ListContainer
 {
-       function UList($root, $text)
+//     function UList($root, $text)
+       function __construct($root, $text)
        {
-               parent::ListContainer('ul', 'li', '-', $text);
+               //parent::ListContainer('ul', 'li', '-', $text);
+               parent::__construct('ul', 'li', '-', $text);
        }
 }
 
@@ -422,9 +437,11 @@ class UList extends ListContainer
 // + Three
 class OList extends ListContainer
 {
-       function OList($root, $text)
+//     function OList($root, $text)
+       function __construct($root, $text)
        {
-               parent::ListContainer('ol', 'li', '+', $text);
+               //parent::ListContainer('ol', 'li', '+', $text);
+               parent::__construct('ol', 'li', '+', $text);
        }
 }
 
@@ -433,9 +450,11 @@ class OList extends ListContainer
 // : definition3 | description3
 class DList extends ListContainer
 {
-       function DList($out)
+//     function DList($out)
+       function __construct($out)
        {
-               parent::ListContainer('dl', 'dt', ':', $out[0]);
+               //parent::ListContainer('dl', 'dt', ':', $out[0]);
+               parent::__construct('dl', 'dt', ':', $out[0]);
                $this->last = Element::insert(new ListElement($this->level, 'dd'));
                if ($out[1] != '')
                        $this->last = $this->last->insert(Factory_Inline($out[1]));
@@ -448,9 +467,11 @@ class BQuote extends Element
 {
        var $level;
 
-       function BQuote($root, $text)
+//     function BQuote($root, $text)
+       function __construct($root, $text)
        {
-               parent::Element();
+               //parent::Element();
+               parent::__construct();
 
                $head = substr($text, 0, 1);
                $this->level = min(3, strspn($text, $head));
@@ -511,9 +532,11 @@ class TableCell extends Element
        var $rowspan = 1;
        var $style; // is array('width'=>, 'align'=>...);
 
-       function TableCell($text, $is_template = FALSE)
+//     function TableCell($text, $is_template = FALSE)
+       function __construct($text, $is_template = FALSE)
        {
-               parent::Element();
+               //parent::Element();
+               parent::__construct();
                $this->style = $matches = array();
 
                while (preg_match('/^(?:(LEFT|CENTER|RIGHT)|(BG)?COLOR\(([#\w]+)\)|SIZE\((\d+)\)):(.*)$/',
@@ -589,9 +612,11 @@ class Table extends Element
        var $col; // number of column
        public $align;          // テーブル表示位置
        
-       function Table($out)
+//     function Table($out)
+       function __construct($out)
        {
-               parent::Element();
+               //parent::Element();
+               parent::__construct();
 
                $cells       = explode('|', $out[1]);
                $this->col   = count($cells);
@@ -713,9 +738,11 @@ class YTable extends Element
        var $col;
        public $align;          // テーブル表示位置
 
-       function YTable($_value)
+//     function YTable($_value)
+       function __construct($_value)
        {
-               parent::Element();
+               //parent::Element();
+               parent::__construct();
 
                $align = $value = $matches = array();
                foreach($_value as $val) {
@@ -801,10 +828,12 @@ class YTable extends Element
 // ' 'Space-beginning sentence
 class Pre extends Element
 {
-       function Pre($root, $text)
+//     function Pre($root, $text)
+       function __construct($root, $text)
        {
                global $preformat_ltrim;
-               parent::Element();
+               //parent::Element();
+               parent::__construct();
                $this->elements[] = htmlspecialchars(
                        (! $preformat_ltrim || $text == '' || $text{0} != ' ') ? $text : substr($text, 1));
        }
@@ -833,9 +862,11 @@ class Div extends Element
        var $name;
        var $param;
 
-       function Div($out)
+//     function Div($out)
+       function __construct($out)
        {
-               parent::Element();
+               //parent::Element();
+               parent::__construct();
                list(, $this->name, $this->param) = array_pad($out, 3, '');
        }
 
@@ -856,9 +887,11 @@ class Align extends Element
 {
        var $align;
 
-       function Align($align)
+//     function Align($align)
+       function __construct($align)
        {
-               parent::Element();
+               //parent::Element();
+               parent::__construct();
                $this->align = $align;
        }
 
@@ -900,12 +933,14 @@ class Body extends Element
                ',' => 'YTable',
                '#' => 'Div');
 
-       function Body($id)
+//     function Body($id)
+       function __construct($id)
        {
                $this->id            = $id;
                $this->contents      = new Element();
                $this->contents_last = $this->contents;
-               parent::Element();
+//             parent::Element();
+               parent::__construct();
        }
 
        function parse($lines)
@@ -1055,13 +1090,15 @@ class Body extends Element
 
 class Contents_UList extends ListContainer
 {
-       function Contents_UList($text, $level, $id)
+//     function Contents_UList($text, $level, $id)
+       function __construct($text, $level, $id)
        {
                // Reformatting $text
                // A line started with "\n" means "preformatted" ... X(
                make_heading($text);
                $text = "\n" . '<a href="#' . $id . '">' . $text . '</a>' . "\n";
-               parent::ListContainer('ul', 'li', '-', str_repeat('-', $level));
+               //parent::ListContainer('ul', 'li', '-', str_repeat('-', $level));
+               parent::__construct('ul', 'li', '-', str_repeat('-', $level));
                $this->insert(Factory_Inline($text));
        }
 

diff --git a/widgets/wiki_main/include/lib/diff.php b/widgets/wiki_main/include/lib/diff.php
index f510708..5eb0fe2 100644 (file)
--- a/widgets/wiki_main/include/lib/diff.php
+++ b/widgets/wiki_main/include/lib/diff.php
@@ -108,7 +108,8 @@ class line_diff
 {
        var $arr1, $arr2, $m, $n, $pos, $key, $plus, $minus, $equal, $reverse;
 
-       function line_diff($plus = '+', $minus = '-', $equal = ' ')
+//     function line_diff($plus = '+', $minus = '-', $equal = ' ')
+       function __construct($plus = '+', $minus = '-', $equal = ' ')
        {
                $this->plus  = $plus;
                $this->minus = $minus;
@@ -263,7 +264,8 @@ class DiffLine
        var $text;
        var $status;
 
-       function DiffLine($text)
+//     function DiffLine($text)
+       function __construct($text)
        {
                $this->text   = $text . "\n";
                $this->status = array();

diff --git a/widgets/wiki_main/include/lib/make_link.php b/widgets/wiki_main/include/lib/make_link.php
index 0b3fbcf..b824a21 100644 (file)
--- a/widgets/wiki_main/include/lib/make_link.php
+++ b/widgets/wiki_main/include/lib/make_link.php
@@ -62,7 +62,8 @@ class InlineConverter
                $this->converters = $converters;
        }
 
-       function InlineConverter($converters = NULL, $excludes = NULL)
+//     function InlineConverter($converters = NULL, $excludes = NULL)
+       function __construct($converters = NULL, $excludes = NULL)
        {
                if ($converters === NULL) {
                        $converters = array(
@@ -163,7 +164,8 @@ class Link
        var $alias;
 
        // Constructor
-       function Link($start)
+//     function Link($start)
+       function __construct($start)
        {
                $this->start = $start;
        }
@@ -221,9 +223,11 @@ class Link_plugin extends Link
        var $pattern;
        var $plain,$param;
 
-       function Link_plugin($start)
+//     function Link_plugin($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               //parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -289,9 +293,11 @@ EOD;
 // Footnotes
 class Link_note extends Link
 {
-       function Link_note($start)
+//     function Link_note($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               //parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -365,9 +371,11 @@ EOD;
 // URLs
 class Link_url extends Link
 {
-       function Link_url($start)
+//     function Link_url($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               //parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -422,9 +430,11 @@ EOD;
 // URLs (InterWiki definition on "InterWikiName")
 class Link_url_interwiki extends Link
 {
-       function Link_url_interwiki($start)
+//     function Link_url_interwiki($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               //parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -462,9 +472,11 @@ class Link_mailto extends Link
 {
        var $is_image, $image;
 
-       function Link_mailto($start)
+//     function Link_mailto($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               //parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -504,9 +516,11 @@ class Link_interwikiname extends Link
        var $param  = '';
        var $anchor = '';
 
-       function Link_interwikiname($start)
+//     function Link_interwikiname($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               //parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -577,9 +591,11 @@ class Link_bracketname extends Link
 {
        var $anchor, $refer;
 
-       function Link_bracketname($start)
+//     function Link_bracketname($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               //parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -638,9 +654,11 @@ EOD;
 // WikiNames
 class Link_wikiname extends Link
 {
-       function Link_wikiname($start)
+//     function Link_wikiname($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               //parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -679,12 +697,14 @@ class Link_autolink extends Link
        var $auto;
        var $auto_a; // alphabet only
 
-       function Link_autolink($start)
+//     function Link_autolink($start)
+       function __construct($start)
        {
                global $autolink;
                global $gEnvManager;
 
-               parent::Link($start);
+               //parent::Link($start);
+               parent::__construct($start);
 
                // modified for Magic3 by naoki on 2008/9/28
                //if (! $autolink || ! file_exists(CACHE_DIR . 'autolink.dat'))
@@ -730,9 +750,11 @@ class Link_autolink extends Link
 
 class Link_autolink_a extends Link_autolink
 {
-       function Link_autolink_a($start)
+//     function Link_autolink_a($start)
+       function __construct($start)
        {
-               parent::Link_autolink($start);
+               //parent::Link_autolink($start);
+               parent::__construct($start);
        }
 
        function get_pattern()

diff --git a/widgets/wiki_main/include/plugin/attach.inc.php b/widgets/wiki_main/include/plugin/attach.inc.php
index b38c6fd..b3a7b31 100644 (file)
--- a/widgets/wiki_main/include/plugin/attach.inc.php
+++ b/widgets/wiki_main/include/plugin/attach.inc.php
@@ -565,7 +565,8 @@ class AttachFile
        var $size_str = '';
        var $status = array('count'=>array(0), 'age'=>'', 'pass'=>'', 'freeze'=>FALSE);
 
-       function AttachFile($page, $file, $age = 0)
+//     function AttachFile($page, $file, $age = 0)
+       function __construct($page, $file, $age = 0)
        {
                $this->page = $page;
                $this->file = preg_replace('#^.*/#','',$file);
@@ -1013,7 +1014,8 @@ class AttachFiles
        var $page;
        var $files = array();
 
-       function AttachFiles($page)
+//     function AttachFiles($page)
+       function __construct($page)
        {
                $this->page = $page;
        }
@@ -1082,7 +1084,8 @@ class AttachPages
 {
        var $pages = array();
 
-       function AttachPages($page = '', $age = NULL)
+//     function AttachPages($page = '', $age = NULL)
+       function __construct($page = '', $age = NULL)
        {
                // アップロード用のディレクトリ内のファイルリストを取得
                $dir = opendir(UPLOAD_DIR) or