Commit: master - pukiwiki_plus (git)

Commit MetaInfo

• Revision: 07ed08515585506b222864cb1ceb0a19050e34f7 (tree)
• Time: 2016-12-16 08:43:58
• Author: night1ynx <night1ynxd@gmai...>
• Commiter: night1ynx

Log Message

Fix errors in PHP 7.0+

Change Summary

• add: lib/compat.php
• modified: lib/config.php
• modified: lib/convert_html.php
• modified: lib/func.php
• modified: lib/init.php
• modified: lib/lang.php
• modified: lib/link.php
• modified: lib/openid/Auth/OpenID/Consumer.php
• modified: lib/openid/Auth/OpenID/Server.php
• modified: lib/openid/Auth/Yadis/XRDS.php
• modified: lib/pukiwiki.php
• modified: plugin/attach.inc.php
• modified: plugin/dav.inc.php
• modified: plugin/map.inc.php
• modified: plugin/navi.inc.php
• modified: plugin/tracker.inc.php
• modified: skin/guiedit/wiki2xhtml.php

Incremental Difference

--- /dev/null
+++ b/lib/compat.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Forward/Backward compatibility layer
+ *
+ * @copyright 2016 night1ynx
+ * @license   GPLv2 or later
+ */
+
+/**
+ * E_USER_DEPRECATED was introduced since PHP 5.3
+ */
+if (! defined('E_USER_DEPRECATED')) {
+    define('E_USER_DEPRECATED', E_USER_WARNING);
+}
+
+if (! function_exists('ereg')) {
+    /**
+     * @deprecated
+     */
+    function ereg($pattern, $string, &$regs = array()) {
+        trigger_error('ereg() was removed in PHP 7.0', E_USER_DEPRECATED);
+        return mb_ereg($pattern, $string, $regs);
+    }
+}
+
+if (! function_exists('ereg_replace')) {
+    /**
+     * @deprecated
+     */
+    function ereg_replace($pattern, $replacement, $string) {
+        trigger_error('ereg_replace() was removed in PHP 7.0', E_USER_DEPRECATED);
+        return mb_ereg_replace($pattern, $replacement, $string);
+    }
+}
+
+if (! function_exists('split')) {
+    /**
+     * @deprecated
+     */
+    function split($pattern, $string, $limit = -1) {
+        trigger_error('split() was removed in PHP 7.0', E_USER_DEPRECATED);
+        return mb_split($pattern, $string, $limit);
+    }
+}

--- a/lib/config.php
+++ b/lib/config.php
@@ -41,7 +41,7 @@ class Config
 		if (! is_page($this->page)) return FALSE;
 
 		$this->objs = array();
