fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-05 09:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'pr/youdontknowit' into develop

Browse source
This commit is contained in:
Kijin Sung 2021-04-12 23:01:40 +09:00
commit a85f1bf1f8
7 changed files with 127 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

78
modules/ncenterlite/ncenterlite.controller.php
View file

@ -274,15 +274,30 @@ class ncenterliteController extends ncenterlite
return $output;
}
}
$this->setMessage('success_updated');
if (Context::get('success_return_url'))
if(Context::get('is_popup') != 'Y')
{
$this->setRedirectUrl(Context::get('success_return_url'));
if (Context::get('success_return_url'))
{
$this->setRedirectUrl(Context::get('success_return_url'));
}
else
{
$this->setRedirectUrl(getNotEncodedUrl('act', 'dispNcenterliteUnsubscribeList', 'member_srl', $this->user->member_srl));
}
}
else
{
$this->setRedirectUrl(getNotEncodedUrl('act', 'dispNcenterliteUnsubscribeList', 'member_srl', $this->user->member_srl));
if (Context::get('success_return_url'))
{
$this->setRedirectUrl(Context::get('success_return_url'));
}
else
{
$this->setRedirectUrl(getNotEncodedUrl('act', 'dispNcenterliteUnsubscribeList', 'target_srl', $obj->target_srl, 'unsubscribe_type', $obj->unsubscribe_type));
}
}
}
@ -1083,11 +1098,21 @@ class ncenterliteController extends ncenterlite
if(Mobile::isFromMobilePhone())
{
$this->template_path = sprintf('%sm.skins/%s/', $this->module_path, $config->mskin);
if(!is_dir($this->template_path) || !$config->mskin)
if(!$config->mskin)
{
$config->mskin = 'default';
$this->template_path = sprintf('%sm.skins/%s/', $this->module_path, $config->mskin);
}
// If use to same PC skin set.
else if ($config->mskin === '/USE_RESPONSIVE/')
{
$this->template_path = sprintf('%sskins/%s/', $this->module_path, $config->skin);
if(!$config->skin)
{
$config->skin = 'default';
$this->template_path = sprintf('%sskins/%s/', $this->module_path, $config->skin);
}
}
}
else
{
@ -1099,14 +1124,14 @@ class ncenterliteController extends ncenterlite
}
}
$oTemplateHandler = TemplateHandler::getInstance();
$result = $oTemplateHandler->compile($this->template_path, 'ncenterlite.html');
$this->_addFile();
$html = $this->_getTemplate();
$output_display = $html . $output_display;
$output_display = $result . $output_display;
}
function triggerAddMemberMenu()
{
$oNcenterliteModel = getModel('ncenterlite');
$oMemberController = getController('member');
$config = NcenterliteModel::getConfig();
@ -1147,16 +1172,9 @@ class ncenterliteController extends ncenterlite
Context::loadFile(array($this->template_path . 'ncenterlite.css', '', '', 100));
}
$oNcenterliteModel = getModel('ncenterlite');
$config = NcenterliteModel::getConfig();
if(!Mobile::isFromMobilePhone())
{
if($config->colorset && file_exists(FileHandler::getRealPath($this->template_path . 'ncenterlite.' . $config->colorset . '.css')))
{
Context::loadFile(array($this->template_path . 'ncenterlite.' . $config->colorset . '.css', '', '', 100));
}
}
elseif(Mobile::isFromMobilePhone())
if(Mobile::isFromMobilePhone() && $config->mskin !== '/USE_RESPONSIVE/')
{
if($config->mcolorset && file_exists(FileHandler::getRealPath($this->template_path . 'ncenterlite.' . $config->mcolorset . '.css')))
{
@ -1167,32 +1185,20 @@ class ncenterliteController extends ncenterlite
Context::loadFile(array('./common/js/xe.min.js', 'head', '', -100000));
Context::loadFile(array($this->template_path . 'ncenterlite.mobile.css', '', '', 100));
}
else
{
if($config->colorset && file_exists(FileHandler::getRealPath($this->template_path . 'ncenterlite.' . $config->colorset . '.css')))
{
Context::loadFile(array($this->template_path . 'ncenterlite.' . $config->colorset . '.css', '', '', 100));
}
}
if($config->zindex)
{
Context::set('ncenterlite_zindex', ' style="z-index:' . $config->zindex . ';" ');
}
}
function _getTemplate()
{
$oNcenterModel = getModel('ncenterlite');
$config = $oNcenterModel->getConfig();
$oTemplateHandler = TemplateHandler::getInstance();
if(Mobile::isFromMobilePhone())
{
$path = sprintf('%sm.skins/%s/', $this->module_path, $config->mskin);
}
else
{
$path = sprintf('%sskins/%s/', $this->module_path, $config->skin);
}
$result = $oTemplateHandler->compile($path, 'ncenterlite.html');
return $result;
}
function updateNotifyRead($notify, $member_srl)
{
$args = new stdClass();

7
modules/ncenterlite/ncenterlite.model.php
View file

@ -282,13 +282,13 @@ class ncenterliteModel extends ncenterlite
$v->text = $this->getNotificationText($v);
$v->ago = $this->getAgo($v->regdate);
$v->url = getUrl('','act','procNcenterliteRedirect', 'notify', $v->notify);
if($v->target_type === $this->_TYPE_VOTED && $config->anonymous_voter === 'Y')
if(($v->target_type === $this->_TYPE_VOTED && $config->anonymous_voter === 'Y') || ($v->target_type === $this->_TYPE_SCRAPPED && $config->anonymous_scrap === 'Y'))
{
$v->target_member_srl = $member_srl;
$v->target_nick_name = lang('anonymous');
$v->target_user_id = $v->target_email_address = 'anonymous';
}
if($v->target_member_srl)
if($v->target_member_srl && ($v->target_type !== $this->_TYPE_VOTED || $v->target_type !== $this->_TYPE_SCRAPPED))
{
$profileImage = $oMemberModel->getProfileImage($v->target_member_srl);
$v->profileImage = $profileImage->src;
@ -315,6 +315,9 @@ class ncenterliteModel extends ncenterlite
$tmp = $this->getMyNotifyList($member_srl, $page);
foreach($tmp->data as $key => $obj)
{
unset($tmp->data[$key]->target_email_address);
unset($tmp->data[$key]->target_user_id);
unset($tmp->data[$key]->target_member_srl);
$tmp->data[$key]->url = str_replace('&', '&', $obj->url);
}

2
modules/ncenterlite/ncenterlite.view.php
View file

@ -144,6 +144,8 @@ class ncenterliteView extends ncenterlite
function dispNcenterliteInsertUnsubscribe()
{
$this->setLayoutFile('popup_layout');
/** @var ncenterliteModel $oNcenterliteModel */
$oNcenterliteModel = getModel('ncenterlite');
$target_srl = Context::get('target_srl');

77
modules/ncenterlite/skins/default/unsubscribe.html
View file

@ -1,10 +1,5 @@
<load target="../../../member/skins/default/css/member.css" />
<include target="../../../member/skins/default/common_header.html" />
<div class="xm">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/ncenterlite/skins/default/unsubscribe/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="insertConfig" action="./" method="post" class="form-horizontal" id="fo_ncenterlite">
<input type="hidden" name="module" value="ncenterlite" />
<input type="hidden" name="act" value="procNcenterliteInsertUnsubscribe" />
@ -18,46 +13,50 @@
<input type="hidden" name="unsubscribe_srl" value="{$unsubscribe_srl}" />
<input type="hidden" name="unsubscribe_type" value="{$unsubscribe_type}" />
<!--@end-->
<section class="section">
<div class="control-group">
<label class="control-label">{lang('ncenterlite_content_type')}</label>
<input type="hidden" name="success_return_url" value="{getUrl('', 'act', $act, 'target_srl', $target_srl, 'unsubscribe_type', $unsubscribe_type)}" />
<input type="hidden" name="is_popup" value="Y" />
<div class="x_modal-header">
<h1>{$lang->ncenterlite_cmd_unsubscribe_settings}</h1>
</div>
<blockquote>
<section class="target_article">
<h1>
{$type}
</h1>
<p>
<!--@if($unsubscribeData)-->
{escape($unsubscribeData->text, false)}
<!--@else-->
{escape($text, false)}
<!--@end-->
</p>
</section>
</blockquote>
<div class="x_control-group">
<label class="x_control-label">{$lang->this_message_unsubscribe}</label>
<div class="x_controls">
<div class="controls">
<p>
{$type}
</p>
</div>
</div>
<div class="control-group">
<label class="control-label">{lang('content')}</label>
<div class="controls">
<p>
<!--@if($unsubscribeData)-->
{escape($unsubscribeData->text, false)}
<!--@else-->
{escape($text, false)}
<!--@end-->
</p>
</div>
</div>
<div class="control-group">
<label class="control-label">{$lang->this_message_unsubscribe}</label>
<div class="controls">
<label class="inline">
<input type="radio" name="value" value="Y" checked="checked"|cond="$unsubscribeData->value != 'N'" /> {$lang->ncenterlite_to_unsubscribe}
<label class="inline" for="unsubscribe_value_y">
<input type="radio" name="value" id="unsubscribe_value_y" value="Y" checked="checked"|cond="$unsubscribeData->value != 'N'" /> {$lang->ncenterlite_to_unsubscribe}
</label>
<label class="inline">
<input type="radio" name="value" value="N" checked="checked"|cond="$unsubscribeData->value == 'N'" /> {$lang->ncenterlite_subscribe}
<label class="inline" for="unsubscribe_value_n">
<input type="radio" name="value" id="unsubscribe_value_n" value="N" checked="checked"|cond="$unsubscribeData->value == 'N'" /> {$lang->ncenterlite_subscribe}
</label>
<p>{$lang->about_this_message_unsubscribe}</p>
</div>
</div>
</section>
<div class="clearfix btnArea">
<div class="pull-right">
<button class="btn btn-primary" type="submit">{$lang->cmd_registration}</button>
</div>
</div>
<div class="x_modal-footer">
<span class="x_btn-group x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_registration}</button>
</span>
</div>
</form>
</div>
<include target="../../../member/skins/default/common_footer.html" />
<script cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/ncenterlite/skins/default/unsubscribe/1'">
alert("{$XE_VALIDATOR_MESSAGE}");
window.close();
</script>

1
modules/ncenterlite/skins/default/unsubscribeList.html
View file

@ -36,6 +36,7 @@
<input type="hidden" name="target_srl" value="{$val->target_srl}" />
<input type="hidden" name="unsubscribe_type" value="{$val->unsubscribe_type}" />
<input type="hidden" name="unsubscribe_srl" value="{$val->unsubscribe_srl}" />
<input type="hidden" name="is_popup" value="N" />
<select name="value" style="width:175px;">
<option value="Y">{$lang->ncenterlite_to_unsubscribe}</option>
<option value="N">{$lang->ncenterlite_subscribe}</option>

73
modules/ncenterlite/skins/default_bottom/unsubscribe.html
View file

@ -1,5 +1,4 @@
<load target="../../../member/skins/default/css/member.css" />
<include target="../../../member/skins/default/common_header.html" />
<div class="xm">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/ncenterlite/skins/default_bottom/unsubscribe/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
@ -18,46 +17,50 @@
<input type="hidden" name="unsubscribe_srl" value="{$unsubscribe_srl}" />
<input type="hidden" name="unsubscribe_type" value="{$unsubscribe_type}" />
<!--@end-->
<section class="section">
<div class="control-group">
<label class="control-label">{lang('ncenterlite_content_type')}</label>
<input type="hidden" name="success_return_url" value="{getUrl('', 'act', $act, 'target_srl', $target_srl, 'unsubscribe_type', $unsubscribe_type)}" />
<input type="hidden" name="is_popup" value="Y" />
<div class="x_modal-header">
<h1>{$lang->ncenterlite_cmd_unsubscribe_settings}</h1>
</div>
<blockquote>
<section class="target_article">
<h1>
{$type}
</h1>
<p>
<!--@if($unsubscribeData)-->
{escape($unsubscribeData->text, false)}
<!--@else-->
{escape($text, false)}
<!--@end-->
</p>
</section>
</blockquote>
<div class="x_control-group">
<label class="x_control-label">{$lang->this_message_unsubscribe}</label>
<div class="x_controls">
<div class="controls">
<p>
{$type}
</p>
</div>
</div>
<div class="control-group">
<label class="control-label">{lang('content')}</label>
<div class="controls">
<p>
<!--@if($unsubscribeData)-->
{escape($unsubscribeData->text, false)}
<!--@else-->
{escape($text, false)}
<!--@end-->
</p>
</div>
</div>
<div class="control-group">
<label class="control-label">{$lang->this_message_unsubscribe}</label>
<div class="controls">
<label class="inline">
<input type="radio" name="value" value="Y" checked="checked"|cond="$unsubscribeData->value != 'N'" /> {$lang->ncenterlite_to_unsubscribe}
<label class="inline" for="unsubscribe_value_y">
<input type="radio" name="value" id="unsubscribe_value_y" value="Y" checked="checked"|cond="$unsubscribeData->value != 'N'" /> {$lang->ncenterlite_to_unsubscribe}
</label>
<label class="inline">
<input type="radio" name="value" value="N" checked="checked"|cond="$unsubscribeData->value == 'N'" /> {$lang->ncenterlite_subscribe}
<label class="inline" for="unsubscribe_value_n">
<input type="radio" name="value" id="unsubscribe_value_n" value="N" checked="checked"|cond="$unsubscribeData->value == 'N'" /> {$lang->ncenterlite_subscribe}
</label>
<p>{$lang->about_this_message_unsubscribe}</p>
</div>
</div>
</section>
<div class="clearfix btnArea">
<div class="pull-right">
<button class="btn btn-primary" type="submit">{$lang->cmd_registration}</button>
</div>
</div>
<div class="x_modal-footer">
<span class="x_btn-group x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_registration}</button>
</span>
</div>
</form>
</div>
<include target="../../../member/skins/default/common_footer.html" />
<script cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/ncenterlite/skins/default_bottom/unsubscribe/1'">
alert("{$XE_VALIDATOR_MESSAGE}");
window.close();
</script>

1
modules/ncenterlite/skins/default_bottom/unsubscribeList.html
View file

@ -36,6 +36,7 @@
<input type="hidden" name="target_srl" value="{$val->target_srl}" />
<input type="hidden" name="unsubscribe_type" value="{$val->unsubscribe_type}" />
<input type="hidden" name="unsubscribe_srl" value="{$val->unsubscribe_srl}" />
<input type="hidden" name="is_popup" value="N" />
<select name="value" style="width:175px;">
<option value="Y">{$lang->ncenterlite_to_unsubscribe}</option>
<option value="N">{$lang->ncenterlite_subscribe}</option>