From 1df8d3644b1daa2ed24e274c8f7f5312b165b2d4 Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Fri, 16 May 2008 19:09:01 +0000
Subject: [PATCH] Add query string to CUSTOM=LOGIN

---
 e107_files/shortcode/custom.sc | 50 ++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/e107_files/shortcode/custom.sc b/e107_files/shortcode/custom.sc
index 579b3048a..1cc8e3f9f 100644
--- a/e107_files/shortcode/custom.sc
+++ b/e107_files/shortcode/custom.sc
@@ -3,31 +3,35 @@ $ret = "";
 $custom_query = explode('+', $parm);
 switch($custom_query[0])
 {
-		case "login":
-		case "login noprofile":
-				include_lan(e_PLUGIN."login_menu/languages/".e_LANGUAGE.".php");
+  case "login":
+  case "login noprofile":
+	include_lan(e_PLUGIN."login_menu/languages/".e_LANGUAGE.".php");
 
-				$sep = (defined("LOGINC_SEP")) ? LOGINC_SEP : "<span class='loginc sep'>.:.</span>";
+	$sep = (defined("LOGINC_SEP")) ? LOGINC_SEP : "<span class='loginc sep'>.:.</span>";
 
-				if (USER == TRUE){
-						$ret .= "<span class='mediumtext'><span class='loginc welcome'>".LOGIN_MENU_L5." ".USERNAME."</span>&nbsp;&nbsp;&nbsp;".$sep." ";
-						if(ADMIN == TRUE){
-								$ret .= "<a class='loginc admin' href='".e_ADMIN."admin.php'>".LOGIN_MENU_L11."</a> ".$sep." ";
-						}
-						$ret .= ($custom_query[0] != "login noprofile") ? "<a class='loginc profile' href='".e_BASE."user.php?id.".USERID."'>".LOGIN_MENU_L13."</a>\n".$sep." ":"";
-						$ret .= "<a class='loginc usersettings' href='" . e_BASE . "usersettings.php'>".LOGIN_MENU_L12."</a> ".$sep." <a class='loginc logout' href='".e_BASE."index.php?logout'>".LOGIN_MENU_L8."</a> ".$sep."</span>";
-				} else {
-						$ret .= "<form method='post' action='".e_SELF."'>\n<div class='loginc_div'>\n".LOGIN_MENU_L1."<input class='tbox loginc user' type='text' name='username' size='15' value='$username' maxlength='20' />&nbsp;&nbsp;\n".LOGIN_MENU_L2."<input class='tbox loginc pass' type='password' name='userpass' size='15' value='' maxlength='20' />&nbsp;&nbsp;\n";
-						$ret .= ($pref['user_tracking'] == "cookie") ? "<input type='checkbox' name='autologin' value='1' />".LOGIN_MENU_L6."&nbsp;&nbsp;\n" : "";
-						$ret .= "<input class='button loginc' type='submit' name='userlogin' value='".LOGIN_MENU_L28."' />";
-						if($pref['user_reg'])
-						{
-							$ret .= "&nbsp;&nbsp;<a class='loginc signup' href='".e_SIGNUP."'>".LOGIN_MENU_L3."</a>";
-						}
-						$ret .= "</div>\n</form>";
-				}
-				return $ret;
-				break;
+	if (USER == TRUE)
+	{
+	  $ret .= "<span class='mediumtext'><span class='loginc welcome'>".LOGIN_MENU_L5." ".USERNAME."</span>&nbsp;&nbsp;&nbsp;".$sep." ";
+	  if(ADMIN == TRUE)
+	  {
+		$ret .= "<a class='loginc admin' href='".e_ADMIN."admin.php'>".LOGIN_MENU_L11."</a> ".$sep." ";
+	  }
+	  $ret .= ($custom_query[0] != "login noprofile") ? "<a class='loginc profile' href='".e_BASE."user.php?id.".USERID."'>".LOGIN_MENU_L13."</a>\n".$sep." ":"";
+	  $ret .= "<a class='loginc usersettings' href='" . e_BASE . "usersettings.php'>".LOGIN_MENU_L12."</a> ".$sep." <a class='loginc logout' href='".e_BASE."index.php?logout'>".LOGIN_MENU_L8."</a> ".$sep."</span>";
+	} 
+	else 
+	{
+	  $ret .= "<form method='post' action='".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."'>\n<div class='loginc_div'>\n".LOGIN_MENU_L1."<input class='tbox loginc user' type='text' name='username' size='15' value='$username' maxlength='20' />&nbsp;&nbsp;\n".LOGIN_MENU_L2."<input class='tbox loginc pass' type='password' name='userpass' size='15' value='' maxlength='20' />&nbsp;&nbsp;\n";
+	  $ret .= ($pref['user_tracking'] == "cookie") ? "<input type='checkbox' name='autologin' value='1' />".LOGIN_MENU_L6."&nbsp;&nbsp;\n" : "";
+	  $ret .= "<input class='button loginc' type='submit' name='userlogin' value='".LOGIN_MENU_L28."' />";
+	  if($pref['user_reg'])
+	  {
+		$ret .= "&nbsp;&nbsp;<a class='loginc signup' href='".e_SIGNUP."'>".LOGIN_MENU_L3."</a>";
+	  }
+	  $ret .= "</div>\n</form>";
+	}
+	return $ret;
+	break;
 
 		case "search":
 				if(!check_class($pref['search_restrict']))