-		$obj        = & new ConfigTable('');
+		$obj        = new ConfigTable('');
 		$matches = array();
 
 		foreach (get_source($this->page) as $line) {
@@ -59,22 +59,22 @@ class Config
 
 				if ($level == 1) {
 					$this->objs[$obj->title] = $obj;
-					$obj = & new ConfigTable($line);
+					$obj = new ConfigTable($line);
 				} else {
 					if (! is_a($obj, 'ConfigTable_Direct'))
-						$obj = & new ConfigTable_Direct('', $obj);
+						$obj = new ConfigTable_Direct('', $obj);
 					$obj->set_key($line);
 				}
 				
 			} else if ($head == '-' && $level > 1) {
 				if (! is_a($obj, 'ConfigTable_Direct'))
-					$obj = & new ConfigTable_Direct('', $obj);
+					$obj = new ConfigTable_Direct('', $obj);
 				$obj->add_value($line);
 
 			} else if ($head == '|' && preg_match('/^\|(.+)\|\s*$/', $line, $matches)) {
 				// Table row
 				if (! is_a($obj, 'ConfigTable_Sequential'))
-					$obj = & new ConfigTable_Sequential('', $obj);
+					$obj = new ConfigTable_Sequential('', $obj);
 				// Trim() each table cell
 				$obj->add_value(array_map('trim', explode('|', $matches[1])));
 			} else {
@@ -111,7 +111,7 @@ class Config
 	function & get_object($title)
 	{
 		if (! isset($this->objs[$title]))
-			$this->objs[$title] = & new ConfigTable('*' . trim($title) . "\n");
+			$this->objs[$title] = new ConfigTable('*' . trim($title) . "\n");
 		return $this->objs[$title];
 	}
 

--- a/lib/convert_html.php
+++ b/lib/convert_html.php
@@ -20,7 +20,7 @@ function convert_html($lines)
 
 	if (! is_array($lines)) $lines = explode("\n", $lines);
 
-	$body = & new Body(++$contents_id);
+	$body = new Body(++$contents_id);
 	$body->parse($lines);
 
 	return $body->toString();
@@ -192,7 +192,7 @@ class Inline extends Element
 
 	function & toPara($class = '')
 	{
-		$obj = & new Paragraph('', $class);
+		$obj = new Paragraph('', $class);
 		$obj->insert($this);
 		return $obj;
 	}
@@ -580,7 +580,7 @@ class Table extends Element
 		$is_template = ($this->type == 'c');
 		$row = array();
 		foreach ($cells as $cell)
-			$row[] = & new TableCell($cell, $is_template);
+			$row[] = new TableCell($cell, $is_template);
 		$this->elements[] = $row;
 	}
 
@@ -860,7 +860,7 @@ class Body extends Element
 	function Body($id)
 	{
 		$this->id            = $id;
-		$this->contents      = & new Element();
+		$this->contents      = new Element();
 		$this->contents_last = & $this->contents;
 		parent::Element();
 	}

