extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 17:48:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

merged sesson-functions for .16, incl. the brute-force stuffe and cacheing the data from other session in the appsession

Browse Source 
fixed multidomain logins for register_globals off
This commit is contained in:
Ralf Becker 2003-05-18 19:18:58 +00:00
parent 53b8b8844f
commit a09ccfb730
33 changed files with 231 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/inc/class.boaccess_history.inc.php
View File

@ -45,10 +45,14 @@
$record['li'] = $GLOBALS['phpgw']->common->show_date($record['li']); $record['li'] = $GLOBALS['phpgw']->common->show_date($record['li']);
} }
if ($record['lo'] != '') if ($record['lo'])
{ {
$record['lo'] = $GLOBALS['phpgw']->common->show_date($record['lo']); $record['lo'] = $GLOBALS['phpgw']->common->show_date($record['lo']);
} }
else
{
$record['lo'] = ''; // dont show a 0 for not loged out
}
if (ereg('@',$record['loginid'])) if (ereg('@',$record['loginid']))
{ {
@ -62,19 +66,13 @@
'li' => $record['li'], 'li' => $record['li'],
'lo' => $record['lo'], 'lo' => $record['lo'],
'account_id' => $record['account_id'], 'account_id' => $record['account_id'],
'sessionid' => $record['sessionid'],
'total' => $total 'total' => $total
); );
} }
return $_records; return $_records;
} }
function grab_fullname($account_id)
{
$acct = createobject('phpgwapi.accounts',$account_id);
$acct->read_repository();
return $GLOBALS['phpgw']->common->display_fullname($acct->data['account_lid'],$acct->data['firstname'],$acct->data['lastname']);
}
function total($account_id) function total($account_id)
{ {
return $this->so->total($account_id); return $this->so->total($account_id);

8
admin/inc/class.bocurrentsessions.inc.php
View File

@ -48,7 +48,7 @@
'session_logintime' => $GLOBALS['phpgw']->common->show_date($value['session_logintime']), 'session_logintime' => $GLOBALS['phpgw']->common->show_date($value['session_logintime']),
'session_action' => $value['session_action'], 'session_action' => $value['session_action'],
'session_dla' => $value['session_dla'], 'session_dla' => $value['session_dla'],
'session_idle' => gmdate('G:i:s',($GLOBALS['phpgw']->datetime->gmtnow - $value['session_dla'])) 'session_idle' => gmdate('G:i:s',(time() - $value['session_dla']))
); );
} }
return $_values; return $_values;
@ -56,11 +56,11 @@
function kill() function kill()
{ {
if ($GLOBALS['HTTP_GET_VARS']['ksession'] && if ($_GET['ksession'] &&
($GLOBALS['sessionid'] != $GLOBALS['HTTP_GET_VARS']['ksession']) && ($GLOBALS['sessionid'] != $_GET['ksession']) &&
! $GLOBALS['phpgw']->acl->check('current_sessions_access',8,'admin')) ! $GLOBALS['phpgw']->acl->check('current_sessions_access',8,'admin'))
{ {
$GLOBALS['phpgw']->session->destroy($GLOBALS['HTTP_GET_VARS']['ksession'],0); $GLOBALS['phpgw']->session->destroy($_GET['ksession'],0);
} }
$this->ui = createobject('admin.uicurrentsessions'); $this->ui = createobject('admin.uicurrentsessions');
$this->ui->list_sessions(); $this->ui->list_sessions();

5
admin/inc/class.soaccess_history.inc.php
View File

@ -32,7 +32,7 @@
{ {
$where = $this->test_account_id($account_id); $where = $this->test_account_id($account_id);
$this->db->limit_query("select loginid,ip,li,lo,account_id from phpgw_access_log $where order by li desc",$start,__LINE__,__FILE__); $this->db->limit_query("select loginid,ip,li,lo,account_id,sessionid from phpgw_access_log $where order by li desc",$start,__LINE__,__FILE__);
while ($this->db->next_record()) while ($this->db->next_record())
{ {
$records[] = array( $records[] = array(
@ -40,7 +40,8 @@
'ip' => $this->db->f('ip'), 'ip' => $this->db->f('ip'),
'li' => $this->db->f('li'), 'li' => $this->db->f('li'),
'lo' => $this->db->f('lo'), 'lo' => $this->db->f('lo'),
'account_id' => $this->db->f('account_id') 'account_id' => $this->db->f('account_id'),
'sessionid' => $this->db->f('sessionid')
); );
} }
return $records; return $records;

5
admin/inc/class.uiaccess_history.inc.php
View File

@ -40,6 +40,7 @@
$sort = ($GLOBALS['HTTP_POST_VARS']['sort']?$GLOBALS['HTTP_POST_VARS']['sort']:0); $sort = ($GLOBALS['HTTP_POST_VARS']['sort']?$GLOBALS['HTTP_POST_VARS']['sort']:0);
$order = ($GLOBALS['HTTP_POST_VARS']['order']?$GLOBALS['HTTP_POST_VARS']['order']:0); $order = ($GLOBALS['HTTP_POST_VARS']['order']?$GLOBALS['HTTP_POST_VARS']['order']:0);
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('View access log');
$GLOBALS['phpgw']->common->phpgw_header(); $GLOBALS['phpgw']->common->phpgw_header();
$total_records = $this->bo->total($account_id); $total_records = $this->bo->total($account_id);
@ -64,7 +65,7 @@
'account_id' => $account_id 'account_id' => $account_id
) )
) . '">' . lang('Return to view account') . '</a>'; ) . '">' . lang('Return to view account') . '</a>';
$var['lang_last_x_logins'] = lang('Last %1 logins for %2',$total_records,$this->bo->grab_fullname($account_id)); $var['lang_last_x_logins'] = lang('Last %1 logins for %2',$total_records,$GLOBALS['phpgw']->common->grab_owner_name($account_id));
} }
else else
{ {
@ -82,7 +83,7 @@
'row_loginid' => $record['loginid'], 'row_loginid' => $record['loginid'],
'row_ip' => $record['ip'], 'row_ip' => $record['ip'],
'row_li' => $record['li'], 'row_li' => $record['li'],
'row_lo' => $record['lo'], 'row_lo' => $record['account_id'] ? $record['lo'] : '<b>'.lang($record['sessionid']).'</b>',
'row_total' => ($record['lo']?$record['total']:'&nbsp;') 'row_total' => ($record['lo']?$record['total']:'&nbsp;')
); );
$this->template->set_var($var); $this->template->set_var($var);

6
admin/inc/class.uicurrentsessions.inc.php
View File

@ -71,6 +71,7 @@
$this->store_location($info); $this->store_location($info);
} }
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('List of current users');
$this->header(); $this->header();
$this->template->set_file('current','currentusers.tpl'); $this->template->set_file('current','currentusers.tpl');
@ -89,7 +90,6 @@
$total = $this->bo->total(); $total = $this->bo->total();
$this->template->set_var('lang_current_users',lang('List of current users'));
$this->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']); $this->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['bg_color']);
$this->template->set_var('left_next_matchs',$this->nextmatchs->left('/admin/currentusers.php',$info['start'],$total)); $this->template->set_var('left_next_matchs',$this->nextmatchs->left('/admin/currentusers.php',$info['start'],$total));
$this->template->set_var('right_next_matchs',$this->nextmatchs->right('/admin/currentusers.php',$info['start'],$total)); $this->template->set_var('right_next_matchs',$this->nextmatchs->right('/admin/currentusers.php',$info['start'],$total));
@ -164,13 +164,13 @@
return False; return False;
} }
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Kill session');
$this->header(); $this->header();
$this->template->set_file('form','kill_session.tpl'); $this->template->set_file('form','kill_session.tpl');
$this->template->set_var('lang_title',lang('Kill session'));
$this->template->set_var('lang_message',lang('Are you sure you want to kill this session ?')); $this->template->set_var('lang_message',lang('Are you sure you want to kill this session ?'));
$this->template->set_var('link_no','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions') . '">' . lang('No') . '</a>'); $this->template->set_var('link_no','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions') . '">' . lang('No') . '</a>');
$this->template->set_var('link_yes','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.bocurrentsessions.kill&ksession=' . $GLOBALS['HTTP_GET_VARS']['ksession']) . '">' . lang('Yes') . '</a>'); $this->template->set_var('link_yes','<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.bocurrentsessions.kill&ksession=' . $_GET['ksession']) . '">' . lang('Yes') . '</a>');
$this->template->pfp('out','form'); $this->template->pfp('out','form');
} }

1
admin/inc/class.uilog.inc.php
View File

@ -255,6 +255,7 @@
$table = $this->html->hash_table($rows,$header,$this, 'format_row'); $table = $this->html->hash_table($rows,$header,$this, 'format_row');
$this->t->set_var('event_list',$table); $this->t->set_var('event_list',$table);
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.($this->editmode?lang('Edit Table format') : lang('View error log'));
$GLOBALS['phpgw']->common->phpgw_header(); $GLOBALS['phpgw']->common->phpgw_header();
$this->t->pfp('out','log_list_t'); $this->t->pfp('out','log_list_t');
// $this->set_app_langs(); // $this->set_app_langs();

31
admin/setup/phpgw_de.lang
View File

