fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +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

2
modules/addon/addon.admin.controller.php
View file

@ -156,7 +156,7 @@
$this->makeCacheFile($site_module_info->site_srl, "pc", 'site'); $this->makeCacheFile($site_module_info->site_srl, "pc", 'site');
$this->makeCacheFile($site_module_info->site_srl, "mobile", '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);
} }

27
modules/admin/admin.admin.controller.php
View file

@ -169,12 +169,8 @@
// Save File // Save File
FileHandler::writeFile($theme_file, $theme_buff); 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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminTheme'); return $this->setRedirectUrl($returnUrl, $output);
header('location:'.$returnUrl);
return;
}
else return $output;
} }
/** /**
@ -209,7 +205,8 @@
if (!$output->toBool()) return $output; if (!$output->toBool()) return $output;
$this->add('result', $result); $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'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -287,11 +282,9 @@
$oModuleController->insertModuleConfig('admin', $oAdminConfig); $oModuleController->insertModuleConfig('admin', $oAdminConfig);
$this->setMessage('success_deleted', 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**

14
modules/comment/comment.admin.controller.php
View file

@ -34,11 +34,8 @@
$this->procCommentAdminChangeStatus(); $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', '');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_keyword', ''); $this->setRedirectUrl($returnUrl);
header('location:'.$returnUrl);
return;
}
} }
/** /**
@ -229,11 +226,8 @@
//$this->setMessage( sprintf(Context::getLang('msg_checked_comment_is_deleted'), $deleted_count) ); //$this->setMessage( sprintf(Context::getLang('msg_checked_comment_is_deleted'), $deleted_count) );
$this->setMessage($msgCode, 'info'); $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);
$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);
header('location:'.$returnUrl);
return;
}
} }
/** /**

8
modules/comment/comment.controller.php
View file

@ -866,11 +866,9 @@
$this->setError(-1); $this->setError(-1);
$this->setMessage('success_updated', 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**

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

@ -28,12 +28,8 @@
$oModuleController = &getController('module'); $oModuleController = &getController('module');
$output = $oModuleController->insertModuleConfig('communication',$args); $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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommunicationAdminConfig'); return $this->setRedirectUrl($returnUrl, $output);
$this->setRedirectUrl($returnUrl);
return;
}
else return $output;
} }
} }

31
modules/communication/communication.controller.php
View file

@ -28,12 +28,8 @@
$output = executeQuery('communication.updateAllowMessage', $args); $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'));
$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);
header('location:'.$returnUrl);
return;
}
return $output;
} }
/** /**
@ -252,11 +248,8 @@
$this->setMessage('success_deleted'); $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'));
$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);
header('location:'.$returnUrl);
return;
}
} }
/** /**
@ -325,11 +318,9 @@
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$this->setMessage('success_moved'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationFriend');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -365,11 +356,9 @@
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$this->setMessage('success_deleted'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationFriend');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**

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

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

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

@ -1341,11 +1341,8 @@ class documentController extends document {
$this->add('category_srl', $args->category_srl); $this->add('category_srl', $args->category_srl);
$this->add('parent_srl', $args->parent_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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : Context::get('error_return_url'); $this->setRedirectUrl($returnUrl);
header('location:'.$returnUrl);
return;
}
} }
/** /**
@ -1885,11 +1882,9 @@ class documentController extends document {
$_SESSION['document_management'] = array(); $_SESSION['document_management'] = array();
$this->setMessage($msg_code); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -1922,11 +1917,9 @@ class documentController extends document {
} }
$this->setError(-1); $this->setError(-1);
$this->setMessage('success_updated', 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**

4
modules/editor/editor.admin.controller.php
View file

@ -119,9 +119,7 @@
$oEditorController->removeCache($args->site_srl); $oEditorController->removeCache($args->site_srl);
$this->setMessage('success_updated'); $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'));
}
} }
/** /**

8
modules/editor/editor.controller.php
View file

@ -132,11 +132,9 @@
$this->setError(-1); $this->setError(-1);
$this->setMessage('success_updated', 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**

25
modules/file/file.admin.controller.php
View file

@ -72,11 +72,9 @@
} }
$this->setMessage( sprintf(Context::getLang('msg_checked_file_is_deleted'), $file_count) ); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminList');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -95,12 +93,9 @@
// Create module Controller object // Create module Controller object
$oModuleController = &getController('module'); $oModuleController = &getController('module');
$output = $oModuleController->insertModuleConfig('file',$config); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminConfig');
header('location:'.$returnUrl); return $this->setRedirectUrl($returnUrl, $output);
return;
}
return $output;
} }
/** /**
@ -146,11 +141,9 @@
$this->setError(-1); $this->setError(-1);
$this->setMessage('success_updated', 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**

17
modules/integration_search/integration_search.admin.controller.php
View file

@ -34,12 +34,8 @@
$oModuleController = &getController('module'); $oModuleController = &getController('module');
$output = $oModuleController->insertModuleConfig('integration_search',$args); $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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent'); return $this->setRedirectUrl($returnUrl, $output);
header('location:'.$returnUrl);
return;
}
else return $output;
} }
/** /**
@ -112,12 +108,9 @@
$output = $oModuleController->insertModuleConfig('integration_search',$args); $output = $oModuleController->insertModuleConfig('integration_search',$args);
$this->setMessage('success_updated', 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminSkinInfo');
$this->setRedirectUrl($returnUrl); return $this->setRedirectUrl($returnUrl, $output);
return;
}
else $output;
} }
} }
?> ?>

5
modules/layout/layout.admin.controller.php
View file

@ -44,7 +44,7 @@
$output = $this->procLayoutAdminUpdate(); $output = $this->procLayoutAdminUpdate();
if (!$output->toBool()) return $output; 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); $output = $this->updateLayout($args);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$this->setRedirectUrl(Context::get('error_return_url')); return $this->setRedirectUrl(Context::get('error_return_url'), $output);
return new Object();
} }
/** /**

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

@ -103,11 +103,9 @@
if (is_uploaded_file($image_name['tmp_name'])){ if (is_uploaded_file($image_name['tmp_name'])){
$oMemberController->insertImageName($args->member_srl, $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -232,11 +230,8 @@
// default setting end // default setting end
$this->setMessage('success_updated'); $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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminConfig'); $this->setRedirectUrl($returnUrl);
$this->setRedirectUrl($returnUrl);
return;
}
} }
function _createSignupRuleset($signupForm, $agreement = null){ function _createSignupRuleset($signupForm, $agreement = null){
@ -345,11 +340,8 @@
$this->add('page',Context::get('page')); $this->add('page',Context::get('page'));
$this->setMessage('success_registed'); $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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); $this->setRedirectUrl($returnUrl);
header('location:'.$returnUrl);
return;
}
} }
/** /**
@ -367,11 +359,8 @@
$this->add('page',Context::get('page')); $this->add('page',Context::get('page'));
$this->setMessage('success_updated'); $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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); $this->setRedirectUrl($returnUrl);
header('location:'.$returnUrl);
return;
}
} }
/** /**
@ -387,11 +376,8 @@
$this->add('page',Context::get('page')); $this->add('page',Context::get('page'));
$this->setMessage('success_deleted'); $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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); $this->setRedirectUrl($returnUrl);
header('location:'.$returnUrl);
return;
}
} }
/** /**
@ -452,11 +438,8 @@
$this->setMessage('success_registed'); $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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminJoinFormList'); $this->setRedirectUrl($returnUrl);
$this->setRedirectUrl($returnUrl);
return;
}
} }
function procMemberAdminDeleteJoinForm(){ 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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList'); $this->setRedirectUrl($returnUrl);
$this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -673,11 +653,8 @@
$this->add('user_ids', implode(',',$success_ids)); $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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminDeniedIDList'); $this->setRedirectUrl($returnUrl);
header('location:'.$returnUrl);
return;
}
} }
/** /**
@ -813,11 +790,8 @@
$this->setMessage('success_updated'); $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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'); $this->setRedirectUrl($returnUrl);
$this->setRedirectUrl($returnUrl);
return;
}
} }
function procMemberAdminUpdateGroupOrder() { function procMemberAdminUpdateGroupOrder() {
@ -829,7 +803,7 @@
executeQuery('member.updateMemberGroupListOrder', $args); executeQuery('member.updateMemberGroupListOrder', $args);
} }
header(sprintf('Location:%s', getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'))); $this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'));
} }
/** /**

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

@ -55,19 +55,15 @@
} }
} }
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { if(!$config->after_login_url)
{
if(!$config->after_login_url) { $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
$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;
} }
else
return $output; {
$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; $ApprovedURL = Context::getRequestUri(RELEASE_SSL) . "?module=member&act=" . $validator. "&goto=" . $goto;
$redirect_url = $auth_request->redirectURL($trust_root, $ApprovedURL); $redirect_url = $auth_request->redirectURL($trust_root, $ApprovedURL);
$this->add("redirect_url", $redirect_url); $this->add("redirect_url", $redirect_url);
if (Context::getRequestMethod() == 'POST')
header("location:" . $redirect_url); $this->setRedirectUrl($redirect_url);
} }
function getLegacyUserIDsFromOpenID($openid_identity) { function getLegacyUserIDsFromOpenID($openid_identity) {
@ -421,10 +417,10 @@
/** /**
* @brief Save posts * @brief Save posts
* @Deplicated - instead Document Controller - procDocumentTempSave method use * @Deprecated - instead Document Controller - procDocumentTempSave method use
**/ **/
function procMemberSaveDocument() { 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); $trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config);
if(!$trigger_output->toBool()) return $trigger_output; 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;
{
$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;
} }
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 // Return result
$this->add('member_srl', $args->member_srl); $this->add('member_srl', $args->member_srl);
$this->setMessage('success_updated'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -734,11 +724,9 @@
$this->add('member_srl', $args->member_srl); $this->add('member_srl', $args->member_srl);
$this->setMessage('success_updated'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -769,11 +757,9 @@
$this->destroySessionInfo(); $this->destroySessionInfo();
// Return success message // Return success message
$this->setMessage('success_leaved'); $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', ''); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -817,11 +803,9 @@
$this->insertProfileImage($member_srl, $file['tmp_name']); $this->insertProfileImage($member_srl, $file['tmp_name']);
// Page refresh // Page refresh
//$this->setRefreshPage(); //$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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
function insertProfileImage($member_srl, $target_file) { function insertProfileImage($member_srl, $target_file) {
@ -868,11 +852,9 @@
$this->insertImageName($member_srl, $file['tmp_name']); $this->insertImageName($member_srl, $file['tmp_name']);
// Page refresh // Page refresh
//$this->setRefreshPage(); //$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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
function insertImageName($member_srl, $target_file) { function insertImageName($member_srl, $target_file) {
@ -962,11 +944,9 @@
$this->insertImageMark($member_srl, $file['tmp_name']); $this->insertImageMark($member_srl, $file['tmp_name']);
// Page refresh // Page refresh
//$this->setRefreshPage(); //$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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
function insertImageMark($member_srl, $target_file) { function insertImageMark($member_srl, $target_file) {
@ -1134,11 +1114,8 @@
$this->add('user_id',$user_id); $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', '');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); $this->setRedirectUrl($returnUrl.'&user_id='.$user_id);
$this->setRedirectUrl($returnUrl.'&user_id='.$user_id);
return;
}
} }
/** /**
@ -1293,11 +1270,9 @@
$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address); $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
$this->setMessage($msg); $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', ''); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -2214,11 +2189,8 @@
$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $newEmail); $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $newEmail);
$this->setMessage($msg); $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', '');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); $this->setRedirectUrl($returnUrl);
header('location:'.$returnUrl);
return;
}
} }
function procMemberAuthEmailAddress(){ function procMemberAuthEmailAddress(){

53
modules/menu/menu.admin.controller.php
View file

@ -54,11 +54,8 @@
$this->add('menu_srl', $args->menu_srl); $this->add('menu_srl', $args->menu_srl);
$this->setMessage('success_registed'); $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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent'); $this->setRedirectUrl($returnUrl);
$this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -74,11 +71,9 @@
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$this->setMessage('success_registed'); $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); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl);
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -97,11 +92,9 @@
$this->deleteMenu($menu_srl); $this->deleteMenu($menu_srl);
$this->setMessage('success_deleted', 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -275,11 +268,9 @@
$this->add('parent_srl', $args->parent_srl); $this->add('parent_srl', $args->parent_srl);
$this->setMessage($message, 'info'); $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); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap', 'menu_srl', $args->menu_srl);
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -321,11 +312,8 @@
$this->add('menu_item_srl', $parent_srl); $this->add('menu_item_srl', $parent_srl);
$this->setMessage('success_deleted'); $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);
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl); $this->setRedirectUrl($returnUrl);
$this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -401,11 +389,9 @@
} }
$this->setMessage('success_updated', 'info'); $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); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl);
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -649,11 +635,8 @@
// Update the xml file and get its location // Update the xml file and get its location
$xml_file = $this->makeXmlFile($args->menu_srl); $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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup'); $this->setRedirectUrl($returnUrl);
$this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**

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

@ -25,11 +25,9 @@
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$this->setMessage('success_updated'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMessageAdminConfig');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
} }
?> ?>

40
modules/module/module.admin.controller.php
View file

@ -22,11 +22,9 @@
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$this->setMessage("success_registed"); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -37,11 +35,9 @@
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$this->setMessage('success_updated'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -52,11 +48,9 @@
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$this->setMessage('success_deleted'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -492,11 +486,9 @@
$this->add('name', $args->name); $this->add('name', $args->name);
$this->setMessage("success_saved", 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', $module, 'target', $target, 'act', 'dispModuleAdminLangcode');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -516,11 +508,9 @@
$this->makeCacheDefinedLangCode($args->site_srl); $this->makeCacheDefinedLangCode($args->site_srl);
$this->setMessage("success_deleted", 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminLangcode');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
function procModuleAdminGetList() function procModuleAdminGetList()

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

@ -783,7 +783,7 @@
if (!$ajax) if (!$ajax)
{ {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminFileBox'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminFileBox');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return; return;
} }
else else

16
modules/page/page.admin.controller.php
View file

@ -80,11 +80,9 @@
$this->add("page", Context::get('page')); $this->add("page", Context::get('page'));
$this->add('module_srl',$output->get('module_srl')); $this->add('module_srl',$output->get('module_srl'));
$this->setMessage($msg_code); $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'); $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); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -178,11 +176,9 @@
$this->add('module','page'); $this->add('module','page');
$this->add('page',Context::get('page')); $this->add('page',Context::get('page'));
$this->setMessage('success_deleted'); $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'); $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); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**

25
modules/point/point.admin.controller.php
View file

@ -82,11 +82,9 @@
$oModuleController->insertModuleConfig('point', $config); $oModuleController->insertModuleConfig('point', $config);
$this->setMessage('success_updated'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminConfig');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -145,11 +143,9 @@
$this->setError(-1); $this->setError(-1);
$this->setMessage('success_updated', 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -183,12 +179,9 @@
$this->setError(-1); $this->setError(-1);
$this->setMessage('success_updated', 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminPointList');
$this->setRedirectUrl($returnUrl); return $this->setRedirectUrl($returnUrl, $output);
return;
}
return $output;
} }
/** /**

16
modules/poll/poll.admin.controller.php
View file

@ -24,11 +24,9 @@
$oModuleController->insertModuleConfig('poll', $config); $oModuleController->insertModuleConfig('poll', $config);
$this->setMessage('success_updated'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminConfig');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -53,11 +51,9 @@
} }
$this->setMessage( sprintf(Context::getLang('msg_checked_poll_is_deleted'), $poll_count) ); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminList');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
function procPollAdminAddCart() function procPollAdminAddCart()

8
modules/poll/poll.controller.php
View file

@ -168,11 +168,9 @@
$this->add('poll_srl', $poll_srl); $this->add('poll_srl', $poll_srl);
$this->add('tpl',$tpl); $this->add('tpl',$tpl);
$this->setMessage('success_poll'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminConfig');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**

16
modules/rss/rss.admin.controller.php
View file

@ -75,11 +75,9 @@
//$this->setLayoutFile('default_layout.html'); //$this->setLayoutFile('default_layout.html');
//$this->setTemplatePath($this->module_path.'tpl'); //$this->setTemplatePath($this->module_path.'tpl');
//$this->setTemplateFile("top_refresh.html"); //$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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispRssAdminIndex');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
@ -115,11 +113,9 @@
//$this->setError(0); //$this->setError(0);
$this->setMessage('success_updated', 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }

42
modules/spamfilter/spamfilter.admin.controller.php
View file

@ -27,12 +27,8 @@
$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter',$argsConfig); $moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter',$argsConfig);
if(!$moduleConfigOutput->toBool()) return $moduleConfigOutput; 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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting'); $this->setRedirectUrl($returnUrl);
header('location:'.$returnUrl);
return;
}
return false;
} }
function procSpamfilterAdminInsertDeniedIP(){ function procSpamfilterAdminInsertDeniedIP(){
@ -43,13 +39,9 @@
$insertIPOutput = $oSpamfilterController->insertIP($ipaddressList); $insertIPOutput = $oSpamfilterController->insertIP($ipaddressList);
if(!$insertIPOutput->toBool()) return $insertIPOutput; 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(){ function procSpamfilterAdminInsertDeniedWord(){
//스팸 키워드 추가 //스팸 키워드 추가
@ -58,12 +50,9 @@
$insertWordOutput = $this->insertWord($wordList); $insertWordOutput = $this->insertWord($wordList);
if(!$insertWordOutput->toBool()) return $insertWordOutput; 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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
return false;
} }
/** /**
@ -72,12 +61,9 @@
function procSpamfilterAdminDeleteDeniedIP() { function procSpamfilterAdminDeleteDeniedIP() {
$ipaddress = Context::get('ipaddress'); $ipaddress = Context::get('ipaddress');
$output = $this->deleteIP($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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting');
header('location:'.$returnUrl); return $this->setRedirectUrl($returnUrl, $output);
return;
}
return $output;
} }
/** /**
@ -88,12 +74,8 @@
//$word = base64_decode(Context::get('word')); //$word = base64_decode(Context::get('word'));
$output = $this->deleteWord($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');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting'); return $this->setRedirectUrl($returnUrl, $output);
header('location:'.$returnUrl);
return;
}
return $output;
} }
/** /**

25
modules/trackback/trackback.admin.controller.php
View file

@ -38,11 +38,9 @@
} }
$this->setMessage( sprintf(Context::getLang('msg_checked_trackback_is_deleted'), $trackback_count) ); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrackbackAdminList');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**
@ -55,12 +53,9 @@
$oModuleController = &getController('module'); $oModuleController = &getController('module');
$output = $oModuleController->insertModuleConfig('trackback',$config); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrackbackAdminList');
header('location:'.$returnUrl); return $this->setRedirectUrl($returnUrl, $output);
return;
}
return $output;
} }
/** /**
@ -86,11 +81,9 @@
$this->setError(-1); $this->setError(-1);
$this->setMessage('success_updated', 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
header('location:'.$returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**

17
modules/trash/trash.admin.controller.php
View file

@ -56,12 +56,9 @@ class trashAdminController extends trash
if(!$this->_emptyTrash($trashSrls)) return new Object(-1, $lang->fail_empty); if(!$this->_emptyTrash($trashSrls)) return new Object(-1, $lang->fail_empty);
$this->setMessage('success_deleted', 'info'); $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); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList', 'origin_module', $originModule);
$this->setRedirectUrl($returnUrl); return $this->setRedirectUrl($returnUrl, $output);
return;
}
return new Object(0, $lang->success_empty);
} }
/** /**
@ -152,11 +149,9 @@ class trashAdminController extends trash
} }
$this->setMessage('success_restore', 'info'); $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'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return;
}
} }
/** /**