fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-29 23:32:54 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.3 (~r10951). required minify admin.min.js

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10952 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 03:04:27 +00:00
commit d97822999e
34 changed files with 233 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/admin/tpl/js/admin.js
View file

@ -1435,7 +1435,7 @@ jQuery(function($){
$(this).append($sTog);
$sTog.click(function(){
var $t = $(this);
var $sTogObj = $t.parent().nextUntil('.h2, .h3');
var $sTogObj = $t.parent().nextUntil('.h2, .h3').not('.langEdit, .tgContent, .modal');
if($t.parent().next().is(':hidden')){
$t.find('i').attr('class','icon-chevron-up');
$sTogObj.slideDown(200);

3
modules/layout/layout.admin.controller.php
View file

@ -188,7 +188,8 @@
$output = $this->updateLayout($args);
if(!$output->toBool()) return $output;
return $this->setRedirectUrl(Context::get('error_return_url'), $output);
$this->setRedirectUrl(Context::get('error_return_url'));
return $output;
}
/**

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

@ -84,6 +84,13 @@
// Return xml file informaton after listing up the layout and extra_vars
$layout_info = $this->getLayoutInfo($layout, $output->data, $output->data->layout_type);
// If deleted layout files, delete layout instance
// if (!$layout_info) {
// $oLayoutController = &getAdminController('layout');
// $oLayoutController->deleteLayout($layout_srl);
// return;
// }
//insert in cache
if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$layout_info);
}

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

@ -232,6 +232,15 @@
$this->_createLoginRuleset($args->identifier);
$this->_createFindAccountByQuestion($args->identifier);
}
// check agreement value exist
if($args->agreement)
{
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
$output = FileHandler::writeFile($agreement_file, $args->agreement);
unset($args->agreement);
}
$output = $oModuleController->updateModuleConfig('member', $args);
// default setting end

101
modules/member/member.class.php
View file

@ -31,6 +31,8 @@
Context::addSSLAction('dispMemberModifyEmailAddress');
Context::addSSLAction('dispMemberGetTempPassword');
Context::addSSLAction('dispMemberResendAuthMail');
Context::addSSLAction('dispMemberLoginForm');
Context::addSSLAction('dispMemberFindAccount');
Context::addSSLAction('procMemberLogin');
Context::addSSLAction('procMemberModifyPassword');
Context::addSSLAction('procMemberInsert');
@ -74,43 +76,46 @@
global $lang;
$oMemberModel = &getModel('member');
$identifier = 'email_address';
$items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark');
$mustRequireds = array('email_address', 'nick_name','password', 'find_account_question');
$list_order = array();
foreach($items as $key){
unset($signupItem);
$signupItem->isDefaultForm = true;
$signupItem->name = $key;
$signupItem->title = $key;
$signupItem->mustRequired = in_array($key, $mustRequireds);
$signupItem->imageType = (strpos($key, 'image') !== false);
$signupItem->required = $signupItem->mustRequired;
$signupItem->isUse = $signupItem->mustRequired;
$signupItem->isIdentifier = ($key == $identifier);
if ($signupItem->imageType){
$signupItem->max_width = $config->{$key.'_max_width'};
$signupItem->max_height = $config->{$key.'_max_height'};
// Create a member controller object
$oMemberController = &getController('member');
$oMemberAdminController = &getAdminController('member');
if(!$args->signupForm || !is_array($args->signupForm))
{
$identifier = 'email_address';
$items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark');
$mustRequireds = array('email_address', 'nick_name','password', 'find_account_question');
$list_order = array();
foreach($items as $key){
unset($signupItem);
$signupItem->isDefaultForm = true;
$signupItem->name = $key;
$signupItem->title = $key;
$signupItem->mustRequired = in_array($key, $mustRequireds);
$signupItem->imageType = (strpos($key, 'image') !== false);
$signupItem->required = $signupItem->mustRequired;
$signupItem->isUse = $signupItem->mustRequired;
$signupItem->isIdentifier = ($key == $identifier);
if ($signupItem->imageType){
$signupItem->max_width = $config->{$key.'_max_width'};
$signupItem->max_height = $config->{$key.'_max_height'};
}
if ($signupItem->isIdentifier)
array_unshift($list_order, $signupItem);
else
$list_order[] = $signupItem;
}
if ($signupItem->isIdentifier)
array_unshift($list_order, $signupItem);
else
$list_order[] = $signupItem;
$args->signupForm = $list_order;
$args->identifier = $identifier;
$oModuleController->insertModuleConfig('member',$args);
// Create Ruleset File
FileHandler::makeDir('./files/ruleset');
$oMemberAdminController->_createSignupRuleset($args->signupForm);
$oMemberAdminController->_createLoginRuleset($args->identifier);
$oMemberAdminController->_createFindAccountByQuestion($args->identifier);
}
$args->signupForm = $list_order;
$args->identifier = $identifier;
$oModuleController->insertModuleConfig('member',$args);
// Create a member controller object
$oMemberController = &getController('member');
$oMemberAdminController = &getAdminController('member');
// Create Ruleset File
FileHandler::makeDir('./files/ruleset');
$oMemberAdminController->_createSignupRuleset($args->signupForm);
$oMemberAdminController->_createLoginRuleset($args->identifier);
$oMemberAdminController->_createFindAccountByQuestion($args->identifier);
$groups = $oMemberModel->getGroups();
if(!count($groups)) {
@ -200,11 +205,14 @@
if(!$oDB->isColumnExists("member", "list_order")) return true;
if(!$oDB->isIndexExists("member","idx_list_order")) return true;
$oMemberModel = &getModel('member');
$config = $oMemberModel->getMemberConfig();
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
// check signup form ordering info
if (!$config->signupForm) return true;
// check agreement field exist
if ($config->agreement) return true;
if (!is_readable('./files/ruleset/insertMember.xml')) return true;
if (!is_readable('./files/ruleset/login.xml')) return true;
if (!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true;
@ -277,13 +285,24 @@
$oDB->addIndex("member","idx_list_order", array("list_order"));
}
$oMemberModel = &getModel('member');
$config = $oMemberModel->getMemberConfig();
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
$oModuleController = &getController('module');
// check agreement value exist
if($config->agreement)
{
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
$output = FileHandler::writeFile($agreement_file, $config->agreement);
$config->agreement = NULL;
$output = $oModuleController->updateModuleConfig('member', $config);
}
// check signup form ordering info
if (!$config->signupForm || !is_array($config->signupForm)){
global $lang;
$oModuleController = &getController('module');
$oMemberModel = &getModel('member');
// Get join form list which is additionally set
$extendItems = $oMemberModel->getJoinFormList();
@ -332,9 +351,9 @@
}
$config->signupForm = $list_order;
$config->identifier = $identifier;
unset($config->agreement);
$output = $oModuleController->updateModuleConfig('member', $config);
}
FileHandler::makeDir('./files/ruleset');
$oMemberAdminController = &getAdminController('member');

2
modules/member/member.mobile.php
View file

@ -37,7 +37,7 @@ class memberMobile extends member
Context::set('identifier', $config->identifier);
// Set a template file
Context::set('referer_url', $_SERVER['HTTP_REFERER']);
Context::set('referer_url', htmlspecialchars($_SERVER['HTTP_REFERER']));
$this->setTemplateFile('login_form');
}

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

@ -262,7 +262,7 @@
Context::set('identifier', $config->identifier);
// Set a template file
Context::set('referer_url', $_SERVER['HTTP_REFERER']);
Context::set('referer_url', htmlspecialchars($_SERVER['HTTP_REFERER']));
Context::set('act', 'procMemberLogin');
$this->setTemplateFile('login_form');
}

4
modules/member/skins/default/signup_form.html
View file

@ -45,8 +45,8 @@
<li>
<p class="q">{$lang->allow_mailing}</p>
<p class="a">
<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'"> <label for="mailingYes">{$lang->cmd_yes}</label>
<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" > <label for="mailingNo">{$lang->cmd_no}</label>
<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'" /> <label for="mailingYes">{$lang->cmd_yes}</label>
<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" /> <label for="mailingNo">{$lang->cmd_no}</label>
</p>
</li>
<li>

19
modules/member/tpl/signup_form.html
View file

@ -35,23 +35,24 @@
<input type="password" name="password" id="password" value=""/>
</li>
<li>
<label for="password2">{$lang->password2} <em style="color:red">*</em></label>
<label for="password2">{$lang->password3} <em style="color:red">*</em></label>
<input type="password" name="password2" id="password2" value=""/>
</li>
<li loop="$formTags=>$formTag">
<label>{$formTag->title}</label>
<block cond="$formTag->name != 'signature'">{$formTag->inputTag}</block>
<block cond="$formTag->name =='signature'">{$editor}</block>
</li>
<block loop="$formTags=>$formTag" cond="$formTag->name != 'signature'">
<li>
<label>{$formTag->title}</label>
{$formTag->inputTag}
</li>
</block>
<li>
<label>{$lang->allow_mailing}</label>
<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'"> <label for="mailingYes">{$lang->cmd_yes}</label>
<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" > <label for="mailingNo">{$lang->cmd_no}</label>
<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'" /> <label for="mailingYes">{$lang->cmd_yes}</label>
<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" /> <label for="mailingNo">{$lang->cmd_no}</label>
</li>
<li>
<label>{$lang->allow_message}</label>
<block loop="$lang->allow_message_type=>$key,$val">
<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key || (!$member_info && $key == 'Y')" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
</block>
</li>
</ul>

2
modules/message/m.skins/default/system_message.html
View file

@ -16,7 +16,7 @@
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("./filter/openid_login.xml")-->
<div class="mLogin" id="gLogin">
<form action="./" method="post" ruleset="@login" id="gForm" class="ff">
<form action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" id="gForm" class="ff">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<fieldset>

4
modules/message/skins/default/system_message.html
View file

@ -1,4 +1,4 @@
<load target="../../../../common/js/jquery.js" />
<load target="../../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
<load target="./filter/openid_login.xml" />
<load target="./message.css" />
<load target="./message.js" />
@ -8,7 +8,7 @@
<div id="loginAccess" class="gLogin">
<h1>{$system_message}</h1>
<div class="mLogin" id="gLogin" cond="!$is_logged && $module == 'admin'">
<form ruleset="@login" action="./" method="post" id="gForm">
<form ruleset="@login" action="{getUrl('','act','procMemberLogin')}" method="post" id="gForm">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />

4
modules/module/module.model.php
View file

@ -70,13 +70,15 @@
function getDefaultMid() {
$default_url = preg_replace('/\/$/','',Context::getDefaultUrl());
$request_url = preg_replace('/\/$/','',Context::getRequestUri());
$default_url_parse = parse_url($default_url);
$request_url_parse = parse_url($request_url);
$vid = Context::get('vid');
$mid = Context::get('mid');
// Set up
// test.xe.com
$domain = '';
if($default_url && $default_url != $request_url) {
if($default_url && $default_url_parse['host'] != $request_url_parse['host']) {
$url_info = parse_url($request_url);
$hostname = $url_info['host'];
$path = preg_replace('/\/$/','',$url_info['path']);

4
modules/rss/rss.controller.php
View file

@ -26,6 +26,10 @@
$current_module_srl = Context::get('module_srl');
$site_module_info = Context::get('site_module_info');
if(is_array($current_module_srl))
{
unset($current_module_srl);
}
if(!$current_module_srl) {
$current_module_info = Context::get('current_module_info');
$current_module_srl = $current_module_info->module_srl;

20
modules/widget/tpl/js/generate_code.js
View file

@ -87,14 +87,20 @@ function doFillWidgetVars() {
// 위젯 스타일 유지를 위한 hidden input 추가하고 값을 저장
var attrs = selected_node.attributes;
for (i=0; i< attrs.length ; i++){
var name = attrs[i].name;
var value = jQuery(selected_node).attr(name);
if(value=='Array') continue;
if(jQuery("[name="+name+"]",fo_widget).size()>0 || !value || name == 'style') continue;
var dummy = jQuery('<input type="hidden" name="'+name+'" >').val(value).appendTo("#fo_widget").get(0);
}
// IE7에서 발생하는 jQuery 용 attribute를 걸러내기 위해 추가
var attrFilters = ['style', 'sizset', 'draggable', 'class'];
for (i=0; i< attrs.length ; i++){
var name = attrs[i].name;
var value = jQuery(selected_node).attr(name);
if(value=='Array') continue;
if(jQuery("[name="+name+"]",fo_widget).size()>0 || !value) continue;
if(name.indexOf('sizcache') == 0) continue;
if(jQuery.inArray(name, attrFilters) > -1) continue;
var dummy = jQuery('<input type="hidden" name="'+name+'" />').val(value).appendTo("#fo_widget").get(0);
}
// 위젯의 속성 설정
var obj_list = new Array();

6
modules/widget/tpl/js/widget.js
View file

@ -53,9 +53,9 @@ function doStartPageModify(zoneID, module_srl) {
doFitBorderSize();
// 드래그와 리사이즈와 관련된 이벤트 리스너 생성
xAddEventListener(document,"click",doCheckWidget);
xAddEventListener(document,"mousedown",doCheckWidgetDrag);
xAddEventListener(document,'mouseover',widgetSetup);
xAddEventListener(document.getElementById('zonePageContent'), "click",doCheckWidget);
xAddEventListener(document.getElementById('zonePageContent'), "mousedown",doCheckWidgetDrag);
xAddEventListener(document.getElementById('zonePageContent'), 'mouseover',widgetSetup);
}

4
modules/widget/tpl/widget_generate_code.include.html
View file

@ -67,8 +67,12 @@
<option loop="$var->options => $key, $val" value="{$key}">{$val}</option>
</select>
<block cond="$var->type == 'select-multi-order'">
<!--@if($var->init_options && is_array($var->init_options))-->
{@$inits = array_keys($var->init_options)}
<input type="hidden" name="{$id}" value="{implode(',', $inits)}" />
<!--@else-->
<input type="hidden" name="{$id}" value="" />
<!--@end-->
<select class="multiorder_show" size="8" multiple="multiple" style="width:290px;vertical-align:top">
<option loop="$var->options => $key, $val" cond="!$var->init_options[$key]" value="{$key}" default="true"|cond="$var->default_options[$key]">{$val}</option>
</select>