[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgroupware login.php
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] phpgroupware login.php |
|
Date: |
Wed, 30 Aug 2006 15:23:05 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: phpgroupware
Changes by: Dave Hall <skwashd> 06/08/30 15:23:05
Modified files:
. : login.php
Log message:
E_ALL, code clean up, switch to http_build_query (with php4 compat) and
generally make this a little neater, tested pretty well
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/login.php?cvsroot=phpgroupware&r1=1.105&r2=1.106
Patches:
Index: login.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/login.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- login.php 5 Jul 2006 11:41:38 -0000 1.105
+++ login.php 30 Aug 2006 15:23:05 -0000 1.106
@@ -8,16 +8,16 @@
* @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgroupware
- * @version $Id: login.php,v 1.105 2006/07/05 11:41:38 sigurdne Exp $
+ * @version $Id: login.php,v 1.106 2006/08/30 15:23:05 skwashd Exp $
*/
$phpgw_info = array();
$GLOBALS['phpgw_info']['flags'] = array(
- 'disable_template_class' => True,
- 'login' => True,
+ 'disable_template_class' => true,
+ 'login' => true,
'currentapp' => 'login',
- 'noheader' => True
+ 'noheader' => true
);
if(file_exists('./header.inc.php'))
{
@@ -34,20 +34,20 @@
Header('Location: setup/index.php');
exit;
}
-
$GLOBALS['phpgw_info']['server']['template_set'] =
$GLOBALS['phpgw_info']['login_template_set'];
$GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT
- .
'/phpgwapi/templates/'
- .
$GLOBALS['phpgw_info']['login_template_set'];
+ .
"/phpgwapi/templates/{$GLOBALS['phpgw_info']['login_template_set']}";
$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( isset($GLOBALS['phpgw_info']['server']['deny_all_logins'])
+ && $GLOBALS['phpgw_info']['server']['deny_all_logins'] )
{
$tmpl->set_file(
- array(
+ array
+ (
'login_form' => 'login_denylogin.tpl'
)
);
@@ -172,11 +172,11 @@
}
/* Program starts here */
- $login = $_POST['login'];
- $passwd = $_POST['passwd'];
+ $login = isset($_POST['login']) ? $_POST['login'] : '';
+ $passwd = isset($_POST['passwd']) ? $_POST['passwd'] : '';
if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'http' &&
isset($_SERVER['PHP_AUTH_USER']))
{
- $submit = True;
+ $submit = true;
$login = $_SERVER['PHP_AUTH_USER'];
$passwd = $_SERVER['PHP_AUTH_PW'];
}
@@ -205,7 +205,7 @@
if (isset($sslattributes['Email']))
{
- $submit = True;
+ $submit = true;
# login will be set here if the user logged out and
uses a different username with
# the same SSL-certificate.
@@ -220,19 +220,18 @@
unset($sslattributes);
}
- if (isset($_POST['passwd_type']) || $_POST['submit'] ||
$_POST['submit_x'] || $_POST['submit_y'])
+ if (isset($_POST['passwd_type']) && (isset($_POST['submitit']) ||
isset($_POST['submit_x']) || isset($_POST['submit_y']) ) )
{
- if(getenv(REQUEST_METHOD) != 'POST' &&
- $_SERVER['REQUEST_METHOD'] != 'POST' &&
+ if ( $_SERVER['REQUEST_METHOD'] != 'POST' &&
!isset($_SERVER['PHP_AUTH_USER']) &&
!isset($_SERVER['REMOTE_USER']) &&
!isset($_SERVER['SSL_CLIENT_S_DN'])
)
{
-
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','code=5'));
+ $GLOBALS['phpgw']->redirect('/login.php', array('cd' =>
'5'));
}
- if (strstr($login,'@') === False &&
isset($_POST['logindomain']))
+ if (strstr($login,'@') === false &&
isset($_POST['logindomain']))
{
$login .= '@' . $_POST['logindomain'];
}
@@ -241,11 +240,10 @@
if (! isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
{
-
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] .
'/login.php?cd=' . $GLOBALS['phpgw']->session->cd_reason);
+ $GLOBALS['phpgw']->redirect('login.php?cd=' .
$GLOBALS['phpgw']->session->cd_reason);
exit;
}
- else
- {
+
$forward = get_var('phpgw_forward', array('GET',
'POST'), 0);
if($forward)
{
@@ -258,7 +256,7 @@
}
}
}
- if
(!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles'])
+ if (
!isset($GLOBALS['phpgw_info']['server']['disable_autoload_langfiles']) ||
!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles'] )
{
check_langs();
}
@@ -266,7 +264,9 @@
$GLOBALS['phpgw']->hooks->process('login');
- if($GLOBALS['phpgw_info']['server']['shm_lang'] &&
function_exists('sem_get'))
+ if( isset($GLOBALS['phpgw_info']['server']['shm_lang'])
+ && $GLOBALS['phpgw_info']['server']['shm_lang']
+ && function_exists('sem_get'))
{
if(!$GLOBALS['phpgw']->shm->get_value('lang_en'))
{
@@ -277,7 +277,6 @@
$GLOBALS['phpgw']->redirect_link('/home.php',
$extra_vars);
exit;
}
- }
$tmpl->set_file(array('login_form' => 'login.tpl'));
$tmpl->set_var('charset', lang('charset'));
@@ -306,7 +305,7 @@
{
$tmpl->set_var('domain_selected',
'selected="selected"');
}
- $tmpl->parse('domain_options', 'domain_option', True);
+ $tmpl->parse('domain_options', 'domain_option', true);
}
$tmpl->parse('domain_selects', 'domain_select');
$tmpl->set_var(
@@ -359,13 +358,21 @@
$tmpl->set_var('lang_message', ' ');
}
- if( !$GLOBALS['phpgw_info']['server']['usecookies'] && isset($_COOKIE)
&& is_array($_COOKIE) )
+ if( !isset($GLOBALS['phpgw_info']['server']['usecookies']) &&
!$GLOBALS['phpgw']['server']['usecookies']
+ && isset($_COOKIE) && is_array($_COOKIE) )
+ {
+ if ( isset($_COOKIE['last_loginid']) )
{
unset($_COOKIE['last_loginid']);
+ }
+
+ if ( isset($_COOKIE['last_domain']) )
+ {
unset($_COOKIE['last_domain']);
}
+ }
- $last_loginid = $_COOKIE['last_loginid'];
+ $last_loginid = isset($_COOKIE['last_loginid']) ?
$_COOKIE['last_loginid'] : '';
if($GLOBALS['phpgw_info']['server']['show_domain_selectbox'] &&
$last_loginid !== '')
{
reset($GLOBALS['phpgw_domain']);
@@ -377,23 +384,26 @@
}
}
+ //FIXME switch to an array
+ $extra_vars = array();
foreach($_GET as $name => $value)
{
if (ereg('phpgw_',$name))
{
- $extra_vars .= '&' . $name . '=' . urlencode($value);
+ $extra_vars[$name] = urlencode($value);
}
}
- if ($extra_vars)
+ $cd = 0;
+ if ( isset($_GET['cd']) )
{
- $extra_vars = '?' . substr($extra_vars,1,strlen($extra_vars));
+ $cd = (int) $_GET['cd'];
}
- $tmpl->set_var('login_url',
$GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php' . $extra_vars);
+ $tmpl->set_var('login_url',
$GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php?' .
http_build_query($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('cd', check_logoutcode($cd) );
$tmpl->set_var('last_loginid', $last_loginid);
$tmpl->set_var('lang_username', lang('username'));
@@ -402,9 +412,9 @@
$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']
+ $tmpl->set_var('website_title',
isset($GLOBALS['phpgw_info']['server']['site_title'])
?
$GLOBALS['phpgw_info']['server']['site_title']
- : 'phpGroupWare')
+ : 'phpGroupWare'
);
$tmpl->set_var('template_set',
$GLOBALS['phpgw_info']['login_template_set']);
@@ -432,7 +442,14 @@
$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"'
: ''));
+ $autocomplete = '';
+ if ( isset($GLOBALS['phpgw_info']['server']['autocomplete_login'])
+ && $GLOBALS['phpgw_info']['server']['autocomplete_login'] )
+ {
+ $autocomplete = 'autocomplete="off"';
+ }
+ $tmpl->set_var('autocomplete', $autocomplete);
+ unset($autocomplete);
$tmpl->pfp('loginout','login_form');
?>
- [Phpgroupware-cvs] phpgroupware login.php,
Dave Hall <=