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

issue 2112 improve setRedirectUrl method

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10828 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-07-04 06:00:47 +00:00
parent fe4a304318
commit 011120e5e0
27 changed files with 234 additions and 438 deletions
Download patch file Download diff file Expand all files Collapse all files

32
modules/document/document.admin.controller.php
View file

@ -419,12 +419,8 @@
$oModuleController = &getController('module');
$output = $oModuleController->insertModuleConfig('document',$config);
if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminConfig');
header('location:'.$returnUrl);
return;
}
return $output;
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminConfig');
return $this->setRedirectUrl($returnUrl, $output);
}
/**
@ -511,11 +507,9 @@
if(!$output->toBool()) return $output;
$this->setMessage('success_registed');
if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $args->document_srl);
$this->setRedirectUrl($returnUrl);
return;
}
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $args->document_srl);
$this->setRedirectUrl($returnUrl);
}
/**
@ -618,12 +612,8 @@
}
$output = executeQuery($query, $args);
if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $args->document_srl);
header('location:'.$returnUrl);
return;
}
return $output;
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $args->document_srl);
return $this->setRedirectUrl($returnUrl, $output);
}
/**
@ -636,12 +626,8 @@
$args->alias_srl = $alias_srl;
$output = executeQuery("document.deleteAlias", $args);
if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $document_srl);
header('location:'.$returnUrl);
return;
}
return $output;
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $document_srl);
return $this->setRedirectUrl($returnUrl, $output);
}
/**