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

after join, redirect_url modify by module selector

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12487 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-12-28 01:33:18 +00:00
parent c5d81668c2
commit c82e654111
5 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -191,9 +191,13 @@ class memberAdminController extends member
FileHandler::removeFile($agreement_file);
$args->agreement = NULL;
}
if(!trim(strip_tags($args->redirect_url)))
if($args->redirect_url)
{
$args->redirect_url = NULL;
$tmpArgs->menu_item_srl = (int)$args->redirect_url;
$output = executeQuery('module.getModuleInfoByMenuItemSrl', $tmpArgs);
$args->redirect_url = Context::getDefaultUrl().$output->data->mid;
}
$args->profile_image = $args->profile_image ? 'Y' : 'N';

13
modules/member/member.admin.view.php
View file

@ -134,6 +134,19 @@ class memberAdminView extends member
{
$config = $this->memberConfig;
if($config->redirect_url)
{
$mid = str_ireplace(Context::getDefaultUrl(), '', $config->redirect_url);
$siteModuleInfo = Context::get('site_module_info');
$oModuleModel = getModel('module');
$moduleInfo = $oModuleModel->getModuleInfoByMid($mid, (int)$siteModuleInfo->site_srl);
$config->redirect_url = $moduleInfo->module_srl;
Context::set('config', $config);
}
$oMemberModel = getModel('member');
// retrieve skins of editor
$oEditorModel = getModel('editor');

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

@ -55,7 +55,7 @@
<div class="x_control-group">
<label class="x_control-label" for="redirect_url">{$lang->redirect_url}</label>
<div class="x_controls">
<input type="url" id="redirect_url" name="redirect_url" value="{$config->redirect_url}" />
<input class="module_search" type="text" name="redirect_url" value="{$config->redirect_url}" />
<p class="x_help-inline">{$lang->about_redirect_url}</p>
</div>
</div>

9
modules/module/module.admin.model.php
View file

@ -535,7 +535,14 @@ class moduleAdminModel extends module
*/
function getModuleAdminModuleInfo()
{
$module_srl = Context::get('module_srl');
if(Context::get('search_module_srl'))
{
$module_srl = Context::get('search_module_srl');
}
else
{
$module_srl = Context::get('module_srl');
}
$model = getModel('module');
$module_info = $model->getModuleInfoByModuleSrl($module_srl);

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

@ -478,7 +478,7 @@ class moduleController extends module
// only delete module
else
{
return $this->onlyDeleteModule($modue_srl);
return $this->onlyDeleteModule($module_srl);
}
}