diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php index 8ac44dcfd..8b89b030a 100644 --- a/modules/addon/addon.admin.controller.php +++ b/modules/addon/addon.admin.controller.php @@ -156,7 +156,7 @@ $this->makeCacheFile($site_module_info->site_srl, "pc", 'site'); $this->makeCacheFile($site_module_info->site_srl, "mobile", 'site'); - $this->setRedirectUrl(getNotEncodedUrl('', 'module', $module, 'act', 'dispAddonAdminSetup', 'selected_addon', $addon_name)); + $this->setRedirectUrl(getNotEncodedUrl('', 'module', $module, 'act', 'dispAddonAdminSetup', 'selected_addon', $addon_name), $output); } diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index f087e7480..55bc061da 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -169,12 +169,8 @@ // Save File FileHandler::writeFile($theme_file, $theme_buff); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminTheme'); - header('location:'.$returnUrl); - return; - } - else return $output; + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminTheme'); + return $this->setRedirectUrl($returnUrl, $output); } /** @@ -209,7 +205,8 @@ if (!$output->toBool()) return $output; $this->add('result', $result); - $this->setRedirectUrl(Context::get('error_return_url')); + + return $this->setRedirectUrl(Context::get('error_return_url'), $output); } /** @@ -264,11 +261,9 @@ } $this->setMessage('success_updated', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup'); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup'); + $this->setRedirectUrl($returnUrl); } /** @@ -287,11 +282,9 @@ $oModuleController->insertModuleConfig('admin', $oAdminConfig); $this->setMessage('success_deleted', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup'); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup'); + $this->setRedirectUrl($returnUrl); } /** diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php index e53047040..3059a49ee 100644 --- a/modules/comment/comment.admin.controller.php +++ b/modules/comment/comment.admin.controller.php @@ -34,11 +34,8 @@ $this->procCommentAdminChangeStatus(); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_keyword', ''); - header('location:'.$returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_keyword', ''); + $this->setRedirectUrl($returnUrl); } /** @@ -229,11 +226,8 @@ //$this->setMessage( sprintf(Context::getLang('msg_checked_comment_is_deleted'), $deleted_count) ); $this->setMessage($msgCode, 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_keyword', $search_keyword, 'search_target', $search_target); - header('location:'.$returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_keyword', $search_keyword, 'search_target', $search_target); + $this->setRedirectUrl($returnUrl); } /** diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index 0e1e0c5ac..b39000b77 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -866,11 +866,9 @@ $this->setError(-1); $this->setMessage('success_updated', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); + $this->setRedirectUrl($returnUrl); } /** diff --git a/modules/communication/communication.admin.controller.php b/modules/communication/communication.admin.controller.php index 27d478a4e..2c38d2683 100644 --- a/modules/communication/communication.admin.controller.php +++ b/modules/communication/communication.admin.controller.php @@ -28,12 +28,8 @@ $oModuleController = &getController('module'); $output = $oModuleController->insertModuleConfig('communication',$args); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommunicationAdminConfig'); - $this->setRedirectUrl($returnUrl); - return; - } - else return $output; + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommunicationAdminConfig'); + return $this->setRedirectUrl($returnUrl, $output); } } diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php index 9bdfaa671..d9352b386 100644 --- a/modules/communication/communication.controller.php +++ b/modules/communication/communication.controller.php @@ -28,12 +28,8 @@ $output = executeQuery('communication.updateAllowMessage', $args); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationMessages', 'message_type', Context::get('message_type')); - header('location:'.$returnUrl); - return; - } - return $output; + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationMessages', 'message_type', Context::get('message_type')); + return $this->setRedirectUrl($returnUrl, $output); } /** @@ -252,11 +248,8 @@ $this->setMessage('success_deleted'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationMessages', 'message_type', Context::get('message_type')); - header('location:'.$returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationMessages', 'message_type', Context::get('message_type')); + $this->setRedirectUrl($returnUrl); } /** @@ -325,11 +318,9 @@ if(!$output->toBool()) return $output; $this->setMessage('success_moved'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationFriend'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationFriend'); + $this->setRedirectUrl($returnUrl); } /** @@ -365,11 +356,9 @@ if(!$output->toBool()) return $output; $this->setMessage('success_deleted'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationFriend'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationFriend'); + $this->setRedirectUrl($returnUrl); } /** diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index c04511847..3d1ea54e4 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -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); } /** diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 5d073b59b..6d702968b 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -1341,11 +1341,8 @@ class documentController extends document { $this->add('category_srl', $args->category_srl); $this->add('parent_srl', $args->parent_srl); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : Context::get('error_return_url'); - header('location:'.$returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : Context::get('error_return_url'); + $this->setRedirectUrl($returnUrl); } /** @@ -1885,11 +1882,9 @@ class documentController extends document { $_SESSION['document_management'] = array(); $this->setMessage($msg_code); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList'); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList'); + $this->setRedirectUrl($returnUrl); } /** @@ -1922,11 +1917,9 @@ class documentController extends document { } $this->setError(-1); $this->setMessage('success_updated', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); + $this->setRedirectUrl($returnUrl); } /** diff --git a/modules/editor/editor.admin.controller.php b/modules/editor/editor.admin.controller.php index c0e9d3f2a..074ef4873 100644 --- a/modules/editor/editor.admin.controller.php +++ b/modules/editor/editor.admin.controller.php @@ -119,9 +119,7 @@ $oEditorController->removeCache($args->site_srl); $this->setMessage('success_updated'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $this->setRedirectUrl(Context::get('error_return_url')); - } + $this->setRedirectUrl(Context::get('error_return_url')); } /** diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php index c9f2047e3..c16312512 100644 --- a/modules/editor/editor.controller.php +++ b/modules/editor/editor.controller.php @@ -132,11 +132,9 @@ $this->setError(-1); $this->setMessage('success_updated', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); + $this->setRedirectUrl($returnUrl); } /** diff --git a/modules/file/file.admin.controller.php b/modules/file/file.admin.controller.php index 36a8e0e22..be2a1ed6c 100644 --- a/modules/file/file.admin.controller.php +++ b/modules/file/file.admin.controller.php @@ -72,11 +72,9 @@ } $this->setMessage( sprintf(Context::getLang('msg_checked_file_is_deleted'), $file_count) ); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminList'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminList'); + $this->setRedirectUrl($returnUrl); } /** @@ -95,12 +93,9 @@ // Create module Controller object $oModuleController = &getController('module'); $output = $oModuleController->insertModuleConfig('file',$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', 'dispFileAdminConfig'); - header('location:'.$returnUrl); - return; - } - return $output; + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminConfig'); + return $this->setRedirectUrl($returnUrl, $output); } /** @@ -146,11 +141,9 @@ $this->setError(-1); $this->setMessage('success_updated', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); + $this->setRedirectUrl($returnUrl); } /** diff --git a/modules/integration_search/integration_search.admin.controller.php b/modules/integration_search/integration_search.admin.controller.php index c29397300..466fa3e54 100644 --- a/modules/integration_search/integration_search.admin.controller.php +++ b/modules/integration_search/integration_search.admin.controller.php @@ -34,12 +34,8 @@ $oModuleController = &getController('module'); $output = $oModuleController->insertModuleConfig('integration_search',$args); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent'); - header('location:'.$returnUrl); - return; - } - else return $output; + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent'); + return $this->setRedirectUrl($returnUrl, $output); } /** @@ -112,12 +108,9 @@ $output = $oModuleController->insertModuleConfig('integration_search',$args); $this->setMessage('success_updated', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminSkinInfo'); - $this->setRedirectUrl($returnUrl); - return; - } - else $output; + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminSkinInfo'); + return $this->setRedirectUrl($returnUrl, $output); } } ?> diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php index 1b7181e0a..9a81c5ffe 100644 --- a/modules/layout/layout.admin.controller.php +++ b/modules/layout/layout.admin.controller.php @@ -44,7 +44,7 @@ $output = $this->procLayoutAdminUpdate(); if (!$output->toBool()) return $output; - $this->setRedirectUrl(Context::get('success_return_url')); + return $this->setRedirectUrl(Context::get('success_return_url'), $output); } /** @@ -188,8 +188,7 @@ $output = $this->updateLayout($args); if(!$output->toBool()) return $output; - $this->setRedirectUrl(Context::get('error_return_url')); - return new Object(); + return $this->setRedirectUrl(Context::get('error_return_url'), $output); } /** diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index f7ed1944e..48973af8c 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -103,11 +103,9 @@ if (is_uploaded_file($image_name['tmp_name'])){ $oMemberController->insertImageName($args->member_srl, $image_name['tmp_name']); } - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList'); + $this->setRedirectUrl($returnUrl); } /** @@ -232,11 +230,8 @@ // default setting end $this->setMessage('success_updated'); - 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', 'dispMemberAdminConfig'); - $this->setRedirectUrl($returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminConfig'); + $this->setRedirectUrl($returnUrl); } function _createSignupRuleset($signupForm, $agreement = null){ @@ -345,11 +340,8 @@ $this->add('page',Context::get('page')); $this->setMessage('success_registed'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); - header('location:'.$returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); + $this->setRedirectUrl($returnUrl); } /** @@ -367,11 +359,8 @@ $this->add('page',Context::get('page')); $this->setMessage('success_updated'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); - header('location:'.$returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); + $this->setRedirectUrl($returnUrl); } /** @@ -387,11 +376,8 @@ $this->add('page',Context::get('page')); $this->setMessage('success_deleted'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); - header('location:'.$returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); + $this->setRedirectUrl($returnUrl); } /** @@ -452,11 +438,8 @@ $this->setMessage('success_registed'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminJoinFormList'); - $this->setRedirectUrl($returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminJoinFormList'); + $this->setRedirectUrl($returnUrl); } function procMemberAdminDeleteJoinForm(){ @@ -573,11 +556,8 @@ } } - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList'); - $this->setRedirectUrl($returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList'); + $this->setRedirectUrl($returnUrl); } /** @@ -673,11 +653,8 @@ $this->add('user_ids', implode(',',$success_ids)); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminDeniedIDList'); - header('location:'.$returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminDeniedIDList'); + $this->setRedirectUrl($returnUrl); } /** @@ -813,11 +790,8 @@ $this->setMessage('success_updated'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); - $this->setRedirectUrl($returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); + $this->setRedirectUrl($returnUrl); } function procMemberAdminUpdateGroupOrder() { @@ -829,7 +803,7 @@ executeQuery('member.updateMemberGroupListOrder', $args); } - header(sprintf('Location:%s', getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'))); + $this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList')); } /** diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 1b069f4a1..f7b4889cc 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -55,19 +55,15 @@ } } - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - - if(!$config->after_login_url) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); - } else { - $returnUrl = $config->after_login_url; - } - - $this->setRedirectUrl($returnUrl); - return; + if(!$config->after_login_url) + { + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); } - - return $output; + else + { + $returnUrl = $config->after_login_url; + } + return $this->setRedirectUrl($returnUrl, $output); } /** @@ -109,8 +105,8 @@ $ApprovedURL = Context::getRequestUri(RELEASE_SSL) . "?module=member&act=" . $validator. "&goto=" . $goto; $redirect_url = $auth_request->redirectURL($trust_root, $ApprovedURL); $this->add("redirect_url", $redirect_url); - if (Context::getRequestMethod() == 'POST') - header("location:" . $redirect_url); + + $this->setRedirectUrl($redirect_url); } function getLegacyUserIDsFromOpenID($openid_identity) { @@ -421,10 +417,10 @@ /** * @brief Save posts - * @Deplicated - instead Document Controller - procDocumentTempSave method use + * @Deprecated - instead Document Controller - procDocumentTempSave method use **/ function procMemberSaveDocument() { - return new Object(0, 'Deplicated method'); + return new Object(0, 'Deprecated method'); } /** @@ -589,28 +585,24 @@ $trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config); if(!$trigger_output->toBool()) return $trigger_output; - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) + if($config->redirect_url) { - if($config->redirect_url) - { - $returnUrl = $config->redirect_url; - } - else - { - if(Context::get('success_return_url')) - { - $returnUrl = Context::get('success_return_url'); - } - else if($_COOKIE['XE_REDIRECT_URL']) - { - $returnUrl = $_COOKIE['XE_REDIRECT_URL']; - setcookie("XE_REDIRECT_URL", '', 1); - } - } - - header('location:' . $returnUrl); - return; + $returnUrl = $config->redirect_url; } + else + { + if(Context::get('success_return_url')) + { + $returnUrl = Context::get('success_return_url'); + } + else if($_COOKIE['XE_REDIRECT_URL']) + { + $returnUrl = $_COOKIE['XE_REDIRECT_URL']; + setcookie("XE_REDIRECT_URL", '', 1); + } + } + + $this->setRedirectUrl($returnUrl); } /** @@ -697,11 +689,9 @@ // Return result $this->add('member_srl', $args->member_srl); $this->setMessage('success_updated'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo'); + $this->setRedirectUrl($returnUrl); } /** @@ -734,11 +724,9 @@ $this->add('member_srl', $args->member_srl); $this->setMessage('success_updated'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo'); + $this->setRedirectUrl($returnUrl); } /** @@ -769,11 +757,9 @@ $this->destroySessionInfo(); // Return success message $this->setMessage('success_leaved'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); + $this->setRedirectUrl($returnUrl); } /** @@ -817,11 +803,9 @@ $this->insertProfileImage($member_srl, $file['tmp_name']); // Page refresh //$this->setRefreshPage(); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo'); + $this->setRedirectUrl($returnUrl); } function insertProfileImage($member_srl, $target_file) { @@ -868,11 +852,9 @@ $this->insertImageName($member_srl, $file['tmp_name']); // Page refresh //$this->setRefreshPage(); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo'); + $this->setRedirectUrl($returnUrl); } function insertImageName($member_srl, $target_file) { @@ -962,11 +944,9 @@ $this->insertImageMark($member_srl, $file['tmp_name']); // Page refresh //$this->setRefreshPage(); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo'); + $this->setRedirectUrl($returnUrl); } function insertImageMark($member_srl, $target_file) { @@ -1134,11 +1114,8 @@ $this->add('user_id',$user_id); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); - $this->setRedirectUrl($returnUrl.'&user_id='.$user_id); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); + $this->setRedirectUrl($returnUrl.'&user_id='.$user_id); } /** @@ -1293,11 +1270,9 @@ $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address); $this->setMessage($msg); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); + $this->setRedirectUrl($returnUrl); } /** @@ -2214,11 +2189,8 @@ $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $newEmail); $this->setMessage($msg); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); - header('location:'.$returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); + $this->setRedirectUrl($returnUrl); } function procMemberAuthEmailAddress(){ diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index 509757cb4..a14b35ff6 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -54,11 +54,8 @@ $this->add('menu_srl', $args->menu_srl); $this->setMessage('success_registed'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent'); - $this->setRedirectUrl($returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent'); + $this->setRedirectUrl($returnUrl); } /** @@ -74,11 +71,9 @@ if(!$output->toBool()) return $output; $this->setMessage('success_registed'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl); + $this->setRedirectUrl($returnUrl); } /** @@ -97,11 +92,9 @@ $this->deleteMenu($menu_srl); $this->setMessage('success_deleted', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap'); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap'); + $this->setRedirectUrl($returnUrl); } /** @@ -275,11 +268,9 @@ $this->add('parent_srl', $args->parent_srl); $this->setMessage($message, 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap', 'menu_srl', $args->menu_srl); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap', 'menu_srl', $args->menu_srl); + $this->setRedirectUrl($returnUrl); } /** @@ -321,11 +312,8 @@ $this->add('menu_item_srl', $parent_srl); $this->setMessage('success_deleted'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl); - $this->setRedirectUrl($returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl); + $this->setRedirectUrl($returnUrl); } /** @@ -401,11 +389,9 @@ } $this->setMessage('success_updated', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl); + $this->setRedirectUrl($returnUrl); } /** @@ -649,11 +635,8 @@ // Update the xml file and get its location $xml_file = $this->makeXmlFile($args->menu_srl); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup'); - $this->setRedirectUrl($returnUrl); - return; - } + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup'); + $this->setRedirectUrl($returnUrl); } /** diff --git a/modules/message/message.admin.controller.php b/modules/message/message.admin.controller.php index eed7ee199..3fb6bbe2c 100644 --- a/modules/message/message.admin.controller.php +++ b/modules/message/message.admin.controller.php @@ -25,11 +25,9 @@ if(!$output->toBool()) return $output; $this->setMessage('success_updated'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMessageAdminConfig'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMessageAdminConfig'); + $this->setRedirectUrl($returnUrl); } } ?> diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php index 343a4fdf9..5edecd520 100644 --- a/modules/module/module.admin.controller.php +++ b/modules/module/module.admin.controller.php @@ -22,11 +22,9 @@ if(!$output->toBool()) return $output; $this->setMessage("success_registed"); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory'); + $this->setRedirectUrl($returnUrl); } /** @@ -37,11 +35,9 @@ if(!$output->toBool()) return $output; $this->setMessage('success_updated'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory'); + $this->setRedirectUrl($returnUrl); } /** @@ -52,11 +48,9 @@ if(!$output->toBool()) return $output; $this->setMessage('success_deleted'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory'); + $this->setRedirectUrl($returnUrl); } /** @@ -492,11 +486,9 @@ $this->add('name', $args->name); $this->setMessage("success_saved", 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', $module, 'target', $target, 'act', 'dispModuleAdminLangcode'); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', $module, 'target', $target, 'act', 'dispModuleAdminLangcode'); + $this->setRedirectUrl($returnUrl); } /** @@ -516,11 +508,9 @@ $this->makeCacheDefinedLangCode($args->site_srl); $this->setMessage("success_deleted", 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminLangcode'); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminLangcode'); + $this->setRedirectUrl($returnUrl); } function procModuleAdminGetList() diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php index 2cd5e7805..2253d057a 100644 --- a/modules/module/module.controller.php +++ b/modules/module/module.controller.php @@ -783,7 +783,7 @@ if (!$ajax) { $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminFileBox'); - header('location:'.$returnUrl); + $this->setRedirectUrl($returnUrl); return; } else diff --git a/modules/page/page.admin.controller.php b/modules/page/page.admin.controller.php index 8f7e6e7ad..f664767a9 100644 --- a/modules/page/page.admin.controller.php +++ b/modules/page/page.admin.controller.php @@ -80,11 +80,9 @@ $this->add("page", Context::get('page')); $this->add('module_srl',$output->get('module_srl')); $this->setMessage($msg_code); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'module_srl', $output->get('module_srl'), 'act', 'dispPageAdminInfo'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'module_srl', $output->get('module_srl'), 'act', 'dispPageAdminInfo'); + $this->setRedirectUrl($returnUrl); } /** @@ -178,11 +176,9 @@ $this->add('module','page'); $this->add('page',Context::get('page')); $this->setMessage('success_deleted'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'module_srl', $output->get('module_srl'), 'act', 'dispPageAdminInfo'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'module_srl', $output->get('module_srl'), 'act', 'dispPageAdminInfo'); + $this->setRedirectUrl($returnUrl); } /** diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php index 45276dc30..5ba78bedc 100644 --- a/modules/point/point.admin.controller.php +++ b/modules/point/point.admin.controller.php @@ -82,11 +82,9 @@ $oModuleController->insertModuleConfig('point', $config); $this->setMessage('success_updated'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminConfig'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminConfig'); + $this->setRedirectUrl($returnUrl); } /** @@ -145,11 +143,9 @@ $this->setError(-1); $this->setMessage('success_updated', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); + $this->setRedirectUrl($returnUrl); } /** @@ -183,12 +179,9 @@ $this->setError(-1); $this->setMessage('success_updated', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminPointList'); - $this->setRedirectUrl($returnUrl); - return; - } - return $output; + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminPointList'); + return $this->setRedirectUrl($returnUrl, $output); } /** diff --git a/modules/poll/poll.admin.controller.php b/modules/poll/poll.admin.controller.php index 7cc7bfc3b..b992f4983 100644 --- a/modules/poll/poll.admin.controller.php +++ b/modules/poll/poll.admin.controller.php @@ -24,11 +24,9 @@ $oModuleController->insertModuleConfig('poll', $config); $this->setMessage('success_updated'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminConfig'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminConfig'); + $this->setRedirectUrl($returnUrl); } /** @@ -53,11 +51,9 @@ } $this->setMessage( sprintf(Context::getLang('msg_checked_poll_is_deleted'), $poll_count) ); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminList'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminList'); + $this->setRedirectUrl($returnUrl); } function procPollAdminAddCart() diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php index cc7288e0a..792b81b7d 100644 --- a/modules/poll/poll.controller.php +++ b/modules/poll/poll.controller.php @@ -168,11 +168,9 @@ $this->add('poll_srl', $poll_srl); $this->add('tpl',$tpl); $this->setMessage('success_poll'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminConfig'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminConfig'); + $this->setRedirectUrl($returnUrl); } /** diff --git a/modules/rss/rss.admin.controller.php b/modules/rss/rss.admin.controller.php index 815ed9449..9ebf53297 100644 --- a/modules/rss/rss.admin.controller.php +++ b/modules/rss/rss.admin.controller.php @@ -75,11 +75,9 @@ //$this->setLayoutFile('default_layout.html'); //$this->setTemplatePath($this->module_path.'tpl'); //$this->setTemplateFile("top_refresh.html"); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispRssAdminIndex'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispRssAdminIndex'); + $this->setRedirectUrl($returnUrl); } @@ -115,11 +113,9 @@ //$this->setError(0); $this->setMessage('success_updated', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); + $this->setRedirectUrl($returnUrl); } diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php index 8b0071b7c..a20bb6b61 100644 --- a/modules/spamfilter/spamfilter.admin.controller.php +++ b/modules/spamfilter/spamfilter.admin.controller.php @@ -27,12 +27,8 @@ $moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter',$argsConfig); if(!$moduleConfigOutput->toBool()) return $moduleConfigOutput; - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting'); - header('location:'.$returnUrl); - return; - } - return false; + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting'); + $this->setRedirectUrl($returnUrl); } function procSpamfilterAdminInsertDeniedIP(){ @@ -43,13 +39,9 @@ $insertIPOutput = $oSpamfilterController->insertIP($ipaddressList); if(!$insertIPOutput->toBool()) return $insertIPOutput; } - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting'); - header('location:'.$returnUrl); - return; - } - return false; + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting'); + $this->setRedirectUrl($returnUrl); } function procSpamfilterAdminInsertDeniedWord(){ //스팸 키워드 추가 @@ -58,12 +50,9 @@ $insertWordOutput = $this->insertWord($wordList); if(!$insertWordOutput->toBool()) return $insertWordOutput; } - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting'); - header('location:'.$returnUrl); - return; - } - return false; + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting'); + $this->setRedirectUrl($returnUrl); } /** @@ -72,12 +61,9 @@ function procSpamfilterAdminDeleteDeniedIP() { $ipaddress = Context::get('ipaddress'); $output = $this->deleteIP($ipaddress); - 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', 'dispSpamfilterAdminSetting'); - header('location:'.$returnUrl); - return; - } - return $output; + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting'); + return $this->setRedirectUrl($returnUrl, $output); } /** @@ -88,12 +74,8 @@ //$word = base64_decode(Context::get('word')); $output = $this->deleteWord($word); - 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', 'dispSpamfilterAdminSetting'); - header('location:'.$returnUrl); - return; - } - return $output; + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting'); + return $this->setRedirectUrl($returnUrl, $output); } /** diff --git a/modules/trackback/trackback.admin.controller.php b/modules/trackback/trackback.admin.controller.php index fab6fa61a..684c068e7 100644 --- a/modules/trackback/trackback.admin.controller.php +++ b/modules/trackback/trackback.admin.controller.php @@ -38,11 +38,9 @@ } $this->setMessage( sprintf(Context::getLang('msg_checked_trackback_is_deleted'), $trackback_count) ); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrackbackAdminList'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrackbackAdminList'); + $this->setRedirectUrl($returnUrl); } /** @@ -55,12 +53,9 @@ $oModuleController = &getController('module'); $output = $oModuleController->insertModuleConfig('trackback',$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', 'dispTrackbackAdminList'); - header('location:'.$returnUrl); - return; - } - return $output; + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrackbackAdminList'); + return $this->setRedirectUrl($returnUrl, $output); } /** @@ -86,11 +81,9 @@ $this->setError(-1); $this->setMessage('success_updated', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); - header('location:'.$returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent'); + $this->setRedirectUrl($returnUrl); } /** diff --git a/modules/trash/trash.admin.controller.php b/modules/trash/trash.admin.controller.php index 64958931a..59273e311 100644 --- a/modules/trash/trash.admin.controller.php +++ b/modules/trash/trash.admin.controller.php @@ -56,12 +56,9 @@ class trashAdminController extends trash if(!$this->_emptyTrash($trashSrls)) return new Object(-1, $lang->fail_empty); $this->setMessage('success_deleted', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList', 'origin_module', $originModule); - $this->setRedirectUrl($returnUrl); - return; - } - return new Object(0, $lang->success_empty); + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList', 'origin_module', $originModule); + return $this->setRedirectUrl($returnUrl, $output); } /** @@ -152,11 +149,9 @@ class trashAdminController extends trash } $this->setMessage('success_restore', 'info'); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList'); - $this->setRedirectUrl($returnUrl); - return; - } + + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList'); + $this->setRedirectUrl($returnUrl); } /**