--- a/lib/func.php
+++ b/lib/func.php
@@ -621,7 +621,7 @@ function get_glossary_pattern(& $pages, $min_len = -1)
 {
 	global $WikiName, $autoglossary, $nowikiname;
 
-	$config = &new Config('Glossary');
+	$config = new Config('Glossary');
 	$config->read();
 	$ignorepages      = $config->get('IgnoreList');
 	$forceignorepages = $config->get('ForceIgnoreList');
@@ -657,7 +657,7 @@ function get_autolink_pattern(& $pages, $min_len = -1)
 {
 	global $WikiName, $autolink, $nowikiname;
 
-	$config = &new Config('AutoLink');
+	$config = new Config('AutoLink');
 	$config->read();
 	$ignorepages      = $config->get('IgnoreList');
 	$forceignorepages = $config->get('ForceIgnoreList');

--- a/lib/init.php
+++ b/lib/init.php
@@ -352,7 +352,7 @@ $BracketName = '(?!\s):?[^\r\n\t\f\[\]<>#&":]+:?(?<!\s)';
 $InterWikiName = '(\[\[)?((?:(?!\s|:|\]\]).)+):(.+)(?(1)\]\])';
 
 // 注釈
-$NotePattern = '/\(\(((?:(?>(?:(?!\(\()(?!\)\)(?:[^\)]|$)).)+)|(?R))*)\)\)/ex';
+$NotePattern = '/\(\(((?:(?>(?:(?!\(\()(?!\)\)(?:[^\)]|$)).)+)|(?R))*)\)\)/x';
 
 /////////////////////////////////////////////////
 // 初期設定(ユーザ定義ルール読み込み)
@@ -380,5 +380,3 @@ $line_rules = array_merge(array(
 	'&amp;(#[0-9]+|#x[0-9a-f]+|' . $entity_pattern . ');' => '&$1;',
 	"\r"          => '<br />' . "\n",	/* 行末にチルダは改行 */
 ), $line_rules);
-
-?>

--- a/lib/lang.php
+++ b/lib/lang.php
@@ -110,7 +110,7 @@ function get_language($level = 0)
 	for($i=0; $i < $level; $i++){
 		if ($i == $level) return DEFAULT_LANG;
 		// 指定関数の実行
-		$_x = $obj_lng->$lng_func[$i]();
+		$_x = $obj_lng->{$lng_func[$i]}();
 		if (! is_array($_x)) continue;
 
 		foreach($_x as $_lang) {

--- a/lib/link.php
+++ b/lib/link.php
@@ -261,7 +261,7 @@ function & links_get_objects($page, $refresh = FALSE)
 	static $obj;
 
 	if (! isset($obj) || $refresh)
-		$obj = & new InlineConverter(NULL, array('note'));
+		$obj = new InlineConverter(NULL, array('note'));
 
 	$result = $obj->get_objects(join('', preg_grep('/^(?!\/\/|\s)./', get_source($page))), $page);
 	return $result;

--- a/lib/openid/Auth/OpenID/Consumer.php
+++ b/lib/openid/Auth/OpenID/Consumer.php
@@ -268,9 +268,9 @@ class Auth_OpenID_Consumer {
         $this->session =& $session;
 
         if ($consumer_cls !== null) {
-            $this->consumer =& new $consumer_cls($store);
+            $this->consumer = new $consumer_cls($store);
         } else {
-            $this->consumer =& new Auth_OpenID_GenericConsumer($store);
+            $this->consumer = new Auth_OpenID_GenericConsumer($store);
         }
 
         $this->_token_key = $this->session_key_prefix . $this->_token_suffix;

--- a/lib/openid/Auth/OpenID/Server.php
+++ b/lib/openid/Auth/OpenID/Server.php
@@ -1097,7 +1097,7 @@ class Auth_OpenID_CheckIDRequest extends Auth_OpenID_Request {
                                   in OpenID 1.x immediate mode.');
                 }
 
-                $setup_request =& new Auth_OpenID_CheckIDRequest(
+                $setup_request = new Auth_OpenID_CheckIDRequest(
                                                 $this->identity,
                                                 $this->return_to,
                                                 $this->trust_root,
@@ -1677,9 +1677,9 @@ class Auth_OpenID_Server {
     function Auth_OpenID_Server(&$store, $op_endpoint=null)
     {
         $this->store =& $store;
-        $this->signatory =& new Auth_OpenID_Signatory($this->store);
-        $this->encoder =& new Auth_OpenID_SigningEncoder($this->signatory);
-        $this->decoder =& new Auth_OpenID_Decoder($this);
+        $this->signatory = new Auth_OpenID_Signatory($this->store);
+        $this->encoder = new Auth_OpenID_SigningEncoder($this->signatory);
+        $this->decoder = new Auth_OpenID_Decoder($this);
         $this->op_endpoint = $op_endpoint;
         $this->negotiator =& Auth_OpenID_getDefaultNegotiator();
     }

--- a/lib/openid/Auth/Yadis/XRDS.php
+++ b/lib/openid/Auth/Yadis/XRDS.php
@@ -352,7 +352,7 @@ class Auth_Yadis_XRDS {
         $services = $this->parser->evalXPath('xrd:Service', $this->xrdNode);
 
         foreach ($services as $node) {
-            $s =& new Auth_Yadis_Service();
+            $s = new Auth_Yadis_Service();
             $s->element = $node;
             $s->parser =& $this->parser;
 
@@ -475,4 +475,4 @@ class Auth_Yadis_XRDS {
     }
 }
 
-?>
\ No newline at end of file
+?>

--- a/lib/pukiwiki.php
+++ b/lib/pukiwiki.php
@@ -41,6 +41,7 @@ if (! defined('DATA_HOME')) define('DATA_HOME', '');
 
 if (! defined('LIB_DIR')) define('LIB_DIR', '');
 
+require(LIB_DIR . 'compat.php');
 require(LIB_DIR . 'func.php');
 require(LIB_DIR . 'file.php');
 require(LIB_DIR . 'funcplus.php');

--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -124,7 +124,7 @@ function plugin_attach_convert()
 
 	$ret = '';
 	if (! $nolist) {
-		$obj  = & new AttachPages($page);
+		$obj  = new AttachPages($page);
 		$ret .= $obj->toString($page, TRUE);
 	}
 	if (! $noform) {
@@ -199,7 +199,7 @@ function attach_filelist()
 
 	$page = isset($vars['page']) ? $vars['page'] : '';
 
-	$obj = & new AttachPages($page, 0);
+	$obj = new AttachPages($page, 0);
 
 	if (! isset($obj->pages[$page])) {
 		return '';
@@ -333,7 +333,7 @@ function attach_doupload(&$file, $page, $pass=NULL, $temp='', $copyright=FALSE,
 
 	if ($must_compress && is_uploaded_file($file['tmp_name'])) {
 		if (PLUGIN_ATTACH_COMPRESS_TYPE == 'TGZ' && exist_plugin('dump')) {
-			$obj = & new AttachFile($page, $file['name'] . '.tgz');
+			$obj = new AttachFile($page, $file['name'] . '.tgz');
 			if ($obj->exist)
 				return array('result'=>FALSE,
 					'msg'=>$_attach_messages['err_exists']);
@@ -349,7 +349,7 @@ function attach_doupload(&$file, $page, $pass=NULL, $temp='', $copyright=FALSE,
 			@unlink($tar->filename);
 		} else
 		if (PLUGIN_ATTACH_COMPRESS_TYPE == 'GZ' && extension_loaded('zlib')) {
-			$obj = & new AttachFile($page, $file['name'] . '.gz');
+			$obj = new AttachFile($page, $file['name'] . '.gz');
 			if ($obj->exist)
 				return array('result'=>FALSE,
 					'msg'=>$_attach_messages['err_exists']);
@@ -366,7 +366,7 @@ function attach_doupload(&$file, $page, $pass=NULL, $temp='', $copyright=FALSE,
 			@unlink($file['tmp_name']);
 		} else
 		if (PLUGIN_ATTACH_COMPRESS_TYPE == 'ZIP' && class_exists('ZipArchive')) {
-			$obj = & new AttachFile($page, $file['name'] . '.zip');
+			$obj = new AttachFile($page, $file['name'] . '.zip');
 			if ($obj->exist)
 				return array('result'=>FALSE,
 					'msg'=>$_attach_messages['err_exists']);
@@ -382,7 +382,7 @@ function attach_doupload(&$file, $page, $pass=NULL, $temp='', $copyright=FALSE,
 		}
 	} else {
 //miko
-		$obj = & new AttachFile($page, $file['name']);
+		$obj = new AttachFile($page, $file['name']);
 		if ($obj->exist)
 			return array('result'=>FALSE,
 				'msg'=>$_attach_messages['err_exists']);
@@ -506,7 +506,7 @@ function attach_info($err = '')
 
 	check_editable($refer, true, true);
 
-	$obj = & new AttachFile($refer, $file, $age);
+	$obj = new AttachFile($refer, $file, $age);
 	return $obj->getstatus() ?
 		$obj->info($err) :
 		array('msg'=>$_attach_messages['err_notfound']);
@@ -523,7 +523,7 @@ function attach_delete()
 	if (is_freeze($refer) || ! is_editable($refer))
 		return array('msg'=>$_attach_messages['err_noparm']);
 
-	$obj = & new AttachFile($refer, $file, $age);
+	$obj = new AttachFile($refer, $file, $age);
 	if (! $obj->getstatus())
 		return array('msg'=>$_attach_messages['err_notfound']);
 		
@@ -542,7 +542,7 @@ function attach_freeze($freeze)
 	if (is_freeze($refer) || ! is_editable($refer)) {
 		return array('msg'=>$_attach_messages['err_noparm']);
 	} else {
-		$obj = & new AttachFile($refer, $file, $age);
+		$obj = new AttachFile($refer, $file, $age);
 		return $obj->getstatus() ?
 			$obj->freeze($freeze, $pass) :
 			array('msg'=>$_attach_messages['err_notfound']);
@@ -561,7 +561,7 @@ function attach_rename()
 	if (is_freeze($refer) || ! is_editable($refer)) {
 		return array('msg'=>$_attach_messages['err_noparm']);
 	}
-	$obj = & new AttachFile($refer, $file, $age);
+	$obj = new AttachFile($refer, $file, $age);
 	if (! $obj->getstatus())
 		return array('msg'=>$_attach_messages['err_notfound']);
 
@@ -577,7 +577,7 @@ function attach_open()
 		${$var} = isset($vars[$var]) ? $vars[$var] : '';
 	}
 
-	$obj = & new AttachFile($refer, $file, $age);
+	$obj = new AttachFile($refer, $file, $age);
 	return $obj->getstatus() ?
 		$obj->open() :
 		array('msg'=>$_attach_messages['err_notfound']);
@@ -592,7 +592,7 @@ function attach_list()
 
 	$refer = isset($vars['refer']) ? $vars['refer'] : '';
 
-	$obj = & new AttachPages($refer);
+	$obj = new AttachPages($refer);
 
 	$msg = $_attach_messages[($refer == '') ? 'msg_listall' : 'msg_listpage'];
 	$body = ($refer == '' || isset($obj->pages[$refer])) ?
@@ -714,7 +714,7 @@ EOD;
 </form>
 EOD;
 	if ($listview) {
-		$obj = & new AttachPages($page);
+		$obj = new AttachPages($page);
 		$body = ($refer == '' || isset($obj->pages[$page])) ?
 			$obj->toRender($page, FALSE) :
 			$_attach_messages['err_noexist'];
@@ -1067,7 +1067,7 @@ class AttachFiles
 
 	function add($file, $age)
 	{
-		$this->files[$file][$age] = & new AttachFile($this->page, $file, $age);
+		$this->files[$file][$age] = new AttachFile($this->page, $file, $age);
 	}
 
 	// ファイル一覧を取得
@@ -1192,7 +1192,7 @@ class AttachPages
 			$_file = decode($matches[2]);
 			$_age  = isset($matches[3]) ? $matches[3] : 0;
 			if (! isset($this->pages[$_page])) {
-				$this->pages[$_page] = & new AttachFiles($_page);
+				$this->pages[$_page] = new AttachFiles($_page);
 			}
 			$this->pages[$_page]->add($_file, $_age);
 		}

--- a/plugin/dav.inc.php
+++ b/plugin/dav.inc.php
@@ -517,7 +517,7 @@ function plugin_dav_maketree0()
 	// 現状は、添付ファイル非表示の場合は抑止
 	if (!$attach_link) return $root;
 
-	$attaches = & new AttachPages('');
+	$attaches = new AttachPages('');
 	foreach($attaches->pages as $key => $val){
 		if(check_non_list($key)) continue;
 		if(!check_readable($key, false, false)) continue;

--- a/plugin/map.inc.php
+++ b/plugin/map.inc.php
@@ -43,13 +43,13 @@ function plugin_map_action()
 	// Generate a tree
 	$nodes = array();
 	foreach ($pages as $page) {
-		$nodes[$page] = & new MapNode($page, $reverse);
+		$nodes[$page] = new MapNode($page, $reverse);
 	}
 
 	// Node not found: Because of filtererd by $non_list
 	if (! isset($nodes[$refer])) {
 		$vars['refer'] = $refer = $defaultpage;
-		$nodes[$refer] = & new MapNode($page, $reverse);
+		$nodes[$refer] = new MapNode($page, $reverse);
 	}
 
 	if ($reverse) {
@@ -177,7 +177,7 @@ class MapNode
 		if ($this->parent_id == 0) $this->parent_id = -1;
 
 		foreach ($this->rels as $page) {
-			if (! isset($nodes[$page])) $nodes[$page] = & new MapNode($page);
+			if (! isset($nodes[$page])) $nodes[$page] = new MapNode($page);
 			if ($nodes[$page]->parent_id == 0)
 				$nodes[$page]->parent_id = $this->id;
 		}

--- a/plugin/navi.inc.php
+++ b/plugin/navi.inc.php
@@ -102,12 +102,19 @@ function plugin_navi_convert()
 		natcasesort($pages);
 		if ($reverse) $pages = array_reverse($pages);
 
+		$pages = array_values($pages);
 		$prev = $home;
-		foreach ($pages as $page) {
-			if ($page == $current) break;
+		$next = '';
+		foreach ($pages as $index => $page) {
+			if ($page === $current) {
+				$next_key = $index + 1;
+				if (array_key_exists($next_key, $pages) {
+					$next = $pages[$next_key];
+				}
+				break;
+			}
 			$prev = $page;
 		}
-		$next = current($pages);
 
 		$pos = strrpos($current, '/');
 		$up = '';

--- a/plugin/tracker.inc.php
+++ b/plugin/tracker.inc.php
@@ -91,7 +91,7 @@ function plugin_tracker_convert()
 	}
 	unset($args, $argc, $arg);
 
-	$tracker_form = & new Tracker_form();
+	$tracker_form = new Tracker_form();
 	if (! $tracker_form->init($base, $refer, $config, $rel)) {
 		return '#tracker: ' . htmlspecialchars($tracker_form->error) . '<br />';
 	}
@@ -204,7 +204,7 @@ function plugin_tracker_action()
 
 	$from = $to = array();
 
-	$tracker_form = & new Tracker_form();
+	$tracker_form = new Tracker_form();
 	if (! $tracker_form->init($base, $refer, $config)) {
 		return array(
 			'msg'  => 'Cannot write',
@@ -437,7 +437,7 @@ class Tracker_form
 			return FALSE;
 		}
 
-		$this->fields[$fieldname] = & new $class(
+		$this->fields[$fieldname] = new $class(
 			$this,			// Reference
 			array(
 				$fieldname,
@@ -957,7 +957,7 @@ function plugin_tracker_list_render($base, $refer, $rel = '', $config = '', $ord
 	$tracker_count++;
 //miko
 
-	$tracker_list = & new Tracker_list();
+	$tracker_list = new Tracker_list();
 
 	if (! $tracker_list->init($base, $refer, $config, $rel)  ||
 		! $tracker_list->setSortOrder($order)) {
@@ -1017,7 +1017,7 @@ class Tracker_list
 
 	function init($base, $refer, $config = NULL, $relative = '')
 	{
-		$this->form = & new Tracker_form();
+		$this->form = new Tracker_form();
 		return $this->form->init($base, $refer, $config, $relative);
 	}
 

--- a/skin/guiedit/wiki2xhtml.php
+++ b/skin/guiedit/wiki2xhtml.php
@@ -25,7 +25,7 @@ require_once(GUIEDIT_LIB_PATH . 'guiedit.ini.php');
 function guiedit_convert_html($lines) {
 	if (! is_array($lines)) $lines = explode("\n", $lines);
 
-	$body = & new BodyEx();
+	$body = new BodyEx();
 	$body->parse($lines);
 
 	return $body->toString();
@@ -517,7 +517,7 @@ class InlineEx extends ElementEx
 
 	function & toPara($class = '')
 	{
-		$obj = & new ParagraphEx('', $class);
+		$obj = new ParagraphEx('', $class);
 		$obj->insert($this);
 		return $obj;
 	}
@@ -937,7 +937,7 @@ class TableEx extends ElementEx
 		$is_template = ($this->type == 'c');
 		$row = array();
 		foreach ($cells as $cell)
-			$row[] = & new TableCellEx($cell, $is_template);
+			$row[] = new TableCellEx($cell, $is_template);
 		$this->elements[] = $row;
 	}