@ -1,6 +1,8 @@
%1 - %2 of %3 user accounts admin de %1 - %2 von %3 Benutzerkonten
(stored password will not be shown here) admin de (Gespeicherte Passwort wird hier nicht angezeigt) (stored password will not be shown here) admin de (Gespeicherte Passwort wird hier nicht angezeigt)
(to install new applications use<br><a href="setup/" target="setup">setup</a> [manage applications admin de (Zur Installation neuer Anwendungen verwenden Sie bitte<br><a href="setup/" target="setup">Setup</a> [Anwendungen Verwalten] !!!) (to install new applications use<br><a href="setup/" target="setup">setup</a> [manage applications admin de (Zur Installation neuer Anwendungen verwenden Sie bitte<br><a href="setup/" target="setup">Setup</a> [Anwendungen Verwalten] !!!)
(to install new applications use<br><a href="setup/" target="setup">setup</a> [manage applications] !!!) admin de (Zur Installation neuer Anwendungen verwenden Sie bitte<br><a href="setup/" target="setup">Setup</a> [Anwendungen Verwalten] !!!) (to install new applications use<br><a href="setup/" target="setup">setup</a> [manage applications] !!!) admin de (Zur Installation neuer Anwendungen verwenden Sie bitte<br><a href="setup/" target="setup">Setup</a> [Anwendungen Verwalten] !!!)
accesslog and bruteforce defense admin de Zugangsprotokoll und Abwehr von BruteForce Angriffen
account active admin de Konto aktiv account active admin de Konto aktiv
account has been created common de Konto wurde erstellt account has been created common de Konto wurde erstellt
account has been deleted common de Konto wurde gel.scht account has been deleted common de Konto wurde gel.scht
@ -18,26 +20,30 @@ add new account admin de Neues Konto hinzuf&uuml;gen
add new application admin de Neue Anwendung hinzufügen add new application admin de Neue Anwendung hinzufügen
add peer server admin de Peer Server hinzufügen add peer server admin de Peer Server hinzufügen
admin email admin de Email Administration admin email admin de Email Administration
admin email addresses (comma-separated) to be notified about the blocking (empty for no notify) ? admin de Email Adressen der Administratoren (mit Komma getrennt) die über eine Sperre benachrichtigt werden sollen (leer für keine Benachrichtigung) ?
admin name admin de Admin Name admin name admin de Admin Name
administration admin de Administration administration admin de Administration
admins admin de Admins admins admin de Admins
after how many unsuccessful attempts to login, an account should be blocked (default 3) ? admin de Nach wie vielen erfolglosen Versuchen sich anzumelden, soll ein Benutzerkonto gesperrt werden (Vorgabe 3) ?
after how many unsuccessful attempts to login, an ip should be blocked (default 3) ? admin de Nach wie vielen erfolglosen Versuchen sich anzumelden, soll eine IP-Adresse gesperrt werden (Vorgabe 3) ?
all records and account information will be lost! admin de Alle Datens&auml;tze und Kontoinformationen sind dann verloren! all records and account information will be lost! admin de Alle Datens&auml;tze und Kontoinformationen sind dann verloren!
all users admin de Alle Benutzer all users admin de Alle Benutzer
allow anonymous access to this app admin de Anonymen Zugriff auf diese Anwendung zulassen allow anonymous access to this app admin de Anonymen Zugriff auf diese Anwendung zulassen
anonymous user admin de Anonymer Benutzer anonymous user admin de Anonymer Benutzer
anonymous user<br>(not shown in list sessions) admin de Anonymer Benutzer<br>(wird bei Sitzungen anzeigen nicht angezeigt)
application admin de Anwendung application admin de Anwendung
application name admin de Name der Anwendung application name admin de Name der Anwendung
application title admin de Titel der Anwendung application title admin de Titel der Anwendung
applications admin de Anwendungen applications admin de Anwendungen
are you sure you want to delete the application %1 ? admin de Sind Sie sicher, dass Sie die Anwendung %1 löschen wollen ?
are you sure you want to delete this account ? admin de Sind Sie sicher, dass Sie dieses Konto löschen wollen ? are you sure you want to delete this account ? admin de Sind Sie sicher, dass Sie dieses Konto löschen wollen ?
are you sure you want to delete this application ? admin de Sind Sie sicher, dass Sie diese Anwendung löschen wollen ?
are you sure you want to delete this category ? common de Sind Sie sicher, dass Sie diese Kategorie l&ouml;schen wollen ? are you sure you want to delete this category ? common de Sind Sie sicher, dass Sie diese Kategorie l&ouml;schen wollen ?
are you sure you want to delete this group ? admin de Sind Sie sicher, dass Sie diese Gruppe löschen wollen ? are you sure you want to delete this group ? admin de Sind Sie sicher, dass Sie diese Gruppe löschen wollen ?
are you sure you want to delete this server? admin de Sind sie sicher, dass sie diesen Server löschen wollen ? are you sure you want to delete this server? admin de Sind sie sicher, dass sie diesen Server löschen wollen ?
are you sure you want to kill this session ? admin de Sind Sie sicher, dass Sie diese Session killen wollen ? are you sure you want to kill this session ? admin de Sind Sie sicher, dass Sie diese Session killen wollen ?
attempt to use correct mimetype for ftp instead of default 'application/octet-stream' admin de Soll versucht werden den richtigen MINE-typ für FTP zu verwenden, statt dem default 'application/octet-stream' attempt to use correct mimetype for ftp instead of default 'application/octet-stream' admin de Soll versucht werden den richtigen MINE-typ für FTP zu verwenden, statt dem default 'application/octet-stream'
authentication / accounts admin de Benutzerauthentifizierung / Benutzerkonten authentication / accounts admin de Benutzerauthentifizierung / Benutzerkonten
auto create account records for authenticated users admin de Automatisch Kontendaten für authentifizierte Benutzer anlegen auto create account records for authenticated users admin de Automatisch Benutzerkonten für authentifizierte Benutzer anlegen
bi-dir passthrough admin de Weiterleitung in beide Richtungen bi-dir passthrough admin de Weiterleitung in beide Richtungen
bi-directional admin de beide Richtungen bi-directional admin de beide Richtungen
bottom admin de unten bottom admin de unten
@ -78,6 +84,9 @@ edit table format admin de Tabellenformat bearbeiten
edit user account admin de Benutzerkonto bearbeiten edit user account admin de Benutzerkonto bearbeiten
enabled - hidden from navbar admin de Verfügbar, aber nicht in der Navigationsleiste enabled - hidden from navbar admin de Verfügbar, aber nicht in der Navigationsleiste
enter some random text for app_session <br>encryption (requires mcrypt) admin de Zufälligen Text für app_session<br>Verschlüsselung (braucht mcrypt) enter some random text for app_session <br>encryption (requires mcrypt) admin de Zufälligen Text für app_session<br>Verschlüsselung (braucht mcrypt)
enter the background color for the login page admin de Hintergrundfarbe für die Anmeldeseite
enter the background color for the site title admin de Hintergrundfarbe für den Title der phpGroupWare installation
enter the file name of your logo admin de Dateiname ihres Logos
enter the full path for temporary files.<br>examples: /tmp, c:\temp admin de Vollständiger Pfad für temporäre Dateien.<br>Beispiel: /tmp, C:\TEMP enter the full path for temporary files.<br>examples: /tmp, c:\temp admin de Vollständiger Pfad für temporäre Dateien.<br>Beispiel: /tmp, C:\TEMP
enter the full path for users and group files.<br>examples: /files, e:\files admin de Vollständiger Pfad für Benutzer- und Gruppendateien.<br>Beispiel: /files, E:\Files enter the full path for users and group files.<br>examples: /files, e:\files admin de Vollständiger Pfad für Benutzer- und Gruppendateien.<br>Beispiel: /files, E:\Files
enter the hostname of the machine on which this server is running admin de Hostname des Computers auf dem der Server läuft enter the hostname of the machine on which this server is running admin de Hostname des Computers auf dem der Server läuft
@ -85,11 +94,14 @@ enter the location of phpgroupware's url.<br>example: http://www.domain.com/phpg
enter the site password for peer servers admin de Site Passwort für Peer Server enter the site password for peer servers admin de Site Passwort für Peer Server
enter the site username for peer servers admin de Site Benutzername für Peer Server enter the site username for peer servers admin de Site Benutzername für Peer Server
enter the title for your site admin de Titel der phpGroupWare Installation enter the title for your site admin de Titel der phpGroupWare Installation
enter the title of your logo admin de Titel Ihres Logos
enter the url where your logo should link to admin de URL mit der das Logo verlinkt werden soll
enter your default ftp server admin de Default FTP Server enter your default ftp server admin de Default FTP Server
enter your http proxy server admin de HTTP Proxy Server enter your http proxy server admin de HTTP Proxy Server
enter your http proxy server port admin de HTTP Proxy Server Port enter your http proxy server port admin de HTTP Proxy Server Port
expires admin de abgelaufen expires admin de abgelaufen
file space admin de Dateiraum file space admin de Dateiraum
file space must be an integer admin de Speicherplatz muss eine Zahl sein
find and register all application hooks admin de Registrieren aller Applikation hooks find and register all application hooks admin de Registrieren aller Applikation hooks
force selectbox admin de Auswahl erzwingen force selectbox admin de Auswahl erzwingen
global categories admin de Globale Kategorien global categories admin de Globale Kategorien
@ -102,6 +114,8 @@ group name admin de Gruppenname
hide php information admin de PHP Informationen ausblenden hide php information admin de PHP Informationen ausblenden
home directory admin de Benutzerverzeichnis home directory admin de Benutzerverzeichnis
host information admin de Host Information host information admin de Host Information
how many days should entries stay in the access log, before they get deleted (default 90) ? admin de Wie viele Tage sollen Einträge im Zugangsprotokoll bleiben, bevor sie gelöscht werden (Vorgabe 90) ?
how many minutes should an account or ip be blocked (default 30) ? admin de Wie viele Minuten soll ein Benutzerkonto oder eine IP gesperrt werden (Vorgabe 30) ?
idle admin de im Leerlauf idle admin de im Leerlauf
if no acl records for user or any group the user is a member of admin de Wenn es keinen ACL Eintrag für einen Benutzer oder oder eine Gruppe der er angehört gibt if no acl records for user or any group the user is a member of admin de Wenn es keinen ACL Eintrag für einen Benutzer oder oder eine Gruppe der er angehört gibt
if using ldap, do you want to manage homedirectory and loginshell attributes? admin de Wenn sie LDAP verwenden, wollen Sie Benutzerverzeichnisse und Komandointerpreter verwalten ? if using ldap, do you want to manage homedirectory and loginshell attributes? admin de Wenn sie LDAP verwenden, wollen Sie Benutzerverzeichnisse und Komandointerpreter verwalten ?
@ -138,15 +152,17 @@ message has been updated admin de Nachricht wurde ge
minimum account id (e.g. 500 or 100, etc.) admin de Minimum für Benutzer Id (zB. minimum account id (e.g. 500 or 100, etc.) admin de Minimum für Benutzer Id (zB.
mode admin de Modus mode admin de Modus
never admin de Nie never admin de Nie
new group admin de Neuer Benutzer
new group name admin de Neuer Gruppenname new group name admin de Neuer Gruppenname
new password [ leave blank for no change admin de Neues Passwort [ Feld leerlassen, wenn das Passwort nicht geändert werden soll ] new password [ leave blank for no change admin de
new password [ leave blank for no change admin de
new password [ leave blank for no change ] admin de Neues Passwort [ Feld leerlassen, wenn das Passwort nicht geändert werden soll ] new password [ leave blank for no change ] admin de Neues Passwort [ Feld leerlassen, wenn das Passwort nicht geändert werden soll ]
new user admin de Neue Gruppe
no algorithms available admin de Kein Algorithmus verfügbar no algorithms available admin de Kein Algorithmus verfügbar
no login history exists for this user admin de Benutzer hat sich noch nie angemeldet no login history exists for this user admin de Benutzer hat sich noch nie angemeldet
no matches found admin de Keine Übereinstimmungen gefunden no matches found admin de Keine Übereinstimmungen gefunden
no modes available admin de Kein Modus verfügbar no modes available admin de Kein Modus verfügbar
note: ssl available only if php is compiled with curl support admin de Notiz: SSL ist nur verfügbar, wenn PHP mit CURL-Unterstützung erzeugt wurde note: ssl available only if php is compiled with curl support admin de Notiz: SSL ist nur verfügbar, wenn PHP mit CURL-Unterstützung erzeugt wurde
open popup window admin de PopUp Fenster öffnen
outbound admin de ausgehend outbound admin de ausgehend
passthrough admin de durchgehend passthrough admin de durchgehend
path information admin de Pfad-Information path information admin de Pfad-Information
@ -159,6 +175,7 @@ phpinfo admin de PHP Informationen
please enter a name admin de Bitte einen Namen eingeben please enter a name admin de Bitte einen Namen eingeben
please enter a name for that server ! admin de Bitte einen Namen für diesen Server eingeben ! please enter a name for that server ! admin de Bitte einen Namen für diesen Server eingeben !
please run setup to become current admin de Bitte Setup ausführen um die Installation zu aktualisieren please run setup to become current admin de Bitte Setup ausführen um die Installation zu aktualisieren
please select admin de Bitte auswählen
preferences admin de Einstellungen preferences admin de Einstellungen
re-enter password admin de Passwort wiederholen re-enter password admin de Passwort wiederholen
read this list of methods. admin de Diese Liste der Methoden lesen read this list of methods. admin de Diese Liste der Methoden lesen
@ -179,7 +196,7 @@ server password admin de Server Passwort
server type(mode) admin de Server Typ (Modus) server type(mode) admin de Server Typ (Modus)
server url admin de Server URL server url admin de Server URL
server username admin de Server Benutzername server username admin de Server Benutzername
set preference values. admin de Einstellungswert würde geändert set preference values. admin de Einstellungswert wurde geändert
show 'powered by' logo on admin de Zeige 'powered by' Logo show 'powered by' logo on admin de Zeige 'powered by' Logo
site admin de Site site admin de Site
site configuration admin de Konfiguration der Anwendung site configuration admin de Konfiguration der Anwendung
@ -203,6 +220,8 @@ they must be removed before you can continue admin de Sie m
this application is current admin de Diese Anwendung ist aktuell this application is current admin de Diese Anwendung ist aktuell
this application requires an upgrade admin de Diese Anwednung benötigt ein Upgrade this application requires an upgrade admin de Diese Anwednung benötigt ein Upgrade
this category is currently being used by applications as a parent category admin de Diese Kategorie wird gegenw&auml;rtig als &uuml;bergeordnete Kategorie benutzt. this category is currently being used by applications as a parent category admin de Diese Kategorie wird gegenw&auml;rtig als &uuml;bergeordnete Kategorie benutzt.
timeout for application session data in seconds (default 86400 = 1 day) admin de Zeit nach der Anwendungsdaten der Sitzung gelöscht werden in Sekunden (Vorgabe 86400 = 1 Tag)
timeout for sessions in seconds (default 14400 = 4 hours)<br>(not for php4 sessions!!!) admin de Zeit nach der Sitzungen verfallen (Vorgabe 14400 = 4 Stunden)<br>(nicht für php4 Sitzungen)
top admin de oben top admin de oben
total records admin de Anzahl Datensätze insgesamt total records admin de Anzahl Datensätze insgesamt
trust level admin de Grad des Vertrauens trust level admin de Grad des Vertrauens
@ -215,7 +234,7 @@ user data admin de Benutzerdaten
user groups admin de Benutzergruppen user groups admin de Benutzergruppen
userdata admin de Benutzerkonto userdata admin de Benutzerkonto
users choice admin de Benutzerauswahl users choice admin de Benutzerauswahl
view access log admin de Zugriffs-Protokoll anzeigen view access log admin de Zugangsprotokoll anzeigen
view error log admin de Fehler-Protokoll anzeigen view error log admin de Fehler-Protokoll anzeigen
view sessions admin de Sitzungen anzeigen view sessions admin de Sitzungen anzeigen
view user account admin de Benutzerkonto anzeigen view user account admin de Benutzerkonto anzeigen

26
admin/setup/phpgw_en.lang
View File

@ -1,5 +1,7 @@
%1 - %2 of %3 user accounts admin en %1 - %2 of %3 user accounts
(stored password will not be shown here) admin en (Stored password will not be shown here) (stored password will not be shown here) admin en (Stored password will not be shown here)
(to install new applications use<br><a href="setup/" target="setup">setup</a> [manage applications] !!!) admin en (To install new applications use<br><a href="setup/" target="setup">Setup</a> [Manage Applications] !!!) (to install new applications use<br><a href="setup/" target="setup">setup</a> [manage applications] !!!) admin en (To install new applications use<br><a href="setup/" target="setup">Setup</a> [Manage Applications] !!!)
accesslog and bruteforce defense admin en AccessLog and BruteForce defense
account active admin en Account active account active admin en Account active
account has been created common en Account has been created account has been created common en Account has been created
account has been deleted common en Account has been deleted account has been deleted common en Account has been deleted
@ -21,20 +23,24 @@ add new account admin en Add new account
add new application admin en Add new application add new application admin en Add new application
add peer server admin en Add Peer Server add peer server admin en Add Peer Server
admin email admin en Admin Email admin email admin en Admin Email
admin email addresses (comma-separated) to be notified about the blocking (empty for no notify) ? admin en Admin email addresses (comma-separated) to be notified about the blocking (empty for no notify) ?
admin name admin en Admin Name admin name admin en Admin Name
administration admin en Administration administration admin en Administration
admins admin en Admins admins admin en Admins
after how many unsuccessful attempts to login, an account should be blocked (default 3) ? admin en After how many unsuccessful attempts to login, an account should be blocked (default 3) ?
after how many unsuccessful attempts to login, an ip should be blocked (default 3) ? admin en After how many unsuccessful attempts to login, an IP should be blocked (default 3) ?
all records and account information will be lost! admin en All records and account information will be lost! all records and account information will be lost! admin en All records and account information will be lost!
all users admin en All Users all users admin en All Users
allow anonymous access to this app admin en Allow anonymous access to this app allow anonymous access to this app admin en Allow anonymous access to this app
anonymous user admin en Anonymous user anonymous user admin en Anonymous user
anonymous user<br>(not shown in list sessions) admin en Anonymous User<br>(not shown in list sessions)
application admin en Application application admin en Application
application name admin en Application name application name admin en Application name
application title admin en Application title application title admin en Application title
applications admin en Applications applications admin en Applications
apply admin en apply apply admin en apply
are you sure you want to delete the application %1 ? admin en Are you sure you want to delete the application %1 ?
are you sure you want to delete this account ? admin en Are you sure you want to delete this account ? are you sure you want to delete this account ? admin en Are you sure you want to delete this account ?
are you sure you want to delete this application ? admin en Are you sure you want to delete this application ?
are you sure you want to delete this category ? common en Are you sure you want to delete this category ? are you sure you want to delete this category ? common en Are you sure you want to delete this category ?
are you sure you want to delete this global category ? admin en Are you sure you want to delete this global category ? are you sure you want to delete this global category ? admin en Are you sure you want to delete this global category ?
are you sure you want to delete this group ? admin en Are you sure you want to delete this group ? are you sure you want to delete this group ? admin en Are you sure you want to delete this group ?
@ -48,6 +54,7 @@ bi-dir passthrough admin en bi-dir passthrough
bi-directional admin en bi-directional bi-directional admin en bi-directional
bottom admin en bottom bottom admin en bottom
category %1 has been saved ! admin en Category %1 has been saved ! category %1 has been saved ! admin en Category %1 has been saved !
category list admin en Category list
change main screen message admin en Change main screen message change main screen message admin en Change main screen message
check ip address of all sessions admin en check ip address of all sessions check ip address of all sessions admin en check ip address of all sessions
check items to <b>%1</b> to %2 for %3 admin en Check items to <b>%1</b> to %2 for %3 check items to <b>%1</b> to %2 for %3 admin en Check items to <b>%1</b> to %2 for %3
@ -97,6 +104,9 @@ edit user account admin en Edit user account
enabled - hidden from navbar admin en Enabled - Hidden from navbar enabled - hidden from navbar admin en Enabled - Hidden from navbar
enter a description for the category admin en enter a description for the category enter a description for the category admin en enter a description for the category
enter some random text for app_session <br>encryption (requires mcrypt) admin en Enter some random text for app_session <br>encryption (requires mcrypt) enter some random text for app_session <br>encryption (requires mcrypt) admin en Enter some random text for app_session <br>encryption (requires mcrypt)
enter the background color for the login page admin en Enter the background color for the login page
enter the background color for the site title admin en Enter the background color for the site title
enter the file name of your logo admin en Enter the file name of your logo
enter the full path for temporary files.<br>examples: /tmp, c:\temp admin en Enter the full path for temporary files.<br>Examples: /tmp, C:\TEMP enter the full path for temporary files.<br>examples: /tmp, c:\temp admin en Enter the full path for temporary files.<br>Examples: /tmp, C:\TEMP
enter the full path for users and group files.<br>examples: /files, e:\files admin en Enter the full path for users and group files.<br>Examples: /files, E:\FILES enter the full path for users and group files.<br>examples: /files, e:\files admin en Enter the full path for users and group files.<br>Examples: /files, E:\FILES
enter the hostname of the machine on which this server is running admin en Enter the hostname of the machine on which this server is running enter the hostname of the machine on which this server is running admin en Enter the hostname of the machine on which this server is running
@ -105,6 +115,8 @@ enter the search string. to show all entries, empty this field and press the sub
enter the site password for peer servers admin en Enter the site password for peer servers enter the site password for peer servers admin en Enter the site password for peer servers
enter the site username for peer servers admin en Enter the site username for peer servers enter the site username for peer servers admin en Enter the site username for peer servers
enter the title for your site admin en Enter the title for your site enter the title for your site admin en Enter the title for your site
enter the title of your logo admin en Enter the title of your logo
enter the url where your logo should link to admin en Enter the url where your logo should link to
enter your default ftp server admin en Enter your default FTP server enter your default ftp server admin en Enter your default FTP server
enter your http proxy server admin en Enter your HTTP proxy server enter your http proxy server admin en Enter your HTTP proxy server
enter your http proxy server port admin en Enter your HTTP proxy server port enter your http proxy server port admin en Enter your HTTP proxy server port
@ -123,6 +135,8 @@ group name admin en Group Name
hide php information admin en hide php information hide php information admin en hide php information
home directory admin en Home directory home directory admin en Home directory
host information admin en Host information host information admin en Host information
how many days should entries stay in the access log, before they get deleted (default 90) ? admin en How many days should entries stay in the access log, before they get deleted (default 90) ?
how many minutes should an account or ip be blocked (default 30) ? admin en How many minutes should an account or IP be blocked (default 30) ?
idle admin en idle idle admin en idle
if no acl records for user or any group the user is a member of admin en If no ACL records for user or any group the user is a member of if no acl records for user or any group the user is a member of admin en If no ACL records for user or any group the user is a member of
if using ldap, do you want to manage homedirectory and loginshell attributes? admin en If using LDAP, do you want to manage homedirectory and loginshell attributes? if using ldap, do you want to manage homedirectory and loginshell attributes? admin en If using LDAP, do you want to manage homedirectory and loginshell attributes?
@ -159,14 +173,20 @@ maximum account id (e.g. 65535 or 1000000) admin en Maximum account id (e.g. 655
message has been updated admin en message has been updated message has been updated admin en message has been updated
minimum account id (e.g. 500 or 100, etc.) admin en Minimum account id (e.g. 500 or 100, etc.) minimum account id (e.g. 500 or 100, etc.) admin en Minimum account id (e.g. 500 or 100, etc.)
mode admin en Mode mode admin en Mode
new group admin en New Group
new group name admin en New group name new group name admin en New group name
new password [ leave blank for no change ] admin en New password [ Leave blank for no change ] new password [ leave blank for no change ] admin en New password [ Leave blank for no change ]
new user admin en New User
no algorithms available admin en no algorithms available
no login history exists for this user admin en No login history exists for this user no login history exists for this user admin en No login history exists for this user
no matches found admin en No matches found no matches found admin en No matches found
no permission to add groups admin en no permission to add groups no permission to add groups admin en no permission to add groups
no permission to add users admin en no permission to add users no permission to add users admin en no permission to add users
no permission to create groups admin en no permission to create groups no permission to create groups admin en no permission to create groups
note: ssl available only if php is compiled with curl support admin en Note: SSL available only if PHP is compiled with curl support note: ssl available only if php is compiled with curl support admin en Note: SSL available only if PHP is compiled with curl support
no modes available admin en no modes available
note: ssl available only if php is compiled with curl support admin en Note: SSL available only if PHP is compiled with curl support
open popup window admin en open popup window
outbound admin en outbound outbound admin en outbound
passthrough admin en passthrough passthrough admin en passthrough
path information admin en Path information path information admin en Path information
@ -179,8 +199,10 @@ phpinfo admin en PHP information
please enter a name admin en Please enter a name please enter a name admin en Please enter a name
please enter a name for that server ! admin en Please enter a name for that server ! please enter a name for that server ! admin en Please enter a name for that server !
please run setup to become current admin en Please run setup to become current please run setup to become current admin en Please run setup to become current
please select admin en Please Select
preferences admin en Preferences preferences admin en Preferences
re-enter password admin en Re-enter password re-enter password admin en Re-enter password
read this list of methods. admin en Read this list of methods.
remove all users from this group admin en Remove all users from this group remove all users from this group admin en Remove all users from this group
remove all users from this group ? admin en Remove all users from this group ? remove all users from this group ? admin en Remove all users from this group ?
return to admin mainscreen admin en return to admin mainscreen return to admin mainscreen admin en return to admin mainscreen
@ -228,6 +250,8 @@ they must be removed before you can continue admin en They must be removed befor
this application is current admin en This application is current this application is current admin en This application is current
this application requires an upgrade admin en This application requires an upgrade this application requires an upgrade admin en This application requires an upgrade
this category is currently being used by applications as a parent category admin en This category is currently being used by applications as a parent category. this category is currently being used by applications as a parent category admin en This category is currently being used by applications as a parent category.
timeout for application session data in seconds (default 86400 = 1 day) admin en Timeout for application session data in seconds (default 86400 = 1 day)
timeout for sessions in seconds (default 14400 = 4 hours)<br>(not for php4 sessions!!!) admin en Timeout for sessions in seconds (default 14400 = 4 hours)<br>(not for php4 sessions!!!)
top admin en top top admin en top
total records admin en Total records total records admin en Total records
trust level admin en Trust Level trust level admin en Trust Level

14
admin/templates/default/accesslog.tpl
View File

@ -8,11 +8,11 @@
<td> <td>
<div align="center"> <div align="center">
<table border="0" width="100%"> <table border="0" width="100%">
<tr> <tr valign="bottom">
<td align="left"> <td align="left" colspan="2">
{lang_last_x_logins} {lang_last_x_logins}
</td> </td>
<td align="center" colspan="3"> <td align="center" colspan="2">
{showing} {showing}
</td> </td>
<td align="right"> <td align="right">
@ -24,10 +24,10 @@
</td> </td>
</tr> </tr>
<tr class="th"> <tr class="th">
<td>{lang_loginid}</td> <td width="10%">{lang_loginid}</td>
<td>{lang_ip}</td> <td width="15%">{lang_ip}</td>
<td>{lang_login}</td> <td width="20%">{lang_login}</td>
<td>{lang_logout}</td> <td width="30%">{lang_logout}</td>
<td>{lang_total}</td> <td>{lang_total}</td>
</tr> </tr>
{rows_access} {rows_access}

9
admin/templates/default/currentusers.tpl
View File

@ -1,7 +1,6 @@
<!-- BEGIN list --> <!-- BEGIN list -->
<center> <br>
{lang_current_users}: <table border="0" width="95%" align="center">
<table border="0" width="95%">
<tr class="bg_color"> <tr class="bg_color">
{left_next_matchs} {left_next_matchs}
<td>&nbsp;</td> <td>&nbsp;</td>
@ -20,8 +19,8 @@
{rows} {rows}
</center>
</table> </table>
<br>
<!-- END list --> <!-- END list -->
<!-- BEGIN row --> <!-- BEGIN row -->
@ -34,5 +33,3 @@
<td>{row_kill}</td> <td>{row_kill}</td>
</tr> </tr>
<!-- END row --> <!-- END row -->

122
login.php
View File

@ -11,7 +11,7 @@
* option) any later version. * * option) any later version. *
\**************************************************************************/ \**************************************************************************/
/* $Id$ */ /* $Id$ */
$phpgw_info = array(); $GLOBALS['phpgw_info'] = array();
$GLOBALS['phpgw_info']['flags'] = array $GLOBALS['phpgw_info']['flags'] = array
( (
'login' => True, 'login' => True,
@ -22,6 +22,7 @@
if(file_exists('./header.inc.php')) if(file_exists('./header.inc.php'))
{ {
include('./header.inc.php'); include('./header.inc.php');
$GLOBALS['phpgw']->sessions = createObject('phpgwapi.sessions');
} }
else else
{ {
@ -65,18 +66,9 @@
$data['login_standard']['loginscreen'] = True; $data['login_standard']['loginscreen'] = True;
function show_cookie()
{
/* This needs to be this way, because if someone doesnt want to use cookies, we shouldnt sneak one in */
if ($GLOBALS['HTTP_GET_VARS']['code'] != 5 && (isset($GLOBALS['phpgw_info']['server']['usecookies']) && $GLOBALS['phpgw_info']['server']['usecookies']))
{
return $GLOBALS['HTTP_COOKIE_VARS']['last_loginid'];
}
}
function check_logoutcode() function check_logoutcode()
{ {
switch($GLOBALS['HTTP_GET_VARS']['code']) switch($_GET['code'])
{ {
case 1: case 1:
$GLOBALS['phpgw_info']['flags']['msgbox_data']['You have been successfully logged out'] = True; $GLOBALS['phpgw_info']['flags']['msgbox_data']['You have been successfully logged out'] = True;
@ -87,14 +79,21 @@
case 5: case 5:
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Bad login or password'] = False; $GLOBALS['phpgw_info']['flags']['msgbox_data']['Bad login or password'] = False;
break; break;
case 99:
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Blocked, too many attempts'] = False;
break;
case 10: case 10:
if($GLOBALS['phpgw_info']['server']['usecookies'])
{
Setcookie('sessionid');
Setcookie('kp3');
Setcookie('domain');
}
$GLOBALS['phpgw_info']['flags']['msgbox_data']['Your session could not be verified'] = False; $GLOBALS['phpgw_info']['flags']['msgbox_data']['Your session could not be verified'] = False;
$GLOBALS['phpgw']->sessions->phpgw_setcookie('sessionid');
$GLOBALS['phpgw']->sessions->phpgw_setcookie('kp3');
$GLOBALS['phpgw']->sessions->phpgw_setcookie('domain');
//fix for bug php4 expired sessions bug
if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php4')
{
$GLOBALS['phpgw']->sessions->phpgw_setcookie(PHPGW_PHPSESSID);
}
break; break;
} }
} }
@ -139,34 +138,34 @@
$GLOBALS['phpgw_setup']->detection->check_lang(false); // get installed langs $GLOBALS['phpgw_setup']->detection->check_lang(false); // get installed langs
$langs = $GLOBALS['phpgw_info']['setup']['installed_langs']; $langs = $GLOBALS['phpgw_info']['setup']['installed_langs'];
while (list($lang) = each($langs)) while (list($lang) = @each($langs))
{ {
$langs[$lang] = $lang; $langs[$lang] = $lang;
} }
$GLOBALS['HTTP_POST_VARS']['submit'] = true; $_POST['submit'] = true;
$GLOBALS['HTTP_POST_VARS']['lang_selected'] = $langs; $_POST['lang_selected'] = $langs;
$GLOBALS['HTTP_POST_VARS']['upgrademethod'] = 'dumpold'; $_POST['upgrademethod'] = 'dumpold';
$included = 'from_login'; $included = 'from_login';
include(PHPGW_SERVER_ROOT . '/setup/lang.php'); include(PHPGW_SERVER_ROOT . '/setup/lang.php');
} }
/* Program starts here */ /* Program starts here */
if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'http' && isset($PHP_AUTH_USER)) if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'http' && isset($_SERVER['PHP_AUTH_USER']))
{ {
$submit = True; $submit = True;
$login = $PHP_AUTH_USER; $login = $_SERVER['PHP_AUTH_USER'];
$passwd = $PHP_AUTH_PW; $passwd = $_SERVER['PHP_AUTH_PW'];
} }
# Apache + mod_ssl style SSL certificate authentication # Apache + mod_ssl style SSL certificate authentication
# Certificate (chain) verification occurs inside mod_ssl # Certificate (chain) verification occurs inside mod_ssl
if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'sqlssl' && isset($HTTP_SERVER_VARS['SSL_CLIENT_S_DN']) && !isset($GLOBALS['HTTP_GET_VARS']['code'])) if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'sqlssl' && isset($_SERVER['SSL_CLIENT_S_DN']) && !isset($_GET['code']))
{ {
# an X.509 subject looks like: # an X.509 subject looks like:
# /CN=john.doe/OU=Department/O=Company/C=xx/Email=john@comapy.tld/L=City/ # /CN=john.doe/OU=Department/O=Company/C=xx/Email=john@comapy.tld/L=City/
# the username is deliberately lowercase, to ease LDAP integration # the username is deliberately lowercase, to ease LDAP integration
$sslattribs = explode('/',$HTTP_SERVER_VARS['SSL_CLIENT_S_DN']); $sslattribs = explode('/',$_SERVER['SSL_CLIENT_S_DN']);
# skip the part in front of the first '/' (nothing) # skip the part in front of the first '/' (nothing)
while ($sslattrib = next($sslattribs)) while ($sslattrib = next($sslattribs))
{ {
@ -180,36 +179,41 @@
# login will be set here if the user logged out and uses a different username with # login will be set here if the user logged out and uses a different username with
# the same SSL-certificate. # the same SSL-certificate.
if (!isset($login)&&isset($sslattributes['Email'])) if (!isset($_POST['login'])&&isset($sslattributes['Email'])) {
{
$login = $sslattributes['Email']; $login = $sslattributes['Email'];
# not checked against the database, but delivered to authentication module # not checked against the database, but delivered to authentication module
$passwd = $HTTP_SERVER_VARS['SSL_CLIENT_S_DN']; $passwd = $_SERVER['SSL_CLIENT_S_DN'];
} }
} }
unset($key); unset($key);
unset($val); unset($val);
unset($sslattributes); unset($sslattributes);
} }
if (isset($GLOBALS['HTTP_POST_VARS']['passwd_type']) || $submit_x || $submit_y)
// isset($GLOBALS['HTTP_POST_VARS']['passwd']) && $GLOBALS['HTTP_POST_VARS']['passwd']) // enable konqueror to login via Return if (isset($_POST['passwd_type']) || $submit_x || $submit_y)
// isset($_POST['passwd']) && $_POST['passwd']) // enable konqueror to login via Return
{ {
if (getenv(REQUEST_METHOD) != 'POST' && $_SERVER['REQUEST_METHOD'] != 'POST' if (getenv(REQUEST_METHOD) != 'POST' && $_SERVER['REQUEST_METHOD'] != 'POST'
&& !isset($PHP_AUTH_USER) && !isset($HTTP_SERVER_VARS['SSL_CLIENT_S_DN'])) && !isset($_SERVER['PHP_AUTH_USER']) && !isset($_SERVER['SSL_CLIENT_S_DN']))
{ {
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','code=5')); $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','code=5'));
} }
$GLOBALS['sessionid'] = $GLOBALS['phpgw']->session->create($GLOBALS['HTTP_POST_VARS']['login'],$GLOBALS['HTTP_POST_VARS']['passwd'],$GLOBALS['HTTP_POST_VARS']['passwd_type']); $login = $_POST['login'];
if (strstr($login,'@') === False && isset($_POST['logindomain']))
{
$login .= '@' . $_POST['logindomain'];
}
$GLOBALS['sessionid'] = $GLOBALS['phpgw']->session->create($login,$_POST['passwd'],$_POST['passwd_type']);
if(!isset($GLOBALS['sessionid']) || !$GLOBALS['sessionid']) if(!isset($GLOBALS['sessionid']) || !$GLOBALS['sessionid'])
{ {
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php?code=5'); $GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php?code=' . $GLOBALS['phpgw']->session->cd_reason);
} }
else else
{ {
if ($GLOBALS['phpgw_forward']) if ($GLOBALS['phpgw_forward'])
{ {
while (list($name,$value) = each($GLOBALS['HTTP_GET_VARS'])) while (list($name,$value) = each($_GET))
{ {
if (ereg('phpgw_',$name)) if (ereg('phpgw_',$name))
{ {
@ -219,7 +223,7 @@
} }
check_langs(); check_langs();
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/home.php','code=yes' . $extra_vars,True)); $GLOBALS['phpgw']->redirect_link('/home.php','cd=yes' . $extra_vars);
} }
} }
else else
@ -227,10 +231,10 @@
// !!! DONT CHANGE THESE LINES !!! // !!! DONT CHANGE THESE LINES !!!
// If there is something wrong with this code TELL ME! // If there is something wrong with this code TELL ME!
// Commenting out the code will not fix it. (jengo) // Commenting out the code will not fix it. (jengo)
if (isset($GLOBALS['HTTP_COOKIE_VARS']['last_loginid'])) if (isset($_COOKIE['last_loginid']))
{ {
$accounts = CreateObject('phpgwapi.accounts'); $accounts = CreateObject('phpgwapi.accounts');
$prefs = CreateObject('phpgwapi.preferences', $accounts->name2id($last_loginid)); $prefs = CreateObject('phpgwapi.preferences', $accounts->name2id($_COOKIE['last_loginid']));
if (! $prefs->account_id) if (! $prefs->account_id)
{ {
@ -241,47 +245,45 @@
$GLOBALS['phpgw_info']['user']['preferences'] = $prefs->read_repository(); $GLOBALS['phpgw_info']['user']['preferences'] = $prefs->read_repository();
} }
#print 'LANG:' . $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] . '<br>'; #print 'LANG:' . $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] . '<br>';
$GLOBALS['phpgw']->translation->add_app('login');
$GLOBALS['phpgw']->translation->add_app('loginscreen');
if (lang('loginscreen_message') != 'loginscreen_message*')
{
$data['login_standard']['phpgw_loginscreen_message'] = stripslashes(lang('loginscreen_message'));
}
} }
else else
{ {
// If the lastloginid cookies isn't set, we will default to english. // If the lastloginid cookies isn't set, we will default to english.
// Change this if you need. // Change this if you need.
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = 'en'; $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = 'en';
$GLOBALS['phpgw']->translation->add_app('login'); }
$GLOBALS['phpgw']->translation->add_app('loginscreen'); $GLOBALS['phpgw']->translation->add_app('login');
if (lang('loginscreen_message') != 'loginscreen_message*') $GLOBALS['phpgw']->translation->add_app('loginscreen');
{ if (lang('loginscreen_message') != 'loginscreen_message*')
$data['login_standard']['phpgw_loginscreen_message'] = stripslashes(lang('loginscreen_message')); {
} $data['login_standard']['phpgw_loginscreen_message'] = stripslashes(lang('loginscreen_message'));
} }
} }
if (!isset($GLOBALS['HTTP_GET_VARS']['code']) || !$GLOBALS['HTTP_GET_VARS']['code']) $last_loginid = $_COOKIE['last_loginid'];
{
$GLOBALS['HTTP_GET_VARS']['code'] = '';
}
if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox']) if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
{ {
foreach ($phpgw_domain as $domain => $domain_data) foreach ($phpgw_domain as $domain => $domain_data)
{ {
$ds = array('domain' => $domain); $ds = array('domain' => $domain);
if ($domain == $last_domain) if ($domain == $_COOKIE['last_domain'])
{ {
$ds += array('selected' => 'selected'); $ds['selected'] = 'selected';
} }
$data['login_standard']['domain_select'][] = $ds; $data['login_standard']['domain_select'][] = $ds;
} }
} }
elseif ($last_loginid !== '')
{
reset($GLOBALS['phpgw_domain']);
list($default_domain) = each($GLOBALS['phpgw_domain']);
if ($_COOKIE['last_domain'] != $default_domain)
{
$last_loginid .= '@' . $_COOKIE['last_domain'];
}
}
while (list($name,$value) = each($GLOBALS['HTTP_GET_VARS'])) while (list($name,$value) = each($_GET))
{ {
if (ereg('phpgw_',$name)) if (ereg('phpgw_',$name))
{ {
@ -305,7 +307,7 @@
$data['login_standard']['website_title'] = $GLOBALS['phpgw_info']['server']['site_title']; $data['login_standard']['website_title'] = $GLOBALS['phpgw_info']['server']['site_title'];
$data['login_standard']['login_url'] = 'login.php' . $extra_vars; $data['login_standard']['login_url'] = 'login.php' . $extra_vars;
$data['login_standard']['cookie'] = show_cookie(); $data['login_standard']['cookie'] = $last_loginid;
$data['login_standard']['lang_username'] = lang('username'); $data['login_standard']['lang_username'] = lang('username');
$data['login_standard']['lang_powered_by'] = lang('powered by'); $data['login_standard']['lang_powered_by'] = lang('powered by');
$data['login_standard']['lang_version'] = lang('version'); $data['login_standard']['lang_version'] = lang('version');

76
phpgwapi/inc/functions.inc.php
View File

@ -21,16 +21,18 @@
* along with this library; if not, write to the Free Software Foundation, * * along with this library; if not, write to the Free Software Foundation, *
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
\**************************************************************************/ \**************************************************************************/
/* $Id$ */ /* $Id$ */
/***************************************************************************\ /****************************************************************************\
* If running in PHP3, then load up the support functions file for * * If running in PHP3, then force admin to upgrade *
* transparent support. * \****************************************************************************/
\***************************************************************************/
if (floor(phpversion()) == 3) if (floor(phpversion()) == 3)
{ {
include(PHPGW_API_INC.'/php3_support_functions.inc.php'); echo 'phpGroupWare now requires PHP 4.1 or greater.<br>';
echo 'Please contact your System Administrator';
exit;
} }
include(PHPGW_API_INC.'/common_functions.inc.php'); include(PHPGW_API_INC.'/common_functions.inc.php');
@ -89,7 +91,7 @@
/****************************************************************************\ /****************************************************************************\
* Multi-Domain support * * Multi-Domain support *
\****************************************************************************/ \****************************************************************************/
/* make them fix their header */ /* make them fix their header */
if (!isset($GLOBALS['phpgw_domain'])) if (!isset($GLOBALS['phpgw_domain']))
{ {
@ -97,39 +99,20 @@
exit; exit;
} }
reset($GLOBALS['phpgw_domain']); reset($GLOBALS['phpgw_domain']);
$default_domain = each($GLOBALS['phpgw_domain']); list($GLOBALS['phpgw_info']['server']['default_domain']) = each($GLOBALS['phpgw_domain']);
$GLOBALS['phpgw_info']['server']['default_domain'] = $default_domain[0];
unset ($default_domain); // we kill this for security reasons
$GLOBALS['login'] = get_var('login',Array('POST')); if (isset($_POST['login'])) // on login
$GLOBALS['logindomain'] = get_var('logindomain',Array('POST'));
/* This code will handle virtdomains so that is a user logins with user@domain.com, it will switch into virtualization mode. */
if (isset($domain) && $domain)
{ {
$GLOBALS['phpgw_info']['user']['domain'] = $domain; $GLOBALS['login'] = $_POST['login'];
if (strstr($GLOBALS['login'],'@') === False)
{
$GLOBALS['login'] .= '@' . get_var('logindomain',array('POST'),$GLOBALS['phpgw_info']['server']['default_domain']);
}
list(,$GLOBALS['phpgw_info']['user']['domain']) = explode('@',$GLOBALS['login']);
} }
elseif (isset($GLOBALS['login']) && isset($GLOBALS['logindomain'])) else // on "normal" pageview
{ {
if (!ereg ("\@", $GLOBALS['login'])) $GLOBALS['phpgw_info']['user']['domain'] = get_var('domain', array('GET', 'COOKIE'), FALSE);
{
$GLOBALS['login'] = $GLOBALS['login'] . '@' . $GLOBALS['logindomain'];
}
$GLOBALS['phpgw_info']['user']['domain'] = $GLOBALS['logindomain'];
unset ($GLOBALS['logindomain']);
}
elseif (isset($GLOBALS['login']) && !isset($GLOBALS['logindomain']))
{
if (ereg ("\@", $GLOBALS['login']))
{
$login_array = explode('@', $GLOBALS['login']);
$GLOBALS['phpgw_info']['user']['domain'] = $login_array[1];
}
else
{
$GLOBALS['phpgw_info']['user']['domain'] = $GLOBALS['phpgw_info']['server']['default_domain'];
$GLOBALS['login'] = $GLOBALS['login'] . '@' . $GLOBALS['phpgw_info']['user']['domain'];
}
} }
if (@isset($GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']])) if (@isset($GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]))
@ -153,7 +136,6 @@
{ {
unset ($GLOBALS['phpgw_domain']); // we kill this for security reasons unset ($GLOBALS['phpgw_domain']); // we kill this for security reasons
} }
unset ($domain); // we kill this to save memory
@print_debug('domain',$GLOBALS['phpgw_info']['user']['domain'],'api'); @print_debug('domain',$GLOBALS['phpgw_info']['user']['domain'],'api');
@ -232,6 +214,12 @@
unset($cache_query); unset($cache_query);
unset($server_info_cache); unset($server_info_cache);
if(@isset($GLOBALS['phpgw_info']['server']['enforce_ssl']) && !$HTTPS)
{
Header('Location: https://' . $GLOBALS['phpgw_info']['server']['hostname'] . $GLOBALS['phpgw_info']['server']['webserver_url'] . $_SERVER['REQUEST_URI']);
exit;
}
/************************************************************************\ /************************************************************************\
* Required classes * * Required classes *
\************************************************************************/ \************************************************************************/
@ -289,16 +277,12 @@
{ {
if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'login') if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'login')
{ {
if(@isset($GLOBALS['phpgw_info']['server']['enforce_ssl']) && $GLOBALS['phpgw_info']['server']['enforce_ssl'] && !$GLOBALS['HTTP_SERVER_VARS']['HTTPS']) if (@$_POST['login'] != '')
{ {
$GLOBALS['phpgw']->redirect($GLOBALS['HTTP_SERVER_VARS']['REQUEST_URI']); list($login) = explode("@",$_POST['login']);
} print_debug('LID',$login,'app');
if (@$login != '') $login_id = $GLOBALS['phpgw']->accounts->name2id($login);
{ print_debug('User ID',$login_id,'app');
$login_array = explode("@",$login);
print_debug('LID : '.$login_array[0], 'messageonly','api');
$login_id = $GLOBALS['phpgw']->accounts->name2id($login_array[0]);
print_debug('User ID : '.$login_id, 'messageonly','api');
$GLOBALS['phpgw']->accounts->accounts($login_id); $GLOBALS['phpgw']->accounts->accounts($login_id);
$GLOBALS['phpgw']->preferences->preferences($login_id); $GLOBALS['phpgw']->preferences->preferences($login_id);
} }

2
phpgwapi/setup/phpgw_br.lang
View File

@ -100,7 +100,7 @@ your message as been sent common br Sua mensagem foi enviada
your search returned 1 match common br sua pesquisa retornou 1 correspondecia your search returned 1 match common br sua pesquisa retornou 1 correspondecia
your search returned %1 matchs common br Sua pesquisa retornou %1 correspondencias your search returned %1 matchs common br Sua pesquisa retornou %1 correspondencias
your settings have been updated common br suas preferencias foram atualizadas your settings have been updated common br suas preferencias foram atualizadas
bad login or password login br login ou senha incorreta bad login or password common br login ou senha incorreta
login login br Login login login br Login
password login br Password password login br Password
sorry, your login has expired login br Desculpe, sua conta expiorou sorry, your login has expired login br Desculpe, sua conta expiorou

2
phpgwapi/setup/phpgw_cs.lang
View File

@ -36,7 +36,7 @@ author common cs Autor
autosave default category common cs Automaticky ukládat standartní kategorii autosave default category common cs Automaticky ukládat standartní kategorii
azerbaijan common cs azerbaijan common cs
back common cs Zpìt back common cs Zpìt
bad login or password login cs ©patné jméno nebo heslo bad login or password common cs ©patné jméno nebo heslo
bahamas common cs bahamas common cs
bahrain common cs bahrain common cs
bangladesh common cs bangladesh common cs

2
phpgwapi/setup/phpgw_da.lang
View File

@ -35,7 +35,7 @@ author common da Forfatter
autosave default category common da Autogem Standard Kategori autosave default category common da Autogem Standard Kategori
azerbaijan common da Azerbaijan azerbaijan common da Azerbaijan
back common da Tilbage back common da Tilbage
bad login or password login da Forkert brugernavn eller password bad login or password common da Forkert brugernavn eller password
bahamas common da Bahamas bahamas common da Bahamas
bahrain common da Bahrain bahrain common da Bahrain
bangladesh common da Bangladesh bangladesh common da Bangladesh

5
phpgwapi/setup/phpgw_de.lang
View File

@ -35,7 +35,7 @@ austria common de &Ouml;STERREICH
autosave default category common de Standard-Kategorie automatisch speichern autosave default category common de Standard-Kategorie automatisch speichern
azerbaijan common de ASERBAIDSCHAN azerbaijan common de ASERBAIDSCHAN
back common de Zur&uuml;ck back common de Zur&uuml;ck
bad login or password login de Falsches Login order Passwort bad login or password common de Falscher Benutzername oder Passwort
bahamas common de BAHAMAS bahamas common de BAHAMAS
bahrain common de BAHRAIN bahrain common de BAHRAIN
bangladesh common de BANGLADESH bangladesh common de BANGLADESH
@ -47,6 +47,7 @@ belize common de BELIZE
benin common de BENIN benin common de BENIN
bermuda common de BERMUDA bermuda common de BERMUDA
bhutan common de BHUTAN bhutan common de BHUTAN
blocked, too many attempts common de Gesperrt, zu viele Versuche
bolivia common de BOLIVIEN bolivia common de BOLIVIEN
bosnia and herzegovina common de BOSNIEN UND HERZEGOVINA bosnia and herzegovina common de BOSNIEN UND HERZEGOVINA
botswana common de BOTSWANA botswana common de BOTSWANA
@ -452,7 +453,7 @@ todays date, eg. "%1" common de heutiges Datum, zB. "%1"
togo common de TOGO togo common de TOGO
tokelau common de TOKELAU tokelau common de TOKELAU
tonga common de TONGA tonga common de TONGA
total common de Gesammt total common de Gesamt
trinidad and tobago common de TRINIDAD AND TOBAGO trinidad and tobago common de TRINIDAD AND TOBAGO
tuesday common de Dienstag tuesday common de Dienstag
tunisia common de TUNISIEN tunisia common de TUNISIEN

11
phpgwapi/setup/phpgw_en.lang
View File

@ -36,7 +36,7 @@ author common en Author
autosave default category common en Autosave Default Category autosave default category common en Autosave Default Category
azerbaijan common en AZERBAIJAN azerbaijan common en AZERBAIJAN
back common en Back back common en Back
bad login or password login en Bad login or password bad login or password common en Bad login or password
bahamas common en BAHAMAS bahamas common en BAHAMAS
bahrain common en BAHRAIN bahrain common en BAHRAIN
bangladesh common en BANGLADESH bangladesh common en BANGLADESH
@ -48,6 +48,7 @@ belize common en BELIZE
benin common en BENIN benin common en BENIN
bermuda common en BERMUDA bermuda common en BERMUDA
bhutan common en BHUTAN bhutan common en BHUTAN
blocked, too many attempts common en Blocked, too many attempts
bolivia common en BOLIVIA bolivia common en BOLIVIA
bosnia and herzegovina common en BOSNIA AND HERZEGOVINA bosnia and herzegovina common en BOSNIA AND HERZEGOVINA
botswana common en BOTSWANA botswana common en BOTSWANA
@ -182,8 +183,11 @@ group access common en Group Access
group has been added common en Group has been added group has been added common en Group has been added
group has been deleted common en Group has been deleted group has been deleted common en Group has been deleted
group has been updated common en Group has been updated group has been updated common en Group has been updated
group name common en group name
group public common en Group Public group public common en Group Public
groups common en Groups groups common en Groups
groups with permission for %1 common en Groups with permission for %1
groups without permission for %1 common en Groups without permission for %1
guadeloupe common en GUADELOUPE guadeloupe common en GUADELOUPE
guam common en GUAM guam common en GUAM
guatemala common en GUATEMALA guatemala common en GUATEMALA
@ -246,6 +250,7 @@ list common en List
lithuania common en LITHUANIA lithuania common en LITHUANIA
local common en Local local common en Local
login common en Login login common en Login
loginid common en LoginID
logout common en Logout logout common en Logout
low common en Low low common en Low
lowest common en Lowest lowest common en Lowest
@ -399,7 +404,9 @@ search common en Search
section common en Section section common en Section
select common en Select select common en Select
select category common en Select Category select category common en Select Category
select group common en Select group
select one common en Select one select one common en Select one
select user common en Select user
send common en Send send common en Send
senegal common en SENEGAL senegal common en SENEGAL
september common en September september common en September
@ -483,6 +490,8 @@ use button to search for common en use Button to search for
use button to search for address common en use Button to search for Address use button to search for address common en use Button to search for Address
use button to search for project common en use Button to search for Project use button to search for project common en use Button to search for Project
user common en User user common en User
user accounts common en user accounts
user groups common en user groups
username common en Username username common en Username
users common en users users common en users
users choice common en Users Choice users choice common en Users Choice

2
phpgwapi/setup/phpgw_es.lang
View File

@ -30,7 +30,7 @@ author common es Autor
autosave default category common es Autograbar Categoria Predeterminada autosave default category common es Autograbar Categoria Predeterminada
azerbaijan common es AZERBAIJAN azerbaijan common es AZERBAIJAN
back common es Volver back common es Volver
bad login or password login es Nombre de Usuario o Clave invalido bad login or password common es Nombre de Usuario o Clave invalido
bahamas common es BAHAMAS bahamas common es BAHAMAS
bahrain common es BAHRAIN bahrain common es BAHRAIN
bangladesh common es BANGLADESH bangladesh common es BANGLADESH

2
phpgwapi/setup/phpgw_fi.lang
View File

@ -30,7 +30,7 @@ author common fi Luonut
autosave default category common fi Tallenna oletusluokka automaattisesti autosave default category common fi Tallenna oletusluokka automaattisesti
azerbaijan common fi AZERBAIJAN azerbaijan common fi AZERBAIJAN
back common fi Takaisin back common fi Takaisin
bad login or password login fi Tunnus tai salasana ei kelpaa bad login or password common fi Tunnus tai salasana ei kelpaa
bahamas common fi BAHAMA bahamas common fi BAHAMA
bahrain common fi BAHRAIN bahrain common fi BAHRAIN
bangladesh common fi BANGLADESH bangladesh common fi BANGLADESH

2
phpgwapi/setup/phpgw_fr.lang
View File

@ -32,7 +32,7 @@ author common fr Auteur
autosave default category common fr Sauvegarde automatique dans catégorie par défaut autosave default category common fr Sauvegarde automatique dans catégorie par défaut
azerbaijan common fr AZERBAIDJAN azerbaijan common fr AZERBAIDJAN
back common fr Retour back common fr Retour
bad login or password login fr Mauvais login ou mot de passe bad login or password common fr Mauvais login ou mot de passe
bahamas common fr BAHAMAS bahamas common fr BAHAMAS
bahrain common fr BAHRAIN bahrain common fr BAHRAIN
bangladesh common fr BANGLADESH bangladesh common fr BANGLADESH

2
phpgwapi/setup/phpgw_hu.lang
View File

@ -112,7 +112,7 @@ your message has been sent common hu
your search returned 1 match common hu Keresés végeredménye: 1 találat your search returned 1 match common hu Keresés végeredménye: 1 találat
your search returned %1 matchs common hu Keresés végeredménye: %1 találat your search returned %1 matchs common hu Keresés végeredménye: %1 találat
your settings have been updated common hu A beállításai módosításra kerültek your settings have been updated common hu A beállításai módosításra kerültek
bad login or password login hu Rossz felhasználó vagy jelszó bad login or password common hu Rossz felhasználó vagy jelszó
login login hu Belépés login login hu Belépés
password login hu Jelszó password login hu Jelszó
phpgroupware login login hu phpGroupWare bejelentkezés phpgroupware login login hu phpGroupWare bejelentkezés

2
phpgwapi/setup/phpgw_it.lang
View File

@ -30,7 +30,7 @@ author common it Autore
autosave default category common it Categoria default per il salvataggio automatico autosave default category common it Categoria default per il salvataggio automatico
azerbaijan common it AZERBAIJAN azerbaijan common it AZERBAIJAN
back common it Indietro back common it Indietro
bad login or password login it Nome utente o password sbagliati bad login or password common it Nome utente o password sbagliati
bahamas common it BAHAMAS bahamas common it BAHAMAS
bahrain common it BAHRAIN bahrain common it BAHRAIN
bangladesh common it BANGLADESH bangladesh common it BANGLADESH

2
phpgwapi/setup/phpgw_ja.lang
View File

@ -213,7 +213,7 @@ your search has returned no matchs ! common ja
your search returned 1 match common ja １件見つかりました。 your search returned 1 match common ja １件見つかりました。
your search returned %1 matchs common ja %1 件見つかりました。 your search returned %1 matchs common ja %1 件見つかりました。
your settings have been updated common ja Your settings have been Updated your settings have been updated common ja Your settings have been Updated
bad login or password login ja パスワードが誤っています bad login or password common ja パスワードが誤っています
login login ja ログイン login login ja ログイン
password login ja パスワード password login ja パスワード
phpgroupware login login ja phpGroupWare login phpgroupware login login ja phpGroupWare login

2
phpgwapi/setup/phpgw_ko.lang
View File

@ -108,7 +108,7 @@ your message has been sent common ko
your search returned 1 match common ko 1건의 결과가 검색되었습니다. your search returned 1 match common ko 1건의 결과가 검색되었습니다.
your search returned %1 matchs common ko %1건의 결과가 검색되었습니다. your search returned %1 matchs common ko %1건의 결과가 검색되었습니다.
your settings have been updated common ko 설정이 변경되었습니다. your settings have been updated common ko 설정이 변경되었습니다.
bad login or password login ko 사용자ID나 패스워드가 틀립니다. bad login or password common ko 사용자ID나 패스워드가 틀립니다.
login login ko 로그인 login login ko 로그인
password login ko 비밀번호 password login ko 비밀번호
sorry, your login has expired login ko 사용자ID를 더 이상 사용하실수 없습니다. sorry, your login has expired login ko 사용자ID를 더 이상 사용하실수 없습니다.

2
phpgwapi/setup/phpgw_nl.lang
View File

@ -123,7 +123,7 @@ your search returned 1 match common nl Uw zoekopdracht leverde 1 item op
your search returned %1 matchs common nl Uw zoekopdracht leverde %1 items op your search returned %1 matchs common nl Uw zoekopdracht leverde %1 items op
your settings have been updated common nl Uw instellingen zijn gewijzigd your settings have been updated common nl Uw instellingen zijn gewijzigd
powered by phpgroupware version %1 all nl Deze site werkt met <a href=http://www.phpgroupware.org>phpGroupWare</a> version %1 powered by phpgroupware version %1 all nl Deze site werkt met <a href=http://www.phpgroupware.org>phpGroupWare</a> version %1
bad login or password login nl Onjuiste gebruikersnaam of wachtwoord bad login or password common nl Onjuiste gebruikersnaam of wachtwoord
login login nl Aanmelden login login nl Aanmelden
password login nl Wachtwoord password login nl Wachtwoord
phpgroupware login login nl pgpGroupWare aanmelding phpgroupware login login nl pgpGroupWare aanmelding

2
phpgwapi/setup/phpgw_no.lang
View File

@ -102,7 +102,7 @@ your message has been sent common no Din melding har blitt sent
your search returned 1 match common no ditt søk gav 1 match your search returned 1 match common no ditt søk gav 1 match
your search returned %1 matchs common no ditt søk gav %1 match your search returned %1 matchs common no ditt søk gav %1 match
your settings have been updated common no Dine innstillinger har blitt oppdatert your settings have been updated common no Dine innstillinger har blitt oppdatert
bad login or password login no Ugyldig login eller passord bad login or password common no Ugyldig login eller passord
login login no Login login login no Login
password login no Passord password login no Passord
sorry, your login has expired login no Beklager, din login er utgått sorry, your login has expired login no Beklager, din login er utgått

2
phpgwapi/setup/phpgw_pl.lang
View File

@ -30,7 +30,7 @@ author common pl Autor
autosave default category common pl Automatyczny zapis domy¶lnej kategorii autosave default category common pl Automatyczny zapis domy¶lnej kategorii
azerbaijan common pl AZERBEJD¯AN azerbaijan common pl AZERBEJD¯AN
back common pl Powrót back common pl Powrót
bad login or password login pl B喚dna nazwa u篡tkownika lub has這 bad login or password common pl B喚dna nazwa u篡tkownika lub has這
bahamas common pl BAHAMY bahamas common pl BAHAMY
bahrain common pl BAHRAJN bahrain common pl BAHRAJN
bangladesh common pl BANGLADESZ bangladesh common pl BANGLADESZ

2
phpgwapi/setup/phpgw_pt.lang
View File

@ -30,7 +30,7 @@ author common pt Autor
autosave default category common pt Salvar automaticamente categoria padrão autosave default category common pt Salvar automaticamente categoria padrão
azerbaijan common pt AZERBAIJAN azerbaijan common pt AZERBAIJAN
back common pt Voltar back common pt Voltar
bad login or password login pt Login ou senha incorretos bad login or password common pt Login ou senha incorretos
bahamas common pt BAHAMAS bahamas common pt BAHAMAS
bahrain common pt BAHRAIN bahrain common pt BAHRAIN
bangladesh common pt BANGLADESH bangladesh common pt BANGLADESH

2
phpgwapi/setup/phpgw_sv.lang
View File

@ -125,7 +125,7 @@ your search returned 1 match common sv din s
your search returned %1 matchs common sv din sökning gav %1 träffar your search returned %1 matchs common sv din sökning gav %1 träffar
your settings have been updated common sv Dina innställningar har blivit uppdaterade your settings have been updated common sv Dina innställningar har blivit uppdaterade
zip code common sv Postnummer zip code common sv Postnummer
bad login or password login sv Ogiltigt login eller lösenord bad login or password common sv Ogiltigt login eller lösenord
sorry, your login has expired login sv Beklagar, din login har utgått sorry, your login has expired login sv Beklagar, din login har utgått
use cookies login sv Använd cookies use cookies login sv Använd cookies
username login sv Användarnamn username login sv Användarnamn

2
phpgwapi/setup/phpgw_zt.lang
View File

@ -27,7 +27,7 @@ australia common zt AUSTRALIA
austria common zt AUSTRIA austria common zt AUSTRIA
autosave default category common zt 自動儲存預設分類目錄 autosave default category common zt 自動儲存預設分類目錄
azerbaijan common zt AZERBAIJAN azerbaijan common zt AZERBAIJAN
bad login or password login zt 錯誤的使用者代碼或密碼 bad login or password common zt 錯誤的使用者代碼或密碼
bahamas common zt BAHAMAS bahamas common zt BAHAMAS
bahrain common zt BAHRAIN bahrain common zt BAHRAIN
bangladesh common zt BANGLADESH bangladesh common zt BANGLADESH

2
phpgwapi/setup/setup.inc.php
View File

@ -12,7 +12,7 @@
/* Basic information about this app */ /* Basic information about this app */
$setup_info['phpgwapi']['name'] = 'phpgwapi'; $setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['version'] = '0.9.15.012'; $setup_info['phpgwapi']['version'] = '0.9.15.013';
$setup_info['phpgwapi']['versions']['current_header'] = '1.23'; $setup_info['phpgwapi']['versions']['current_header'] = '1.23';
$setup_info['phpgwapi']['enable'] = 3; $setup_info['phpgwapi']['enable'] = 3;
$setup_info['phpgwapi']['app_order'] = 1; $setup_info['phpgwapi']['app_order'] = 1;

12
phpgwapi/setup/tables_current.inc.php
View File

@ -112,12 +112,12 @@
), ),
'phpgw_access_log' => array( 'phpgw_access_log' => array(
'fd' => array( 'fd' => array(
'sessionid' => array('type' => 'char', 'precision' => 32), 'sessionid' => array('type' => 'char','precision' => '32','nullable' => False),
'loginid' => array('type' => 'varchar', 'precision' => 30), 'loginid' => array('type' => 'varchar','precision' => '30','nullable' => False),
'ip' => array('type' => 'varchar', 'precision' => 30), 'ip' => array('type' => 'varchar','precision' => '30','nullable' => False),
'li' => array('type' => 'int', 'precision' => 4), 'li' => array('type' => 'int','precision' => '4','nullable' => False),
'lo' => array('type' => 'varchar', 'precision' => 255), 'lo' => array('type' => 'int','precision' => '4','nullable' => True,'default' => '0'),
'account_id' => array('type' => 'int', 'precision' => 4, 'default' => 0, 'nullable' => False) 'account_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0')
), ),
'pk' => array(), 'pk' => array(),
'fk' => array(), 'fk' => array(),

23
phpgwapi/setup/tables_update.inc.php
View File

@ -139,6 +139,14 @@
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
} }
$test[] = '0.9.14.506';
function phpgwapi_upgrade0_9_14_506()
{
// 0.9.15.001-13 are already included in 0.9.14.506
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.013';
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
}
$test[] = '0.9.15.001'; $test[] = '0.9.15.001';
function phpgwapi_upgrade0_9_15_001() function phpgwapi_upgrade0_9_15_001()
{ {
@ -382,4 +390,19 @@
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.012'; $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.012';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
} }
$test[] = '0.9.15.012';
function phpgwapi_upgrade0_9_15_012()
{
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_access_log','lo',array(
'type' => 'int',
'precision' => '4',
'nullable' => True,
'default' => '0'
));
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.013';
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
}
?> ?>