Merge pull request #6 from orrisroot/master

support XCL 2.2, etc.
suin-xoops · Jul 24, 2014 · 2cdbf7e · 2cdbf7e
2 parents e724ad3 + a1edb79
commit 2cdbf7e
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 12 deletions.
diff --git a/build/AdelieDebug.class.php b/build/AdelieDebug.class.php
diff --git a/build/version b/build/version
@@ -1 +1 @@
-{"build":1367540064,"datetime":"2013-05-03 09:14:24"}
+{"build":1405183780,"datetime":"2014-07-13 01:49:40"}
diff --git a/source/AdelieDebug/Debug/Trace.php b/source/AdelieDebug/Debug/Trace.php
@@ -27,7 +27,7 @@ public static function trace($minus = 0, $return = false)
 		for ( $i = 0; $i < $minus; $i ++ )
 		{
 			$trace = preg_replace("/.*\n#1([^\d])/s", '#1$1', $trace);
-			$trace = preg_replace ('/^#(\d+)/me', '\'#\' . ($1 - 1)', $trace);
+			$trace = preg_replace_callback('/^#(\d+)/m', function($m) { return '#' . ($m[1] - 1); }, $trace);
 		}
 
 		if ( $return === true )

diff --git a/source/AdelieDebug/Debug/XoopsDebugger.php b/source/AdelieDebug/Debug/XoopsDebugger.php
@@ -31,7 +31,7 @@ public function enableDebugRenderSystem()
 
 	public function prepare()
 	{
-		$GLOBALS['xoopsErrorHandler'] =& AdelieDebug_Debug_XoopsErrorHandler::getInstance();
+		$GLOBALS['xoopsErrorHandler'] =& AdelieDebug_Debug_XoopsErrorHandler::getInstanceWrapper();
 		$GLOBALS['xoopsErrorHandler']->activate(false);
 
 		$xoopsLogger = AdelieDebug_Debug_XoopsLogger::getInstance();

diff --git a/source/AdelieDebug/Debug/XoopsErrorHandler.php b/source/AdelieDebug/Debug/XoopsErrorHandler.php
@@ -31,6 +31,11 @@ public static function getInstance()
 
 			return $instance;
 		}
+
+		public static function &getInstanceWrapper()
+		{
+			return self::getInstance();
+		}
 	}
 }
 else
@@ -42,7 +47,7 @@ public function __construct()
 			// 親のコンストラクタの処理を封じる
 		}
 
-		public function getInstance()
+		public function &getInstance()
 		{
 			static $instance = null;
 
@@ -53,6 +58,12 @@ public function getInstance()
 
 			return $instance;
 		}
+
+		public static function &getInstanceWrapper()
+		{
+			$obj = new self();
+			return $obj->getInstance();
+		}
 	}
 }
 

diff --git a/source/AdelieDebug/Debug/XoopsLogger.php b/source/AdelieDebug/Debug/XoopsLogger.php
@@ -26,7 +26,7 @@ public static function getInstance()
 		$reflectionClass = new ReflectionClass('XoopsLogger');
 		$instanceMethod = $reflectionClass->getMethod('instance');
 
-		if ( $instanceMethod->isStatic() === true ) {
+		if ( $instanceMethod->returnsReference() === false ) {
 			return AdelieDebug_Debug_XoopsLogger_TP::instance();
 		} else {
 			return AdelieDebug_Debug_XoopsLogger_XCL::instance();

diff --git a/source/AdelieDebug/Debug/XoopsLogger/XCL.php b/source/AdelieDebug/Debug/XoopsLogger/XCL.php
@@ -2,7 +2,7 @@
 
 class AdelieDebug_Debug_XoopsLogger_XCL extends AdelieDebug_Debug_XoopsLogger
 {
-	public function instance()
+	public static function &instance()
 	{
 		static $instance = null;
 

diff --git a/source/AdelieDebug/Preload.php b/source/AdelieDebug/Preload.php
@@ -39,7 +39,7 @@ public function setupDebugEventHandler(&$instance, $debugMode)
 		$this->debugger->enableErrorReporting(); // Legacy_Controller::_setupDebugger() で error_reproting = 0 にされちゃってるので必要
 	}
 
-	public function addOutputFilterToXoopsTpl(XoopsTpl $xoopsTpl)
+	public function addOutputFilterToXoopsTpl(Smarty $xoopsTpl)
 	{
 		if ( method_exists($xoopsTpl, 'registerFilter') === true )
 		{

diff --git a/source/AdelieDebug/Template/Report/Index.tpl b/source/AdelieDebug/Template/Report/Index.tpl
@@ -14,7 +14,7 @@
 			<strong><{$typeName}> (<{$ids|@count}>)</strong>
 			<span>...</span>
 			<{foreach from=$ids item="id"}>
-				<a href="#adelieDebugLogId<{$id}>" style="margin: 10px;">#<{$id}></a>
+				<a href="#adelieDebugLogId<{$id}>" style="margin: 10px;" onclick="javascript:document.getElementById('adelieDebugDetail').style.display='block'">#<{$id}></a>
 			<{/foreach}>
 		</div>
 	<{foreachelse}>
@@ -131,4 +131,4 @@
 		<{/if}>
 	<{/foreach}>
 </div>
-</div>
+</div>