Commit: 6373f6775c5f768e25580eb64ac6d8d533b450c0 - teswiki (git)

blogger

Commit MetaInfo

• Revision: 6373f6775c5f768e25580eb64ac6d8d533b450c0 (tree)
• Time: 2016-11-04 21:15:06
• Author: Akito Hachiya <s.beec1e@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2394 Use construct() instead of old style constructor

Change Summary

• modified: lib/config.php
• modified: lib/convert_html.php
• modified: lib/diff.php
• modified: lib/make_link.php
• modified: plugin/attach.inc.php
• modified: plugin/dump.inc.php
• modified: plugin/map.inc.php
• modified: plugin/showrss.inc.php
• modified: plugin/tracker.inc.php

Incremental Difference

--- a/lib/config.php
+++ b/lib/config.php
@@ -27,7 +27,7 @@ class Config
 	var $name, $page; // Page name
 	var $objs = array();
 
-	function Config($name)
+	function __construct($name)
 	{
 		$this->name = $name;
 		$this->page = PKWK_CONFIG_PREFIX . $name;
@@ -135,7 +135,7 @@ class ConfigTable
 	var $after  = array();	// Page contents (except table ones)
 	var $values = array();	// Table contents
 
-	function ConfigTable($title, $obj = NULL)
+	function __construct($title, $obj = NULL)
 	{
 		if ($obj !== NULL) {
 			$this->title  = $obj->title;

--- a/lib/convert_html.php
+++ b/lib/convert_html.php
@@ -32,7 +32,7 @@ class Element
 	var $elements; // References of childs
 	var $last;     // Insert new one at the back of the $last
 
-	function Element()
+	function __construct()
 	{
 		$this->elements = array();
 		$this->last     = & $this;
@@ -165,9 +165,9 @@ function & Factory_Div(& $root, $text)
 // Inline elements
 class Inline extends Element
 {
-	function Inline($text)
+	function __construct($text)
 	{
-		parent::Element();
+		parent::__construct();
 		$this->elements[] = trim((substr($text, 0, 1) == "\n") ?
 			$text : make_link($text));
 	}
@@ -202,9 +202,9 @@ class Paragraph extends Element
 {
 	var $param;
 
-	function Paragraph($text, $param = '')
+	function __construct($text, $param = '')
 	{
-		parent::Element();
+		parent::__construct();
 		$this->param = $param;
 		if ($text == '') return;
 
@@ -234,9 +234,9 @@ class Heading extends Element
 	var $id;
 	var $msg_top;
 
-	function Heading(& $root, $text)
+	function __construct(& $root, $text)
 	{
-		parent::Element();
+		parent::__construct();
 
 		$this->level = min(3, strspn($text, '*'));
 		list($text, $this->msg_top, $this->id) = $root->getAnchor($text, $this->level);
@@ -266,9 +266,9 @@ class Heading extends Element
 // Horizontal Rule
 class HRule extends Element
 {
-	function HRule(& $root, $text)
+	function __construct(& $root, $text)
 	{
-		parent::Element();
+		parent::__construct();
 	}
 
 	function canContain(& $obj)
@@ -293,9 +293,9 @@ class ListContainer extends Element
 	var $margin;
 	var $left_margin;
 
-	function ListContainer($tag, $tag2, $head, $text)
+	function __construct($tag, $tag2, $head, $text)
 	{
-		parent::Element();
+		parent::__construct();
 
 		$var_margin      = '_' . $tag . '_margin';
 		$var_left_margin = '_' . $tag . '_left_margin';
@@ -361,9 +361,9 @@ class ListContainer extends Element
 
 class ListElement extends Element
 {
-	function ListElement($level, $head)
+	function __construct($level, $head)
 	{
-		parent::Element();
+		parent::__construct();
 		$this->level = $level;
 		$this->head  = $head;
 	}
@@ -384,9 +384,9 @@ class ListElement extends Element
 // - Three
 class UList extends ListContainer
 {
-	function UList(& $root, $text)
+	function __construct(& $root, $text)
 	{
-		parent::ListContainer('ul', 'li', '-', $text);
+		parent::__construct('ul', 'li', '-', $text);
 	}
 }
 
@@ -395,9 +395,9 @@ class UList extends ListContainer
 // + Three
 class OList extends ListContainer
 {
-	function OList(& $root, $text)
+	function __construct(& $root, $text)
 	{
-		parent::ListContainer('ol', 'li', '+', $text);
+		parent::__construct('ol', 'li', '+', $text);
 	}
 }
 
@@ -406,9 +406,9 @@ class OList extends ListContainer
 // : definition3 | description3
 class DList extends ListContainer
 {
-	function DList($out)
+	function __construct($out)
 	{
-		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]));
@@ -421,9 +421,9 @@ class BQuote extends Element
 {
 	var $level;
 
-	function BQuote(& $root, $text)
+	function __construct(& $root, $text)
 	{
-		parent::Element();
+		parent::__construct();
 
 		$head = substr($text, 0, 1);
 		$this->level = min(3, strspn($text, $head));
@@ -484,9 +484,9 @@ class TableCell extends Element
 	var $rowspan = 1;
 	var $style; // is array('width'=>, 'align'=>...);
 
-	function TableCell($text, $is_template = FALSE)
+	function __construct($text, $is_template = FALSE)
 	{
-		parent::Element();
+		parent::__construct();
 		$this->style = $matches = array();
 
 		while (preg_match('/^(?:(LEFT|CENTER|RIGHT)|(BG)?COLOR\(([#\w]+)\)|SIZE\((\d+)\)):(.*)$/',
@@ -561,9 +561,9 @@ class Table extends Element
 	var $types;
 	var $col; // number of column
 
-	function Table($out)
+	function __construct($out)
 	{
-		parent::Element();
+		parent::__construct();
 
 		$cells       = explode('|', $out[1]);
 		$this->col   = count($cells);
@@ -665,9 +665,9 @@ class YTable extends Element
 	// TODO: Seems unable to show literal '==' without tricks.
 	//       But it will be imcompatible.
 	// TODO: Why toString() or toXHTML() here
-	function YTable($row = array('cell1 ', ' cell2 ', ' cell3'))
+	function __construct($row = array('cell1 ', ' cell2 ', ' cell3'))
 	{
-		parent::Element();
+		parent::__construct();
 
 		$str = array();
 		$col = count($row);
@@ -738,10 +738,10 @@ class YTable extends Element
 // ' 'Space-beginning sentence
 class Pre extends Element
 {
-	function Pre(& $root, $text)
+	function __construct(& $root, $text)
 	{
 		global $preformat_ltrim;
-		parent::Element();
+		parent::__construct();
 		$this->elements[] = htmlsc(
 			(! $preformat_ltrim || $text == '' || $text{0} != ' ') ? $text : substr($text, 1));
 	}
@@ -769,9 +769,9 @@ class Div extends Element
 	var $name;
 	var $param;
 
-	function Div($out)
+	function __construct($out)
 	{
-		parent::Element();
+		parent::__construct();
 		list(, $this->name, $this->param) = array_pad($out, 3, '');
 	}
 
@@ -792,9 +792,9 @@ class Align extends Element
 {
 	var $align;
 
-	function Align($align)
+	function __construct($align)
 	{
-		parent::Element();
+		parent::__construct();
 		$this->align = $align;
 	}
 
@@ -827,12 +827,12 @@ class Body extends Element
 		',' => 'YTable',
 		'#' => 'Div');
 
-	function Body($id)
+	function __construct($id)
 	{
 		$this->id            = $id;
 		$this->contents      = new Element();
 		$this->contents_last = & $this->contents;
-		parent::Element();
+		parent::__construct();
 	}
 
 	function parse(& $lines)
@@ -979,13 +979,13 @@ class Body extends Element
 
 class Contents_UList extends ListContainer
 {
-	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::__construct('ul', 'li', '-', str_repeat('-', $level));
 		$this->insert(Factory_Inline($text));
 	}
 
@@ -1004,4 +1004,3 @@ class Contents_UList extends ListContainer
 		$this->style = sprintf($_list_pad_str, $this->level, $margin, $margin);
 	}
 }
-

--- a/lib/diff.php
+++ b/lib/diff.php
@@ -99,7 +99,7 @@ class line_diff
 {
 	var $arr1, $arr2, $m, $n, $pos, $key, $plus, $minus, $equal, $reverse;
 
-	function line_diff($plus = '+', $minus = '-', $equal = ' ')
+	function __construct($plus = '+', $minus = '-', $equal = ' ')
 	{
 		$this->plus  = $plus;
 		$this->minus = $minus;
@@ -254,7 +254,7 @@ class DiffLine
 	var $text;
 	var $status;
 
-	function DiffLine($text)
+	function __construct($text)
 	{
 		$this->text   = $text . "\n";
 		$this->status = array();

--- a/lib/make_link.php
+++ b/lib/make_link.php
@@ -50,7 +50,7 @@ class InlineConverter
 		$this->converters = $converters;
 	}
 
-	function InlineConverter($converters = NULL, $excludes = NULL)
+	function __construct($converters = NULL, $excludes = NULL)
 	{
 		if ($converters === NULL) {
 			$converters = array(
@@ -151,7 +151,7 @@ class Link
 	var $alias;
 
 	// Constructor
-	function Link($start)
+	function __construct($start)
 	{
 		$this->start = $start;
 	}
@@ -209,9 +209,9 @@ class Link_plugin extends Link
 	var $pattern;
 	var $plain,$param;
 
-	function Link_plugin($start)
+	function __construct($start)
 	{
-		parent::Link($start);
+		parent::__construct($start);
 	}
 
 	function get_pattern()
@@ -278,9 +278,9 @@ EOD;
 // Footnotes
 class Link_note extends Link
 {
-	function Link_note($start)
+	function __construct($start)
 	{
-		parent::Link($start);
+		parent::__construct($start);
 	}
 
 	function get_pattern()
@@ -346,9 +346,9 @@ EOD;
 // URLs
 class Link_url extends Link
 {
-	function Link_url($start)
+	function __construct($start)
 	{
-		parent::Link($start);
+		parent::__construct($start);
 	}
 
 	function get_pattern()
@@ -393,9 +393,9 @@ EOD;
 // URLs (InterWiki definition on "InterWikiName")
 class Link_url_interwiki extends Link
 {
-	function Link_url_interwiki($start)
+	function __construct($start)
 	{
-		parent::Link($start);
+		parent::__construct($start);
 	}
 
 	function get_pattern()
@@ -433,9 +433,9 @@ class Link_mailto extends Link
 {
 	var $is_image, $image;
 
-	function Link_mailto($start)
+	function __construct($start)
 	{
-		parent::Link($start);
+		parent::__construct($start);
 	}
 
 	function get_pattern()
@@ -475,9 +475,9 @@ class Link_interwikiname extends Link
 	var $param  = '';
 	var $anchor = '';
 
-	function Link_interwikiname($start)
+	function __construct($start)
 	{
-		parent::Link($start);
+		parent::__construct($start);
 	}
 
 	function get_pattern()
@@ -544,9 +544,9 @@ class Link_bracketname extends Link
 {
 	var $anchor, $refer;
 
-	function Link_bracketname($start)
+	function __construct($start)
 	{
-		parent::Link($start);
+		parent::__construct($start);
 	}
 
 	function get_pattern()
@@ -606,9 +606,9 @@ EOD;
 // WikiNames
 class Link_wikiname extends Link
 {
-	function Link_wikiname($start)
+	function __construct($start)
 	{
-		parent::Link($start);
+		parent::__construct($start);
 	}
 
 	function get_pattern()
@@ -647,11 +647,11 @@ class Link_autolink extends Link
 	var $auto;
 	var $auto_a; // alphabet only
 
-	function Link_autolink($start)
+	function __construct($start)
 	{
 		global $autolink;
 
-		parent::Link($start);
+		parent::__construct($start);
 
 		if (! $autolink || ! file_exists(CACHE_DIR . 'autolink.dat'))
 			return;
@@ -693,9 +693,9 @@ class Link_autolink extends Link
 
 class Link_autolink_a extends Link_autolink
 {
-	function Link_autolink_a($start)
+	function __construct($start)
 	{
-		parent::Link_autolink($start);
+		parent::__construct($start);
 	}
 
 	function get_pattern()

--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -432,7 +432,7 @@ class AttachFile
 	var $size_str = '';
 	var $status = array('count'=>array(0), 'age'=>'', 'pass'=>'', 'freeze'=>FALSE);
 
-	function AttachFile($page, $file, $age = 0)
+	function __construct($page, $file, $age = 0)
 	{
 		$this->page = $page;
 		$this->file = preg_replace('#^.*/#','',$file);
@@ -754,7 +754,7 @@ class AttachFiles
 	var $page;
 	var $files = array();
 
-	function AttachFiles($page)
+	function __construct($page)
 	{
 		$this->page = $page;
 	}
@@ -823,7 +823,7 @@ class AttachPages
 {
 	var $pages = array();
 
-	function AttachPages($page = '', $age = NULL)
+	function __construct($page = '', $age = NULL)
 	{
 
 		$dir = opendir(UPLOAD_DIR) or

--- a/plugin/dump.inc.php
+++ b/plugin/dump.inc.php
@@ -331,7 +331,7 @@ class tarlib
 	var $dummydata;
 
 	// コンストラクタ
-	function tarlib() {
+	function __construct() {
 		$this->filename = '';
 		$this->fp       = FALSE;
 		$this->status   = TARLIB_STATUS_INIT;
@@ -712,6 +712,5 @@ class tarlib
 
 		$this->status = TARLIB_STATUS_INIT;
 	}
-
 }
 ?>

--- a/plugin/map.inc.php
+++ b/plugin/map.inc.php
@@ -104,7 +104,7 @@ class MapNode
 	var $done;
 	var $hide_pattern;
 
-	function MapNode($page, $reverse = FALSE)
+	function __construct($page, $reverse = FALSE)
 	{
 		global $script, $non_list;
 

--- a/plugin/showrss.inc.php
+++ b/plugin/showrss.inc.php
@@ -77,7 +77,7 @@ class ShowRSS_html
 	var $items = array();
 	var $class = '';
 
-	function ShowRSS_html($rss)
+	function __construct($rss)
 	{
 		foreach ($rss as $date=>$items) {
 			foreach ($items as $item) {

--- a/plugin/tracker.inc.php
+++ b/plugin/tracker.inc.php
@@ -267,7 +267,7 @@ class Tracker_field
 	var $sort_type = SORT_REGULAR;
 	var $id = 0;
 
-	function Tracker_field($field,$page,$refer,&$config)
+	function __construct($field,$page,$refer,&$config)
 	{
 		global $post;
 		static $id = 0;
@@ -373,9 +373,9 @@ class Tracker_field_format extends Tracker_field
 	var $styles = array();
 	var $formats = array();
 
-	function Tracker_field_format($field,$page,$refer,&$config)
+	function __construct($field,$page,$refer,&$config)
 	{
-		parent::Tracker_field($field,$page,$refer,$config);
+		parent::__construct($field,$page,$refer,$config);
 
 		foreach ($this->config->get($this->name) as $option)
 		{
@@ -663,7 +663,7 @@ class Tracker_list
 	var $order;
 	var $sort_keys;
 
-	function Tracker_list($page,$refer,&$config,$list)
+	function __construct($page,$refer,&$config,$list)
 	{
 		$this->page = $page;
 		$this->config = &$config;