Merge branch 'release/1.8.1'

Author: bnu

.travis.yml

@@ -6,7 +6,10 @@ php:
   - 5.6
   - hhvm
 before_script:
+  - travis_retry composer self-update
   - npm install -g grunt-cli
   - npm install
+  - if [ $(phpenv version-name) != "5.3" ]; then composer install; fi
 script:
   - grunt lint
+  - if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept run; fi

classes/db/DB.class.php

@@ -166,7 +166,7 @@ class DB
 	 * leve of transaction
 	 * @var unknown
 	 */
-	private $transationNestedLevel = 0;
+	private $transactionNestedLevel = 0;
 
 	/**
 	 * returns instance of certain db type
@@ -314,11 +314,6 @@ function _getSupportedList()
 		{
 			$db_type = $supported_list[$i];
 
-			if(version_compare(phpversion(), '5.0') < 0 && preg_match('/pdo/i', $db_type))
-			{
-				continue;
-			}
-
 			$class_name = sprintf("DB%s%s", strtoupper(substr($db_type, 0, 1)), strtolower(substr($db_type, 1)));
 			$class_file = sprintf(_XE_PATH_ . "classes/db/%s.class.php", $class_name);
 			if(!file_exists($class_file))
@@ -1142,10 +1137,10 @@ function begin()
 			return;
 		}
 
-		if($this->_begin($this->transationNestedLevel))
+		if($this->_begin($this->transactionNestedLevel))
 		{
 			$this->transaction_started = TRUE;
-			$this->transationNestedLevel++;
+			$this->transactionNestedLevel++;
 		}
 	}
 
@@ -1169,11 +1164,11 @@ function rollback()
 		{
 			return;
 		}
-		if($this->_rollback($this->transationNestedLevel))
+		if($this->_rollback($this->transactionNestedLevel))
 		{
-			$this->transationNestedLevel--;
+			$this->transactionNestedLevel--;
 
-			if(!$this->transationNestedLevel)
+			if(!$this->transactionNestedLevel)
 			{
 				$this->transaction_started = FALSE;
 			}
@@ -1201,14 +1196,14 @@ function commit($force = FALSE)
 		{
 			return;
 		}
-		if($this->transationNestedLevel == 1 && $this->_commit())
+		if($this->transactionNestedLevel == 1 && $this->_commit())
 		{
 			$this->transaction_started = FALSE;
-			$this->transationNestedLevel = 0;
+			$this->transactionNestedLevel = 0;
 		}
 		else
 		{
-			$this->transationNestedLevel--;
+			$this->transactionNestedLevel--;
 		}
 	}
 

classes/mail/Mail.class.php

@@ -1,14 +1,7 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(version_compare(PHP_VERSION, '5.0.0', '>='))
-{
-	require_once _XE_PATH_ . "libs/phpmailer/phpmailer.php";
-}
-else
-{
-	require_once _XE_PATH_ . "libs/phpmailer/class.phpmailer.php";
-}
+require_once _XE_PATH_ . "libs/phpmailer/phpmailer.php";
 
 /**
  * Mailing class for XpressEngine

classes/mobile/Mobile.class.php

@@ -52,9 +52,7 @@ function _isFromMobilePhone()
 		{
 			return $this->ismobile;
 		}
-
-		$db_info = Context::getDBInfo();
-		if($db_info->use_mobile_view != "Y" || Context::get('full_browse') || $_COOKIE["FullBrowse"])
+		if(Mobile::isMobileEnabled() === false || Context::get('full_browse') || $_COOKIE["FullBrowse"])
 		{
 			return ($this->ismobile = false);
 		}
@@ -234,5 +232,10 @@ function setMobile($ismobile)
 		$oMobile->ismobile = $ismobile;
 	}
 
+	function isMobileEnabled()
+	{
+		$db_info = Context::getDBInfo();
+		return ($db_info->use_mobile_view === 'Y');
+	}
 }
 ?>

classes/module/ModuleHandler.class.php

@@ -667,7 +667,8 @@ function procModule()
 				'dispEditorConfigPreview' => 1,
 				'dispLayoutPreviewWithModule' => 1
 		);
-		if($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent() && !isset($skipAct[Context::get('act')]))
+		$db_use_mobile = Mobile::isMobileEnabled();
+		if($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent() && !isset($skipAct[Context::get('act')]) && $db_use_mobile === true)
 		{
 			global $lang;
 			$header = '<style>div.xe_mobile{opacity:0.7;margin:1em 0;padding:.5em;background:#333;border:1px solid #666;border-left:0;border-right:0}p.xe_mobile{text-align:center;margin:1em 0}a.xe_mobile{color:#ff0;font-weight:bold;font-size:24px}@media only screen and (min-width:500px){a.xe_mobile{font-size:15px}}</style>';

classes/security/Password.class.php

@@ -111,7 +111,7 @@ public function createHash($password, $algorithm = null)
 
 			case 'pbkdf2':
 				$iterations = pow(2, $this->getWorkFactor() + 5);
-				$salt = $this->createSecureSalt(12);
+				$salt = $this->createSecureSalt(12, 'alnum');
 				$hash = base64_encode($this->pbkdf2($password, $salt, 'sha256', $iterations, 24));
 				return 'sha256:'.sprintf('%07d', $iterations).':'.$salt.':'.$hash;
 

classes/template/TemplateHandler.class.php

@@ -68,7 +68,7 @@ static public function &getInstance()
 	 * @param string $tpl_file
 	 * @return void
 	 */
