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

merge from luminous (11139-12038)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12040 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-11-02 07:20:00 +00:00
commit 86011ab063
23 changed files with 126 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.htaccess
View file

@ -49,3 +49,6 @@ RewriteRule ^([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?mid=$1&entry=$2 [L,QSA]
# vid + mid + entry title # vid + mid + entry title
RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?vid=$1&mid=$2&entry=$3 [L,QSA] RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?vid=$1&mid=$2&entry=$3 [L,QSA]
#shop / vid / [category|product] / identifier
RewriteCond %{SCRIPT_FILENAME} !-f
RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([a-zA-Z0-9_\.-]+)$ ./index.php?act=route&vid=$1&type=$2&identifier=$3 [L,QSA]

3
classes/display/DisplayHandler.class.php
View file

@ -27,7 +27,8 @@
(defined('__OB_GZHANDLER_ENABLE__') && __OB_GZHANDLER_ENABLE__ == 1) && (defined('__OB_GZHANDLER_ENABLE__') && __OB_GZHANDLER_ENABLE__ == 1) &&
strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')!==false && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')!==false &&
function_exists('ob_gzhandler') && function_exists('ob_gzhandler') &&
extension_loaded('zlib') extension_loaded('zlib') &&
$oModule->gzhandler_enable
) $this->gz_enabled = true; ) $this->gz_enabled = true;
// Extract contents to display by the request method // Extract contents to display by the request method
if(Context::get('xeVirtualRequestMethod')=='xml') { if(Context::get('xeVirtualRequestMethod')=='xml') {

2
classes/module/ModuleObject.class.php
View file

@ -30,6 +30,8 @@
var $module_config = NULL; var $module_config = NULL;
var $ajaxRequestMethod = array('XMLRPC', 'JSON'); var $ajaxRequestMethod = array('XMLRPC', 'JSON');
var $gzhandler_enable = TRUE;
/** /**
* setter to set the name of module * setter to set the name of module
* @param string $module name of module * @param string $module name of module

2
common/js/common.js
View file

@ -190,7 +190,7 @@ jQuery(function($) {
}); });
} }
jQuery('input[type="submit"]').click(function(ev){ jQuery('input[type="submit"],button[type="submit"]').click(function(ev){
var $el = jQuery(ev.currentTarget); var $el = jQuery(ev.currentTarget);
setTimeout(function(){ setTimeout(function(){

2
common/js/xe.js
View file

@ -474,7 +474,7 @@ jQuery(function($) {
}); });
} }
jQuery('input[type="submit"]').click(function(ev){ jQuery('input[type="submit"],button[type="submit"]').click(function(ev){
var $el = jQuery(ev.currentTarget); var $el = jQuery(ev.currentTarget);
setTimeout(function(){ setTimeout(function(){

2
common/js/xe.min.js vendored
View file

@ -14,7 +14,7 @@ arguments[0],a.extend(c,arguments[1]||{})}!0==c.doClick&&(c.checked=null);"strin
typeof g.length||1>g.length)g=Array(g);if(g.length)for(var j=0;j<g.length;j++){var i=g[j].url,l=g[j].str,m=g[j].target,h="";switch(m){case "popup":h=" onclick=\"popopen(this.href,'"+m+"'); return false;\"";break;case "javascript":h=' onclick="'+i+'; return false; "';i="#";break;default:h=' onclick="window.open(this.href); return false;"'}b+='<li ><a href="'+i+'"'+h+">"+l+"</a></li> "}}this.loaded_popup_menus[c]=b}b&&(c=a("#popup_menu_area").html("<ul>"+b+"</ul>"),b=e.page_y,e=e.page_x,c.outerHeight()+ typeof g.length||1>g.length)g=Array(g);if(g.length)for(var j=0;j<g.length;j++){var i=g[j].url,l=g[j].str,m=g[j].target,h="";switch(m){case "popup":h=" onclick=\"popopen(this.href,'"+m+"'); return false;\"";break;case "javascript":h=' onclick="'+i+'; return false; "';i="#";break;default:h=' onclick="window.open(this.href); return false;"'}b+='<li ><a href="'+i+'"'+h+">"+l+"</a></li> "}}this.loaded_popup_menus[c]=b}b&&(c=a("#popup_menu_area").html("<ul>"+b+"</ul>"),b=e.page_y,e=e.page_x,c.outerHeight()+
b>a(window).height()+a(window).scrollTop()&&(b=a(window).height()-c.outerHeight()+a(window).scrollTop()),c.outerWidth()+e>a(window).width()+a(window).scrollLeft()&&(e=a(window).width()-c.outerWidth()+a(window).scrollLeft()),c.css({top:b,left:e}).show())}}})(jQuery); b>a(window).height()+a(window).scrollTop()&&(b=a(window).height()-c.outerHeight()+a(window).scrollTop()),c.outerWidth()+e>a(window).width()+a(window).scrollLeft()&&(e=a(window).width()-c.outerWidth()+a(window).scrollLeft()),c.css({top:b,left:e}).show())}}})(jQuery);
jQuery(function(a){a.browser.msie&&a("select").each(function(a,b){for(var g=!1,d=[],i=0;i<b.options.length;i++)b.options[i].disabled?(b.options[i].style.color="#CCCCCC",g=!0):d[a]=-1<d[a]?d[a]:i;if(g&&(b.oldonchange=b.onchange,b.onchange=function(){this.options[this.selectedIndex].disabled?this.selectedIndex=d[a]:this.oldonchange&&this.oldonchange()},0<=b.selectedIndex&&b.options[b.selectedIndex].disabled))b.onchange()});var b=a(".xe_content .fold_button");if(b.size()){var d=a("div.fold_container", jQuery(function(a){a.browser.msie&&a("select").each(function(a,b){for(var g=!1,d=[],i=0;i<b.options.length;i++)b.options[i].disabled?(b.options[i].style.color="#CCCCCC",g=!0):d[a]=-1<d[a]?d[a]:i;if(g&&(b.oldonchange=b.onchange,b.onchange=function(){this.options[this.selectedIndex].disabled?this.selectedIndex=d[a]:this.oldonchange&&this.oldonchange()},0<=b.selectedIndex&&b.options[b.selectedIndex].disabled))b.onchange()});var b=a(".xe_content .fold_button");if(b.size()){var d=a("div.fold_container",
b);a("button.more",b).click(function(){a(this).hide().next("button").show().parent().next(d).show()});a("button.less",b).click(function(){a(this).hide().prev("button").show().parent().next(d).hide()})}jQuery('input[type="submit"]').click(function(a){var b=jQuery(a.currentTarget);setTimeout(function(){b.attr("disabled","disabled")},0);setTimeout(function(){b.removeAttr("disabled")},3E3)})}); b);a("button.more",b).click(function(){a(this).hide().next("button").show().parent().next(d).show()});a("button.less",b).click(function(){a(this).hide().prev("button").show().parent().next(d).hide()})}jQuery('input[type="submit"],button[type="submit"]').click(function(a){var b=jQuery(a.currentTarget);setTimeout(function(){b.attr("disabled","disabled")},0);setTimeout(function(){b.removeAttr("disabled")},3E3)})});
(function(){var a=Array.isArray||function(a){return"[object Array]"==Object.prototype.toString.call(a)};String.prototype.getQuery=function(a){var d=this.replace(/#.*$/,"")===window.location.href.replace(/#.*$/,"")?current_url:this,c=d.indexOf("?");if(-1==c)return null;var e={};d.substr(c+1,this.length).replace(/([^=]+)=([^&]*)(&|$)/g,function(a,b,c){e[b]=c});a=e[a];"undefined"==typeof a&&(a="");return a};String.prototype.setQuery=function(b,d){var c=this.replace(/#.*$/,"")===window.location.href.replace(/#.*$/, (function(){var a=Array.isArray||function(a){return"[object Array]"==Object.prototype.toString.call(a)};String.prototype.getQuery=function(a){var d=this.replace(/#.*$/,"")===window.location.href.replace(/#.*$/,"")?current_url:this,c=d.indexOf("?");if(-1==c)return null;var e={};d.substr(c+1,this.length).replace(/([^=]+)=([^&]*)(&|$)/g,function(a,b,c){e[b]=c});a=e[a];"undefined"==typeof a&&(a="");return a};String.prototype.setQuery=function(b,d){var c=this.replace(/#.*$/,"")===window.location.href.replace(/#.*$/,
"")?current_url:this,e=c.indexOf("?"),g=c.replace(/#$/,""),j,i;"undefined"==typeof d&&(d="");if(-1!=e){var l=g.substr(e+1,c.length),m={},h=[],g=c.substr(0,e);l.replace(/([^=]+)=([^&]*)(&|$)/g,function(a,b,c){m[b]=c});m[b]=d;for(var n in m)m.hasOwnProperty(n)&&(i=String(m[n]).trim())&&h.push(n+"="+decodeURI(i));l=h.join("&");g+=l?"?"+l:""}else String(d).trim()&&(g=g+"?"+b+"="+d);e=/^https:\/\/([^:\/]+)(:\d+|)/i;e.test(g)&&(c="http://"+RegExp.$1,window.http_port&&80!=http_port&&(c+=":"+http_port),g= "")?current_url:this,e=c.indexOf("?"),g=c.replace(/#$/,""),j,i;"undefined"==typeof d&&(d="");if(-1!=e){var l=g.substr(e+1,c.length),m={},h=[],g=c.substr(0,e);l.replace(/([^=]+)=([^&]*)(&|$)/g,function(a,b,c){m[b]=c});m[b]=d;for(var n in m)m.hasOwnProperty(n)&&(i=String(m[n]).trim())&&h.push(n+"="+decodeURI(i));l=h.join("&");g+=l?"?"+l:""}else String(d).trim()&&(g=g+"?"+b+"="+d);e=/^https:\/\/([^:\/]+)(:\d+|)/i;e.test(g)&&(c="http://"+RegExp.$1,window.http_port&&80!=http_port&&(c+=":"+http_port),g=
g.replace(e,c));c=!!window.enforce_ssl;if(!c&&a(window.ssl_actions)&&(j=g.getQuery("act"))){e=0;for(i=ssl_actions.length;e<i;e++)if(ssl_actions[e]===j){c=!0;break}}e=/http:\/\/([^:\/]+)(:\d+|)/i;c&&e.test(g)&&(c="https://"+RegExp.$1,window.https_port&&443!=https_port&&(c+=":"+https_port),g=g.replace(e,c));g=g.replace(/\/(index\.php)?\?/,"/index.php?");return encodeURI(g)};String.prototype.trim=function(){return this.replace(/(^\s*)|(\s*$)/g,"")}})(); g.replace(e,c));c=!!window.enforce_ssl;if(!c&&a(window.ssl_actions)&&(j=g.getQuery("act"))){e=0;for(i=ssl_actions.length;e<i;e++)if(ssl_actions[e]===j){c=!0;break}}e=/http:\/\/([^:\/]+)(:\d+|)/i;c&&e.test(g)&&(c="https://"+RegExp.$1,window.https_port&&443!=https_port&&(c+=":"+https_port),g=g.replace(e,c));g=g.replace(/\/(index\.php)?\?/,"/index.php?");return encodeURI(g)};String.prototype.trim=function(){return this.replace(/(^\s*)|(\s*$)/g,"")}})();

2
common/lang/lang.xml
View file

@ -3484,7 +3484,7 @@
</item> </item>
<item name="filter"> <item name="filter">
<item name="isnull"> <item name="isnull">
<value xml:lang="ko"><![CDATA[%s에 값을 입력해주세요.]]></value> <value xml:lang="ko"><![CDATA[%s 값은 필수입니다.]]></value>
<value xml:lang="en"><![CDATA[Please enter a value for %s]]></value> <value xml:lang="en"><![CDATA[Please enter a value for %s]]></value>
<value xml:lang="jp"><![CDATA[%sに値を入力してください。]]></value> <value xml:lang="jp"><![CDATA[%sに値を入力してください。]]></value>
<value xml:lang="zh-CN"><![CDATA[请输入%s]]></value> <value xml:lang="zh-CN"><![CDATA[请输入%s]]></value>

2
config/func.inc.php
View file

@ -947,7 +947,7 @@
**/ **/
function getRequestUriByServerEnviroment() function getRequestUriByServerEnviroment()
{ {
return $_SERVER['REQUEST_URI']; return removeHackTag($_SERVER['REQUEST_URI']);
} }
/** /**

1
m.layouts/default/layout.html
View file

@ -22,6 +22,7 @@
<!--@elseif($act!='dispMemberLoginForm')--> <!--@elseif($act!='dispMemberLoginForm')-->
<li class="fl"><a href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}...</a></li> <li class="fl"><a href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}...</a></li>
<!--@end--> <!--@end-->
<li class="fl" cond="$is_logged"><a href="{getUrl('act', 'dispMemberInfo')}">{$lang->cmd_view_member_info}...</a></li>
<li class="fr"><a href="{getUrl('m',0)}">PC</a></li> <li class="fr"><a href="{getUrl('m',0)}">PC</a></li>
<li class="fr"><a href="{getUrl('act','dispModuleChangeLang','oldact',$act)}">LANG</a></li> <li class="fr"><a href="{getUrl('act','dispModuleChangeLang','oldact',$act)}">LANG</a></li>
</ul> </ul>

6
m.layouts/default/mx.css
View file

@ -12,9 +12,11 @@ body,input,textarea,select,button,table{font-family:Tahoma,Geneva,sans-serif}
.hd .h1 a{color:#fff} .hd .h1 a{color:#fff}
.hd .h1 img{border:0} .hd .h1 img{border:0}
.hd .mu{display:inline-block;height:26px;line-height:26px;padding:0 10px;font-size:12px;font-weight:bold;color:#fff;text-decoration:none;box-shadow:0 0 1px #000;-webkit-box-shadow:0 0 1px #000;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#373737),color-stop(0.5,#323232),color-stop(0.5,#1b1b1b));background:#1b1b1b -moz-linear-gradient(top,#777,#373737);background-color:#1b1b1b} .hd .mu{display:inline-block;height:26px;line-height:26px;padding:0 10px;font-size:12px;font-weight:bold;color:#fff;text-decoration:none;box-shadow:0 0 1px #000;-webkit-box-shadow:0 0 1px #000;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#373737),color-stop(0.5,#323232),color-stop(0.5,#1b1b1b));background:#1b1b1b -moz-linear-gradient(top,#777,#373737);background-color:#1b1b1b}
.hd .mu:after{content:"›";margin:0 0 0 3px;font-size:24px;vertical-align:middle;position:relative;top:-2px} .hd .mu:after{content:"›";margin:0 0 0 2px}
.hd .muon{cursor:pointer;display:inline-block;height:26px;line-height:26px;padding:0 10px;font-size:12px;font-weight:bold;color:#fff;text-decoration:none;box-shadow:0 0 1px #000;-webkit-box-shadow:0 0 1px #000;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#373737),color-stop(0.5,#323232),color-stop(0.5,#1b1b1b));background:#1b1b1b -moz-linear-gradient(top,#777,#373737);background-color:#1b1b1b} .hd .muon{cursor:pointer;display:inline-block;height:26px;line-height:26px;padding:0 10px;font-size:12px;font-weight:bold;color:#fff;text-decoration:none;box-shadow:0 0 1px #000;-webkit-box-shadow:0 0 1px #000;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#373737),color-stop(0.5,#323232),color-stop(0.5,#1b1b1b));background:#1b1b1b -moz-linear-gradient(top,#777,#373737);background-color:#1b1b1b}
.hd .muon:before{content:"‹";font-weight:bold;font-size:16px;line-height:16px;margin:0 2px 0 0;font-family:Verdana, Geneva, sans-serif} .hd .muon:before{content:"‹";margin:0 2px 0 0}
.hd .mu:after,
.hd .muon:before{font-size:16px;line-height:16px;vertical-align:middle;position:relative;top:-2px;font-family:Verdana, Geneva, sans-serif}
/* Footer */ /* Footer */
.ft{padding:0;margin:0;list-style:none;background:#868686;overflow:hidden;zoom:1} .ft{padding:0;margin:0;list-style:none;background:#868686;overflow:hidden;zoom:1}
.ft:after{content:"";display:block;clear:both} .ft:after{content:"";display:block;clear:both}

1
modules/comment/queries/getNewestCommentList.xml
View file

@ -10,7 +10,6 @@
<condition operation="in" column="module_srl" var="module_srl" filter="number" pipe="and" /> <condition operation="in" column="module_srl" var="module_srl" filter="number" pipe="and" />
</conditions> </conditions>
<navigation> <navigation>
<index var="sort_index" default="status" order="desc" />
<index var="sort_index" default="list_order" order="asc" /> <index var="sort_index" default="list_order" order="asc" />
<list_count var="list_count" default="20" /> <list_count var="list_count" default="20" />
</navigation> </navigation>

16
modules/communication/communication.controller.php
View file

@ -195,12 +195,16 @@
$oCommunicationModel = &getModel('communication'); $oCommunicationModel = &getModel('communication');
$message = $oCommunicationModel->getSelectedMessage($message_srl); $message = $oCommunicationModel->getSelectedMessage($message_srl);
if(!$message) return new Object(-1,'msg_invalid_request'); if(!$message) return new Object(-1,'msg_invalid_request');
// Check a message type if 'S' or 'R' // Check the grant
if($message->sender_srl == $member_srl && $message->message_type == 'S') { switch($message->message_type)
if(!$message_srl) return new Object(-1, 'msg_invalid_request'); {
} elseif($message->receiver_srl == $member_srl && $message->message_type == 'R') { case 'S':
if(!$message_srl) return new Object(-1, 'msg_invalid_request'); if($message->sender_srl != $member_srl) return new Object(-1, 'msg_invalid_request');
} break;
case 'R':
if($message->receiver_srl != $member_srl) return new Object(-1, 'msg_invalid_request');
break;
}
// Delete // Delete
$args->message_srl = $message_srl; $args->message_srl = $message_srl;
$output = executeQuery('communication.deleteMessage', $args); $output = executeQuery('communication.deleteMessage', $args);

21
modules/communication/communication.view.php
View file

@ -62,6 +62,27 @@
if($message_srl) { if($message_srl) {
$columnList = array('message_srl', 'sender_srl', 'receiver_srl', 'message_type', 'title', 'content', 'readed', 'regdate'); $columnList = array('message_srl', 'sender_srl', 'receiver_srl', 'message_type', 'title', 'content', 'readed', 'regdate');
$message = $oCommunicationModel->getSelectedMessage($message_srl, $columnList); $message = $oCommunicationModel->getSelectedMessage($message_srl, $columnList);
switch($message->message_type)
{
case 'R':
if($message->receiver_srl != $logged_info->member_srl)
{
return $this->stop('msg_invalid_request');
}
break;
case 'S':
if($message->sender_srl != $logged_info->member_srl)
{
return $this->stop('msg_invalid_request');
}
break;
case 'T':
if($message->receiver_srl != $logged_info->member_srl && $message->sender_srl != $logged_info->member_srl)
{
return $this->stop('msg_invalid_request');
}
break;
}
if($message->message_srl == $message_srl && ($message->receiver_srl == $logged_info->member_srl || $message->sender_srl == $logged_info->member_srl) ) { if($message->message_srl == $message_srl && ($message->receiver_srl == $logged_info->member_srl || $message->sender_srl == $logged_info->member_srl) ) {
stripEmbedTagForAdmin($message->content, $message->sender_srl); stripEmbedTagForAdmin($message->content, $message->sender_srl);
Context::set('message', $message); Context::set('message', $message);

47
modules/member/m.skins/default/css/member.css
View file

@ -13,31 +13,22 @@
.xm img{border:0} .xm img{border:0}
.xm p{line-height:1.5} .xm p{line-height:1.5}
/* Heading */ /* Heading */
.xm .h1, .xm .hx{position:relative;border-bottom:1px solid #ccc8be;padding:8px 10px;margin:0}
.xm .h2, .xm .hx:after{content:"";margin:0 -10px;position:relative;top:10px;display:block;clear:both;height:1px;background:#fff}
.xm .h3, .xm .hx.h2{background:#e5e5e5;text-shadow:1px 1px 0 #fff;position:relative;zoom:1}
.xm .h4{position:relative;zoom:1} .xm .hx>h2{margin:0 10px 0 0;display:inline;font-size:16px;line-height:1.4}
.xm .h1{font-size:24px} .xm .hx a{color:#000}
.xm .h2{font-size:20px} /* Content */
.xm .h3{font-size:16px} .xm .co{margin: 10px;line-height: 1.4;font-size: 14px;color:#333}
.xm .h4{font-size:12px} /* DL */
/* Table */ .xm .dl{margin:15px 0}
.xm .table{margin:1em 0} .xm .dl>dt{font-weight:bold;margin-top:10px}
.xm .table table{width:100%;border:0;border-collapse:collapse;border-top:2px solid #ccc} .xm .dl>dt>em{font-style:normal;color:#e00}
.xm .table caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0} .xm .dl>dd{margin-left:20px}
.xm .table caption:after{content:"";display:block;clear:both} /* Button Area */
.xm .table caption a{font-weight:normal} .xm .ba{margin:15px 0;padding:0;list-style:none;border:1px solid #ddd;border-radius:4px}
.xm .table caption em{float:right;margin-left:1em} .xm .ba li{border-top:1px solid #ddd}
.xm .table caption strong{color:#e00} .xm .ba li:first-child{border:0}
.xm .table caption .side{float:right;font-weight:normal;margin-left:1em} .xm .ba li>a,
.xm .table th, .xm .ba li>button,
.xm .table td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap} .xm .ba li>input{display:block;white-space:nowrap;padding:7px 10px;text-decoration:none;color:#000;background:#f4f4f4;text-shadow:0 1px 0 #fff;overflow:hidden;text-overflow:ellipsis}
.xm .table th{background:#f8f8f8}
.xm .table thead th{border-bottom:1px solid #999}
.xm .table tfoot td{font-weight:bold;background:#f8f8f8}
.xm .table.even tbody tr:nth-of-type(even) td{background-color:#fafafa}
.xm .table td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle}
.xm .table img{vertical-align:middle}
.xm .table em{font-style:normal;font-weight:normal;color:#e00}
.xm .table .title,
.xm .table .text{white-space:normal}

2
modules/member/m.skins/default/modify_info.html
View file

@ -35,7 +35,7 @@
<label for="{$formTag->name}">{$formTag->title}</label> <label for="{$formTag->name}">{$formTag->title}</label>
<div id="{$formTag->name}" cond="$formTag->name != 'signature' && $formTag->type != 'date'" class="tel"|cond="$formTag->type == 'tel'">{$formTag->inputTag}</div> <div id="{$formTag->name}" cond="$formTag->name != 'signature' && $formTag->type != 'date'" class="tel"|cond="$formTag->type == 'tel'">{$formTag->inputTag}</div>
<textarea id="{$formTag->name}" cond="$formTag->name == 'signature'" name="signature" rows="8" cols="42" class="itxx">{$member_info->signature}</textarea> <textarea id="{$formTag->name}" cond="$formTag->name == 'signature'" name="signature" rows="8" cols="42" class="itxx">{$member_info->signature}</textarea>
<input id="{$formTag->name}" class="inputText" type="date" value="{$oMemberInfo[$formTag->name]}" cond="$formTag->type == 'date'" /> <input id="{$formTag->name}" class="inputText" type="date" name="{$formTag->name}" value="{$oMemberInfo[$formTag->name]}" cond="$formTag->type == 'date'" />
</li> </li>
<li><label for="mailing" class="db fb al">{$lang->allow_mailing}</label><input id="mailing" type="checkbox" name="allow_mailing" value="Y" class="checkbox" <!--@if($member_info->allow_mailing!='N')-->checked="checked"<!--@end--> /> <p style="color:#666">{$lang->about_allow_mailing}</p></li> <li><label for="mailing" class="db fb al">{$lang->allow_mailing}</label><input id="mailing" type="checkbox" name="allow_mailing" value="Y" class="checkbox" <!--@if($member_info->allow_mailing!='N')-->checked="checked"<!--@end--> /> <p style="color:#666">{$lang->about_allow_mailing}</p></li>
</ul> </ul>

49
modules/member/member.admin.controller.php
View file

@ -153,6 +153,9 @@
$args = Context::gets( $args = Context::gets(
'enable_confirm', 'enable_confirm',
'limit_day', 'limit_day',
'agreement', 'agreement',
'redirect_url', 'redirect_url',
'profile_image', 'profile_image_max_width', 'profile_image_max_height', 'profile_image', 'profile_image_max_width', 'profile_image_max_height',
@ -187,6 +190,16 @@
$args->signature = $args->signature != 'Y' ? 'N' : 'Y'; $args->signature = $args->signature != 'Y' ? 'N' : 'Y';
$args->identifier = $all_args->identifier; $args->identifier = $all_args->identifier;
// set default // set default
$all_args->is_nick_name_public = 'Y'; $all_args->is_nick_name_public = 'Y';
$all_args->is_find_account_question_public = 'N'; $all_args->is_find_account_question_public = 'N';
@ -213,6 +226,12 @@
$signupItem->isPublic = ($all_args->{'is_'.$key.'_public'} == 'Y' && $signupItem->isUse) ? 'Y' : 'N'; $signupItem->isPublic = ($all_args->{'is_'.$key.'_public'} == 'Y' && $signupItem->isUse) ? 'Y' : 'N';
if ($signupItem->imageType){ if ($signupItem->imageType){
$signupItem->max_width = $all_args->{$key.'_max_width'}; $signupItem->max_width = $all_args->{$key.'_max_width'};
$signupItem->max_height = $all_args->{$key.'_max_height'}; $signupItem->max_height = $all_args->{$key.'_max_height'};
@ -227,6 +246,16 @@
$signupItem->title = $extendItem->column_title; $signupItem->title = $extendItem->column_title;
$signupItem->description = $extendItem->description; $signupItem->description = $extendItem->description;
// check usable value change, required/option // check usable value change, required/option
if ($signupItem->isUse != ($extendItem->is_active == 'Y') || $signupItem->required != ($extendItem->required == 'Y')){ if ($signupItem->isUse != ($extendItem->is_active == 'Y') || $signupItem->required != ($extendItem->required == 'Y')){
unset($update_args); unset($update_args);
@ -236,7 +265,27 @@
$update_output = executeQuery('member.updateJoinForm', $update_args); $update_output = executeQuery('member.updateJoinForm', $update_args);
} }
unset($extendItem); unset($extendItem);
} }
$signupForm[] = $signupItem; $signupForm[] = $signupItem;
} }

1
modules/member/member.controller.php
View file

@ -436,6 +436,7 @@
// Login Information // Login Information
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$args->member_srl = $logged_info->member_srl; $args->member_srl = $logged_info->member_srl;
$args->birthday = strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>''));
// Remove some unnecessary variables from all the vars // Remove some unnecessary variables from all the vars
$all_args = Context::getRequestVars(); $all_args = Context::getRequestVars();
unset($all_args->module); unset($all_args->module);

2
modules/member/queries/getScrapDocument.xml
View file

@ -3,7 +3,7 @@
<table name="member_scrap" /> <table name="member_scrap" />
</tables> </tables>
<columns> <columns>
<column name="count(*)" alias="count" /> <column name="count(document_srl)" alias="count" />
</columns> </columns>
<conditions> <conditions>
<condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" /> <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />

3
modules/member/skins/default/find_member_account.html
View file

@ -1,5 +1,8 @@
<include target="./common_header.html" /> <include target="./common_header.html" />
<load target="filter/find_member_account.xml" /> <load target="filter/find_member_account.xml" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<h2 class="h2">{$lang->cmd_find_member_account_with_email}</h2> <h2 class="h2">{$lang->cmd_find_member_account_with_email}</h2>
<p>{$lang->about_find_member_account}</p> <p>{$lang->about_find_member_account}</p>
<form action="./" method="get" onsubmit="return procFilter(this, find_member_account)"> <form action="./" method="get" onsubmit="return procFilter(this, find_member_account)">

2
modules/menu/menu.admin.view.php
View file

@ -141,7 +141,7 @@
$oMenuAdminModel = &getAdminModel('menu'); $oMenuAdminModel = &getAdminModel('menu');
$menuListFromDB = $oMenuAdminModel->getMenus(); $menuListFromDB = $oMenuAdminModel->getMenus();
$output = $menuListFromDB; if(is_array($menuListFromDB)) $output = array_reverse($menuListFromDB);
$menuList = array(); $menuList = array();
if(is_array($output)) if(is_array($output))

2
themes/xe_solid_enterprise/layouts/xe_solid_enterprise/css/style.css
View file

@ -14,7 +14,7 @@ img{border:none}
#wrap .slide_banner{width:100%;height:446px;background:url(../images/slide_box_bg.gif) repeat-x top left;padding-top:15px} #wrap .slide_banner{width:100%;height:446px;background:url(../images/slide_box_bg.gif) repeat-x top left;padding-top:15px}
.container .search_box_layout{position:absolute;top:10px;right:0px} .container .search_box_layout{position:absolute;top:10px;right:0px}
.search_box_layout .inputBox{width:218px;height:29px;background:url(../images/search_box_bg.gif) no-repeat top left} .search_box_layout .inputBox{width:218px;height:29px;background:url(../images/search_box_bg.gif) no-repeat top left}
.search_box_layout .inputBox .iText{width:175px;float:left;background:none;;outline:none;border:0 none;padding-left:10px;margin-top:3px} .search_box_layout .inputBox .iText{width:175px;float:left;background:none;outline:none;border:0 none;padding-left:10px;margin-top:5px}
.search_box_layout .inputBox .is_submit{width:15px;height:14px;float:right;margin-top:6px;margin-right:10px} .search_box_layout .inputBox .is_submit{width:15px;height:14px;float:right;margin-top:6px;margin-right:10px}
/* GNB */ /* GNB */
.header .gnb{position:absolute;top:36px;left:220px;z-index:300} .header .gnb{position:absolute;top:36px;left:220px;z-index:300}

2
themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/slides.min.jquery.js
View file

File diff suppressed because one or more lines are too long

2
themes/xe_solid_enterprise/layouts/xe_solid_enterprise/layout.html
View file

@ -108,7 +108,7 @@
<input type="hidden" name="mid" value="{$mid}" /> <input type="hidden" name="mid" value="{$mid}" />
<input type="hidden" name="act" value="IS" /> <input type="hidden" name="act" value="IS" />
<div class="inputBox"> <div class="inputBox">
<input type="text" name="is_keyword" value="{$is_keyword}" /> <input type="text" name="is_keyword" value="{$is_keyword}" class="iText" />
<input type="image" src="images/icon_search.gif" class="is_submit" value="{$lang->cmd_search}" /> <input type="image" src="images/icon_search.gif" class="is_submit" value="{$lang->cmd_search}" />
</div> </div>
</form> </form>