Merge branch 'release/1.11.6'

xpressengine · Oct 22, 2019 · 2262efa · 2262efa
2 parents b119a5f + 1e002a3
commit 2262efa
Show file tree

Hide file tree

Showing 474 changed files with 5,837 additions and 5,762 deletions.
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1 +1 @@
-Copyright (C) NAVER <http://www.navercorp.com>
+Copyright (C) XEHub <https://www.xehub.io>
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,7 +1,7 @@
 module.exports = function(grunt) {
 	"use strict";
 
-	var banner = '/*! Copyright (C) NAVER <http://www.navercorp.com> */\n';
+	var banner = '/*! Copyright (C) XEHub <https://www.xehub.io> */\n';
 	var banner_xe_js = banner + '/**!\n * @concat modernizr.js + common.js + js_app.js + xml2json.js + xml_handler.js + xml_js_filter.js\n * @brief XE Common JavaScript\n **/\n';
 
 	grunt.file.defaultEncoding = 'utf8';

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) NAVER <http://www.navercorp.com>
+Copyright (C) XEHub <https://www.xehub.io>
 
 XE is an opensource and being developed in the opensource project.
 For more information, please see the link below.

diff --git a/README.md b/README.md
@@ -27,20 +27,18 @@ XpressEngine은 여러분들의 개발 참여를 기다립니다.
 * MYSQL version 4.1 or greater (But recommend MYSQL >= 5.x) , MS-SQL, CUBRID
 * XML Library
 * GD Library
+* Fileinfo Extension
 * ICONV
 * session.auto_start = Off (php.ini)
 
-## Maintainers
-@akasima @bnu @jhyeon1010 @khongchi @findstar @ngleader
-
 ## Contributors
-http://www.xpressengine.com/contributors
+https://www.xpressengine.com/contributors
 
 ## Support
-* Official site (Korean) : http://www.xpressengine.com/
+* Official site (Korean) : https://www.xpressengine.com
 
 ## License
-Copyright 2014 NAVER Corp. <http://www.navercorp.com>
+Copyright 2014 XEHub. <https://www.xehub.io>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

diff --git a/addons/adminlogging/adminlogging.addon.php b/addons/adminlogging/adminlogging.addon.php
@@ -1,12 +1,12 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
+/* Copyright (C) XEHub <https://www.xehub.io> */
 
 if(!defined('__XE__'))
 	exit();
 
 /**
  * @file adminlogging.addon.php
- * @author NAVER ([email protected])
+ * @author XEHub ([email protected])
  * @brief admin log
  */
 $logged_info = Context::get('logged_info');

diff --git a/addons/adminlogging/conf/info.xml b/addons/adminlogging/conf/info.xml
@@ -16,15 +16,15 @@
     <version>1.7</version>
     <date>2013-11-27</date>
 
-    <author email_address="[email protected]" link="http://xpressengine.com/">
-        <name xml:lang="ko">NAVER</name>
-        <name xml:lang="jp">NAVER</name>
-        <name xml:lang="en">NAVER</name>
-        <name xml:lang="vi">NAVER</name>
-        <name xml:lang="zh-CN">NAVER</name>
-        <name xml:lang="es">NAVER</name>
-        <name xml:lang="ru">NAVER</name>
-        <name xml:lang="ge">NAVER</name>
-        <name xml:lang="zh-TW">NAVER</name>
+    <author email_address="[email protected]" link="https://www.xehub.io">
+        <name xml:lang="ko">XEHub</name>
+        <name xml:lang="jp">XEHub</name>
+        <name xml:lang="en">XEHub</name>
+        <name xml:lang="vi">XEHub</name>
+        <name xml:lang="zh-CN">XEHub</name>
+        <name xml:lang="es">XEHub</name>
+        <name xml:lang="ru">XEHub</name>
+        <name xml:lang="ge">XEHub</name>
+        <name xml:lang="zh-TW">XEHub</name>
     </author>
 </addon>
diff --git a/addons/autolink/autolink.addon.php b/addons/autolink/autolink.addon.php
@@ -1,12 +1,12 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
+/* Copyright (C) XEHub <https://www.xehub.io> */
 
 if(!defined('__XE__'))
 	exit();
 
 /**
  * @file autolink.addon.php
- * @author NAVER ([email protected])
+ * @author XEHub ([email protected])
  * @brief Automatic link add-on
  */
 if($called_position == 'after_module_proc' && Context::getResponseMethod() == "HTML")

diff --git a/addons/autolink/autolink.js b/addons/autolink/autolink.js
@@ -1,7 +1,7 @@
 /**
  * @file autolink.js
  * @brief javascript code for autolink addon
- * @author NAVER ([email protected])
+ * @author XEHub ([email protected])
  */
 (function($){
 	var protocol_re = '(https?|ftp|news|telnet|irc|mms)://';
@@ -77,4 +77,4 @@
 	});
 
 	xe.registerPlugin(new AutoLink());
