Merge pull request #3 from kijin/php7

PHP7 호환성 개선

classes/context/Context.class.php

@@ -200,9 +200,13 @@ class Context
 	 */
 	public function init()
 	{
+		// fix missing HTTP_RAW_POST_DATA in PHP 5.6 and above
 		if(!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === true) {
-			if(simplexml_load_string(file_get_contents("php://input")) !== false) $GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
+			$GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
-			if(strpos($_SERVER['CONTENT_TYPE'], 'json') || strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json')) $GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
+			if(!preg_match('/^[<\{\[]/', $GLOBALS['HTTP_RAW_POST_DATA']))
+			{
+				unset($GLOBALS['HTTP_RAW_POST_DATA']);
+			}
 		}
 
 		// set context variables in $GLOBALS (to use in display handler)

classes/db/DB.class.php

@@ -1089,7 +1089,7 @@ class DB
 	 * this method is protected
 	 * @return boolean
 	 */
-	function _begin()
+	function _begin($transactionLevel = 0)
 	{
 		return TRUE;
 	}
@@ -1117,7 +1117,7 @@ class DB
 	 * this method is protected
 	 * @return boolean
 	 */
-	function _rollback()
+	function _rollback($transactionLevel = 0)
 	{
 		return TRUE;
 	}

classes/db/DBCubrid.class.php

@@ -144,7 +144,7 @@ class DBCubrid extends DB
 	 * this method is private
 	 * @return boolean
 	 */
-	function _begin($transactionLevel)
+	function _begin($transactionLevel = 0)
 	{
 		if(__CUBRID_VERSION__ >= '8.4.0')
 		{
@@ -167,7 +167,7 @@ class DBCubrid extends DB
 	 * this method is private
 	 * @return boolean
 	 */
-	function _rollback($transactionLevel)
+	function _rollback($transactionLevel = 0)
 	{
 		$connection = $this->_getConnection('master');
 

classes/db/DBMssql.class.php

@@ -113,7 +113,7 @@ class DBMssql extends DB
 	 * this method is private
 	 * @return boolean
 	 */
-	function _begin($transactionLevel)
+	function _begin($transactionLevel = 0)
 	{
 		$connection = $this->_getConnection('master');
 
@@ -136,7 +136,7 @@ class DBMssql extends DB
 	 * this method is private
 	 * @return boolean
 	 */
-	function _rollback($transactionLevel)
+	function _rollback($transactionLevel = 0)
 	{
 		$connection = $this->_getConnection('master');
 

classes/db/DBMysql.class.php

@@ -147,7 +147,7 @@ class DBMysql extends DB
 	 * this method is private
 	 * @return boolean
 	 */
-	function _begin()
+	function _begin($transactionLevel = 0)
 	{
 		return true;
 	}
@@ -157,7 +157,7 @@ class DBMysql extends DB
 	 * this method is private
 	 * @return boolean
 	 */
-	function _rollback()
+	function _rollback($transactionLevel = 0)
 	{
 		return true;
 	}

classes/db/DBMysql_innodb.class.php

@@ -51,7 +51,7 @@ class DBMysql_innodb extends DBMysql
 	 * this method is private
 	 * @return boolean
 	 */
-	function _begin($transactionLevel)
+	function _begin($transactionLevel = 0)
 	{
 		$connection = $this->_getConnection('master');
 
@@ -71,7 +71,7 @@ class DBMysql_innodb extends DBMysql
 	 * this method is private
 	 * @return boolean
 	 */
-	function _rollback($transactionLevel)
+	function _rollback($transactionLevel = 0)
 	{
 		$connection = $this->_getConnection('master');
 

classes/db/DBMysqli_innodb.class.php

@@ -85,7 +85,7 @@ class DBMysqli_innodb extends DBMysql
 	 * this method is private
 	 * @return boolean
 	 */
-	function _begin($transactionLevel)
+	function _begin($transactionLevel = 0)
 	{
 		$connection = $this->_getConnection('master');
 
@@ -105,7 +105,7 @@ class DBMysqli_innodb extends DBMysql
 	 * this method is private
 	 * @return boolean
 	 */
-	function _rollback($transactionLevel)
+	function _rollback($transactionLevel = 0)
 	{
 		$connection = $this->_getConnection('master');
 

classes/module/ModuleObject.class.php

@@ -86,7 +86,7 @@ class ModuleObject extends Object
 	 * @param string $type type of message (error, info, update)
 	 * @return void
 	 * */
-	function setMessage($message, $type = NULL)
+	function setMessage($message = 'success', $type = NULL)
 	{
 		parent::setMessage($message);
 		$this->setMessageType($type);
@@ -370,7 +370,7 @@ class ModuleObject extends Object
 	 * set the directory path of the layout directory
 	 * @return string
 	 * */
-	function getLayoutPath()
+	function getLayoutPath($layout_name = "", $layout_type = "P")
 	{
 		return $this->layout_path;
 	}

classes/object/Object.class.php

@@ -94,7 +94,7 @@ class Object
 	 * @param string $message Error message
 	 * @return bool Alaways returns true.
 	 */
-	function setMessage($message = 'success')
+	function setMessage($message = 'success', $type = NULL)
 	{
 		if($str = Context::getLang($message))
 		{

config/func.inc.php

@@ -1200,7 +1200,7 @@ function removeSrcHack($match)
 				continue;
 			}
 
-			$val = preg_replace('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/e', 'chr("\\1"?0x00\\1:\\2+0)', $m[3][$idx] . $m[4][$idx]);
+			$val = preg_replace_callback('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/', function($n) {return chr($n[1] ? ('0x00' . $n[1]) : ($n[2] + 0)); }, $m[3][$idx] . $m[4][$idx]);
 			$val = preg_replace('/^\s+|[\t\n\r]+/', '', $val);
 
 			if(preg_match('/^[a-z]+script:/i', $val))

modules/layout/layout.model.php

@@ -289,7 +289,7 @@ class layoutModel extends layout
 	 * @param string $layout_type (P : PC, M : Mobile)
 	 * @return string path of layout
 	 */
-	function getLayoutPath($layout_name, $layout_type = "P")
+	function getLayoutPath($layout_name = "", $layout_type = "P")
 	{
 		$layout_parse = explode('|@|', $layout_name);
 		if(count($layout_parse) > 1)

modules/module/module.model.php

@@ -1381,7 +1381,7 @@ class moduleModel extends module
 				$args->site_srl = $site_srl;
 				$output = executeQuery('module.getModuleConfig', $args);
 				if($output->data->config) $config = unserialize($output->data->config);
-				else $config = null;
+				else $config = new stdClass();
 
 				//insert in cache
 				if($oCacheHandler->isSupport())