[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9960] formatting
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9960] formatting |
|
Date: |
Sun, 02 Sep 2012 18:56:26 +0000 |
Revision: 9960
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9960
Author: sigurdne
Date: 2012-09-02 18:56:26 +0000 (Sun, 02 Sep 2012)
Log Message:
-----------
formatting
Modified Paths:
--------------
trunk/login.php
Modified: trunk/login.php
===================================================================
--- trunk/login.php 2012-09-02 18:55:51 UTC (rev 9959)
+++ trunk/login.php 2012-09-02 18:56:26 UTC (rev 9960)
@@ -1,32 +1,32 @@
<?php
+
/**
- * phpGroupWare
- *
- * phpgroupware base
- * @author Dan Kuykendall <address@hidden>
- * @author Joseph Engo <address@hidden>
- * @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$
- */
-
- if(isset($_REQUEST['skip_remote']) && $_REQUEST['skip_remote'])
+ * phpGroupWare
+ *
+ * phpgroupware base
+ * @author Dan Kuykendall <address@hidden>
+ * @author Joseph Engo <address@hidden>
+ * @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$
+ */
+ if (isset($_REQUEST['skip_remote']) && $_REQUEST['skip_remote'])
{
$GLOBALS['phpgw_remote_user_fallback'] = 'sql';
}
- if(isset($_GET['logout']) && $_GET['logout']) // In case a user logged
in via SSO - actively logs out
+ if (isset($_GET['logout']) && $_GET['logout']) // In case a user logged
in via SSO - actively logs out
{
- $GLOBALS['phpgw_remote_user_fallback'] = 'sql';
- $_REQUEST['skip_remote'] = true;
- }
- $lightbox = isset($_REQUEST['lightbox']) && $_REQUEST['lightbox'] ?
true : false;
+ $GLOBALS['phpgw_remote_user_fallback'] = 'sql';
+ $_REQUEST['skip_remote'] = true;
+ }
+ $lightbox
= isset($_REQUEST['lightbox']) && $_REQUEST['lightbox'] ? true : false;
require_once 'phpgwapi/inc/sso/include_login.inc.php';
- $partial_url = 'login.php';
- $phpgw_url_for_sso = 'phpgwapi/inc/sso/login_server.php';
- if(isset($GLOBALS['phpgw_remote_user']) &&
!empty($GLOBALS['phpgw_remote_user']))
+ $partial_url = 'login.php';
+ $phpgw_url_for_sso = 'phpgwapi/inc/sso/login_server.php';
+ if (isset($GLOBALS['phpgw_remote_user']) &&
!empty($GLOBALS['phpgw_remote_user']))
{
$partial_url = 'phpgwapi/inc/sso/login_server.php';
}
@@ -34,68 +34,68 @@
/* Program starts here */
$uilogin = new phpgw_uilogin($tmpl,
$GLOBALS['phpgw_info']['server']['auth_type'] == 'remoteuser' &&
!isset($GLOBALS['phpgw_remote_user']));
- if($GLOBALS['phpgw_info']['server']['auth_type'] == 'remoteuser' &&
isset($GLOBALS['phpgw_info']['server']['mapping']) &&
!empty($GLOBALS['phpgw_info']['server']['mapping']) &&
isset($_SERVER['REMOTE_USER']))
+ if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'remoteuser' &&
isset($GLOBALS['phpgw_info']['server']['mapping']) &&
!empty($GLOBALS['phpgw_info']['server']['mapping']) &&
isset($_SERVER['REMOTE_USER']))
{
$login =
$GLOBALS['phpgw']->mapping->get_mapping($_SERVER['REMOTE_USER']);
- if($login == '') // mapping failed
+ if ($login == '') // mapping failed
{
-
if(isset($GLOBALS['phpgw_info']['server']['auto_create_acct']) &&
$GLOBALS['phpgw_info']['server']['auto_create_acct'] == true)
+ if
(isset($GLOBALS['phpgw_info']['server']['auto_create_acct']) &&
$GLOBALS['phpgw_info']['server']['auto_create_acct'] == true)
{
// Redirection to create the new account :
$GLOBALS['phpgw']->redirect_link('/phpgwapi/inc/sso/create_account.php');
}
- else if($GLOBALS['phpgw_info']['server']['mapping'] ==
'table' || $GLOBALS['phpgw_info']['server']['mapping'] == 'all')
+ else if ($GLOBALS['phpgw_info']['server']['mapping'] ==
'table' || $GLOBALS['phpgw_info']['server']['mapping'] == 'all')
{
// Redirection to create a new mapping :
$GLOBALS['phpgw']->redirect_link('/phpgwapi/inc/sso/create_mapping.php');
}
- else if(!(isset($_GET['cd']) && $_GET['cd'] !='0'))
+ else if (!(isset($_GET['cd']) && $_GET['cd'] != '0'))
{
// An error occurs, bailed out
- $GLOBALS['phpgw']->redirect_link('/'.
$partial_url, array('cd' => '20'));
+ $GLOBALS['phpgw']->redirect_link('/' .
$partial_url, array('cd' => '20'));
}
}
- $passwd = $login;
- if(!(isset($_GET['cd']) && $_GET['cd'] !='0'))
+ $passwd = $login;
+ if (!(isset($_GET['cd']) && $_GET['cd'] != '0'))
{
$_POST['submitit'] = true;
}
}
else
{
- $login = phpgw::get_var('login', 'string', 'POST');
+ $login = phpgw::get_var('login', 'string', 'POST');
// remove entities to stop mangling
- $passwd = html_entity_decode(phpgw::get_var('passwd', 'string',
'POST'));
+ $passwd = html_entity_decode(phpgw::get_var('passwd',
'string', 'POST'));
}
if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'http' &&
isset($_SERVER['PHP_AUTH_USER']))
{
- $submit = true;
- $login = $_SERVER['PHP_AUTH_USER'];
- $passwd = $_SERVER['PHP_AUTH_PW'];
+ $submit = true;
+ $login = $_SERVER['PHP_AUTH_USER'];
+ $passwd = $_SERVER['PHP_AUTH_PW'];
}
-
+
if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'ntlm' &&
isset($_SERVER['REMOTE_USER']) && (!isset($_REQUEST['skip_remote']) ||
!$_REQUEST['skip_remote']))
{
- $login = $_SERVER['REMOTE_USER'];
- $passwd = '';
+ $login = $_SERVER['REMOTE_USER'];
+ $passwd = '';
$GLOBALS['hook_values'] = array
(
- 'account_lid' => $login
+ 'account_lid' => $login
);
-
$GLOBALS['phpgw']->hooks->process('auto_addaccount',array('frontend'));
+ $GLOBALS['phpgw']->hooks->process('auto_addaccount',
array('frontend'));
-//------------------Start login ntlm
+ //------------------Start login ntlm
$GLOBALS['sessionid'] =
$GLOBALS['phpgw']->session->create($login, $passwd);
- if (! isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
+ if (!isset($GLOBALS['sessionid']) || !$GLOBALS['sessionid'])
{
- $cd_array=array();
- if($GLOBALS['phpgw']->session->cd_reason)
+ $cd_array = array();
+ if ($GLOBALS['phpgw']->session->cd_reason)
{
- $cd_array['cd'] =
$GLOBALS['phpgw']->session->cd_reason;
+ $cd_array['cd'] =
$GLOBALS['phpgw']->session->cd_reason;
}
$cd_array['skip_remote'] = true;
@@ -104,28 +104,28 @@
}
$forward = phpgw::get_var('phpgw_forward');
- if($forward)
+ if ($forward)
{
- $extra_vars['phpgw_forward'] = $forward;
- foreach($_GET as $name => $value)
+ $extra_vars['phpgw_forward'] = $forward;
+ foreach ($_GET as $name => $value)
{
- if (ereg('phpgw_',$name))
+ if (ereg('phpgw_', $name))
{
- $name = urlencode($name);
- $extra_vars[$name] = urlencode($value);
+ $name =
urlencode($name);
+ $extra_vars[$name] =
urlencode($value);
}
}
}
- if (
!isset($GLOBALS['phpgw_info']['server']['disable_autoload_langfiles']) ||
!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles'] )
+ if
(!isset($GLOBALS['phpgw_info']['server']['disable_autoload_langfiles']) ||
!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles'])
{
-// $uilogin->check_langs();
+ // $uilogin->check_langs();
}
$extra_vars['cd'] = 'yes';
-
+
$GLOBALS['phpgw']->hooks->process('login');
$GLOBALS['phpgw']->redirect_link('/home.php', $extra_vars);
-//----------------- End login ntlm
+ //----------------- End login ntlm
}
# Apache + mod_ssl style SSL certificate authentication
@@ -135,11 +135,11 @@
# an X.509 subject looks like:
#
/CN=john.doe/OU=Department/O=Company/C=xx/address@hidden/L=City/
# the username is deliberately lowercase, to ease LDAP
integration
- $sslattribs = explode('/',$_SERVER['SSL_CLIENT_S_DN']);
+ $sslattribs = explode('/', $_SERVER['SSL_CLIENT_S_DN']);
# skip the part in front of the first '/' (nothing)
- while ($sslattrib = next($sslattribs))
+ while ($sslattrib = next($sslattribs))
{
- list($key,$val) = explode('=',$sslattrib);
+ list($key, $val) = explode('=', $sslattrib);
$sslattributes[$key] = $val;
}
@@ -149,10 +149,11 @@
# login will be set here if the user logged out and
uses a different username with
# the same SSL-certificate.
- if
(!isset($_POST['login'])&&isset($sslattributes['Email'])) {
- $login = $sslattributes['Email'];
+ if (!isset($_POST['login']) &&
isset($sslattributes['Email']))
+ {
+ $login = $sslattributes['Email'];
# not checked against the database, but
delivered to authentication module
- $passwd = $_SERVER['SSL_CLIENT_S_DN'];
+ $passwd = $_SERVER['SSL_CLIENT_S_DN'];
}
}
unset($key);
@@ -160,98 +161,98 @@
unset($sslattributes);
}
- if ( (isset($_POST['submitit']) || isset($_POST['submit_x']) ||
isset($_POST['submit_y']) ) )
+ if ((isset($_POST['submitit']) || isset($_POST['submit_x']) ||
isset($_POST['submit_y'])))
{
- if ( $_SERVER['REQUEST_METHOD'] != 'POST' &&
- !isset($_SERVER['PHP_AUTH_USER']) &&
- !isset($_SERVER['REMOTE_USER']) &&
- !isset($_SERVER['SSL_CLIENT_S_DN'])
- )
+ if ($_SERVER['REQUEST_METHOD'] != 'POST' &&
+ !isset($_SERVER['PHP_AUTH_USER']) &&
+ !isset($_SERVER['REMOTE_USER']) &&
+ !isset($_SERVER['SSL_CLIENT_S_DN'])
+ )
{
- $GLOBALS['phpgw']->redirect_link('/'.$partial_url,
array('cd' => '5'));
+ $GLOBALS['phpgw']->redirect_link('/' . $partial_url,
array('cd' => '5'));
}
$logindomain = phpgw::get_var('logindomain', 'string', 'POST');
- if ( strstr($login,'#') === false && $logindomain )
+ if (strstr($login, '#') === false && $logindomain)
{
$login .= "#{$logindomain}";
}
$receipt = array();
- if ( isset($GLOBALS['phpgw_info']['server']['usecookies'])
- && $GLOBALS['phpgw_info']['server']['usecookies'] )
+ if (isset($GLOBALS['phpgw_info']['server']['usecookies'])
+ &&
$GLOBALS['phpgw_info']['server']['usecookies'])
{
- if(isset($_COOKIE['domain']) && $_COOKIE['domain'] !=
$logindomain)
+ if (isset($_COOKIE['domain']) && $_COOKIE['domain'] !=
$logindomain)
{
$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
-//
$GLOBALS['phpgw']->redirect_link("/{$partial_url}", array('cd' =>22)); //
already within a session
-// exit;
+ //
$GLOBALS['phpgw']->redirect_link("/{$partial_url}", array('cd' =>22)); //
already within a session
+ // exit;
- $receipt[] = lang('Info: you have changed
domain from "%1" to "%2"' ,$_COOKIE['domain'],$logindomain);
+ $receipt[] = lang('Info: you have changed
domain from "%1" to "%2"', $_COOKIE['domain'], $logindomain);
}
}
$GLOBALS['sessionid'] =
$GLOBALS['phpgw']->session->create($login, $passwd);
- if (! isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
+ if (!isset($GLOBALS['sessionid']) || !$GLOBALS['sessionid'])
{
- $cd_array=array();
- if($GLOBALS['phpgw']->session->cd_reason)
+ $cd_array = array();
+ if ($GLOBALS['phpgw']->session->cd_reason)
{
- $cd_array['cd'] =
$GLOBALS['phpgw']->session->cd_reason;
+ $cd_array['cd'] =
$GLOBALS['phpgw']->session->cd_reason;
}
$cd_array['skip_remote'] = true;
- $cd_array['lightbox'] = $lightbox;
+ $cd_array['lightbox'] = $lightbox;
$GLOBALS['phpgw']->redirect_link("/{$partial_url}",
$cd_array);
exit;
}
- if($receipt)
+ if ($receipt)
{
phpgwapi_cache::message_set($receipt, 'message');
}
$forward = phpgw::get_var('phpgw_forward');
- if($forward)
+ if ($forward)
{
- $extra_vars['phpgw_forward'] = $forward;
- foreach($_GET as $name => $value)
+ $extra_vars['phpgw_forward'] = $forward;
+ foreach ($_GET as $name => $value)
{
- if (ereg('phpgw_',$name))
+ if (ereg('phpgw_', $name))
{
//$extra_vars[$name] = $value;
- $name = urlencode($name);
- $extra_vars[$name] = urlencode($value);
+ $name =
urlencode($name);
+ $extra_vars[$name] =
urlencode($value);
}
}
}
- if (
!isset($GLOBALS['phpgw_info']['server']['disable_autoload_langfiles']) ||
!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles'] )
+ if
(!isset($GLOBALS['phpgw_info']['server']['disable_autoload_langfiles']) ||
!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles'])
{
-// $uilogin->check_langs();
+ // $uilogin->check_langs();
}
$extra_vars['cd'] = 'yes';
-
+
$GLOBALS['phpgw']->hooks->process('login');
- if($lightbox)
+ if ($lightbox)
{
$GLOBALS['phpgw']->redirect_link('/login.php',
array('hide_lightbox' => true));
}
else
{
- $GLOBALS['phpgw']->redirect_link('/home.php', $extra_vars);
+ $GLOBALS['phpgw']->redirect_link('/home.php',
$extra_vars);
+ }
}
- }
//Build vars :
$variables = array();
- $variables['lang_login'] = lang('login');
- $variables['partial_url'] = $partial_url;
- if(isset($GLOBALS['phpgw_info']['server']['half_remote_user']) &&
$GLOBALS['phpgw_info']['server']['half_remote_user'] == 'remoteuser')
+ $variables['lang_login'] = lang('login');
+ $variables['partial_url'] = $partial_url;
+ if (isset($GLOBALS['phpgw_info']['server']['half_remote_user']) &&
$GLOBALS['phpgw_info']['server']['half_remote_user'] == 'remoteuser')
{
- $variables['lang_additional_url'] = lang('use sso login');
- $variables['additional_url'] =
$GLOBALS['phpgw']->link('/'.$phpgw_url_for_sso);
+ $variables['lang_additional_url'] = lang('use sso
login');
+ $variables['additional_url'] =
$GLOBALS['phpgw']->link('/' . $phpgw_url_for_sso);
}
$uilogin->phpgw_display_login($variables);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9960] formatting,
Sigurd Nes <=