extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed SiteMgr session-problems by making the cookie path/domain configurable with more reasonable defaults then 1.4 has at the moment, making the display of * behind untranslated phrases an option which is by default off (as it anoyes users) and added a few more explenations to Admin >> Site configuration (plus removing not used ones)

Browse Source
This commit is contained in:
Ralf Becker 2007-05-17 08:35:35 +00:00
parent c60811c353
commit d2f80cf8dc
32 changed files with 118 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/setup/phpgw_ca.lang
View File

@ -435,3 +435,4 @@ you must enter an application title. admin ca Heu d'introdu
you must select a file type admin ca Heu de seleccionar un tipus d'arxiu
you will need to remove the subcategories before you can delete this category admin ca Heu d'esborrar les subcategories abans de poder esborrar aquesta categoria !
your session could not be verified. admin ca La vostra sessió no s'ha pogut verificar.

1
admin/setup/phpgw_cs.lang
View File

@ -359,3 +359,4 @@ you must enter an application name. admin cs Mus
you must enter an application title. admin cs Musíte vlo¾it titulek aplikace.
you must select a file type admin cs Musíte vybrat typ souboru
you will need to remove the subcategories before you can delete this category admin cs Musíte odstranit podkategorie pøedtím, ne¾ mù¾ete smazat tuto kategorii !
your session could not be verified. admin cs Vaše sezení není platné.

1
admin/setup/phpgw_da.lang
View File

@ -354,3 +354,4 @@ you must enter an application name. admin da Du skal indtaste et applikations na
you must enter an application title. admin da Du skal indtaste en applikations titel
you must select a file type admin da Du skal vælge en type
you will need to remove the subcategories before you can delete this category admin da Du blive nød til at fjerne underkategorierne for du kan slette denne kategori!
your session could not be verified. admin da Din session kunne ikke verificeres

11
admin/setup/phpgw_de.lang
View File

