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

merge from 1.5.3.1 (r10978-r11049)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11050 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-08-20 07:56:33 +00:00
commit 0b4f79f420
6 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.htaccess
View file

@ -3,7 +3,7 @@ RewriteEngine On
# reserve XE Layout Template Source File (*.html) # reserve XE Layout Template Source File (*.html)
RewriteRule ^(layouts|m.layouts)/(.+)\.html$ - [L,F] RewriteRule ^(layouts|m.layouts)/(.+)\.html$ - [L,F]
# reserve XE Template Source Files (*.html) # reserve XE Template Source Files (*.html)
RewriteRule /(skins|m.skins|tpl)/(.+)\.html$ - [L,F] RewriteRule /(skins|m.skins)/(.+)\.html$ - [L,F]
# conf, query, schema # conf, query, schema
RewriteRule ^(modules|addons|widgets)/(.+)/(conf|queries|schemas)/(.+)\.xml$ ./index.php [L] RewriteRule ^(modules|addons|widgets)/(.+)/(conf|queries|schemas)/(.+)\.xml$ ./index.php [L]

6
common/tpl/common_layout.html
View file

@ -1,12 +1,13 @@
{@ {@
$db_info = Context::getDBInfo(); $db_info = Context::getDBInfo();
$lang_type = Context::getLangType(); $lang_type = Context::getLangType();
$ssl_actions = Context::getSSLActions();
$css_files=Context::getCssFile();
$js_files=Context::getJsFile();
} }
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{$lang_type}"> <html lang="{$lang_type}">
<head> <head>
{@$css_files=Context::getCssFile()}
{@$js_files=Context::getJsFile()}
<!-- META --> <!-- META -->
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="Generator" content="XpressEngine" /> <meta name="Generator" content="XpressEngine" />
@ -55,7 +56,6 @@ var default_url = "{Context::getDefaultUrl()}";
{Context::getHtmlFooter()} {Context::getHtmlFooter()}
<!-- ETC --> <!-- ETC -->
<div class="wfsr"></div> <div class="wfsr"></div>
{@$ssl_actions=Context::getSSLActions()}
{@ $js_body_files = Context::getJsFile('body') } {@ $js_body_files = Context::getJsFile('body') }
<block loop="$js_body_files => $key, $js_file"> <block loop="$js_body_files => $key, $js_file">
<block cond="$js_file['targetie']"><!--[if {$js_file['targetie']}]></block><script src="{$js_file['file']}"></script><block cond="$js_file['targetie']"><![endif]--></block> <block cond="$js_file['targetie']"><!--[if {$js_file['targetie']}]></block><script src="{$js_file['file']}"></script><block cond="$js_file['targetie']"><![endif]--></block>

2
config/config.inc.php
View file

@ -14,7 +14,7 @@
* Display XE's full version * Display XE's full version
* Even The file should be revised when releasing altough no change is made * Even The file should be revised when releasing altough no change is made
*/ */
define('__XE_VERSION__', '1.5.3'); define('__XE_VERSION__', '1.5.3.1');
/** /**
* @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead. * @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.

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

@ -168,7 +168,12 @@
if($args->enable_confirm !='Y') $args->enable_confirm = 'N'; if($args->enable_confirm !='Y') $args->enable_confirm = 'N';
$args->limit_day = (int)$args->limit_day; $args->limit_day = (int)$args->limit_day;
if(!$args->change_password_date) $args->change_password_date = 0; if(!$args->change_password_date) $args->change_password_date = 0;
if(!trim(strip_tags($args->agreement))) $args->agreement = null; if(!trim(strip_tags($args->agreement)))
{
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
FileHandler::removeFile($agreement_file);
$args->agreement = null;
}
if(!trim(strip_tags($args->after_login_url))) $args->after_login_url = null; if(!trim(strip_tags($args->after_login_url))) $args->after_login_url = null;
if(!trim(strip_tags($args->after_logout_url))) $args->after_logout_url = null; if(!trim(strip_tags($args->after_logout_url))) $args->after_logout_url = null;
if(!trim(strip_tags($args->redirect_url))) $args->redirect_url = null; if(!trim(strip_tags($args->redirect_url))) $args->redirect_url = null;

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

@ -33,6 +33,7 @@
Context::addSSLAction('dispMemberResendAuthMail'); Context::addSSLAction('dispMemberResendAuthMail');
Context::addSSLAction('dispMemberLoginForm'); Context::addSSLAction('dispMemberLoginForm');
Context::addSSLAction('dispMemberFindAccount'); Context::addSSLAction('dispMemberFindAccount');
Context::addSSLAction('dispMemberLeave');
Context::addSSLAction('procMemberLogin'); Context::addSSLAction('procMemberLogin');
Context::addSSLAction('procMemberModifyPassword'); Context::addSSLAction('procMemberModifyPassword');
Context::addSSLAction('procMemberInsert'); Context::addSSLAction('procMemberInsert');
@ -41,7 +42,8 @@
Context::addSSLAction('procMemberModifyEmailAddress'); Context::addSSLAction('procMemberModifyEmailAddress');
Context::addSSLAction('procMemberUpdateAuthMail'); Context::addSSLAction('procMemberUpdateAuthMail');
Context::addSSLAction('procMemberResendAuthMail'); Context::addSSLAction('procMemberResendAuthMail');
Context::addSSLAction('getMemberMenu'); Context::addSSLAction('procMemberLeave');
//Context::addSSLAction('getMemberMenu');
} }
} }

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

@ -37,7 +37,7 @@
} }
// Get terms of user // Get terms of user
$config->agreement = $this->_getAgreement(); $config->agreement = self::_getAgreement();
if(!$config->webmaster_name) $config->webmaster_name = 'webmaster'; if(!$config->webmaster_name) $config->webmaster_name = 'webmaster';
if(!$config->image_name_max_width) $config->image_name_max_width = 90; if(!$config->image_name_max_width) $config->image_name_max_width = 90;
@ -213,7 +213,7 @@
if(!$user_id) return; if(!$user_id) return;
$args->user_id = $user_id; $args->user_id = $user_id;
$output = executeQuery('member.getMemberInfo', $args, $columnList); $output = executeQuery('member.getMemberInfo', $args);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
if(!$output->data) return; if(!$output->data) return;