[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgroupware login.php,1.102
|
From: |
skwashd |
|
Subject: |
[Phpgroupware-cvs] phpgroupware login.php,1.102 |
|
Date: |
Thu, 24 Feb 2005 14:36:32 -0000 |
Update of phpgroupware
Modified Files:
Branch: MAIN
login.php lines: +123 -87
Log Message:
new xhtml login template and some css
====================================================
Index: phpgroupware/login.php
diff -u phpgroupware/login.php:1.101 phpgroupware/login.php:1.102
--- phpgroupware/login.php:1.101 Mon Jan 3 23:12:38 2005
+++ phpgroupware/login.php Sat Jan 15 09:55:35 2005
@@ -40,20 +40,17 @@
$tmpl = CreateObject('phpgwapi.Template',
$GLOBALS['phpgw_info']['server']['template_dir']);
// This is used for system downtime, to prevent new logins.
- if ($GLOBALS['phpgw_info']['server']['deny_all_logins'])
+ if( $GLOBALS['phpgw_info']['server']['deny_all_logins'])
{
- $tmpl->set_file(array(
- 'login_form' => 'login_denylogin.tpl'
- ));
- $tmpl->set_var('template_set','default');
+ $tmpl->set_file(
+ array(
+ 'login_form' => 'login_denylogin.tpl'
+ )
+ );
$tmpl->pfp('loginout','login_form');
exit;
}
- // !! NOTE !!
- // Do NOT and I repeat, do NOT touch ANYTHING to do with lang in this
file.
- // If there is a problem, tell me and I will fix it. (jengo)
-
/*
if ($_GET['cd'] != 10 && $GLOBALS['phpgw_info']['server']['usecookies']
== False)
{
@@ -73,26 +70,6 @@
}
*/
- if (! $deny_login && !
$GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
- {
- $tmpl->set_file(array('login_form' => 'login.tpl'));
- $tmpl->set_var('charset',lang('charset'));
- }
- elseif ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
- {
- $tmpl->set_file(array('login_form' =>
'login_selectdomain.tpl'));
- $tmpl->set_var('charset',lang('charset'));
- }
-
- if(@$GLOBALS['phpgw_info']['server']['domain_from_host']
- &&
address@hidden'phpgw_info']['server']['show_domain_selectbox'])
- {
- $tmpl->set_var('logindomain', '@' . $_SERVER['SERVER_NAME']
- . '<input type="hidden" name="logindomain" value="'
- . $_SERVER['SERVER_NAME'] . '">');
- }
-
-
function check_logoutcode($code)
{
switch($code)
@@ -104,10 +81,10 @@
return lang('Sorry, your login has expired');
break;
case 5:
- return '<font color="FF0000">' . lang('Bad
login or password') . '</font>';
+ return lang('Bad login or password');
break;
case 99:
- return '<font color="FF0000">' . lang('Blocked,
too many attempts') . '</font>';
+ return lang('Blocked, too many attempts');
break;
case 10:
$GLOBALS['phpgw']->sessions->phpgw_setcookie('sessionid');
@@ -120,7 +97,7 @@
$GLOBALS['phpgw']->sessions->phpgw_setcookie(PHPGW_PHPSESSID);
}
- return '<font color=#FF0000>' . lang('Your
session could not be verified.') . '</font>';
+ return lang('Your session could not be
verified.');
break;
default:
return ' ';
@@ -248,6 +225,7 @@
if (! isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
{
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] .
'/login.php?cd=' . $GLOBALS['phpgw']->session->cd_reason);
+ exit;
}
else
{
@@ -271,65 +249,98 @@
$GLOBALS['phpgw']->hooks->process('login');
$GLOBALS['phpgw']->redirect_link('/home.php',
$extra_vars);
+ exit;
}
}
- else
+
+ $tmpl->set_file(array('login_form' => 'login.tpl'));
+ $tmpl->set_var('charset', lang('charset'));
+ $tmpl->set_block('login_form', 'domain_option', 'domain_options');
+ $tmpl->set_block('login_form', 'domain_select', 'domain_selects');
+ $tmpl->set_block('login_form', 'domain_from_host', 'domain_from_hosts');
+
+ if( $GLOBALS['phpgw_info']['server']['domain_from_host']
+ && !$GLOBALS['phpgw_info']['server']['show_domain_selectbox'] )
+ {
+ $tmpl->set_var(
+ array(
+ 'domain_selects' => '',
+ 'logindomain' =>
$_SERVER['SERVER_NAME']
+ )
+ );
+ $tmpl->parse('domain_from_hosts', 'domain_from_host');
+ }
+ elseif( $GLOBALS['phpgw_info']['server']['show_domain_selectbox'] )
{
- // !!! DONT CHANGE THESE LINES !!!
- // If there is something wrong with this code TELL ME!
- // Commenting out the code will not fix it. (jengo)
- if (isset($_COOKIE['last_loginid']))
- {
- $accounts = CreateObject('phpgwapi.accounts');
- $prefs = CreateObject('phpgwapi.preferences',
$accounts->name2id($_COOKIE['last_loginid']));
+ foreach($GLOBALS['phpgw_domain'] as $domain_name =>
$domain_vars)
+ {
+ $tmpl->set_var('domain_name', $domain_name);
- if (! $prefs->account_id)
- {
-
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = 'en';
- }
- else
+ if ($domain_name == $_COOKIE['last_domain'])
{
- $GLOBALS['phpgw_info']['user']['preferences'] =
$prefs->read_repository();
+ $tmpl->set_var('domain_selected',
'selected="selected"');
}
- #print 'LANG:' .
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] . '<br>';
+ $tmpl->parse('domain_options', 'domain_option', True);
}
- else
+ $tmpl->parse('domain_selects', 'domain_select');
+ $tmpl->set_var(
+ array(
+ 'domain_from_hosts' => '',
+ 'lang_domain' =>
lang('domain')
+ )
+ );
+ }
+ else
+ {
+ $tmpl->set_var(
+ array(
+ 'domain_selects' => '',
+ 'domain_from_hosts' => ''
+ )
+ );
+
+ }
+
+ if (isset($_COOKIE['last_loginid']))
+ {
+ $accounts = CreateObject('phpgwapi.accounts');
+ $prefs = CreateObject('phpgwapi.preferences',
$accounts->name2id($_COOKIE['last_loginid']));
+
+ if (! $prefs->account_id)
{
- // If the lastloginid cookies isn't set, we will
default to english.
- // Change this if you need.
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = 'en';
}
- $GLOBALS['phpgw']->translation->add_app('login');
- $GLOBALS['phpgw']->translation->add_app('loginscreen');
- if (lang('loginscreen_message') != 'loginscreen_message*')
+ else
{
-
$tmpl->set_var('lang_message',stripslashes(lang('loginscreen_message')));
+ $GLOBALS['phpgw_info']['user']['preferences'] =
$prefs->read_repository();
}
+ #print 'LANG:' .
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] . '<br>';
+ }
+ else
+ {
+ // If the lastloginid cookies isn't set, we will default to
english.
+ // Change this if you need.
+ $GLOBALS['phpgw_info']['user']['preferences']['common']['lang']
= 'en';
+ }
+ $GLOBALS['phpgw']->translation->add_app('login');
+ $GLOBALS['phpgw']->translation->add_app('loginscreen');
+ if ( ($login_msg = lang('loginscreen_message') ) !=
'loginscreen_message*')
+ {
+ $tmpl->set_var('lang_message', stripslashes($login_msg) );
+ }
+ else
+ {
+ $tmpl->set_var('lang_message', ' ');
}
- if( (address@hidden'phpgw_info']['server']['usecookies']) &&
@is_array($_COOKIE) )
+ if( !$GLOBALS['phpgw_info']['server']['usecookies'] && isset($_COOKIE)
&& is_array($_COOKIE) )
{
unset($_COOKIE['last_loginid']);
unset($_COOKIE['last_domain']);
}
$last_loginid = $_COOKIE['last_loginid'];
- if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
- {
- $domain_select = ''; // For security ... just in case
- foreach($GLOBALS['phpgw_domain'] as $domain_name =>
$domain_vars)
- {
- $domain_select .= '<option value="' . $domain_name .
'"';
-
- if ($domain_name == $_COOKIE['last_domain'])
- {
- $domain_select .= ' selected';
- }
- $domain_select .= '>' . $domain_name . '</option>';
- }
- $tmpl->set_var('select_domain',$domain_select);
- }
- elseif ($last_loginid !== '')
+ if($GLOBALS['phpgw_info']['server']['show_domain_selectbox'] &&
$last_loginid !== '')
{
reset($GLOBALS['phpgw_domain']);
list($default_domain) = each($GLOBALS['phpgw_domain']);
@@ -355,21 +366,46 @@
$tmpl->set_var('login_url',
$GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php' . $extra_vars);
$tmpl->set_var('registration_url',$GLOBALS['phpgw_info']['server']['webserver_url']
. '/registration/');
-
$tmpl->set_var('version',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
- $tmpl->set_var('cd',check_logoutcode($_GET['cd']));
- $tmpl->set_var('cookie',$last_loginid);
-
- $tmpl->set_var('lang_username',lang('username'));
- $tmpl->set_var('lang_password',lang('password'));
- $tmpl->set_var('lang_login',lang('login'));
-
- $tmpl->set_var('website_title',
$GLOBALS['phpgw_info']['server']['site_title']);
-
$tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']);
-
$tmpl->set_var('bg_color',($GLOBALS['phpgw_info']['server']['login_bg_color']?$GLOBALS['phpgw_info']['server']['login_bg_color']:'FFFFFF'));
-
$tmpl->set_var('bg_color_title',($GLOBALS['phpgw_info']['server']['login_bg_color_title']?$GLOBALS['phpgw_info']['server']['login_bg_color_title']:'486591'));
-
$tmpl->set_var('logo_url',($GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'www.phpgroupware.org'));
-
$tmpl->set_var('logo_file',($GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:$GLOBALS['phpgw']->common->find_image('phpgwapi',
'logo') ) );
-
$tmpl->set_var('logo_title',($GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'phpGroupWare
--> home'));
+ $tmpl->set_var('version',
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+ $tmpl->set_var('cd', check_logoutcode($_GET['cd']) );
+ $tmpl->set_var('last_loginid', $last_loginid);
+
+ $tmpl->set_var('lang_username', lang('username'));
+ $tmpl->set_var('lang_password', lang('password'));
+ $tmpl->set_var('lang_login', lang('login'));
+
+ $tmpl->set_var('lang_testjs', lang('Your browser does not support
javascript and/or css, please use a modern standards compliant browser. If you
have disabled either of these features please enable them for this site.') );
+
+ $tmpl->set_var('website_title',
($GLOBALS['phpgw_info']['server']['site_title']
+ ?
$GLOBALS['phpgw_info']['server']['site_title']
+ : 'phpGroupWare')
+ );
+
+ $tmpl->set_var('template_set',
$GLOBALS['phpgw_info']['login_template_set']);
+
+ if( is_file( PHPGW_SERVER_ROOT . SEP . 'phpgwapi' . SEP . 'templates'
+ . SEP . $GLOBALS['phpgw_info']['login_template_set'] . SEP .
'css' . SEP . 'base.css') )
+ {
+ $base_css = 'phpgwapi/templates/' .
$GLOBALS['phpgw_info']['login_template_set'] . '/css/base.css';
+ }
+ else
+ {
+ $base_css = 'phpgwapi/templates/base/css/base.css';
+ }
+
+ if( is_file( PHPGW_SERVER_ROOT . SEP . 'phpgwapi' . SEP . 'templates'
+ . SEP . $GLOBALS['phpgw_info']['login_template_set'] . SEP .
'css' . SEP . 'login.css') )
+ {
+ $login_css = 'phpgwapi/templates/' .
$GLOBALS['phpgw_info']['login_template_set'] . '/css/login.css';
+ }
+ else
+ {
+ $login_css = 'phpgwapi/templates/base/css/login.css';
+ }
+
+ $tmpl->set_var('base_css', $base_css);
+ $tmpl->set_var('login_css', $login_css);
+
$tmpl->set_var('autocomplete',
($GLOBALS['phpgw_info']['server']['autocomplete_login'] ? 'autocomplete="off"'
: ''));
$tmpl->pfp('loginout','login_form');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgroupware login.php,1.102,
skwashd <=