diff --git a/phpgwapi/inc/class.setup.inc.php b/phpgwapi/inc/class.setup.inc.php index d8ba30c267..51fdd3338f 100644 --- a/phpgwapi/inc/class.setup.inc.php +++ b/phpgwapi/inc/class.setup.inc.php @@ -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 '' . 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 '' . lang('Please Wait...'); } else { diff --git a/setup/lang/phpgw_de.lang b/setup/lang/phpgw_de.lang index 76baa612a5..fde5f3a3b3 100644 --- a/setup/lang/phpgw_de.lang +++ b/setup/lang/phpgw_de.lang @@ -82,6 +82,7 @@ pgsqlinstr setup de Hinweise zum erstellen der Datenbank in PostgreSQL:
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 diff --git a/setup/lang/phpgw_en.lang b/setup/lang/phpgw_en.lang index 13941478f1..6abf4c37a1 100644 --- a/setup/lang/phpgw_en.lang +++ b/setup/lang/phpgw_en.lang @@ -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 diff --git a/setup/lang/phpgw_es.lang b/setup/lang/phpgw_es.lang index ed0c46e387..3e21c8f6e5 100644 --- a/setup/lang/phpgw_es.lang +++ b/setup/lang/phpgw_es.lang @@ -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 diff --git a/setup/lang/phpgw_fr.lang b/setup/lang/phpgw_fr.lang index 585d2233b9..cae62b2ecd 100644 --- a/setup/lang/phpgw_fr.lang +++ b/setup/lang/phpgw_fr.lang @@ -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 diff --git a/setup/lang/phpgw_it.lang b/setup/lang/phpgw_it.lang index 1d9378f57a..7fca097f18 100644 --- a/setup/lang/phpgw_it.lang +++ b/setup/lang/phpgw_it.lang @@ -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 diff --git a/setup/lang/phpgw_ja.lang b/setup/lang/phpgw_ja.lang index 13f2f5f3bb..6cabd4f6eb 100644 --- a/setup/lang/phpgw_ja.lang +++ b/setup/lang/phpgw_ja.lang @@ -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 ¥æ¡¼¥¶ÀßÄê¾ðÊó diff --git a/setup/lang/phpgw_pt.lang b/setup/lang/phpgw_pt.lang index 877c96c4b8..e427a38d8d 100644 --- a/setup/lang/phpgw_pt.lang +++ b/setup/lang/phpgw_pt.lang @@ -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 diff --git a/setup/lang/phpgw_zt.lang b/setup/lang/phpgw_zt.lang index 9b7b7dc183..a1b11d2d2a 100644 --- a/setup/lang/phpgw_zt.lang +++ b/setup/lang/phpgw_zt.lang @@ -125,6 +125,7 @@ please check for sql scripts within the application's directory setup zt please configure phpGroupWare for your environment setup zt ½Ð¬°±z²{¦bªºÀô¹Ò³]©w phpGroupWare ªº¬ÛÃö²ÕºA please install setup zt ½Ð¦w¸Ë please login to phpgroupware and run the admin application for additional site configuration setup zt ½Ðµn¤J phpGroupWare ¨Ã°õ¦æºÞ²zªÌÀ³¥Îµ{¦¡³]©w¨ä¾lªº²ÕºA³]©w +please wait... setup zt Please Wait... possible solutions setup zt ¥i¯àªº¸Ñ¨M¤èªk potential problem setup zt ¥i¯àªº°ÝÃD Preferences setup zt ³ß¦n³]©w