Merge branch 'develop' into pr/recaptcha

modules/board/board.controller.php

@@ -482,6 +482,13 @@ class boardController extends board
 	{
 		// get the comment_srl
 		$comment_srl = Context::get('comment_srl');
+
+		$instant_delete = null;
+		if($this->grant->manager == true)
+		{
+			$instant_delete = Context::get('instant_delete');
+		}
+
 		if(!$comment_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
@@ -510,13 +517,13 @@ class boardController extends board
 		// generate comment  controller object
 		$oCommentController = getController('comment');
 
-		if($this->module_info->comment_delete_message === 'yes')
+		if($this->module_info->comment_delete_message === 'yes' && $instant_delete != 'Y')
 		{
 			$comment->content = '';
 			$comment->status = 7;
 			$output = $oCommentController->updateCommentByDelete($comment, $this->grant->manager);
 		}
-		elseif($this->module_info->comment_delete_message === 'only_commnet')
+		elseif($this->module_info->comment_delete_message === 'only_commnet' && $instant_delete != 'Y')
 		{
 			$childs = $oCommentModel->getChildComments($comment_srl);
 			if(count($childs) > 0)

modules/board/lang/en.php

@@ -47,3 +47,4 @@ $lang->about_comment_delete_message = 'When a comment is deleted, leave a placeh
 $lang->cmd_only_p_comment = 'Only if there are replies';
 $lang->cmd_all_comment_message = 'Always';
 $lang->cmd_do_not_message = 'Never';
+$lang->delete_placeholder = 'Delete Placeholder';

modules/board/lang/ko.php

@@ -76,3 +76,4 @@ $lang->about_comment_delete_message = '댓글 삭제시 완전히 지우지 않
 $lang->cmd_only_p_comment = '대댓글이 있는 경우에만 남김';
 $lang->cmd_all_comment_message = '모든 댓글에 남김';
 $lang->cmd_do_not_message = '남기지 않음';
+$lang->delete_placeholder = '완전 삭제';

modules/board/skins/xedition/_comment.html

@@ -52,6 +52,9 @@
 				<a cond="$comment->isGranted()||!$comment->get('member_srl')" href="{getUrl('act','dispBoardDeleteComment','comment_srl',$comment->comment_srl)}" class="delete"><i class="xi-trash"></i> {$lang->cmd_delete}</a>
 				<a cond="$is_logged" class="comment_{$comment->comment_srl} this" href="#popup_menu_area" onclick="return false">{$lang->cmd_comment_do}</a>
 			</p>
+			<p class="action" cond="$comment->status >= 7">
+				<a cond="$grant->manager" href="{getUrl('act','dispBoardDeleteComment','comment_srl',$comment->comment_srl)}" class="delete"><i class="xi-trash"></i> {$lang->delete_placeholder}</a>
+			</p>
 		</li>
 	</ul>
     <div cond="$oDocument->comment_page_navigation" class="pagination">

modules/board/skins/xedition/delete_comment_form.html

@@ -11,10 +11,15 @@
 	<input type="hidden" name="page" value="{$page}" />
 	<input type="hidden" name="document_srl" value="{$oComment->get('document_srl')}" />
 	<input type="hidden" name="comment_srl" value="{$oComment->get('comment_srl')}" />
+
 	<h1>{sprintf($lang->comfirm_act_msg,$lang->comment,$lang->cmd_delete,$lang->msg_eul)}</h1>
 	<div class="btnArea">
+		<label for="instant_delete" cond="$grant->manager" style="line-height: 24px;">
+			<input type="checkbox" id="instant_delete" name="instant_delete" value="Y" cond="$grant->manager" checked="checked"|cond="$oComment->status >= 7" style="vertical-align: middle;" />
+			{$lang->delete_placeholder}
+		</label>
 		<input type="submit" class="btn" value="{$lang->cmd_delete}" />
 		<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
 	</div>
 </form>
-<include target="_footer.html" />
+<include target="_footer.html" />

modules/board/skins/xedition/delete_form.html

@@ -15,4 +15,4 @@
 		<button type="button" class="btn" onclick="history.back()">{$lang->cmd_cancel}</button>
 	</div>
 </form>
-<include target="_footer.html" />
+<include target="_footer.html" />

modules/comment/comment.model.php

@@ -275,6 +275,7 @@ class commentModel extends comment
 	 */
 	function getCommentCountByDate($date = '', $moduleSrlList = array())
 	{
+		$args = new stdClass();
 		if($date)
 		{
 			$args->regDate = date('Ymd', strtotime($date));

modules/counter/counter.controller.php

@@ -176,6 +176,7 @@ class counterController extends counter
 			$args->site_srl = $site_srl;
 			$query_id = 'counter.insertSiteTodayStatus';
 
+			$u_args = new stdClass();
 			$u_args->site_srl = $site_srl; // /< when inserting a daily row, attempt to inser total rows(where regdate=0) together
 			executeQuery($query_id, $u_args);
 		}

modules/counter/counter.model.php

@@ -139,6 +139,7 @@ class counterModel extends counter
 		$max = 0;
 		$sum = 0;
 
+		$status = new stdClass();
 		switch($type)
 		{
 			case 'year' :

modules/document/document.admin.controller.php

@@ -495,6 +495,7 @@ class documentAdminController extends document
 
 		if($document_srl)
 		{
+			$args = new stdClass();
 			$args->document_srl = $document_srl;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
 			if(!$output->toBool()) return $output;
@@ -578,7 +579,7 @@ class documentAdminController extends document
 
 		$this->setMessage('success_registed');
 
-		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $args->document_srl);
+		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias');
 		$this->setRedirectUrl($returnUrl);
 	}
 
@@ -705,6 +706,7 @@ class documentAdminController extends document
 	{
 		$document_srl = Context::get('document_srl');
 		$alias_srl = Context::get('target_srl');
+		$args = new stdClass();
 		$args->alias_srl = $alias_srl;
 		$output = executeQuery("document.deleteAlias", $args);
 

modules/document/document.admin.model.php

@@ -37,6 +37,7 @@ class documentAdminModel extends document
 			unset($obj->mid);
 		}
 		// check if the module_srl is an array
+		$args = new stdClass();
 		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
 		else $args->module_srl = $obj->module_srl;
 		// Variable check
@@ -81,6 +82,7 @@ class documentAdminModel extends document
 	 */
 	function getDocumentTrash($trash_srl)
 	{
+		$args = new stdClass();
 		$args->trash_srl = $trash_srl;
 		$output = executeQuery('document.getTrash', $args);
 

modules/document/document.admin.view.php

@@ -237,6 +237,7 @@ class documentAdminView extends document
 	 */
 	function dispDocumentAdminAlias()
 	{
+		$args = new stdClass();
 		$args->document_srl = Context::get('document_srl');
 		if(!$args->document_srl) return $this->dispDocumentAdminList();
 
@@ -268,6 +269,7 @@ class documentAdminView extends document
 	function dispDocumentAdminTrashList()
 	{
 		// options for a list
+		$args = new stdClass();
 		$args->page = Context::get('page'); // /< Page
 		$args->list_count = 30; // /< the number of posts to display on a single page
 		$args->page_count = 10; // /< the number of pages that appear in the page navigation

modules/document/document.class.php

@@ -211,6 +211,7 @@ class document extends ModuleObject
 		if(!$oDB->isColumnExists("documents","lang_code"))
 		{
 			$oDB->addColumn('documents',"lang_code","varchar",10, config('locale.default_lang'));
+			$obj = new stdClass();
 			$obj->lang_code = config('locale.default_lang');
 			executeQuery('document.updateDocumentsLangCode', $obj);
 		}
@@ -234,6 +235,7 @@ class document extends ModuleObject
 			$output = executeQuery('document.getGroupsExtraKeys', $obj);
 			if($output->toBool() && $output->data && count($output->data)) {
 				foreach($output->data as $extra_keys) {
+					$args = new stdClass();
 					$args->module_srl = $extra_keys->module_srl;
 					$args->var_idx = $extra_keys->idx;
 					$args->new_eid = "extra_vars".$extra_keys->idx;
@@ -245,12 +247,14 @@ class document extends ModuleObject
 		if(!$oDB->isColumnExists("document_extra_vars","eid"))
 		{
 			$oDB->addColumn("document_extra_vars","eid","varchar",40);
+			$obj = new stdClass();
 			$obj->var_idx = '-1,-2';
 			$output = executeQuery('document.getGroupsExtraVars', $obj);
 			if($output->toBool() && $output->data && count($output->data))
 			{
 				foreach($output->data as $extra_vars)
 				{
+					$args = new stdClass();
 					$args->module_srl = $extra_vars->module_srl;
 					$args->var_idx = $extra_vars->idx;
 					$args->new_eid = "extra_vars".$extra_vars->idx;
@@ -272,6 +276,7 @@ class document extends ModuleObject
 		if(!$oDB->isColumnExists('documents', 'status'))
 		{
 			$oDB->addColumn('documents', 'status', 'varchar', 20, 'PUBLIC');
+			$args = new stdClass();
 			$args->is_secret = 'Y';
 			$output = executeQuery('document.updateDocumentStatus', $args);
 		}
@@ -284,7 +289,7 @@ class document extends ModuleObject
 		if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment'))
 		{
 			$oDB->addColumn('documents', 'comment_status', 'varchar', 20, 'ALLOW');
-
+			$args = new stdClass();
 			$args->commentStatus = 'DENY';
 
 			// allow_comment='Y', lock_comment='Y'

modules/document/document.controller.php

@@ -2522,6 +2522,7 @@ class documentController extends document
 		}
 		else if($type == 'cancelDeclare')
 		{
+			$args = new stdClass();
 			$args->document_srl = $document_srl_list;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
 			$msg_code = 'success_declare_canceled';

modules/document/document.model.php

@@ -582,6 +582,7 @@ class documentModel extends document
 	function getDocumentExtraVarsCount($module_srl, $search_obj = NULL)
 	{
 		// Additional search options
+		$args = new stdClass();
 		$args->module_srl = $module_srl;
 
 		$args->category_srl = $search_obj->category_srl;

modules/editor/editor.controller.php

@@ -388,6 +388,7 @@ class editorController extends editor
 	 */
 	function removeEditorConfig($site_srl)
 	{
+		$args = new stdClass();
 		$args->site_srl = $site_srl;
 		executeQuery('editor.deleteSiteComponent', $args);
 	}

modules/file/file.admin.model.php

@@ -132,10 +132,17 @@ class fileAdminModel extends file
 	 */
 	function getFilesCountByDate($date = '')
 	{
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		$args = new stdClass();
+		if($date)
+		{
+			$args->regDate = date('Ymd', strtotime($date));
+		}
 
 		$output = executeQuery('file.getFilesCount', $args);
-		if(!$output->toBool()) return 0;
+		if(!$output->toBool())
+		{
+			return 0;
+		}
 
 		return $output->data->count;
 	}

modules/importer/importer.admin.controller.php

@@ -122,6 +122,7 @@ class importerAdminController extends importer
 				$total_count = 0;
 				foreach ($output->data as $val)
 				{
+					$args = new stdClass();
 					$args->user_id = $val->user_id;
 					$args->member_srl = $val->member_srl;
 					$tmp = executeQuery ('importer.updateDocumentSyncForCUBRID'.$postFix, $args);
@@ -145,6 +146,7 @@ class importerAdminController extends importer
 				$total_count = 0;
 				foreach ($output->data as $val)
 				{
+					$args = new stdClass();
 					$args->user_id = $val->user_id;
 					$args->member_srl = $val->member_srl;
 					$tmp = executeQuery ('importer.updateCommentSyncForCUBRID'.$postFix, $args);
@@ -516,7 +518,7 @@ class importerAdminController extends importer
 			FileHandler::removeFile($target_file);
 			if(!$xmlObj) continue;
 			// List objects
-			$obj = null;
+			$obj = new stdClass();
 			$obj->receiver = base64_decode($xmlObj->message->receiver->body);
 			$obj->sender = base64_decode($xmlObj->message->sender->body);
 			$obj->title = base64_decode($xmlObj->message->title->body);
@@ -526,25 +528,26 @@ class importerAdminController extends importer
 			$obj->readed_date = base64_decode($xmlObj->message->readed_date->body);
 			// Get member_srl of sender/recipient (If not exists, pass)
 			if(!$obj->sender) continue;
+			$sender_args = new stdClass();
 			$sender_args->user_id = $obj->sender;
 			$sender_output = executeQuery('member.getMemberInfo',$sender_args);
 			$sender_srl = $sender_output->data->member_srl;
 			if(!$sender_srl)
 			{
-				unset($sender_args);
+				$sender_args = new stdClass();
 				$sender_args->email_address = $obj->sender;
 				$sender_output = executeQuery('member.getMemberInfoByEmailAddress',$sender_args);
 				$sender_srl = $sender_output->data->member_srl;
 			}
 			if(!$sender_srl) continue;
-
+			$receiver_args = new stdClass();
 			$receiver_args->user_id = $obj->receiver;
 			if(!$obj->receiver) continue;
 			$receiver_output = executeQuery('member.getMemberInfo',$receiver_args);
 			$receiver_srl = $receiver_output->data->member_srl;
 			if(!$receiver_srl)
 			{
-				unset($receiver_args);
+				$receiver_args = new stdClass();
 				$receiver_args->email_address = $obj->receiver;
 				$receiver_output = executeQuery('member.getMemberInfoByEmailAddress',$receiver_args);
 				$receiver_srl = $receiver_output->data->member_srl;
@@ -645,6 +648,7 @@ class importerAdminController extends importer
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
 
+		$ek_args = new stdClass();
 		$ek_args->module_srl = $module_srl;
 		$output = executeQueryArray('document.getDocumentExtraKeys', $ek_args);
 		if($output->data)
@@ -783,7 +787,7 @@ class importerAdminController extends importer
 				foreach($extra_vars as $key => $val)
 				{
 					if(!$val->value) continue;
-					unset($e_args);
+					$e_args = new stdClass;
 					$e_args->module_srl = $module_srl;
 					$e_args->document_srl = $obj->document_srl;
 					$e_args->var_idx = $val->var_idx;
@@ -793,7 +797,7 @@ class importerAdminController extends importer
 					// Create a key for extra vars if not exists (except vars for title and content)
 					if(!preg_match('/^(title|content)_(.+)$/i',$e_args->eid) && !$extra_keys[$e_args->eid])
 					{
-						unset($ek_args);
+						$ek_args = new stdClass();
 						$ek_args->module_srl = $module_srl;
 						$ek_args->var_idx = $val->var_idx;
 						$ek_args->var_name = $val->eid;
@@ -962,6 +966,7 @@ class importerAdminController extends importer
 				else
 				{
 					// Get parent comment infomation
+					$parent_args = new stdClass();
 					$parent_args->comment_srl = $obj->parent_srl;
 					$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
 					// Return if parent comment doesn't exist

modules/importer/ttimport.class.php

@@ -240,6 +240,7 @@ class ttimport
 
 			if($module_name == 'textyle')
 			{
+				$args = new stdClass();
 				$args->document_srl = $obj->document_srl;
 				$args->module_srl = $obj->module_srl;
 				$args->logs = serialize(null);
@@ -674,6 +675,7 @@ class ttimport
 		else
 		{
 			// Get parent_srl
+			$parent_args = new stdClass();
 			$parent_args->comment_srl = $tobj->parent_srl;
 			$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
 			// Return if parent comment doesn't exist

modules/layout/layout.admin.controller.php

@@ -27,6 +27,7 @@ class layoutAdminController extends layout
 
 		// Get information to create a layout
 		$site_module_info = Context::get('site_module_info');
+		$args = new stdClass();
 		$args->site_srl = (int)$site_module_info->site_srl;
 		$args->layout_srl = getNextSequence();
 		$args->layout = Context::get('layout');
@@ -981,7 +982,7 @@ class layoutAdminController extends layout
 		}
 
 		unset($newLayoutInfo->{$name});
-
+		$args = new stdClass();
 		$args->layout_srl = $layoutSrl;
 		$args->extra_vars = serialize($newLayoutInfo);
 		$output = $this->updateLayout($args);

modules/layout/layout.class.php

@@ -86,6 +86,7 @@ class layout extends ModuleObject
 			$oDB->addColumn('layouts','layout_type','char',1,'P',true);
 		}
 
+		$args = new stdClass();
 		$args->layout = '.';
 		$output = executeQueryArray('layout.getLayoutDotList', $args);
 		if($output->data && count($output->data) > 0)

modules/member/member.admin.model.php

@@ -157,6 +157,7 @@ class memberAdminModel extends member
 	 */
 	function getSiteMemberList($site_srl, $page = 1)
 	{
+		$args = new stdClass();
 		$args->site_srl = $site_srl;
 		$args->page = $page;
 		$args->list_count = 40;
@@ -240,10 +241,17 @@ class memberAdminModel extends member
 	 */
 	function getMemberGroupMemberCountByDate($date = '')
 	{
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		$args = new stdClass();
+		if($date)
+		{
+			$args->regDate = date('Ymd', strtotime($date));
+		}
 
 		$output = executeQuery('member.getMemberGroupMemberCountByDate', $args);
-		if(!$output->toBool()) return 0;
+		if(!$output->toBool())
+		{
+			return 0;
+		}
 
 		return count($output->data);
 	}

modules/member/member.class.php

@@ -305,6 +305,7 @@ class member extends ModuleObject {
 		{
 			$oDB->addColumn("member", "list_order", "number", 11);
 			@set_time_limit(0);
+			$args = new stdClass();
 			$args->list_order = 'member_srl';
 			executeQuery('member.updateMemberListOrderAll',$args);
 			executeQuery('member.updateMemberListOrderAll');

modules/member/member.model.php

@@ -770,6 +770,7 @@ class memberModel extends member
 	 */
 	function getJoinForm($member_join_form_srl)
 	{
+		$args = new stdClass();
 		$args->member_join_form_srl = $member_join_form_srl;
 		$output = executeQuery('member.getJoinForm', $args);
 		$join_form = $output->data;
@@ -797,6 +798,7 @@ class memberModel extends member
 	{
 		if(!$this->denied_id_list)
 		{
+			$args = new stdClass();
 			$args->sort_index = "list_order";
 			$args->page = Context::get('page');
 			$args->list_count = 40;

modules/menu/menu.admin.controller.php

@@ -190,6 +190,7 @@ class menuAdminController extends menu
 			else
 			{
 				// create menu item.
+				$item_args = new stdClass();
 				$item_args->menu_srl = $menuSrl;
 				$item_args->url = $moduleInfo->mid;
 				$item_args->name = $moduleInfo->mid;
@@ -1466,6 +1467,7 @@ class menuAdminController extends menu
 		}
 		elseif($mode == 'insert')
 		{
+			$args = new stdClass();
 			$args->menu_item_srl = $target_srl;
 			$args->parent_srl = $parent_srl;
 			$args->listorder = -1*getNextSequence();
@@ -2087,6 +2089,7 @@ class menuAdminController extends menu
 	{
 		if(!count($menu_srl_list)) return;
 		// Delete the value of menu_srls
+		$args = new stdClass();
 		$args->menu_srls = implode(',',$menu_srl_list);
 		$output = executeQuery('menu.deleteMenuLayout', $args);
 		if(!$output->toBool()) return $output;

modules/menu/menu.class.php

@@ -39,7 +39,7 @@ class menu extends ModuleObject
 		{
 			return TRUE;
 		}
-		
+
 		
 		$oMenuAdminModel = getAdminModel('menu');
 		$args = new stdClass();
@@ -95,7 +95,7 @@ class menu extends ModuleObject
 				$menuItemAllList = array();
 				foreach($output  AS $key=>$value)
 				{
-					unset($args);
+					$args = new stdClass();
 					$args->menu_srl = $value->menu_srl;
 					$output2 = executeQueryArray('menu.getMenuItems', $args);
 					if(is_array($output2->data))
@@ -123,7 +123,7 @@ class menu extends ModuleObject
 				$shortcutItemList = array_diff_assoc($menuItemAllList, $menuItemUniqueList);
 				foreach($output AS $key=>$value)
 				{
-					unset($args);
+					$args = new stdClass();
 					$args->menu_srl = $value->menu_srl;
 					$output2 = executeQueryArray('menu.getMenuItems', $args);
 					if(is_array($output2->data))

modules/module/module.class.php

@@ -261,7 +261,7 @@ class module extends ModuleObject
 							$per_page = 100;
 							$total_pages = (int) (($total_count - 1) / $per_page) + 1;
 							// Get extra vars if exist
-							$doc_args = null;
+							$doc_args = new stdClass();
 							$doc_args->module_srl = $module_srl;
 							$doc_args->list_count = $per_page;
 							$doc_args->sort_index = 'list_order';
@@ -326,6 +326,7 @@ class module extends ModuleObject
 			$domain = Context::getDefaultUrl();
 			$url_info = parse_url($domain);
 			$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+			$site_args = new stdClass();
 			$site_args->site_srl = 0;
 			$site_args->index_module_srl  = $mid_output->data->module_srl;
 			$site_args->domain = $domain;
@@ -382,7 +383,7 @@ class module extends ModuleObject
 				if(count($skin_path) != 2) continue;
 				if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
 				{
-					unset($args);
+					$args = new stdClass();
 					$args->skin = $item->skin;
 					$args->new_skin = implode('|@|', $skin_path);
 					$output = executeQuery('module.updateSkinAll', $args);

modules/ncenterlite/lang/en.php

@@ -64,8 +64,10 @@ $lang->ncenterlite_io_about = 'You can activate or inactivate every function of
 $lang->ncenterlite_on = 'Active';
 $lang->ncenterlite_off = 'Inactive';
 $lang->ncenterlite_display = 'Display Notifications';
-$lang->ncenterlite_display_y = 'Yes';
-$lang->ncenterlite_display_n = 'No';
+$lang->ncenterlite_display_all = 'All display';
+$lang->ncenterlite_display_pc = 'Only PC';
+$lang->ncenterlite_display_mobile = 'Only Mobile';
+$lang->ncenterlite_display_none = 'Not display.';
 $lang->ncenterlite_display_about = 'You can hide notifications from Notification Center Lite if you are using a layout or widget that handles notifications for you.';
 $lang->ncenterlite_mention_target = 'Mention target';
 $lang->ncenterlite_mention_target_about = 'Mention target can be nicknames or IDs (@Nickname or @ID).';

modules/ncenterlite/lang/ko.php

@@ -74,8 +74,10 @@ $lang->ncenterlite_on = '동작';
 $lang->ncenterlite_only_message = '쪽지만';
 $lang->ncenterlite_off = '동작 안 함';
 $lang->ncenterlite_display = '알림 표시 여부';
-$lang->ncenterlite_display_y = '표시';
-$lang->ncenterlite_display_n = '표시하지 않음';
+$lang->ncenterlite_display_all = '모두 사용';
+$lang->ncenterlite_display_pc = 'PC만 표시';
+$lang->ncenterlite_display_mobile = '모바일만 표시';
+$lang->ncenterlite_display_none = '표시하지 않음';
 $lang->ncenterlite_display_about = '사용하는 레이아웃이나 위젯에 알림을 표시하는 기능이 있는 경우 중복을 막기 위해 알림센터의 알림을 숨길 수 있습니다.';
 $lang->ncenterlite_mention_target = '멘션 타겟';
 $lang->ncenterlite_mention_target_about = '멘션 알림을 @아이디 소유자에게 보낼지 @닉네임 소유자에게 보낼지 선택할 수 있습니다.';

modules/ncenterlite/ncenterlite.admin.controller.php

@@ -142,7 +142,6 @@ class ncenterliteAdminController extends ncenterlite
 		$output = executeQuery('ncenterlite.deleteNotifyAll', $args);
 		if(!$output->toBool())
 		{
-			$oDB->rollback();
 			return $output;
 		}
 

modules/ncenterlite/ncenterlite.controller.php

@@ -705,7 +705,7 @@ class ncenterliteController extends ncenterlite
 			return new Object();
 		}
 
-		if($config->display_use == 'N')
+		if($config->display_use == 'mobile' && !Mobile::isFromMobilePhone() || $config->display_use == 'pc' && Mobile::isFromMobilePhone() || $config->display_use == 'none')
 		{
 			return new Object();
 		}

modules/ncenterlite/ncenterlite.model.php

@@ -20,7 +20,7 @@ class ncenterliteModel extends ncenterlite
 			{
 				$config->use = array('message' => 1);
 			}
-			if(!$config->display_use) $config->display_use = 'Y';
+			if(!$config->display_use) $config->display_use = 'all';
 
 			if(!$config->mention_names) $config->mention_names = 'nick_name';
 			if(!$config->mention_suffixes)

modules/ncenterlite/tpl/config.html

@@ -21,14 +21,14 @@
 			</div>
 		</div>
 		<div class="x_control-group">
-			<label class="x_control-label">{$lang->ncenterlite_display}</label>
+			<label class="x_control-label" for="display_use">{$lang->ncenterlite_display}</label>
 			<div class="x_controls">
-				<label class="x_inline">
-					<input type="radio" id="display_use_y" name="display_use" value="Y" checked="checked"|cond="$config->display_use == 'Y'" /> {$lang->ncenterlite_display_y}
-				</label>
-				<label class="x_inline">
-					<input type="radio" id="display_use_n" name="display_use" value="N" checked="checked"|cond="$config->display_use == 'N'" /> {$lang->ncenterlite_display_n}
-				</label>
+				<select name="display_use" id="display_use">
+					<option value="all" selected="selected"|cond="$config->display_use == 'all'">{$lang->ncenterlite_display_all}</option>
+					<option value="none" selected="selected"|cond="$config->display_use == 'none'">{$lang->ncenterlite_display_none}</option>
+					<option value="pc" selected="selected"|cond="$config->display_use == 'pc'">{$lang->ncenterlite_display_pc}</option>
+					<option value="mobile" selected="selected"|cond="$config->display_use == 'mobile'">{$lang->ncenterlite_display_mobile}</option>
+				</select>
 				<p class="x_help-block">{$lang->ncenterlite_display_about}</p>
 			</div>
 		</div>

modules/point/point.controller.php

@@ -418,6 +418,7 @@ class pointController extends point
 		// Pass if there are no requested points
 		if(!$point) return new Object();
 		// In case of a registered member, if it is read but cannot just pass, then get the current points
+		$args = new stdClass();
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;

modules/session/session.model.php

@@ -93,6 +93,7 @@ class sessionModel extends session
 
 		if(!count($member_srls)) return $output;
 
+		$member_args = new stdClass();
 		$member_args->member_srl = implode(',',$member_srls);
 		$member_output = executeQueryArray('member.getMembers', $member_args);
 		if($member_output->data)

modules/spamfilter/spamfilter.model.php

@@ -85,6 +85,7 @@ class spamfilterModel extends spamfilter
 			$word = $word_list[$i]->word;
 			if(preg_match('/'.preg_quote($word,'/').'/is', $text))
 			{
+				$args = new stdClass();
 				$args->word = $word;
 				$output = executeQuery('spamfilter.updateDeniedWordHit', $args);
 				return new Object(-1,sprintf(lang('msg_alert_denied_word'), $word));
@@ -154,6 +155,7 @@ class spamfilterModel extends spamfilter
 	{
 		if(!$ipaddress) $ipaddress = $_SERVER['REMOTE_ADDR'];
 
+		$args = new stdClass();
 		$args->ipaddress = $ipaddress;
 		$args->regdate = date("YmdHis", $_SERVER['REQUEST_TIME']-$time);
 		$output = executeQuery('spamfilter.getLogCount', $args);