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

merge from 1.5.2.1

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10466 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-03-23 05:49:16 +00:00
parent c727926d9e
commit 9bf08cf3df
26 changed files with 110 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

36
classes/db/DBMssql.class.php
View file

@ -348,21 +348,26 @@
$default = $column->attrs->default;
$auto_increment = $column->attrs->auto_increment;
$column_schema[] = sprintf('[%s] %s%s %s %s %s %s',
$column_schema[] = sprintf('[%s] %s%s %s %s %s',
$name,
$this->column_type[$type],
!in_array($type,array('number','text'))&&$size?'('.$size.')':'',
$primary_key?'primary key':'',
isset($default)?"default '".$default."'":'',
$notnull?'not null':'null',
$auto_increment?'identity(1,1)':''
);
if($unique) $unique_list[$unique][] = $name;
if($primary_key) $primary_list[] = $name;
else if($unique) $unique_list[$unique][] = $name;
else if($index) $index_list[$index][] = $name;
}
$schema = sprintf('create table [%s] (xe_seq int identity(1,1),%s%s)', $this->addQuotes($table_name), "\n", implode($column_schema,",\n"));
if(count($primary_list))
{
$column_schema[] = sprintf("primary key (%s)", '"'.implode($primary_list,'","').'"');
}
$schema = sprintf('create table [%s] (%s%s)', $this->addQuotes($table_name), "\n", implode($column_schema,",\n"));
$output = $this->_query($schema);
if(!$output) return false;
@ -403,6 +408,27 @@
return $this->_query($query);
}
function getUpdateSql($query, $with_values = true, $with_priority = false){
$columnsList = $query->getUpdateString($with_values);
if($columnsList == '') return new Object(-1, "Invalid query");
$from = $query->getFromString($with_values);
if($from == '') return new Object(-1, "Invalid query");
$tables = $query->getTables();
$alias_list = '';
foreach($tables as $table)
$alias_list .= $table->getAlias();
join(',', split(' ', $alias_list));
$where = $query->getWhereString($with_values);
if($where != '') $where = ' WHERE ' . $where;
$priority = $with_priority?$query->getPriority():'';
return "UPDATE $priority $alias_list SET $columnsList FROM ".$from.$where;
}
/**
* @brief Handle deleteAct
**/
@ -499,6 +525,7 @@
}
$count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
$this->param = $queryObject->getArguments();
$result_count = $this->_query($count_query, $connection);
$count_output = $this->_fetch($result_count);
$total_count = (int)$count_output->count;
@ -529,6 +556,7 @@
$start_count = ($page - 1) * $list_count;
$query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
$this->param = $queryObject->getArguments();
$result = $this->_query ($query, $connection);
if ($this->isError ())
return $this->queryError($queryObject);

2
classes/mobile/Mobile.class.php
View file

