diff --git a/.travis.yml b/.travis.yml
index d518a61de..cb2c700cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ php:
- 5.3
- 5.4
- 5.5
+ - 5.6
+ - hhvm
before_script:
- npm install -g grunt-cli
- npm install
diff --git a/classes/httprequest/XEHttpRequest.class.php b/classes/httprequest/XEHttpRequest.class.php
index 538956561..901d4fcea 100644
--- a/classes/httprequest/XEHttpRequest.class.php
+++ b/classes/httprequest/XEHttpRequest.class.php
@@ -8,6 +8,7 @@
* @author NAVER (developers@xpressengine.com)
* @package /classes/httprequest
* @version 0.1
+ * @deprecated
*/
class XEHttpRequest
{
@@ -24,6 +25,12 @@ class XEHttpRequest
*/
var $m_port;
+ /**
+ * target scheme
+ * @var string
+ */
+ var $m_scheme;
+
/**
* target header
* @var array
@@ -34,10 +41,11 @@ class XEHttpRequest
* constructor
* @return void
*/
- function XEHttpRequest($host, $port)
+ function XEHttpRequest($host, $port, $scheme='')
{
$this->m_host = $host;
$this->m_port = $port;
+ $this->m_scheme = $scheme;
$this->m_headers = array();
}
@@ -108,7 +116,13 @@ class XEHttpRequest
{
static $crlf = "\r\n";
- $sock = @fsockopen($this->m_host, $this->m_port, $errno, $errstr, $timeout);
+ $scheme = '';
+ if($this->m_scheme=='https')
+ {
+ $scheme = 'ssl://';
+ }
+
+ $sock = @fsockopen($scheme . $this->m_host, $this->m_port, $errno, $errstr, $timeout);
if(!$sock)
{
return new Object(-1, 'socket_connect_failed');
diff --git a/config/config.inc.php b/config/config.inc.php
index 603252341..ac19a81ca 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
/**
* Display XE's full version.
*/
-define('__XE_VERSION__', '1.7.5');
+define('__XE_VERSION__', '1.7.5.1');
define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));
diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml
index e93335114..aad7294c4 100644
--- a/modules/admin/lang/lang.xml
+++ b/modules/admin/lang/lang.xml
@@ -125,7 +125,7 @@
-
-
+
-
@@ -166,7 +166,7 @@
-
-
+
@@ -366,7 +366,7 @@
-
-
+
@@ -503,7 +503,7 @@
-
-
+
@@ -539,7 +539,7 @@
-
-
+
@@ -563,7 +563,7 @@
-
-
+
@@ -575,7 +575,7 @@
-
-
+
@@ -587,7 +587,7 @@
-
-
+
@@ -700,7 +700,7 @@
-
-
+
@@ -743,7 +743,7 @@
-
-
+
@@ -790,7 +790,7 @@
-
-
+
-
@@ -817,8 +817,8 @@
-
-
-
+
+
@@ -906,13 +906,14 @@
-
-
+
-
+
-
@@ -931,7 +932,7 @@
-
-
+
@@ -966,14 +967,14 @@
-
-
+
-
-
-
+
+
@@ -1127,7 +1128,7 @@
-
-
+
@@ -1204,7 +1205,7 @@
-
-
+
@@ -1246,28 +1247,28 @@
-
-
+
-
-
+
-
-
+
-
-
+
-
@@ -1326,7 +1327,7 @@
-
-
+
@@ -1348,7 +1349,7 @@
-
safe_mode=On일 경우 XE의 정상적인 동작을 돕습니다.]]>
-
+
@@ -1378,7 +1379,7 @@
-
-
+
@@ -1452,7 +1453,7 @@
-
-
+
@@ -1476,7 +1477,7 @@
-
-
+
-
@@ -1561,40 +1562,48 @@
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
만약 접근이 차단된 경우 './files/config/db.config.php' 파일에서 `'use_sitelock' => 'Y'`를 `'use_sitelock' => 'N'`으로 변경하여 차단을 해제할 수 있습니다.
사이트 잠금 디자인 파일의 위치는 './common/tpl/sitelock.html' 입니다.]]>
+ If the access is blocked, you can unbrick this by changing `'use_sitelock' => 'Y'` to `'use_sitelock' => 'N'` in './files/config/db.config.php.'
The file of site lock design is at './common/tpl/sitelock.html.']]>
もし接近が遮断された場合、'./files/config/db.config.php' ファイルから `'use_sitelock' => 'Y'`を `'use_sitelock' => 'N'`へ変更すれば遮断が解除できます。
サイトロックの設計ファイルの場所は、'./commo/tpl/sitelock.html' です。]]>
-
+
diff --git a/modules/board/board.admin.view.php b/modules/board/board.admin.view.php
index 90cfbee54..3f53e5e7d 100644
--- a/modules/board/board.admin.view.php
+++ b/modules/board/board.admin.view.php
@@ -55,7 +55,7 @@ class boardAdminView extends board {
// install order (sorting) options
foreach($this->order_target as $key) $order_target[$key] = Context::getLang($key);
- $order_target['list_order'] = Context::getLang('regdate');
+ $order_target['list_order'] = Context::getLang('document_srl');
$order_target['update_order'] = Context::getLang('last_update');
Context::set('order_target', $order_target);
}
diff --git a/modules/board/board.class.php b/modules/board/board.class.php
index cb81e10f7..d3adbd471 100644
--- a/modules/board/board.class.php
+++ b/modules/board/board.class.php
@@ -11,7 +11,7 @@ class board extends ModuleObject
{
var $search_option = array('title','content','title_content','comment','user_name','nick_name','user_id','tag'); ///< 검색 옵션
- var $order_target = array('list_order', 'update_order', 'voted_count', 'blamed_count', 'readed_count', 'comment_count', 'title'); // 정렬 옵션
+ var $order_target = array('list_order', 'update_order', 'regdate', 'voted_count', 'blamed_count', 'readed_count', 'comment_count', 'title'); // 정렬 옵션
var $skin = "default"; ///< skin name
var $list_count = 20; ///< the number of documents displayed in a page
diff --git a/modules/board/lang/lang.xml b/modules/board/lang/lang.xml
index 95da583ac..dafa6ef66 100644
--- a/modules/board/lang/lang.xml
+++ b/modules/board/lang/lang.xml
@@ -236,13 +236,13 @@
-
- Please turn off history at additional setup. If not, editing document might show the author's info.]]>
+ Please turn off history at additional setup. If not, editing document might show the author's info.]]>
-
+
-
-
-
+
+
+
Lütfen ek ayarlardan geçmiş'i kapatınız. Eğer kapatmazsanız, belgeyi değiştirmek yazar bilgisinin görüntülenmesine neden olacaktır.]]>
@@ -271,7 +271,7 @@
-
-
+
@@ -282,7 +282,7 @@
-
-
+
@@ -293,7 +293,7 @@
-
-
+
@@ -306,7 +306,7 @@
-
-
+
-
@@ -327,7 +327,7 @@
-
-
+
-
@@ -367,12 +367,12 @@
-
-
+
-
-
+
diff --git a/modules/board/skins/default/list.html b/modules/board/skins/default/list.html
index b5b06ed55..1e0831a4f 100644
--- a/modules/board/skins/default/list.html
+++ b/modules/board/skins/default/list.html
@@ -11,7 +11,7 @@
{$lang->writer} |
{$lang->user_id} |
{$lang->user_name} |
- {$lang->date} |
+ {$lang->date} |
{$lang->last_update} |
{$lang->last_post} |
{$lang->readed_count} |
diff --git a/modules/importer/lang/lang.xml b/modules/importer/lang/lang.xml
index cb0eed534..d2c0d0a0d 100644
--- a/modules/importer/lang/lang.xml
+++ b/modules/importer/lang/lang.xml
@@ -510,23 +510,23 @@ Hãy nhập đường dẫn cho File chứa Data trên Host dưới dạng http:
-
XML Exporter를 이용하면 XML파일로 변환할 수 있습니다.]]>
XML Exporter to convert the data you want into XML File.]]>
+In order to import, you first have to use XML Exporter to convert the data you want into XML File.]]>
XML Exporterを利用して変換したい書き込みデータをXMLファイルで作成してアップロードしてください。]]>
+変換するためには、XML Exporterを利用して変換したい書き込みデータをXMLファイルで作成してアップロードしてください。]]>
XML Exporter生成XML文件后再上传。]]>
+导入数据时请利用 XML Exporter生成XML文件后再上传。]]>
XML Exporter 建立 XML 檔案後再上傳。]]>
+匯入資料時，請利用 XML Exporter 建立 XML 檔案後再上傳。]]>
Exporteur de XML pour convertir les données en fichier de XML, et puis téléchargez-le.]]>
+Pour transférer, vous devez utiliser Exporteur de XML pour convertir les données en fichier de XML, et puis téléchargez-le.]]>
XML Экспортер (XML Exporter), чтобы конвертировать нужные данные в XML Файл и затем загрузить его.]]>
+Чтобы импортировать, Вам следует использовать XML Экспортер (XML Exporter), чтобы конвертировать нужные данные в XML Файл и затем загрузить его.]]>
XML Exporter para transformar los datos en archivo XML, y luego subir ese archivo.]]>
XML DışAktarımcı'yı kullanıp istediğiniz veriyi XML türüne çevirmelisiniz.]]>
+İçe aktarımı gerçekleştirebilmek için öncelikle XML DışAktarımcı'yı kullanıp istediğiniz veriyi XML türüne çevirmelisiniz.]]>
XML Exporter.]]>
+Để hiểu rõ hơn công việc này, bạn có thể tham khảo cách chuyển đổi Data của bạn vào XE khi bạn đã Upload chúng tại XML Exporter.]]>
-
module_path, $member_config->skin);
if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
- $auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$memberInfo->member_srl, 'auth_key',$auth_info->auth_key);
+ $auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_info->auth_key);
Context::set('auth_url', $auth_url);
$oTemplate = &TemplateHandler::getInstance();
diff --git a/modules/member/skins/default/css/member.css b/modules/member/skins/default/css/member.css
index 9b1ad9dcd..1746af915 100644
--- a/modules/member/skins/default/css/member.css
+++ b/modules/member/skins/default/css/member.css
@@ -234,7 +234,7 @@
.xm .pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}
.xm .pagination-centered{text-align:center}
/* Button */
-.xm .btn{font-size:12px;font-family:inherit;display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;line-height:20px;height:auto;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;border:1px solid #cccccc;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05)}
+.xm .btn{font-size:12px;font-family:inherit;display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;line-height:20px;height:auto;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;border:1px solid #cccccc;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05)}
.xm .btn:hover,
.xm .btn:focus,
.xm .btn:active,