diff --git a/login.php b/login.php index a45f674796..83729d6562 100755 --- a/login.php +++ b/login.php @@ -44,6 +44,7 @@ $tmpl->pfp('loginout','login_form'); exit; } + $tmpl->set_file(array('login_form' => 'login.tpl')); // !! NOTE !! // Do NOT and I repeat, do NOT touch ANYTHING to do with lang in this file. @@ -68,15 +69,6 @@ } */ - if (! $deny_login && ! $GLOBALS['phpgw_info']['server']['show_domain_selectbox']) - { - $tmpl->set_file(array('login_form' => 'login.tpl')); - } - elseif ($GLOBALS['phpgw_info']['server']['show_domain_selectbox']) - { - $tmpl->set_file(array('login_form' => 'login_selectdomain.tpl')); - } - function check_logoutcode($code) { switch($code) @@ -235,10 +227,11 @@ } } + $domain_select = ' '; $last_loginid = $_COOKIE['last_loginid']; if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox']) { - $domain_select = ''; // For security ... just in case + $domain_select = "\n"; } elseif ($last_loginid !== '') { @@ -261,6 +254,7 @@ $last_loginid .= '@' . $_COOKIE['last_domain']; } } + $tmpl->set_var('select_domain',$domain_select); foreach($_GET as $name => $value) { diff --git a/phpgwapi/templates/default/login.tpl b/phpgwapi/templates/default/login.tpl index 6ec9b73629..2b5c7f4866 100644 --- a/phpgwapi/templates/default/login.tpl +++ b/phpgwapi/templates/default/login.tpl @@ -4,7 +4,7 @@ - + @@ -33,21 +33,23 @@ - + + + - + - +
{cd}{cd}
{lang_username}:  {select_domain}
{lang_password}:   
phpGroupWare {version}eGroupWare {version}
diff --git a/phpgwapi/templates/default/login_selectdomain.tpl b/phpgwapi/templates/default/login_selectdomain.tpl deleted file mode 100644 index b811c71f8e..0000000000 --- a/phpgwapi/templates/default/login_selectdomain.tpl +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - -{website_title} - Login - - - -{logo_title} -

 

-
{lang_message}
-

 

- - - - - -
- - - - - - - -
-  phpGroupWare -
- -
- - - - - - - - - - - - - - - - - - - - - -
- {cd} -
{lang_username}: @ 
{lang_password}: 
- -
- {version} -
-
- -
-
- - - diff --git a/phpgwapi/templates/idots/login.tpl b/phpgwapi/templates/idots/login.tpl index 4c990ead7a..edc3005acf 100755 --- a/phpgwapi/templates/idots/login.tpl +++ b/phpgwapi/templates/idots/login.tpl @@ -59,7 +59,7 @@ {lang_username}:  - +{select_domain} {lang_password}:  diff --git a/phpgwapi/templates/idots/login_selectdomain.tpl b/phpgwapi/templates/idots/login_selectdomain.tpl deleted file mode 100755 index 4c990ead7a..0000000000 --- a/phpgwapi/templates/idots/login_selectdomain.tpl +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - -{website_title} - Login - - - -
-{logo_title} -
-
-
{lang_message}
-

 

-
- - - - - - - -
{website_title}
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
-{cd} -
- -
{lang_username}: 
{lang_password}:  
-  -
- -
-  -
- -
-
- - - -
-
- -
-Valid HTML 4.01 -Valid CSS -
-
-eGroupWare {version}
- - -