@ -55,7 +55,7 @@ class Mobile {
function isMobileCheckByAgent()
{
$mobildAgent = array('iPod','iPhone','iPad','Android','BlackBerry','SymbianOS','Bada','Kindle','Wii','SCH-','SPH-','CANU-','Windows Phone','Windows CE','POLARIS','Palm','webOS','Dorothy Browser','IEMobile','MobileSafari','Opera Mobi','Opera Mini','MobileExplorer','Minimo','AvantGo','NetFront','Googlebot-Mobile','Nokia','LGPlayer','SonyEricsson','HTC','hp-tablet','SKT','lgtelecom','Vodafone');
$mobildAgent = array('iPod','iPhone','Android','BlackBerry','SymbianOS','Bada','Kindle','Wii','SCH-','SPH-','CANU-','Windows Phone','Windows CE','POLARIS','Palm','webOS','Dorothy Browser','IEMobile','MobileSafari','Opera Mobi','Opera Mini','MobileExplorer','Minimo','AvantGo','NetFront','Googlebot-Mobile','Nokia','LGPlayer','SonyEricsson','HTC','hp-tablet','SKT','lgtelecom','Vodafone');
foreach($mobildAgent as $agent)
{

33
common/css/xe.css
View file

@ -1,39 +1,25 @@
@charset "utf-8";
/* NHN (developers@xpressengine.com) */
/* Element Reset */
body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px}
body{word-break:break-all;word-wrap:break-word}
img{border:0}
img{border:0;max-width:100%;height:auto}
/* Button Area */
.btnArea{margin:1em 0;text-align:right;zoom:1;clear:both}
.btnArea:after{content:"";display:block;clear:both}
.btnArea .etc{float:left}
/* Button */
.btn{position:relative;display:inline-block;vertical-align:middle}
.btn *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}
.btn *[type=submit][disabled=disabled],
.btn *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}
.btn *[disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}
.btn a,
.btn input[type=button],
.btn button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)}
.btn input[type=submit],
.btn button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000)) !important;background:#333 -moz-linear-gradient(top,#777,#000) !important;background-color:#333 !important;color:#ffc !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)}
.btn *[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)}
.btn *[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000)) !important;background:#333 -moz-linear-gradient(top,#777,#000) !important;background-color:#333 !important;color:#ffc !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)}
.btn a{height:22px}
.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px}
.btn.medium a{height:28px}
.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px}
.btn.large a{height:34px}
/* Button - Regucy */
span.button,
a.button{position:relative;display:inline-block;vertical-align:top}
span.button *,
a.button *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}
span.button *[type=submit][disabled=disabled],
span.button *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}
a.button span,
span.button button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)}
span.button input,
span.button button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000));background:#333 -moz-linear-gradient(top,#777,#000);background-color:#333;color:#ffc !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)}
a.button span{height:22px}
/* Button Area */
.btnArea{margin:1em 0;text-align:right;zoom:1}
.btnArea:after{content:"";display:block;clear:both}
.btnArea .etc{float:left}
/* Text Button */
input[type=submit].text,
input[type=button].text,
@ -49,7 +35,6 @@ button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;co
#popup_menu_area a:focus{text-decoration:underline}
/* Message */
.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}
body>.message{margin:1em}
.message p{margin:1em 0 !important}
.message em{font-style:normal;color:#e00}
.message.info,

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

File diff suppressed because one or more lines are too long

2
common/lang/lang.info
View file

@ -7,6 +7,6 @@ fr,Français
de,Deutsch
ru,Русский
es,Español
tr,Turkey
tr,Turkçe
vi,Tiếng Việt
mn,Mongolian

4
config/config.inc.php
View file

@ -13,7 +13,7 @@
* @brief display XE's full version
* Even The file should be revised when releasing altough no change is made
**/
define('__XE_VERSION__', '1.5.2');
define('__XE_VERSION__', '1.5.2.1');
define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.
/**
@ -51,7 +51,7 @@
* define('__ENABLE_PHPUNIT_TEST__', 0);
* define('__PROXY_SERVER__', 'http://domain:port/path');
* define('__XE_CDN_PREFIX__', 'http://yourCdnDomain.com/path/');
* define('__XE_CDN_VERSION__', 'yourCndVersion');
* define('__XE_CDN_VERSION__', 'yourCdnVersion');
*/
if(file_exists(_XE_PATH_.'config/config.user.inc.php')) {
require _XE_PATH_.'config/config.user.inc.php';

27
modules/admin/tpl/index.html
View file

@ -1,7 +1,4 @@
<!--#include("./_spHeader.html")-->
<include target="./_spHeader.html" />
<div class="content dashboard" id="content">
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
@ -28,7 +25,7 @@
<!--@if($value->need_install)-->
<li style="margin:0 0 4px 0;">{$value->module} - <span class="btn"><button type="button" onclick="doInstallModule('{$value->module}')">{$lang->cmd_create_db_table}</button></span></li>
<!--@else if($value->need_update)-->
<li style="margin:0 0 4px 0;">{$value->module} - <span class="btn"><button type="button" onclick="doUpdateModule('{$value->module}')">{$lang->cmd_module_update}</button></li>
<li style="margin:0 0 4px 0;">{$value->module} - <span class="btn"><button type="button" onclick="doUpdateModule('{$value->module}')">{$lang->cmd_module_update}</button></span></li>
<!--@end-->
<!--@end-->
</ul>
@ -52,16 +49,14 @@
{@$document = $value->variables}
<li>
<a href="{getUrl('', 'document_srl', $document['document_srl'])}" target="_blank"><!--@if(trim($value->getTitle()))-->{$value->getTitle()}<!--@else--><strong>{$lang->no_title_document}</strong><!--@end--></a> <span class="side">{$document['nick_name']}</span>
<span class="action">
<form>
<form class="action">
<input type="hidden" name="module" value="admin" />
<input type="hidden" name="act" value="procDocumentManageCheckedDocument" />
<input type="hidden" name="cart[]" value="{$document['document_srl']}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
<button type="submit" name="type" value="trash" class="text">{$lang->cmd_trash}</button>
<button type="submit" name="type" value="delete" class="text">{$lang->cmd_delete}</button>
</form>
</span>
</form>
</li>
<!--@end-->
<li cond="!is_array($latestDocumentList) || count($latestDocumentList) < 1">{$lang->no_data}</li>
@ -73,16 +68,14 @@
<!--@foreach($latestCommentList AS $key=>$value)-->
<li>
<a href="{getUrl('', 'document_srl', $value->document_srl)}#comment_{$value->comment_srl}" target="_blank"><!--@if(trim($value->content))-->{$value->getSummary()}<!--@else--><strong>{$lang->no_text_comment}</strong><!--@end--></a> <span class="side">{$value->nick_name}</span>
<span class="action">
<form>
<form class="action">
<input type="hidden" name="module" value="admin" />
<input type="hidden" name="act" value="procCommentAdminDeleteChecked" />
<input type="hidden" name="cart[]" value="{$value->comment_srl}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
<button type="submit" name="is_trash" value="true" class="text">{$lang->cmd_trash}</button>
<button type="submit" name="is_trash" value="false" class="text">{$lang->cmd_delete}</button>
</form>
</span>
</form>
</li>
<!--@end-->
<li cond="!is_array($latestCommentList) || count($latestCommentList) < 1">{$lang->no_data}</li>
@ -94,15 +87,13 @@
<!--@foreach($latestTrackbackList AS $key=>$value)-->
<li>
<a href="{$value->url}" target="_blank">{$value->title}</a> <span class="side">{$value->blog_name}</span>
<span class="action">
<form>
<form class="action">
<input type="hidden" name="module" value="admin" />
<input type="hidden" name="act" value="procTrackbackAdminDeleteChecked" />
<input type="hidden" name="cart[]" value="{$value->trackback_srl}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
<button type="submit" class="text">{$lang->cmd_delete}</button>
</form>
</span>
</form>
</li>
<!--@end-->
<li cond="!is_array($latestTrackbackList) || count($latestTrackbackList) < 1">{$lang->no_data}</li>
@ -110,4 +101,4 @@
</div>
</div>
</div>
<!--#include("./_spFooter.html")-->
<include target="./_spFooter.html" />

2
modules/document/document.controller.php
View file

@ -166,7 +166,7 @@ class documentController extends document {
// Set to 0 if the category_srl doesn't exist
if($obj->category_srl) {
$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
if(!$category_list[$obj->category_srl]->grant)
if(count($category_list) > 0 && !$category_list[$obj->category_srl]->grant)
{
return new Object(-1, 'msg_not_permitted');
}

2
modules/editor/skins/xpresseditor/css/default.css
View file

@ -32,7 +32,7 @@
.xpress-editor a.skip:hover,
.xpress-editor a.skip:active,
.xpress-editor a.skip:focus{position:relative;display:block;padding:5px;right:0;z-index:60;width:auto;height:auto;text-align:right;white-space:nowrap;color:#000;text-decoration:none;letter-spacing:-1px;_zoom:1}
.xpress-editor .input_area{position:relative;margin:10px;z-index:30;*zoom:1;height:400px}
.xpress-editor .input_area{position:relative;margin:10px;z-index:30;*zoom:1;height:400px;overflow:hidden}
.xpress-editor .input_area iframe,
.xpress-editor .input_area textarea{display:block;width:100% !important;position:relative;height:100%;border:0 !important;padding:0 !important;overflow:auto}
.xpress-editor .input_area textarea{*margin:0 -10px;_margin-bottom:-2px}

21
modules/editor/skins/xpresseditor/js/xpresseditor.js
View file

@ -5813,18 +5813,21 @@ xe.XE_Table = $.Class({
}
}).extend(xe.XE_Table);
})(jQuery);
// Auto Resize Checkbox Toggle Class
$('.input_auto>input').change(function(){
setTimeout(function(){
if($('.input_control').is(':hidden')){
$('.input_auto').addClass('line');
} else {
$('.input_auto').removeClass('line');
}
},1);
jQuery(function($){
$('.input_auto>input').change(function(){
setTimeout(function(){
if($('.input_control').is(':hidden')){
$('.input_auto').addClass('line');
} else {
$('.input_auto').removeClass('line');
}
},1);
});
});
})(jQuery);
if (!window.xe) xe = {};
xe.Editors = [];

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

@ -1689,11 +1689,6 @@
if (!$args->user_id) $args->user_id = 't'.$args->member_srl;
if (!$args->user_name) $args->user_name = $args->member_srl;
if(trim($args->find_account_answer))
{
$args->find_account_answer = md5($args->find_account_answer);
}
$output = executeQuery('member.insertMember', $args);
if(!$output->toBool()) {
$oDB->rollback();

5
modules/member/member.model.php
View file

@ -250,6 +250,11 @@
}
}
if(strlen($info->find_account_answer) == 32 && preg_match('/[a-zA-Z0-9]+/', $info->find_account_answer))
{
$info->find_account_answer = null;
}
// XSS defence
$oSecurity = new Security($info);
$oSecurity->encodeHTML('user_name', 'nick_name', 'find_account_answer', 'description', 'address.', 'group_list..');

2
modules/member/skins/default/login_form.html
View file

@ -3,7 +3,7 @@
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<h1 class="h1">{$lang->cmd_login}...</h1>
<h1 class="h1">{$lang->cmd_login}</h1>
<form ruleset="@login" action="./" method="post" id="fo_member_login" class="form">
<input type="hidden" name="success_return_url" value="{getUrl('act', '')}" />
<input type="hidden" name="act" value="procMemberLogin" />

2
modules/member/tpl/insert_member.html
View file

@ -36,7 +36,7 @@
<p class="q">{$lang->password} <em style="color:red">*</em></p>
<p class="a">
<input type="hidden" name="password" value="{$member_info->password}" />
<input type="password" name="reset_password" value="" />
<input type="text" name="reset_password" value="" />
</p>
</li>
<li cond="!$member_srl">

4
modules/member/tpl/login_form.html
View file

@ -1,7 +1,7 @@
<load target="css/mlogin.css" usecdn="true" />
<div class="bd">
<div class="hx h2">
<h2>{$lang->cmd_login}...</h2>
<h2>{$lang->cmd_login}</h2>
</div>
<form action="./" method="POST" class="ff">
<input type="hidden" name="module" value="member" />
@ -13,7 +13,7 @@
</ul>
<div class="bna">
<div class="fl"><input name="keep_signed" type="checkbox" value="Y" id="autoLogin" /> <label for="autoLogin">{$lang->keep_signed}</label></div>
<div class="fr"><button type="submit" class="bn dark">{$lang->cmd_login}...</button></div>
<div class="fr"><button type="submit" class="bn dark">{$lang->cmd_login}</button></div>
</div>
</form>
</div>

4
modules/module/tpl/module_grants.html
View file

@ -9,7 +9,7 @@
<input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="admin_member" value="<!--@foreach($admin_member as $key => $val)--><!--@if($member_config->identifier == 'email_address')-->{$val->email_address},<!--@else-->{$val->user_id},<!--@end--><!--@end-->" />
<h3 class="h3">{$lang->module_admin}</h3>
<h2 class="h2">{$lang->module_admin}</h2>
<p>{$lang->about_admin_id}</p>
<ul>
<li>
@ -33,7 +33,7 @@
</p>
</li>
</ul>
<h3 class="h3">{$lang->permission_setting}</h3>
<h2 class="h2">{$lang->permission_setting}</h2>
<p>{$lang->about_grant_deatil}</p>
<div class="table">
<table width="100%" border="1" cellspacing="0">

6
modules/module/tpl/skin_config.html
View file

@ -6,7 +6,7 @@
<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
<input type="hidden" name="page" value="{$page}" />
<h3 class="h3">{$lang->skin_default_info}</h3>
<h2 class="h2">{$lang->skin_default_info}</h2>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<tr>
@ -46,7 +46,7 @@
</table>
</div>
<h3 class="h3">{$lang->extra_vars}</h3>
<h2 class="h2">{$lang->extra_vars}</h2>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<tr valign="top" cond="$skin_info->colorset">
@ -75,7 +75,7 @@
{@$group = $val->group}
</table>
</div>
<h3 class="h3">{$group}</h3>
<h2 class="h2">{$group}</h2>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<!--@end-->

2
modules/point/tpl/config.html
View file

@ -30,7 +30,7 @@
<label for="signup_point">{$lang->point_signup}</label>
<br />
<input type="text" value="{$config->login_point}" name="login_point" id="login_point" style="width:30px" /> :
<label for="login_point">{$lang->cmd_login}...</label>
<label for="login_point">{$lang->cmd_login}</label>
<br />
<input type="text" name="insert_document" value="{$config->insert_document}" id="insert_document" style="width:30px" /> :
<label for="insert_document">{$lang->point_insert_document}</label>

28
tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php
View file

@ -1,16 +1,22 @@
<?php
class MssqlUpdateTest extends MssqlTest {
class MssqlUpdateTest extends MssqlTest {
function _test($xml_file, $argsString, $expected, $expectedArgs = NULL){
$this->_testPreparedQuery($xml_file, $argsString, $expected, 'getUpdateSql', $expectedArgs = NULL);
}
function _test($xml_file, $argsString, $expected, $expectedArgs = NULL) {
$this->_testPreparedQuery($xml_file, $argsString, $expected, 'getUpdateSql', $expectedArgs = NULL);
}
function test_counter_updateCounterUnique() {
$xml_file = _XE_PATH_ . "modules/counter/queries/updateCounterUnique.xml";
$argsString = '$args->regdate = 25;';
$expected = 'UPDATE [counter_status]
SET [unique_visitor] = [unique_visitor] + ?
, [pageview] = [pageview] + ?
FROM [xe_counter_status] as [counter_status]
WHERE [regdate] = ?';
$this->_test($xml_file, $argsString, $expected, array("25", 1, 1));
}
}
function test_counter_updateCounterUnique(){
$xml_file = _XE_PATH_ . "modules/counter/queries/updateCounterUnique.xml";
$argsString = '$args->regdate = 25;';
$expected = 'UPDATE [xe_counter_status] as [counter_status] SET [unique_visitor] = [unique_visitor] + ?, [pageview] = [pageview] + ? WHERE [regdate] = ?';
$this->_test($xml_file, $argsString, $expected, array("25", 1, 1));
}
}
?>

2
themes/xe_solid_enterprise/modules/member/login_form.html
View file

@ -10,7 +10,7 @@
<!-- XE 로그인 폼 -->
<div class="memberSmallBox">
<div class="header">{$lang->cmd_login}...</div>
<div class="header">{$lang->cmd_login}</div>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>

4
widgets/login_info/skins/xe_global/login_form.html
View file

@ -18,7 +18,7 @@
<form action="./" method="post" ruleset="@login" id="fo_login_widget">
<fieldset id="login" class="login_{$colorset}">
<legend>{$lang->cmd_login}...</legend>
<legend>{$lang->cmd_login}</legend>
<h2>Login</h2>
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
@ -54,7 +54,7 @@
<!--@if($member_config->enable_openid=='Y')-->
<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" >
<fieldset id="openid_login" class="openid_login_{$colorset}" style="display:none;">
<legend>{$lang->cmd_login}...</legend>
<legend>{$lang->cmd_login}</legend>
<div class="idpwWrap">
<div class="idpw">
<p>{$lang->openid}</p>

2
widgets/login_info/skins/xe_global/login_info.html
View file

@ -11,7 +11,7 @@
<form action="" method="post">
<fieldset id="login" class="login_{$colorset}">
<legend>{$lang->cmd_login}...</legend>
<legend>{$lang->cmd_login}</legend>
<div class="userName">
<div class="fl u_name"><div class="member_{$logged_info->member_srl}"><strong>{$logged_info->nick_name}</strong></div></div>

4
widgets/login_info/skins/xe_globalTwo/login_form.html
View file

@ -19,7 +19,7 @@
<form action="./" method="post" ruleset="@login" id="fo_login_widget" class="fo_login_widget">
<fieldset id="login" class="login_{$colorset}">
<legend>{$lang->cmd_login}...</legend>
<legend>{$lang->cmd_login}</legend>
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<h2>Login</h2>
@ -55,7 +55,7 @@
<!--@if($member_config->enable_openid=='Y')-->
<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" >
<fieldset id="openid_login" class="openid_login_{$colorset}" style="display:none;">
<legend>{$lang->cmd_login}...</legend>
<legend>{$lang->cmd_login}</legend>
<div class="idpwWrap">
<div class="idpw">
<p>{$lang->openid}</p>

2
widgets/login_info/skins/xe_globalTwo/login_info.html
View file

@ -11,7 +11,7 @@
<form action="" method="post" class="fo_login_widget">
<fieldset id="login" class="login_{$colorset}">
<legend>{$lang->cmd_login}...</legend>
<legend>{$lang->cmd_login}</legend>
<div class="userName">
<div class="fl u_name"><div class="member_{$logged_info->member_srl}"><strong>{$logged_info->nick_name}</strong></div></div>

2
widgets/login_info/skins/xe_solid_enterprise_login/login_form.html
View file

@ -12,7 +12,7 @@ var keep_signed_msg = "{$lang->about_keep_signed}";
<form action="./" method="post" ruleset="@login" id="fo_login_widget">
<fieldset id="login">
<legend>{$lang->cmd_login}...</legend>
<legend>{$lang->cmd_login}</legend>
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<div id="sign_box">

2
widgets/login_info/skins/xe_solid_enterprise_login/login_info.html
View file

@ -4,7 +4,7 @@
<form action="" method="post">
<fieldset id="login" class="login_{$colorset}">
<legend>{$lang->cmd_login}...</legend>
<legend>{$lang->cmd_login}</legend>
<div id="sign_box">
<div class="txt sign_state1"><span class="label">{$logged_info->nick_name}</span></div>
<div class="mbInfo_window" style="overflow:hidden;">