Index: trunk/kernel/frontaction.php
===================================================================
diff -u -r288 -r289
--- trunk/kernel/frontaction.php (.../frontaction.php) (revision 288)
+++ trunk/kernel/frontaction.php (.../frontaction.php) (revision 289)
@@ -12,6 +12,9 @@
echo '
';
echo " ScriptName: $script (".dirname($_SERVER['PHP_SELF']).") ";
+ $div_height = (count($_REQUEST)+1)*26;
+ if($div_height > 300) $div_height = 300;
+ echo '';
echo ' ';
echo 'Src | Name | Value | ';
@@ -21,25 +24,29 @@
$src = isset($_GET[$key]) ? 'GE' : (isset($_POST[$key]) ? 'PO' : (isset($_COOKIE[$key]) ? 'CO' : '?') );
echo ''.$src.' | '.$key.' | '.print_r($value, true).' | ';
}
- echo ' ';
+ echo ' |
';
echo '';
unset($script);
+// echo "SID: ".$objSession->GetSessionKey().'
';
}
switch($Action)
{
case "m_login":
// if($objSession->ValidSession()) $objSession->Logout();
+ //echo $objSession->GetSessionKey()."
\n";
if ($objConfig->Get("CookieSessions") == 1 && $_COOKIE["CookiesTest"] != "1") {
$FormError["login"]["login_user"] = language("lu_cookies_error");
}
- else {
+ else
+ {
$MissingCount = SetMissingDataErrors("login");
if($MissingCount==2)
{
$FormError["login"]["login_user"]= language("lu_ferror_loginboth");
unset($FormError["login"]["login_password"]);
}
+
if($MissingCount==0)
{
if($_POST["login_user"]=="root")
@@ -54,37 +61,28 @@
}
else
{
-
- if(!headers_sent() && ($_POST["usercookie"]==1 || $_GET["usercookie"]==1))
+ if( !headers_sent() && GetVar('usercookie') == 1 )
{
$c = $_POST["login_user"]."|";
$pw = $_POST["login_password"];
- if(strlen($pw)<31)
- $pw = md5($pw);
-
+ if(strlen($pw) < 31) $pw = md5($pw);
$c .= $pw;
setcookie("login",$c,time()+2592000);
}
- $dest = $_POST["dest"];
- if(!strlen($dest))
- $dest = $_GET["dest"];
- if(!strlen($dest))
- $dest = $_POST["DestTemplate"];
- if(!strlen($dest))
- $dest = $_GET["DestTemplate"];
- if(strlen($dest))
- {
- $var_list["t"] = $dest;
- //header("Location: ../../index.php?env=" . BuildEnv());
- }
+
- // echo "DEST: ".$t; die();
- }
- }
- }
- }
- break;
+ // set new destination template if passed
+ $dest = GetVar('dest', true);
+ if(!$dest) $dest = GetVar('DestTemplate', true);
+ if($dest) $var_list['t'] = $dest;
+ echo "DEST: $dest
";
+ }
+ }
+ }
+ }
+ break;
+
case "m_forgotpw":
$MissingCount = SetMissingDataErrors("forgotpw");
if($MissingCount==0)