@ -92,6 +92,8 @@ check ip address of all sessions admin de IP-Adresse f
check items to <b>%1</b> to %2 for %3 admin de Durch Abhaken %3 in %2 <b>%1</b>
click to select a color admin de Anclicken um eine Farbe auszuwählen
color admin de Farbe
cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com) admin de Cookie Domain (Vorgabe leer bedeutet den kompletten Domainnamen, für SiteMgr erlaubt zB. ".domain.com" das gleiche Cookie für egw.domain.com und www.domain.com zu verwenden)
cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!) admin de Cookie Pfad (erlaubt mehrere eGW Sitzungen mit unterschiedlichen Verzeichnissen, hat Probleme mit SiteMgr!)
country selection admin de Länderauswahl
create group admin de Erstelle Gruppe
creates a new field admin de erstellt ein neues Feld
@ -144,6 +146,7 @@ do not delete the category and return back to the list admin de Kategorie NICHT
do you also want to delete all global subcategories ? admin de wollen Sie auch alle globalen Unterkategorien l&ouml;schen?
do you want to delete all global subcategories ? admin de Möchten Sie alle Globale Unterkategorien löschen?
do you want to move all global subcategories one level down ? admin de Wollen sie alle globalen Unterkategorien eine Ebene nach unten verschieben?
document root (default) admin de Wurzelverzeichnis des Webservers (Vorgabe)
each value is a line like <id>[=<label>] admin de jeder Wert ist ein Zeile <id>[=<label>]
each value is a line like id[=label] admin de jeder Wert ist eine Zeile id[=label]
edit account admin de Benutzerkonto bearbeiten
@ -162,6 +165,7 @@ edit this group admin de Diese Gruppe bearbeiten
edit this user admin de Diesen Benutzer bearbeiten
edit user admin de Benutzer bearbeiten
edit user account admin de Benutzerkonto bearbeiten
egroupware directory admin de eGroupWare Verzeichnis
email account active admin de E-Mail-Konto aktiv
email address admin de E-Mail-Adresse
enable debug-messages admin de Debug-Meldungen einschalten
@ -174,7 +178,9 @@ enter some random text for app_session <br>encryption (requires mcrypt) admin de
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 Titel der Installation
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 location of egroupware's url.<br>example: http://www.domain.com/egroupware &nbsp; or &nbsp; /egroupware<br><b>no trailing slash</b> admin de URL zur eGroupWare-Installation.<br>Beispiel: http://www.domain.com/egroupware or /egroupware<br><b>keinen nachfolgenden Slash /</b>
enter the search string. to show all entries, empty this field and press the submit button again admin de Geben Sie Ihren Suchbegriff ein. Um alle Einträge anzuzeigen, geben Sie keinen Begriff ein und drücken Sie den Suchen-Knopf nochmal
@ -277,6 +283,7 @@ minimum account id (e.g. 500 or 100, etc.) admin de Minimum f
minute admin de Minute
mode admin de Modus
month admin de Monat
more secure admin de sicherer
name must not be empty !!! admin de Name darf nicht leer sein !!!
new group name admin de Neuer Gruppenname
new name admin de neuer Name
@ -352,6 +359,7 @@ set preference values. admin de Einstellungswert wurde ge
should the login page include a language selectbox (useful for demo-sites) ? admin de Soll die Anmeldeseite eine Sprachauswahl beinhalten (nützlich für Demosites) ?
show 'powered by' logo on admin de Zeige "powered by" Logo
show access log admin de Zugangsprotokoll anzeigen
show an asterisk (*) to mark untranslated strings admin de Zeige einen Stern (*) um nicht übersetzte Texte zu markieren
show current action admin de aktuelle Aktion anzeigen
show error log admin de Fehlerprotokoll anzeigen
show phpinfo() admin de phpinfo() anzeigen
@ -372,6 +380,7 @@ start testjob! admin de Testjob starten!
submit changes admin de Änderungen speichern
submit the search string admin de Geben Sie Ihren Suchbegriff ein
subtype admin de Untertyp
switch it off, if users are randomly thrown out admin de schalten Sie es aus, wenn Benutzer immer wieder zufällig rausgeworfen werden
template selection admin de Auswahl der Benutzeroberfläche
text entry admin de Texteingabe
that application name already exists. admin de Diesen Anwendungsname gibt es bereits.
@ -438,4 +447,6 @@ you must enter an application name and title. admin de Sie m
you must enter an application name. admin de Sie müssen der Anwendung einen Namen geben.
you must enter an application title. admin de Sie müssen der Anwendung einen Titel geben.
you must select a file type admin de Sie müssen einen Dateityp auswählen
you must select at least one group member. admin de Sie müssen mindestens ein Gruppenmitglied auswählen.
you will need to remove the subcategories before you can delete this category admin de Sie müssen erst die Unterkategorien löschen bevor Sie diese Kategorie löschen können!
your session could not be verified. admin de Ihre Sitzung konnte nicht verifiziert werden.

1
admin/setup/phpgw_el.lang
View File

@ -361,3 +361,4 @@ enter your default mail domain ( from: user@domain ) admin el
enter your smtp server hostname or ip address admin el ÅéóÜãùãÞ ôïõ ïíüìáôïò Þ ôïõ IP ôïõ SMTP server
enter your smtp server port admin el ÅéóÜãùãÞ ôïõ SMTP server port
mail settings admin el
your session could not be verified. admin el Η περίοδος εργασίας δεν μπόρεσε να επαληθευθεί

10
admin/setup/phpgw_en.lang
View File

