forked from extern/egroupware
Add expiration of 20 minutes (to be changed to idle time check later); Change
login behavior to be able to verify acceptance of the cookies before showing the page (using refresh - tested on NS, Mozilla, IE, Konqueror)
This commit is contained in:
parent
879b385f63
commit
9279e65f17
@ -67,7 +67,7 @@
|
||||
@abstract authenticate the setup user
|
||||
@param $auth_type ???
|
||||
*/
|
||||
function auth($auth_type='Config')
|
||||
function auth($auth_type='Config',$ConfigPW='',$HeaderPW='')
|
||||
{
|
||||
$FormLogout = get_var('FormLogout', array('GET','POST'));
|
||||
$ConfigLogin = get_var('ConfigLogin', array('POST'));
|
||||
@ -76,8 +76,8 @@
|
||||
$FormPW = get_var('FormPW', array('POST'));
|
||||
|
||||
$ConfigDomain = get_var('ConfigDomain',array('POST','COOKIE'));
|
||||
$ConfigPW = get_var('ConfigPW', array('POST','COOKIE'));
|
||||
$HeaderPW = get_var('HeaderPW', array('POST','COOKIE'));
|
||||
$ConfigPW = $ConfigPW ? $ConfigPW : get_var('ConfigPW', array('POST','COOKIE'));
|
||||
$HeaderPW = $HeaderPW ? $HeaderPW : get_var('HeaderPW', array('POST','COOKIE'));
|
||||
$ConfigLang = get_var('ConfigLang', array('POST','COOKIE'));
|
||||
|
||||
/* 6 cases:
|
||||
@ -89,13 +89,16 @@
|
||||
6. None of the above
|
||||
*/
|
||||
|
||||
$expire = time() + 1200; /* Expire login in 20 minutes. */
|
||||
|
||||
if(!empty($HeaderLogin) && $auth_type == 'Header')
|
||||
{
|
||||
/* header admin login */
|
||||
if($FormPW == $GLOBALS['phpgw_info']['server']['header_admin_password'])
|
||||
{
|
||||
setcookie('HeaderPW',"$FormPW");
|
||||
return True;
|
||||
setcookie('HeaderPW',"$FormPW","$expire");
|
||||
header('Location: manageheader.php');
|
||||
echo '<meta http-equiv="Refresh" content="1">' . lang('Please Wait...');
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -109,10 +112,10 @@
|
||||
/* config login */
|
||||
if($FormPW == $GLOBALS['phpgw_domain'][$FormDomain]['config_passwd'])
|
||||
{
|
||||
setcookie('ConfigPW',"$FormPW");
|
||||
setcookie('ConfigDomain',"$FormDomain");
|
||||
setcookie('ConfigLang',"$ConfigLang");
|
||||
return True;
|
||||
setcookie('ConfigPW',"$FormPW","$expire");
|
||||
setcookie('ConfigDomain',"$FormDomain","$expire");
|
||||
setcookie('ConfigLang',"$ConfigLang","$expire");
|
||||
echo '<meta http-equiv="Refresh" content="1">' . lang('Please Wait...');
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -82,6 +82,7 @@ pgsqlinstr setup de Hinweise zum erstellen der Datenbank in PostgreSQL:<br>Start
|
||||
please check for sql scripts within the application's directory setup de Bitte schauen Sie nach sql-Scripten im Applikations-Ordner
|
||||
please configure phpGroupWare for your environment setup de Bitte konfigurieren Sie phpGroupWare für Ihre Umgebung
|
||||
please install setup de Bitte installieren
|
||||
please wait... setup de Please Wait...
|
||||
possible solutions setup de Mögliche Lösungen
|
||||
potential problem setup de Potentielles Problem
|
||||
problem resolution setup de Problem Lösung
|
||||
|
@ -148,6 +148,7 @@ please check for sql scripts within the application's directory setup en Please
|
||||
please configure phpGroupWare for your environment setup en Please configure phpGroupWare for your environment
|
||||
please install setup en Please install
|
||||
please login to phpgroupware and run the admin application for additional site configuration setup en Please login to phpgroupware and run the admin application for additional site configuration
|
||||
please wait... setup en Please Wait...
|
||||
possible solutions setup en Possible Solutions
|
||||
potential problem setup en Potential Problem
|
||||
Preferences setup en Preferences
|
||||
|
@ -82,6 +82,7 @@ pgsqlinstr setup es Instrucciones para cr
|
||||
please check for sql scripts within the application's directory setup es Por favor comprueve los guiones sql en el directorio de la aplicación
|
||||
please configure phpGroupWare for your environment setup es Por favor configure phpGroupware para su entorno
|
||||
please install setup es Por favor Instale
|
||||
please wait... setup es Please Wait...
|
||||
possible solutions setup es Posibles Soluciones
|
||||
potential problem setup es Problema Potencial
|
||||
problem resolution setup es Resolución del problema
|
||||
|
@ -90,6 +90,7 @@ please check for sql scripts within the application's directory setup fr SVP v
|
||||
please configure phpGroupWare for your environment setup fr SVP configurez phpGroupWare pour votre environnement
|
||||
please install setup fr SVP installez
|
||||
please login to phpgroupware and run the admin application for additional site configuration setup fr SVP connectez-vous à phpgroupware et exécutez l'application admin pour les possibilités supplémentaires de configuration du site
|
||||
please wait... setup fr Please Wait...
|
||||
possible solutions setup fr Solutions possibles
|
||||
potential problem setup fr Problème potentiel
|
||||
problem resolution setup fr Résolution du problème
|
||||
|
@ -90,6 +90,7 @@ please check for sql scripts within the application's directory setup it Per fav
|
||||
please configure phpGroupWare for your environment setup it Per favore configura phpGroupWare per il tuo Sistema
|
||||
please install setup it Per favore installa
|
||||
please login to phpgroupware and run the admin application for additional site configuration setup it Accedi a phpgroupware ed esegui l'applicazione 'admin' per una ulteriore configurazione del sito
|
||||
please wait... setup it Please Wait...
|
||||
possible solutions setup it Soluzioni possibili
|
||||
potential problem setup it Problema Potenziale
|
||||
problem resolution setup it Risoluzione del problemq
|
||||
|
@ -125,6 +125,7 @@ please configure phpGroupWare for your environment setup ja Please configure php
|
||||
please install setup ja Please install
|
||||
please login setup ja ログイン
|
||||
please login to phpgroupware and run the admin application for additional site configuration setup ja phpGroupWare にログインして、admin アプリケーション内の各アプリケーションサイト環境設定を実行して下さい
|
||||
please wait... setup ja Please Wait...
|
||||
possible solutions setup ja Possible Solutions
|
||||
potential problem setup ja Potential Problem
|
||||
preferences setup ja ユーザ設定情報
|
||||
|
@ -160,6 +160,7 @@ please check for sql scripts within the application's directory setup pt Procure
|
||||
please configure phpGroupWare for your environment setup pt Por favor configure o phpGroupWare para o seu ambiente
|
||||
please install setup pt Por favor instale
|
||||
please login to phpgroupware and run the admin application for additional site configuration setup pt Por favor, conecte no phpgroupware e execute a aplicação de administração para outras configurações do servidor
|
||||
please wait... setup pt Please Wait...
|
||||
possible solutions setup pt Possíveis soluções
|
||||
potential problem setup pt Problema em potencial
|
||||
problem resolution setup pt Solução do problema
|
||||
|
@ -125,6 +125,7 @@ please check for sql scripts within the application's directory setup zt
|
||||
please configure phpGroupWare for your environment setup zt 請為您現在的環境設定 phpGroupWare 的相關組態
|
||||
please install setup zt 請安裝
|
||||
please login to phpgroupware and run the admin application for additional site configuration setup zt 請登入 phpGroupWare 並執行管理者應用程式設定其餘的組態設定
|
||||
please wait... setup zt Please Wait...
|
||||
possible solutions setup zt 可能的解決方法
|
||||
potential problem setup zt 可能的問題
|
||||
Preferences setup zt 喜好設定
|
||||
|
Loading…
Reference in New Issue
Block a user