Merge branch 'develop' into pr/ncenterlite-option

modules/comment/comment.controller.php

@@ -829,9 +829,9 @@ class commentController extends comment
 		}
 
 		// set modifier's information if logged-in and posting author and modifier are matched.
+		$logged_info = Context::get('logged_info');
 		if(Context::get('is_logged'))
 		{
-			$logged_info = Context::get('logged_info');
 			if($source_obj->member_srl == $logged_info->member_srl)
 			{
 				$obj->member_srl = $logged_info->member_srl;

modules/communication/communication.controller.php

@@ -459,10 +459,20 @@ class communicationController extends communication
 		$logged_info = Context::get('logged_info');
 
 		$target_srl = (int) trim(Context::get('target_srl'));
-		if(!$target_srl)
+		if(!$target_srl || $target_srl == $logged_info->member_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
+		
+		// Check duplicate friend
+		$args = new stdClass();
+		$args->member_srl = $logged_info->member_srl;
+		$args->target_srl = $target_srl;
+		$output = executeQuery('communication.isAddedFriend', $args);
+		if($output->data->count)
+		{
+			return new Object(-1, 'msg_already_friend');
+		}
 
 		// Variable
 		$args = new stdClass();

modules/communication/lang/en.php

@@ -21,7 +21,9 @@ $lang->cmd_message_box = 'Message Box';
 $lang->cmd_view_message_box = 'Message Box';
 $lang->cmd_store = 'Save';
 $lang->cmd_add_friend_group = 'Add Friend Group';
-$lang->cmd_rename_friend_group = 'Modify Friend Group Name';
+$lang->cmd_rename_friend_group = 'Rename Friend Group';
+$lang->cmd_delete_friend_group = 'Delete Friend Group';
+$lang->msg_already_friend = 'You are already friends with this person.';
 $lang->msg_no_message = 'There is no message.';
 $lang->msg_cannot_send_to_yourself = 'Cannot send a message to yourself.';
 $lang->message_received = 'You have a new message.';
@@ -36,4 +38,4 @@ $lang->communication_send_message_grant = 'Send Message Grant';
 $lang->cmd_manage_base = 'Basic infomation';
 $lang->alert_new_message_arrived = 'You have %d new message(s). Do you want to check it now?';
 $lang->enable_communication_friend = 'Friend Enable';
-$lang->enable_communication_message = 'Message Enable';
+$lang->enable_communication_message = 'Message Enable';

modules/communication/lang/ja.php

@@ -22,6 +22,8 @@ $lang->cmd_view_message_box = 'メッセージ';
 $lang->cmd_store = '保存';
 $lang->cmd_add_friend_group = '友達グループ追加';
 $lang->cmd_rename_friend_group = '友達グループ名変更';
+$lang->cmd_delete_friend_group = '友達グループ削除';
+$lang->msg_already_friend = '既に友達として登録されています。';
 $lang->msg_no_message = 'メッセージがありません。';
 $lang->msg_cannot_send_to_yourself = '自分自身へのメッセージ送信はできません。';
 $lang->message_received = 'メッセージが届きました。';

modules/communication/lang/ko.php

@@ -22,6 +22,8 @@ $lang->cmd_view_message_box = '쪽지함 보기';
 $lang->cmd_store = '보관';
 $lang->cmd_add_friend_group = '친구 그룹 추가';
 $lang->cmd_rename_friend_group = '친구 그룹 이름 변경';
+$lang->cmd_delete_friend_group = '친구 그룹 삭제';
+$lang->msg_already_friend = '이미 친구로 등록되어 있습니다.';
 $lang->msg_no_message = '쪽지가 없습니다.';
 $lang->msg_cannot_send_to_yourself = '자기 자신에게 쪽지를 보낼 수 없습니다.';
 $lang->message_received = '쪽지가 왔습니다.';
@@ -36,4 +38,4 @@ $lang->communication_send_message_grant = '쪽지 발송 권한';
 $lang->cmd_manage_base = '기본 정보';
 $lang->alert_new_message_arrived = '%d개의 새로운 메시지가 도착하였습니다. 확인하시겠습니까?';
 $lang->enable_communication_friend = '친구기능 사용';
-$lang->enable_communication_message = '쪽지기능 사용';
+$lang->enable_communication_message = '쪽지기능 사용';

modules/communication/skins/default/friends.html

@@ -20,12 +20,12 @@
 			</select>
 			<button type="button" class="btn" onclick="doJumpFriendGroup()">{$lang->cmd_move}</button>
 		</span>
-		<select name="friend_group_list" id="friend_group_list" style="margin:0">
+		<select name="friend_group_list" id="friend_group_list" cond="count($friend_group_list)" style="margin:0">
 			<option loop="$friend_group_list => $key,$val" value="{$val->friend_group_srl}" selected="selected"|cond="$val->friend_group_srl == $friend_group_srl">{$val->title}</option>
 		</select>
 		<span class="btn-group">
-			<button type="button" class="btn" onclick="doRenameFriendGroup();return false;">{$lang->cmd_modify}</button>
-			<button type="button" class="btn" onclick="doDeleteFriendGroup();return false;">{$lang->cmd_delete}</button>
+			<button type="button" class="btn" cond="count($friend_group_list)" onclick="doRenameFriendGroup();return false;">{$lang->cmd_rename_friend_group}</button>
+			<button type="button" class="btn" cond="count($friend_group_list)" onclick="doDeleteFriendGroup();return false;">{$lang->cmd_delete_friend_group}</button>
 			<a href="{getUrl('','module','communication','act','dispCommunicationAddFriendGroup')}" class="btn" onclick="popopen(this.href);return false;">{$lang->cmd_add_friend_group}</a>
 		</span>
 	</div>
@@ -42,7 +42,7 @@
 		</thead>
 		<tbody>
 			<tr loop="$friend_list => $no,$val">
-				<td>{$val->group_title?$val->group_title:"&nbsp;"}</td>
+				<td>{$val->group_title?$val->group_title:$lang->default_friend_group}</td>
 				<td><a href="#popup_menu_area" class="member_{$val->target_srl}">{$val->nick_name}</a></td>
 				<td>{zdate($val->regdate,"Y-m-d")}</td>
 				<td><input type="checkbox" name="friend_srl_list[]" value="{$val->friend_srl}" /></td>
@@ -50,11 +50,11 @@
 		</tbody>
 	</table>
 	<div class="btnArea">
-		<select name="target_friend_group_srl" style="margin:0">
+		<select name="target_friend_group_srl" cond="count($friend_group_list)" style="margin:0">
 			<option loop="$friend_group_list => $key,$val" value="{$val->friend_group_srl}">{$val->title}</option>
 		</select>
 		<span class="btn-group __submit_group">
-			<button type="submit" name="act" class="btn" value="procCommunicationMoveFriend">{$lang->cmd_move}</button>
+			<button type="submit" name="act" class="btn" cond="count($friend_group_list)" value="procCommunicationMoveFriend">{$lang->cmd_move}</button>
 			<button type="submit" name="act" class="btn" value="procCommunicationDeleteFriend">{$lang->cmd_delete}</button>
 		</span>
 	</div>

modules/communication/skins/default/send_message.html

@@ -8,7 +8,7 @@
 	<form ruleset="sendMessage" action="./" method="post">
 		<input type="hidden" name="module" value="communication" />
 		<input type="hidden" name="act" value="procCommunicationSendMessage" />
-		<input type="hidden" name="content" value="{htmlspecialchars($source_message->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" />
+		<input type="hidden" name="content" value="{htmlspecialchars($source_message->content)}" />
 		<input type="hidden" name="receiver_srl" value="{$receiver_info->member_srl}" />
 		<input type="hidden" name="xe_validator_id" value="modules/communication/skins/default/send_message/1" />
 		<table class="table table-striped table-hover">

modules/document/document.controller.php

@@ -610,9 +610,9 @@ class documentController extends document
 		}
 
 		// If an author is identical to the modifier or history is used, use the logged-in user's information.
+		$logged_info = Context::get('logged_info');
 		if(Context::get('is_logged') && !$manual_updated && $module_info->use_anonymous != 'Y')
 		{
-			$logged_info = Context::get('logged_info');
 			if($source_obj->get('member_srl')==$logged_info->member_srl)
 			{
 				$obj->member_srl = $logged_info->member_srl;

modules/file/file.controller.php

@@ -763,7 +763,10 @@ class fileController extends file
 		}
 
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return new Object(-1,'msg_not_permitted_create');
+		if(!Rhymix\Framework\Storage::isDirectory($path) && !Rhymix\Framework\Storage::createDirectory($path))
+		{
+			return new Object(-1,'msg_not_permitted_create');
+		}
 		
 		// Move the file
 		if($manual_insert)

modules/install/install.controller.php

@@ -364,15 +364,14 @@ class installController extends install
 		$checklist = array();
 
 		// Check PHP version
-		$checklist['php_version'] = true;
-		if(version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
+		if(version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '>='))
+		{
+			$checklist['php_version'] = true;
+		}
+		else
 		{
 			$checklist['php_version'] = false;
 		}
-		if(version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
-		{
-			Context::set('phpversion_warning', true);
-		}
 
 		// Check DB
 		if(DB::getEnableList())

modules/install/tpl/check_env.html

@@ -16,14 +16,13 @@
 						<span cond="!$val" class="error">ERROR</span>
 					</td>
 				</tr>
-				<tr cond="$key === 'php_version' && $phpversion_warning === true">
+				<tr cond="!$val && isset($lang->install_checklist_desc[$key])">
 					<td colspan="2" class="error_description">
-						{sprintf($lang->install_checklist_desc['php_version_warning'], __XE_RECOMMEND_PHP_VERSION__)} <a href="https://secure.php.net/supported-versions.php" target="_blank">[{$lang->more}]</a>
-					</td>
-				</tr>
-				<tr cond="$key !== 'php_version' && !$val && isset($lang->install_checklist_desc[$key])">
-					<td colspan="2" class="error_description">
-						{$lang->install_checklist_desc[$key]}
+						<!--@if($key === 'php_version')-->
+							{sprintf($lang->install_checklist_desc[$key], __XE_MIN_PHP_VERSION__)}
+						<!--@else-->
+							{$lang->install_checklist_desc[$key]}
+						<!--@end-->
 					</td>
 				</tr>
 			</block>