fixed: checking for ssl redirect

we should take into account cur.request->function->need_ssl too



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1010 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2015-05-29 09:46:29 +00:00
parent 62f178c2ee
commit d8451ceaa0
1 changed files with 4 additions and 2 deletions

View File

@ -310,9 +310,11 @@ void App::CheckIfNeedSSLredirect()
{
if( config.use_ssl_only_for_logged_users )
{
bool function_need_ssl = (cur.request->function && cur.request->function->need_ssl);
if( cur.request->using_ssl )
{
if( !cur.session->puser )
if( !cur.session->puser && !function_need_ssl )
{
log << log3 << "App: this operation should NOT be used through SSL" << logend;
BaseUrlRedirect(config.use_ssl_redirect_code, true);
@ -320,7 +322,7 @@ void App::CheckIfNeedSSLredirect()
}
else
{
if( cur.session->puser )
if( cur.session->puser || function_need_ssl )
{
log << log3 << "App: this operation should be used through SSL" << logend;
BaseUrlRedirect(config.use_ssl_redirect_code, true);