-	private function init($tpl_path, $tpl_filename, $tpl_file = '')
+	protected function init($tpl_path, $tpl_filename, $tpl_file = '')
 	{
 		// verify arguments
 		if(substr($tpl_path, -1) != '/')
@@ -213,7 +213,7 @@ public function compileDirect($tpl_path, $tpl_filename)
 	 * @param string $buff template file
 	 * @return string compiled result in case of success or NULL in case of error
 	 */
-	private function parse($buff = null)
+	protected function parse($buff = null)
 	{
 		if(is_null($buff))
 		{

codeception.yml

@@ -0,0 +1,18 @@
+actor: Tester
+paths:
+    tests: tests
+    log: tests/_output
+    data: tests/_data
+    helpers: tests/_support
+settings:
+    bootstrap: _bootstrap.php
+    colors: true
+    memory_limit: 1024M
+modules:
+    config:
+        Db:
+            dsn: ''
+            user: ''
+            password: ''
+            dump: tests/_data/dump.sql
+error_level: "E_STRICTE_ALL & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED & ~E_NOTICE"

common/js/plugins/jquery.fileupload/js/main.js

@@ -56,9 +56,25 @@
 
 			var settings = {
 				url: request_uri.setQuery('module', 'file').setQuery('act', 'procFileUpload'),
-				formData: {"editor_sequence": data.editorSequence, "upload_target_srl" : data.uploadTargetSrl},
+				formData: {"editor_sequence": data.editorSequence, "upload_target_srl" : data.uploadTargetSrl, "mid" : window.current_mid},
 
 				dropZone: $container,
+				add: function(e, data) {
+					var dfd = jQuery.Deferred();
+
+					$.each(data.files, function(index, file) {
+						if(self.settings.maxFileSize <= file.size) {
+							dfd.reject();
+							alert(window.xe.msg_exceeds_limit_size);
+							return false;
+						}
+						dfd.resolve();
+					});
+
+					dfd.done(function(){
+						data.submit();
+					});
+				},
 				done: function(e, res) {
 					var result = res.response().result;
 
@@ -69,20 +85,13 @@
 					if(!result) return;
 
 					if(result.error == 0) {
-						// self.done.call(self, arguments);
 					} else {
 						alert(result.message);
 					}
 				},
 				stop: function() {
 					self.loadFilelist();
 				},
-				drop: function(e, data) {
-				},
-				change: function(e, data) {
-				},
-				always: function() {
-				},
 				start: function() {
 					self.settings.progressbarGraph.width(0);
 					self.settings.progressStatus.show();

common/js/plugins/jquery.fileupload/js/main.min.js

@@ -0,0 +1,17 @@
+{
+    "name": "xpressengine/xe-core",
+    "license": "GNU LGPL",
+    "authors": [
+        {
+            "name": "NAVER",
+            "email": "developers@xpressengine.com"
+        }
+    ],
+    "require": {
+    },
+    "require-dev": {
+        "codeception/codeception": "~2.0",
+        "codeception/verify": "0.2.*",
+        "codeception/specify": "0.4.*"
+    }
+}