Index: trunk/themes/default/login/login_form.tpl
===================================================================
diff -u -r2481 -r3201
--- trunk/themes/default/login/login_form.tpl (.../login_form.tpl) (revision 2481)
+++ trunk/themes/default/login/login_form.tpl (.../login_form.tpl) (revision 3201)
@@ -1,6 +1,5 @@
">
- ">
Index: trunk/core/units/general/inp1_parser.php
===================================================================
diff -u -r3174 -r3201
--- trunk/core/units/general/inp1_parser.php (.../inp1_parser.php) (revision 3174)
+++ trunk/core/units/general/inp1_parser.php (.../inp1_parser.php) (revision 3201)
@@ -16,7 +16,7 @@
$get = $_GET;
unset($get['env'], $get['Action'], $get['url'], $get['rewrite']);
$this->Application->StoreVar('K4_Template_Referer', $this->Application->GetVar('t') );
-
+
$this->Application->Redirect($var_list['t'], $get);
}
}
Index: trunk/globals.php
===================================================================
diff -u -r3179 -r3201
--- trunk/globals.php (.../globals.php) (revision 3179)
+++ trunk/globals.php (.../globals.php) (revision 3201)
@@ -1444,6 +1444,7 @@
{
$_REQUEST[$VarName] = $VarValue;
$_POST[$VarName] = $VarValue;
+ $_GET[$VarName] = $VarValue;
}
function PassVar(&$source)
Index: trunk/kernel/parser.php
===================================================================
diff -u -r3164 -r3201
--- trunk/kernel/parser.php (.../parser.php) (revision 3164)
+++ trunk/kernel/parser.php (.../parser.php) (revision 3201)
@@ -902,7 +902,8 @@
else
{
if( getArrayValue($var_list, 'dest') ) $url_params['dest'] = $var_list['dest'];
- }
+ }
+ $url_params['pass'] = 'all';
}
break;
@@ -3422,41 +3423,12 @@
*/
function m_get_var($attribs = array())
{
- global $_GET, $_POST, $_COOKIE, $_FILES, $_ENV, $_SERVER, $_SESSION;
-
- $type = strtolower($attribs['_type']);
+ $type = strtoupper( $attribs['_type'] );
$name = $attribs['_name'];
- switch ($type)
- {
- case "get":
- $vars = $_GET;
- break;
- case "cookie":
- $vars = $_COOKIE;
- break;
- case "files":
- $vars = $_FILES;
- break;
- case "server":
- $vars = $_SERVER;
- break;
- case "session":
- $vars = $_SESSION;
- break;
- case "env":
- $vars = $_ENV;
- break;
- case "post":
- $vars = $_POST;
- break;
- default :
- $vars = $_POST;
- break;
- }
- $ret = $vars[$name];
-
- return $ret;
+ $array_name = '_'.$type;
+ $vars = $GLOBALS[ isset( $GLOBALS[$array_name] ) ? $array_name : '_POST' ];
+ return $vars[$name];
}
/*
Index: trunk/kernel/include/parse.php
===================================================================
diff -u -r3000 -r3201
--- trunk/kernel/include/parse.php (.../parse.php) (revision 3000)
+++ trunk/kernel/include/parse.php (.../parse.php) (revision 3201)
@@ -558,9 +558,7 @@
$CheckSys = $tag->GetAttributeByName('_system');
for($p=0;$pHasCatPermission(trim($plist[$p])))
{
Index: trunk/kernel/frontaction.php
===================================================================
diff -u -r3166 -r3201
--- trunk/kernel/frontaction.php (.../frontaction.php) (revision 3166)
+++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 3201)
@@ -4,7 +4,10 @@
{
case "m_login":
// if($objSession->ValidSession()) $objSession->Logout();
- //echo $objSession->GetSessionKey()."
\n";
+ //echo $objSession->GetSessionKey()."
\n";
+ $url_params = Array();
+ $application =& kApplication::Instance();
+
if ($objConfig->Get("CookieSessions") == 1 && $_COOKIE["cookies_on"] != "1") {
$FormError["login"]["login_user"] = language("lu_cookies_error");
}
@@ -46,9 +49,10 @@
if($next_template)
{
$objSession->SetVariable('next_template','');
- $var_list_update["t"] = $next_template;
-
- header('Location: ' . HREF_Wrapper() );
+ $var_list_update['t'] = $next_template;
+
+ $url_params['pass'] = 'all';
+ header('Location: ' . HREF_Wrapper('', $url_params) );
exit;
$var_list['t'] = $next_template.'.tpl';
}
@@ -57,14 +61,10 @@
$var_list['t'] = 'index';
}
- if( class_exists('kApplication') )
- {
- $application =& kApplication::Instance();
- $application->HandleEvent( new kEvent('u:OnInpLogin') );
-
- $redirect_template = getArrayValue($var_list_update, 't') ? $var_list_update['t'] : $var_list['t'];
- $application->Redirect($redirect_template);
- }
+ $application->HandleEvent( new kEvent('u:OnInpLogin') );
+
+ $redirect_template = getArrayValue($var_list_update, 't') ? $var_list_update['t'] : $var_list['t'];
+ $application->Redirect($redirect_template);
}
else
Index: trunk/kernel/units/general/inp1_parser.php
===================================================================
diff -u -r3174 -r3201
--- trunk/kernel/units/general/inp1_parser.php (.../inp1_parser.php) (revision 3174)
+++ trunk/kernel/units/general/inp1_parser.php (.../inp1_parser.php) (revision 3201)
@@ -16,7 +16,7 @@
$get = $_GET;
unset($get['env'], $get['Action'], $get['url'], $get['rewrite']);
$this->Application->StoreVar('K4_Template_Referer', $this->Application->GetVar('t') );
-
+
$this->Application->Redirect($var_list['t'], $get);
}
}