@ -92,6 +92,8 @@ 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
click to select a color admin en Click to select a color
color admin en Color
cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com) admin en Cookie domain (default empty means use full domain name, for SiteMgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com)
cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!) admin en Cookie path (allows multiple eGW sessions with different directories, has problemes with SiteMgr!)
country selection admin en Country Selection
create group admin en Create Group
creates a new field admin en creates a new field
@ -144,6 +146,7 @@ do not delete the category and return back to the list admin en do NOT delete th
do you also want to delete all global subcategories ? admin en Do you also want to delete all global subcategories ?
do you want to delete all global subcategories ? admin en Do you want to delete all global subcategories ?
do you want to move all global subcategories one level down ? admin en Do you want to move all global subcategories one level down ?
document root (default) admin en Document root (default)
each value is a line like <id>[=<label>] admin en each value is a line like <id>[=<label>]
each value is a line like id[=label] admin en each value is a line like id[=label]
edit account admin en Edit account
@ -162,6 +165,7 @@ edit this group admin en edit this group
edit this user admin en edit this user
edit user admin en edit user
edit user account admin en Edit user account
egroupware directory admin en eGroupWare directory
email account active admin en email account active
email address admin en email address
enable debug-messages admin en Enable debug-messages
@ -277,6 +281,7 @@ minimum account id (e.g. 500 or 100, etc.) admin en Minimum account id (e.g. 500
minute admin en Minute
mode admin en Mode
month admin en Month
more secure admin en more secure
name must not be empty !!! admin en Name must not be empty !!!
new group name admin en New group name
new name admin en new name
@ -352,6 +357,7 @@ set preference values. admin en Set preference values.
should the login page include a language selectbox (useful for demo-sites) ? admin en Should the login page include a language selectbox (useful for demo-sites) ?
show 'powered by' logo on admin en Show 'powered by' logo on
show access log admin en Show access log
show an asterisk (*) to mark untranslated strings admin en Show an asterisk (*) to mark untranslated strings
show current action admin en Show current action
show error log admin en Show error log
show phpinfo() admin en Show phpinfo()
@ -372,6 +378,7 @@ start testjob! admin en Start TestJob!
submit changes admin en Submit Changes
submit the search string admin en Submit the search string
subtype admin en Subtype
switch it off, if users are randomly thrown out admin en switch it off, if users are randomly thrown out
template selection admin en Template Selection
text entry admin en Text Entry
that application name already exists. admin en That application name already exists.
@ -438,5 +445,6 @@ you must enter an application name and title. admin en You must enter an applica
you must enter an application name. admin en You must enter an application name.
you must enter an application title. admin en You must enter an application title.
you must select a file type admin en You must select a file type
you must select at least one group member admin en You must select at least one group member.
you must select at least one group member. admin en You must select at least one group member.
you will need to remove the subcategories before you can delete this category admin en You will need to remove the subcategories before you can delete this category !
your session could not be verified. admin en Your session could not be verified.

3
admin/setup/phpgw_es-es.lang
View File

@ -440,5 +440,6 @@ you must enter an application name and title. admin es-es Debe introducir nombre
you must enter an application name. admin es-es Debe introducir un nombre de aplicación
you must enter an application title. admin es-es Debe introducir un título para la aplicación
you must select a file type admin es-es Debe seleccionar un tipo de archivo
you must select at least one group member admin es-es Debe seleccionar al menos un miembro del grupo
you must select at least one group member. admin es-es Debe seleccionar al menos un miembro del grupo.
you will need to remove the subcategories before you can delete this category admin es-es Deberá eliminar las subcategorías antes de poder borrar esta categoría
your session could not be verified. admin es-es Su sesión no pudo ser verificada.

1
admin/setup/phpgw_eu.lang
View File

@ -331,3 +331,4 @@ you must enter an application name and title. admin eu Izen eta izenburu bat jar
you must enter an application name. admin eu Aplikazioari izen bat eman behar diozu.
you must enter an application title. admin eu Aplikazioari izenburu bat jarri behar diozu.
you must select a file type admin eu Fitxategi mota bat aukeratu behar duzu
your session could not be verified. admin eu Zure saioa ezin izan da egiaztatu

3
admin/setup/phpgw_fi.lang
View File

@ -432,5 +432,6 @@ you must enter an application name and title. admin fi Anna sovelluksen nimi ja
you must enter an application name. admin fi Anna sovelluksen nimi.
you must enter an application title. admin fi Anna sovelluksen otsikko.
you must select a file type admin fi Anna tiedostotyyppi
you must select at least one group member admin fi Valitse vähintää yksi ryhmän jäsen.
your session could not be verified. admin fi Istuntoasi ei voitu varmentaa.
you must select at least one group member. admin fi Valitse vähintää yksi ryhmän jäsen.
you will need to remove the subcategories before you can delete this category admin fi Alikategoriat on poistettava ennen kuin voit poistaa luokan!

3
admin/setup/phpgw_fr.lang
View File

@ -440,5 +440,6 @@ you must enter an application name and title. admin fr Vous devez entrer un nom
you must enter an application name. admin fr Vous devez entrer un nom d'application.
you must enter an application title. admin fr Vous devez entrer un titre d'application.
you must select a file type admin fr Vous devez choisir un type de fichier
you must select at least one group member admin fr Vous devez sélectionner au moins un membre de groupe.
you must select at least one group member. admin fr Vous devez sélectionner au moins un membre de groupe.
you will need to remove the subcategories before you can delete this category admin fr Vous allez devoir enlever les sous-catégories avant de pouvoir effacer cette catégorie !
your session could not be verified. admin fr Votre session n'a pas pu être vérifiée.

1
admin/setup/phpgw_hr.lang
View File

@ -376,3 +376,4 @@ you must enter an application name. admin hr Morate unijeti ime aplikacije.
you must enter an application title. admin hr Morate unijeti naslov aplikacije.
you must select a file type admin hr Morate izabrati vrstu datoteke.
you will need to remove the subcategories before you can delete this category admin hr Morate obrisati sve podkategorije prije noego što obrišete ovu kategoriju !
your session could not be verified. admin hr Vašu sesiju nije moguće potvrditi.

1
admin/setup/phpgw_hu.lang
View File

@ -274,3 +274,4 @@ view this user admin hu felhaszn
xml-rpc admin hu XML-RPC
you must enter an application name and title. admin hu Kötelezõ megadni az alkalmazás nevét és címét!
you must select a file type admin hu Kötelezõ fájltípust választani
your session could not be verified. admin hu A hozzáférése nem ellenõrizhetõ.

1
admin/setup/phpgw_it.lang
View File

@ -436,3 +436,4 @@ you must enter an application name. admin it Devi inserire un nome per l'applica
you must enter an application title. admin it Devi inserire un titolo per l'applicazione
you must select a file type admin it Devi selezionare un tipo di file
you will need to remove the subcategories before you can delete this category admin it E' necessario rimuovere le sotto-categorie prima di cancellare questa categoria
your session could not be verified. admin it La sessione non può essere verificata.

1
admin/setup/phpgw_iw.lang
View File

@ -785,3 +785,4 @@ your php installation does not have appropriate gd support. you need gd library
your tables are current setup iw הטבלאות שלך מעודכנות
your tables may be altered and you may lose data setup iw יתכן שישתנו הטבלאות שלך ויתכן שתאבד מידע
your tables will be dropped and you will lose data setup iw !! הטבלאות שלך ייופלו ותאבד מידע
your session could not be verified. admin iw .לא הצלחתי לשחזר את המושב

1
admin/setup/phpgw_ja.lang
View File

@ -203,3 +203,4 @@ enter your default mail domain ( from: user@domain ) admin ja
enter your smtp server hostname or ip address admin ja SMTP サーバ名または IP アドレス
enter your smtp server port admin ja SMTP ポート番号
mail settings admin ja 電子メール設定
your session could not be verified. admin ja Your session could not be verified.

1
admin/setup/phpgw_ko.lang
View File

@ -378,3 +378,4 @@ you must enter an application name. admin ko
you must enter an application title. admin ko 응용프로그램 제목을 입력해야 합니다
you must select a file type admin ko 파일 타입을 선택해야 합니다.
you will need to remove the subcategories before you can delete this category admin ko 이 카테고리를 삭제하기 전에 하위카테고리를 삭제해야 합니다!
your session could not be verified. admin ko 세션이 검증되지 않았습니다

1
admin/setup/phpgw_lv.lang
View File

@ -363,3 +363,4 @@ you must enter an application name. admin lv Jums jāievada aplikācijas nosauku
you must enter an application title. admin lv Jums jāievada aplikācijas virsraksts
you must select a file type admin lv Jums jāizvēlas faila tips
you will need to remove the subcategories before you can delete this category admin lv Tev vajadzēs izdzēst apakšgrpu pirms tu varēsi izdzēst šo kategoriju!
your session could not be verified. admin lv Nevarēju Jūs pārbaudīt. Mēģiniet pēc 30sek. vēlreiz.

1
admin/setup/phpgw_nl.lang
View File

@ -441,3 +441,4 @@ you must enter an application name. admin nl U moet een toepassingsnaam invoeren
you must enter an application title. admin nl U moet een toepassingstitel invoeren.
you must select a file type admin nl U moet een bestandstype invoeren
you will need to remove the subcategories before you can delete this category admin nl U moet eerst de subcategorieën verwijderen voordat u deze bovenliggende categorie kunt verwijderen!
your session could not be verified. admin nl Uw sessie kon niet geverifieerd worden

1
admin/setup/phpgw_no.lang
View File

@ -399,3 +399,4 @@ you must enter an application name. admin no Du m
you must enter an application title. admin no Du må registrere et programtittel
you must select a file type admin no Du må velge en filtype
you will need to remove the subcategories before you can delete this category admin no Du må først fjerne underkategorier før du kan slette denne kategorien!
your session could not be verified. admin no Din sesjon kunne ikke bekreftes

3
admin/setup/phpgw_pl.lang
View File

@ -438,5 +438,6 @@ you must enter an application name and title. admin pl Musisz poda
you must enter an application name. admin pl Musisz podaæ nazwê aplikacji
you must enter an application title. admin pl Musisz podaæ tytu³ aplikacji
you must select a file type admin pl Musisz wybraæ typ pliku
you must select at least one group member admin pl Musisz wybrać przynajmniej jednego członka grupy.
your session could not be verified. admin pl Nie można zweryfikować sesji.
you must select at least one group member. admin pl Musisz wybrać przynajmniej jednego członka grupy.
you will need to remove the subcategories before you can delete this category admin pl Nale¿y usun±æ kategorie podrzêdne przed skasowaniem tej kategorii !

3
admin/setup/phpgw_pt-br.lang
View File

@ -440,5 +440,6 @@ you must enter an application name and title. admin pt-br Voc
you must enter an application name. admin pt-br Você deve digitar um nome para a aplicação.
you must enter an application title. admin pt-br Você deve digitar um título para a aplicação.
you must select a file type admin pt-br Você deve selecionar um tipo de arquivo.
you must select at least one group member admin pt-br Você deve selecionar ao menos um membro.
you must select at least one group member. admin pt-br Você deve selecionar ao menos um membro.
you will need to remove the subcategories before you can delete this category admin pt-br Você deverá remover as subcategorias antes de remover esta categoria !
your session could not be verified. admin pt-br Sua sessão não pôde ser verificada

1
admin/setup/phpgw_pt.lang
View File

@ -437,3 +437,4 @@ you must enter an application name. admin pt
you must enter an application title. admin pt É necessário atribuir um título à aplicação.
you must select a file type admin pt É necessário seleccionar um tipo de ficheiro
you will need to remove the subcategories before you can delete this category admin pt É necessário remover as subcategorias para poder eliminar esta categoria !
your session could not be verified. admin pt A sua sessão expirou

1
admin/setup/phpgw_ru.lang
View File

@ -437,3 +437,4 @@ you must enter an application name. admin ru
you must enter an application title. admin ru ÷Ù ÄÏÌÖÎÙ ××ÅÓÔÉ ÚÁÇÏÌÏ×ÏË ÐÒÉÌÏÖÅÎÉÑ.
you must select a file type admin ru ÷Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÔÉÐ ÆÁÊÌÁ
you will need to remove the subcategories before you can delete this category admin ru ÷ÁÍ ÎÕÖÎÏ ÕÄÁÌÉÔØ ×ÓÅ ÐÏÄËÁÔÅÇÏÒÉÉ ÐÒÅÖÄÅ, ÞÅÍ ×Ù ÓÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÄÁÎÎÕÀ ËÁÔÅÇÏÒÉÀ !
your session could not be verified. admin ru ÷ÁÛ ÓÅÁÎÓ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÄÏÓÔÏ×ÅÒÅÎ

3
admin/setup/phpgw_sk.lang
View File

@ -433,5 +433,6 @@ you must enter an application name and title. admin sk Mus
you must enter an application name. admin sk Musíte zada» názov aplikácie.
you must enter an application title. admin sk Musíte zada» titulok aplikácie.
you must select a file type admin sk Musíte zada» typ súboru
you must select at least one group member admin sk Musíte zada» aspoò jedného èlena skupiny.
your session could not be verified. admin sk Va¹e sedenie nie je platné.
you must select at least one group member. admin sk Musíte zada» aspoò jedného èlena skupiny.
you will need to remove the subcategories before you can delete this category admin sk Ne¾ odstránite túto kategóriu, musíte odstráni» v¹etky podkategórie !

3
admin/setup/phpgw_sl.lang
View File

@ -440,5 +440,6 @@ you must enter an application name and title. admin sl Vnesti morate ime in nazi
you must enter an application name. admin sl Vnesti morate ime aplikacije.
you must enter an application title. admin sl Vnesti morate naslov aplikacije.
you must select a file type admin sl Izbrati morate tip datoteke
you must select at least one group member admin sl Izbrati morate najmanj enega člana skupine.
you must select at least one group member. admin sl Izbrati morate najmanj enega člana skupine.
you will need to remove the subcategories before you can delete this category admin sl Preden lahko izbrišete to kategorijo, morate izbrisati vse podkategorije!
your session could not be verified. admin sl Vaša seja ne more biti preverjena.

1
admin/setup/phpgw_sv.lang
View File

@ -441,3 +441,4 @@ you must enter an application name. admin sv Du m
you must enter an application title. admin sv Du måste ange en titel för applikationen
you must select a file type admin sv Du måste välja en filtyp
you will need to remove the subcategories before you can delete this category admin sv Du måste ta bort underkategorierna innan du kan ta bort denna kategori
your session could not be verified. admin sv Din session kunde inte verifieras

1
admin/setup/phpgw_uk.lang
View File

@ -357,3 +357,4 @@ you must enter an application name. admin uk Необхідно ввести н
you must enter an application title. admin uk Необхідно ввести найменування приложення
you must select a file type admin uk Необхідно визначити тип файлу
you will need to remove the subcategories before you can delete this category admin uk Необхідно видалити підкатегорії перед тим, як Ви зможете видалити цю категорію !
your session could not be verified. admin uk Неможливо перевірити Ваш вхід

3
admin/setup/phpgw_zh-tw.lang
View File

@ -440,5 +440,6 @@ you must enter an application name and title. admin zh-tw 您必須輸入應用
you must enter an application name. admin zh-tw 您必須輸入應用程式名稱
you must enter an application title. admin zh-tw 您必須輸入應用程式標題
you must select a file type admin zh-tw 您必須選擇一種檔案型態。
you must select at least one group member admin zh-tw 您必須選擇至少一個群組成員。
you must select at least one group member. admin zh-tw 您必須選擇至少一個群組成員。
you will need to remove the subcategories before you can delete this category admin zh-tw 您必須在刪除這個類別前刪除所有的子類別！
your session could not be verified. admin zh-tw 您的連線不合法。

1
admin/setup/phpgw_zh.lang
View File

@ -371,3 +371,4 @@ enter your default mail domain ( from: user@domain ) admin zh 输入默认邮件
enter your smtp server hostname or ip address admin zh 输入SMTP服务器的主机名或IP地址
enter your smtp server port admin zh 输入SMTP服务器的端口号
mail settings admin zh 邮件配置
your session could not be verified. admin zh 本次会话无法校验.

64
admin/templates/default/config.tpl
View File

@ -35,22 +35,7 @@
</select>
</td>
</tr>
<!--
<tr class="row_on">
<td>{lang_Would_you_like_eGroupWare_to_cache_the_phpgw_info_array_?}:</td>
<td>
<select name="newsettings[cache_phpgw_info]">
<option value="">{lang_No}</option>
<option value="True"{selected_cache_phpgw_info_True}>{lang_Yes}</option>
</select>
</td>
</tr>
<tr class="row_off">
<td>{lang_Maximum_entries_in_click_path_history}:</td>
<td><input size="8" name="newsettings[max_history]" value="{value_max_history}"></td>
</tr>
-->
<tr class="row_on">
<td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td>
<td>
@ -98,17 +83,7 @@
<td>{lang_Enter_the_title_for_your_site}:</td>
<td><input name="newsettings[site_title]" value="{value_site_title}"></td>
</tr>
<!-- This is not used / working at the moment, RalfBecker 21.03.2004
<tr class="row_off">
<td>{lang_Enter_the_background_color_for_the_site_title}:</td>
<td>#<input name="newsettings[login_bg_color_title]" value="{value_login_bg_color_title}"></td>
</tr>
<tr class="row_on">
<td>{lang_Enter_the_background_color_for_the_login_page}:</td>
<td>#<input name="newsettings[login_bg_color]" value="{value_login_bg_color}"></td>
</tr>
-->
<tr class="row_off">
<td>{lang_Enter_the_URL_or_filename_(in_phpgwapi/templates/default/images)_of_your_logo}:</td>
<td><input name="newsettings[login_logo_file]" value="{value_login_logo_file}"></td>
@ -125,11 +100,11 @@
</tr>
<tr class="row_on">
<td>{lang_Show_'powered_by'_logo_on}:</td>
<td>{lang_Show_an_asterisk_(*)_to_mark_untranslated_strings}:</td>
<td>
<select name="newsettings[showpoweredbyon]">
<option value="bottom" {selected_showpoweredbyon_bottom}>{lang_bottom}</option>
<option value="top" {selected_showpoweredbyon_top}>{lang_top}</option>
<select name="newsettings[markuntranslated]">
<option value="">{lang_No}</option>
<option value="yes" {selected_markuntranslated_yes}>{lang_Yes}</option>
</select>
</td>
</tr>
@ -142,18 +117,35 @@
<td>{lang_Use_cookies_to_pass_sessionid}:</td>
<td>
<select name="newsettings[usecookies]">
<option value="True"{selected_usecookies_True}>{lang_Yes} - {lang_more_secure}</option>
<option value="">{lang_No}</option>
<option value="True"{selected_usecookies_True}>{lang_Yes}</option>
</select>
</td>
</tr>
<tr class="row_off">
<td>{lang_check_ip_address_of_all_sessions}:</td>
<td>{lang_Cookie_path_(allows_multiple_eGW_sessions_with_different_directories,_has_problemes_with_SiteMgr!)}:</td>
<td>
<select name="newsettings[cookiepath]">
<option value="">{lang_Document_root_(default)}</option>
<option value="egroupware"{selected_cookiepath_egroupware}>{lang_eGroupWare_directory}</option>
</select>
</td>
</tr>
<tr class="row_on">
<td>{lang_Cookie_domain_(default_empty_means_use_full_domain_name,_for_SiteMgr_eg._".domain.com"_allows_to_use_the_same_cookie_for_egw.domain.com_and_www.domain.com)}:</td>
<td>
<input name="newsettings[cookiedomain]" value="{value_cookiedomain}" />
</td>
</tr>
<tr class="row_off">
<td>{lang_check_ip_address_of_all_sessions} ({lang_switch_it_off,_if_users_are_randomly_thrown_out}: "{lang_Your_session_could_not_be_verified.}")</td>
<td>
<select name="newsettings[sessions_checkip]">
<option value="True"{selected_sessions_checkip_True}>{lang_Yes} - {lang_more_secure}</option>
<option value="">{lang_No}</option>
<option value="True"{selected_sessions_checkip_True}>{lang_Yes}</option>
</select>
</td>
</tr>
@ -218,7 +210,7 @@
<input name="newsettings[admin_mails]" value="{value_admin_mails}" size="40">
</td>
</tr>
<!-- not used at the moment RalfBecker 2007/05/17
<tr class="row_on">
<td>{lang_Disable_"auto_completion"_of_the_login_form_}:</td>
<td>
@ -228,8 +220,8 @@
</select>
</td>
</tr>
<tr class="row_off">
-->
<tr class="row_on">
<td>{lang_Enable_the_xmlrpc_service} {lang_(default_No,_leave_it_off_if_you_dont_use_it)}:</td>
<td>
<select name="newsettings[xmlrpc_enabled]">
@ -239,7 +231,7 @@
</td>
</tr>
<tr class="row_on">
<tr class="row_off">
<td>{lang_Enable_the_soap_service} {lang_(default_No,_leave_it_off_if_you_dont_use_it)}:</td>
<td>
<select name="newsettings[soap_enabled]">

23
phpgwapi/inc/class.sessions.inc.php
View File

@ -475,9 +475,16 @@
*/
function egw_set_cookiedomain()
{
// Use HTTP_X_FORWARDED_HOST if set, which is the case behind a none-transparent proxy
$this->cookie_domain = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
if ($GLOBALS['egw_info']['server']['cookiedomain'])
{
// Admin set domain, eg. .domain.com to allow egw.domain.com and www.domain.com
$this->cookie_domain = $GLOBALS['egw_info']['server']['cookiedomain'];
}
else
{
// Use HTTP_X_FORWARDED_HOST if set, which is the case behind a none-transparent proxy
$this->cookie_domain = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'];
}
// remove port from HTTP_HOST
if (preg_match("/^(.*):(.*)$/",$this->cookie_domain,$arr))
{
@ -492,6 +499,16 @@
$url_parts = parse_url($GLOBALS['egw_info']['server']['webserver_url']);
if (!($this->cookie_path = $url_parts['path'])) $this->cookie_path = '/';
// if the cookiepath should be / and it's not, delete evtl. existing cookies and set '/'
if (!$GLOBALS['egw_info']['server']['cookiepath'] && $this->cookie_path != '/')
{
foreach(array('sessionid','kp3','domain','last_domain','last_loginid') as $name)
{
setcookie($name,false,0,$this->cookie_path,$this->cookie_domain);
}
$this->cookie_path = '/';
}
//echo "<p>cookie_path='$this->cookie_path', cookie_domain='$this->cookie_domain'</p>\n";
$this->set_cookie_params($this->cookie_domain,$this->cookie_path); // for php4 sessions necessary
}

16
phpgwapi/inc/class.translation.inc.php
View File

@ -49,7 +49,18 @@
var $lang_table = 'egw_lang';
var $languages_table = 'egw_languages';
var $config_table = 'egw_config';
/**
* Instance of the db-class
*
* @var egw_db
*/
var $db;
/**
* Mark untranslated strings with an asterisk (*), values '' or 'yes'
*
* @var string
*/
var $markunstranslated;
/**
* Constructor, sets up a copy of the db-object, gets the system-charset and tries to load the mbstring extension
@ -145,6 +156,8 @@
$this->add_app('common');
}
$this->add_app($GLOBALS['egw_info']['flags']['currentapp']);
$this->markunstranslated = $GLOBALS['egw_info']['server']['markuntranslated'];
}
/**
@ -161,7 +174,8 @@
{
$this->init();
}
$ret = $key.$not_found; // save key if we dont find a translation
$ret = $key; // save key if we dont find a translation
if ($not_found && $this->markunstranslated) $ret .= $not_found;
if (isset($this->lang_arr[$key]))
{