-})(jQuery);
+})(jQuery);
diff --git a/addons/autolink/autolink.spec.html b/addons/autolink/autolink.spec.html
@@ -59,7 +59,7 @@
 	},
 	"#test9 - don't include parenthesis" : function() {
 		value_of( $('#test9 a').length ).should_be(1);
-		value_of( $('#test9 a').attr('href') ).should_be('http://www.naver.com');
+		value_of( $('#test9 a').attr('href') ).should_be('http://xpressengine.com');
 	},
 	"#test10 - include tild" : function() {
 		value_of( $('#test10 a').length ).should_be(1);
@@ -105,8 +105,8 @@
 	</div>
 	<div id="test7">http://mygony.com</div>
 	<div id="test8">Go to http://mygony.com</div>
-	<div id="test9">Naver(http://www.naver.com)</div>
+	<div id="test9">XEHub(http://xpressengine.com)</div>
 	<div id="test10">User homepage : http://www.xpressengine.com:8000/~user/?mid=def should be a link.</div>
 </div>
 </body>
-</html>
+</html>
diff --git a/addons/autolink/conf/info.xml b/addons/autolink/conf/info.xml
@@ -39,15 +39,15 @@
     <version>1.7</version>
     <date>2013-11-27</date>
 
-    <author email_address="[email protected]" link="http://xpressengine.com/">
-        <name xml:lang="ko">NAVER</name>
-        <name xml:lang="jp">NAVER</name>
-        <name xml:lang="en">NAVER</name>
-        <name xml:lang="vi">NAVER</name>
-        <name xml:lang="zh-CN">NAVER</name>
-        <name xml:lang="es">NAVER</name>
-        <name xml:lang="ru">NAVER</name>
-        <name xml:lang="ge">NAVER</name>
-        <name xml:lang="zh-TW">NAVER</name>
+    <author email_address="[email protected]" link="https://www.xehub.io">
+        <name xml:lang="ko">XEHub</name>
+        <name xml:lang="jp">XEHub</name>
+        <name xml:lang="en">XEHub</name>
+        <name xml:lang="vi">XEHub</name>
+        <name xml:lang="zh-CN">XEHub</name>
+        <name xml:lang="es">XEHub</name>
+        <name xml:lang="ru">XEHub</name>
+        <name xml:lang="ge">XEHub</name>
+        <name xml:lang="zh-TW">XEHub</name>
     </author>
 </addon>
diff --git a/addons/captcha/captcha.addon.php b/addons/captcha/captcha.addon.php
@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
+/* Copyright (C) XEHub <https://www.xehub.io> */
 
 if(!defined("__XE__")) exit();
 
 /**
  * @file captcha.addon.php
- * @author NAVER ([email protected])
+ * @author XEHub ([email protected])
  * @brief Captcha for a particular action
  * English alphabets and voice verification added
  * */

diff --git a/addons/captcha/captcha.js b/addons/captcha/captcha.js
@@ -159,7 +159,7 @@ var calledArgs = null;
 				var $div = $('<div style="z-index:1000;position:absolute; width:310px;' + top_left + ' background:#fff; border:3px solid #ccc;">'+
 					'<form method="post" action="">'+
 						'<div style="position:relative; margin:25px 20px 15px 20px">'+
-							'<img src="about:blank" id="captcha_image" alt="CAPTCHA" width="240" height="50" style="display:block; width:240px; height:50px; border:1px solid #b0b0b0" />'+
+							'<img id="captcha_image" alt="CAPTCHA" width="240" height="50" style="display:block; width:240px; height:50px; border:1px solid #b0b0b0" />'+
 							'<button type="button" class="reload" title="" style="position:absolute; top:0; left:245px; width:25px; height:25px; padding:0; overflow:visible; border:1px solid #575757; background:#747474 url('+request_uri + 'addons/captcha/img/icon.gif) no-repeat center 5px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px; cursor:pointer;box-shadow:0 0 3px #444 inset;-moz-box-shadow:0 0 3px #444 inset;-webkit-box-shadow:0 0 3px #444 inset;"></button>'+
 							'<button type="button" class="play" title="" style="position:absolute; top:27px; left:245px; width:25px; height:25px; padding:0; overflow:visible; border:1px solid #575757; background:#747474 url('+request_uri + 'addons/captcha/img/icon.gif) no-repeat center -20px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px; cursor:pointer;box-shadow:0 0 3px #444 inset;-moz-box-shadow:0 0 3px #444 inset;-webkit-box-shadow:0 0 3px #444 inset;"></button>'+
 						'</div>'+
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Copyright (C) NAVER <http://www.navercorp.com>
		Copyright (C) XEHub <https://www.xehub.io>