holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added smtp-auth configuration to email and API's send-class (translations for that are moved to admin, as the config is now in Admin >> Site config and only for confinience accessible via Admin >> Email >> Site config too

Browse Source
This commit is contained in:
Ralf Becker 2004-07-11 08:33:28 +00:00
parent e7688aeb14
commit e5d689cb9f
22 changed files with 97 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,15 +141,15 @@
$current_message = $GLOBALS['phpgw']->db->f('content');
if($_POST[htmlarea])
if($_POST['htmlarea'])
{
$text_or_htmlarea=$html->htmlarea('message',stripslashes($current_message),'','','TableOperations,ContextMenu,SpellChecker');
$htmlarea_button='<input type="submit" name="no-htmlarea" onclick="self.location.href=\''.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true').'\'" value="'.lang('disable WSIWYG-editor').'">';
$htmlarea_button='<input type="submit" name="no-htmlarea" onclick="self.location.href=\''.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true').'\'" value="'.lang('disable WYSIWYG-editor').'">';
}
else
{
$text_or_htmlarea='<textarea name="message" style="width:100%; min-width:350px; height:300px;" wrap="virtual">' . stripslashes($current_message) . '</textarea>';
$htmlarea_button='<input type="submit" name="htmlarea" onclick="self.location.href=\''.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true').'\'" value="'.lang('activate WSIWYG-editor').'">';
$htmlarea_button='<input type="submit" name="htmlarea" onclick="self.location.href=\''.$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index&htmlarea=true').'\'" value="'.lang('activate WYSIWYG-editor').'">';
}

4
admin/setup/phpgw_da.lang
View File

@ -347,3 +347,7 @@ 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!
enter your default mail domain ( from: user@domain ) admin da Indtast dit standard domæne navn (fra: bruger@domæne)
enter your smtp server hostname or ip address admin da Indtast SMTP-server navn
enter your smtp server port admin da Indtast SMTP-server port
mail settings admin da Post indstillinger

9
admin/setup/phpgw_de.lang
View File

@ -15,7 +15,7 @@ account preferences admin de Einstellungen der Benutzerkonten
acl manager admin de ACL-Manager
acl rights admin de ACL-Rechte
action admin de Aktion
activate wsiwyg-editor admin de WYSIWYG (formatierter Text) Editor aktivieren
activate wysiwyg-editor admin de WYSIWYG Editor (formatierter Text) aktivieren
add a category admin de Eine Kategorie hinzufügen
add a group admin de Eine Gruppe hinzufügen
add a new account. admin de Neues Benutzerkonto anlegen
@ -116,6 +116,7 @@ deny access to user accounts admin de Zugriff auf Benutzerkonten verbieten
deny all users access to grant other users access to their entries ? admin de Allen Benutzern verbieten anderen Benutzern Zugriff zu ihren Daten zu gewähren?
description can not exceed 255 characters in length ! admin de Die Beschreibung darf nicht länger als 255 Zeichen sein!
disable "auto completion" of the login form admin de Automatisches Vervollständigen der Logindaten abschalten
disable wysiwyg-editor admin de WYSIWYG Editor (formatierter Text) abschalten
disabled (not recomended) admin de abgeschaltet (nicht empfohlen)
display admin de Anzeigen
do not delete the category and return back to the list admin de Kategorie NICHT löschen und zurück zur Liste gehen
@ -158,8 +159,11 @@ enter the title of your logo admin de Titel Ihres Logos
enter the url or filename (in phpgwapi/templates/default/images) of your logo admin de URL oder Dateiname (in phpgwapi/templates/default/images) 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 Standard-FTP-Server
enter your default mail domain ( from: user@domain ) admin de Standard EMail-Domain (Von: benutzer@domain)
enter your http proxy server admin de HTTP-Proxy-Server
enter your http proxy server port admin de HTTP-Proxy-Server-Port
enter your smtp server hostname or ip address admin de SMTP-Server Hostname oder IP-Adresse
enter your smtp server port admin de SMTP-Server Port
error canceling timer, maybe there's none set !!! admin de Fehler beim Abbrechen des Testjobs, eventuell läuft gar keiner!!!
error setting timer, wrong syntax or maybe there's one already running !!! admin de Fehler beim Starten des Testjobs, falsche Syntax oder es läuft schon einer!!!
error: %1 not found or other error !!! admin de Fehler: %1 nicht gefunden oder anderer Fehler!!!
@ -222,6 +226,7 @@ login screen admin de Login-Seite
login shell admin de Login-Komandointerpreter (Login-Shell)
login time admin de Login-Zeit
loginid admin de Login-ID
mail settings admin de EMail Einstellungen
main screen message admin de Nachricht der Startseite
manager admin de Manager
maximum account id (e.g. 65535 or 1000000) admin de Maximum für Benutzer-ID (z.B. 65535 oder 1000000)
@ -247,6 +252,7 @@ no permission to create groups admin de Sie haben keine ausreichenden Rechte um
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 gebaut wurde
outbound admin de ausgehend
passthrough admin de durchgehend
password for smtp-authentication admin de Passwort für SMTP Authentifizierung
path information admin de Pfad-Information
peer server list admin de Liste der Server im Verbund
peer servers admin de Server-Verbund
@ -344,6 +350,7 @@ use pure html compliant code (not fully working yet) admin de Vollst
use theme admin de Benutztes Farbschema
user accounts admin de Benutzerkonten
user data admin de Benutzerdaten
user for smtp-authentication (leave it empty if no auth required) admin de Benutzer für SMTP Authentifizierung (leer lassen falls keine Authentifizierung nötig)
user groups admin de Benutzergruppen
userdata admin de Benutzerkonto
users choice admin de Benutzerauswahl

4
admin/setup/phpgw_el.lang
View File

@ -358,3 +358,7 @@ you must enter an application name. admin el
you must enter an application title. admin el ÐñÝðåé íá åéóÜãåéò Ýíáí ôßôëï åöáñìïãÞò
you must select a file type admin el ÐñÝðåé íá åðéëÝîåéò Ýíáí ôýðï áñ÷åßïõ
you will need to remove the subcategories before you can delete this category admin el Èá ðñÝðåé íá äéáãñáöïýí ïé õðïêáôçãïñßåò ðñßí äéáãñÜøåéò áõôÞ ôçí êáôçãïñßá !
enter your default mail domain ( from: user@domain ) admin el ÅéóáãùãÞ ôïõ ðñïêáèïñéóìÝíïõ ïíüìáôïò ôïìÝá áëëçëïãñáößáò (Áðü:user@domain)
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

10
admin/setup/phpgw_en.lang
View File

@ -14,7 +14,7 @@ account preferences admin en Account Preferences
acl manager admin en ACL Manager
acl rights admin en ACL Rights
action admin en Action
activate wsiwyg-editor admin en activate WSIWYG-editor
activate wysiwyg-editor admin en activate WYSIWYG-editor
add a category admin en add a category
add a group admin en add a group
add a new account. admin en Add a new account.
@ -115,7 +115,7 @@ deny access to user accounts admin en Deny access to user accounts
deny all users access to grant other users access to their entries ? admin en Deny all users access to grant other users access to their entries ?
description can not exceed 255 characters in length ! admin en Description can not exceed 255 characters in length !
disable "auto completion" of the login form admin en Disable "auto completion" of the login form
disable wsiwyg-editor admin en disable WSIWYG-editor
disable wysiwyg-editor admin en disable WYSIWYG-editor
disabled (not recomended) admin en disabled (not recomended)
display admin en Display
do not delete the category and return back to the list admin en do NOT delete the category and return back to the list
@ -156,8 +156,11 @@ enter the title of your logo admin en Enter the title of your logo
enter the url or filename (in phpgwapi/templates/default/images) of your logo admin en Enter the URL or filename (in phpgwapi/templates/default/images) 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 mail domain ( from: user@domain ) admin en Enter your default mail domain ( From: user@domain )
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 smtp server hostname or ip address admin en Enter your SMTP server hostname or IP address
enter your smtp server port admin en Enter your SMTP server port
error canceling timer, maybe there's none set !!! admin en Error canceling timer, maybe there's none set !!!
error setting timer, wrong syntax or maybe there's one already running !!! admin en Error setting timer, wrong syntax or maybe there's one already running !!!
error: %1 not found or other error !!! admin en Error: %1 not found or other error !!!
@ -219,6 +222,7 @@ login screen admin en Login screen
login shell admin en Login shell
login time admin en Login Time
loginid admin en LoginID
mail settings admin en Mail settings
main screen message admin en Main screen message
manager admin en Manager
maximum account id (e.g. 65535 or 1000000) admin en Maximum account id (e.g. 65535 or 1000000)
@ -243,6 +247,7 @@ 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
outbound admin en outbound
passthrough admin en passthrough
password for smtp-authentication admin en Password for SMTP-authentication
path information admin en Path information
peer server list admin en Peer server list
peer servers admin en Peer servers
@ -339,6 +344,7 @@ use pure html compliant code (not fully working yet) admin en Use pure HTML comp
use theme admin en Use theme
user accounts admin en User accounts
user data admin en User Data
user for smtp-authentication (leave it empty if no auth required) admin en User for SMTP-authentication (leave it empty if no auth required)
user groups admin en User groups
userdata admin en userdata
users choice admin en Users Choice

4
admin/setup/phpgw_es-ca.lang
View File

@ -401,3 +401,7 @@ you must enter an application title admin es-ca Debe entrar un titulo para la ap
you must enter an application title. admin es-ca Heu d'introduïr un títol per a l'aplicació.
you must select a file type admin es-ca Heu de sel.leccionar un tipus d'arxiu
you will need to remove the subcategories before you can delete this category admin es-ca Heu d'esborrar les subcategoríes abans de poder esborrar aquesta categoría !
enter your default mail domain ( from: user@domain ) admin es-ca Entreu el vostre domini de correu per defecte ( De: usuari@domini )
enter your smtp server hostname or ip address admin es-ca Entreu el nom o l'adreça IP del servidor SMTP
enter your smtp server port admin es-ca Entreu el port del servidor SMTP
mail settings admin es-ca Configuracions de Correu

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

@ -405,3 +405,7 @@ you must enter an application title admin es-es Debe entrar un titulo para la ap
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 will need to remove the subcategories before you can delete this category admin es-es Debera eliminar las subcategorías antes de poder borrar esta categoría
enter your default mail domain ( from: user@domain ) admin es-es Introduzca su dominio de correo predeterminado ( De: usuario@dominio )
enter your smtp server hostname or ip address admin es-es Introduzca su servidor SMTP (nombre o IP)
enter your smtp server port admin es-es Introduzca el puerto del servidor SMTP
mail settings admin es-es Seteos del E-mail

3
admin/setup/phpgw_fi.lang
View File

@ -205,3 +205,6 @@ you must enter an application name and title. admin fi Anna sovelluksen nimi ja
you must enter an application title. admin fi Anna sovelluksen otsikko.
you must select a file type admin fi Anna tiedostotyyppi
you will need to remove the subcategories before you can delete this category admin fi Aliluokat on poistettava ennen kuin voit poistaa luokan!
enter your smtp server hostname or ip address admin fi Anna SMTP -palvelimen nimi tai IP-osoite
enter your smtp server port admin fi Anna SMTP -palvelimen portti
mail settings admin fi Asetukset

3
admin/setup/phpgw_fr.lang
View File

@ -282,3 +282,6 @@ you must enter an application name. admin fr Vous devez entrer un nom d'applicat
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 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 !
enter your smtp server hostname or ip address admin fr Entrez votre nom de serveur SMTP ou adresse IP
enter your smtp server port admin fr Entrez le port de votre serveur SMTP
mail settings admin fr Réglages mail

4
admin/setup/phpgw_it.lang
View File

@ -362,3 +362,7 @@ 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
enter your default mail domain ( from: user@domain ) admin it Inserisci il dominio predefinito per l'email ( Da: utente@dominio )
enter your smtp server hostname or ip address admin it Inserisci l'host o l'IP del server SMTP
enter your smtp server port admin it Inserisci la porta del server SMTP
mail settings admin it Impostazioni Mail

4
admin/setup/phpgw_ja.lang
View File

@ -199,3 +199,7 @@ You must enter an application title. admin ja
you must select a file type admin ja ファイルタイプを選択してください。
zone admin ja 地域
(Stored password will not be shown here) admin ja (登録されているパスワードは表示されません)
enter your default mail domain ( from: user@domain ) admin ja メールドメイン名 ( 書式 user@domain の domain部分 )
enter your smtp server hostname or ip address admin ja SMTP サーバ名または IP アドレス
enter your smtp server port admin ja SMTP ポート番号
mail settings admin ja 電子メール設定

4
admin/setup/phpgw_nl.lang
View File

@ -371,3 +371,7 @@ 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 voor dat u deze bovenliggende categorie kunt verwijderen!
enter your default mail domain ( from: user@domain ) admin nl Geef uw huidige mail domein (Van: gebruiker@domein)
enter your smtp server hostname or ip address admin nl Uw SMTP server host of IP
enter your smtp server port admin nl Uw SMTP port
mail settings admin nl Mail instellingen

4
admin/setup/phpgw_no.lang
View File

@ -33,3 +33,7 @@ view access log admin no Vis Access Log
view sessions admin no Vis sessions
you must enter a password admin no Du må skrive inn et passord
you must select a file type admin no Du må velge en filtype
enter your default mail domain ( from: user@domain ) admin no Skriv inn ditt standard epost domene ( Fra: bruker@domene )
enter your smtp server hostname or ip address admin no Skriv inn din SMTP tjeners navn eller IP adresse
enter your smtp server port admin no Skriv inn din SMTP tjeners portnummer
mail settings admin no Epost innstillinger

5
admin/setup/phpgw_pl.lang
View File

@ -435,4 +435,7 @@ you must enter an application title. admin pl Musisz poda
you must enter the number of listings display admin pl Musisz podaæ liczbê wy¶wietlanych wierszy
you must select a file type admin pl Musisz wybraæ typ pliku
you will need to remove the subcategories before you can delete this category admin pl Nale¿y usun±æ podkategorie przed skasowaniem tej kategorii !
zone admin pl Strefa
zone admin pl Strefaenter your default mail domain ( from: user@domain ) admin pl Podaj nazwê swojej domeny (u¿ytkownik@domena)
enter your smtp server hostname or ip address admin pl Podaj nazwê hosta serwera SMTP lub adres IP
enter your smtp server port admin pl Podaj port serwera SMTP
mail settings admin pl Ustawienia email

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

@ -384,3 +384,7 @@ you must enter an application name. admin pt-br Voc
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 will need to remove the subcategories before you can delete this category admin pt-br Você deverá remover as sub-categorias antes de remover esta categoria !
enter your default mail domain ( from: user@domain ) admin pt-br Digite seu domínio padrão de correio eletrônico (usuario@dominio)
enter your smtp server hostname or ip address admin pt-br Digite o endereço de seu servidor SMTP
enter your smtp server port admin pt-br Digite a porta de seu servidor SMTP
mail settings admin pt-br Configurações de Correio Eletronico

3
admin/setup/phpgw_pt.lang
View File

@ -209,3 +209,6 @@ you must enter an application name and title. admin pt Voc
you must enter an application title. admin pt Você deve digitar um título para a aplicação.
you must select a file type admin pt Você deve selecionar um tipo de arquivo
you will need to remove the subcategories before you can delete this category admin pt Você deverá remover as sub-categorias antes de remover esta categoria !
enter your smtp server hostname or ip address admin pt Digite o endereço de seu servidor SMTP
enter your smtp server port admin pt Digite a porta de seu servidor SMTP
mail settings admin pt Configurações de correio

4
admin/setup/phpgw_ru.lang Normal file
View File

@ -0,0 +1,4 @@
enter your default mail domain ( from: user@domain ) admin ru ÷×ÅÄÉÔÅ ÷ÁÛ ÐÏÞÔÏ×ÙÊ ÄÏÍÅÎ ÐÏ ÕÍÏÌÞÁÎÉÀ ( From: user@domain )
enter your smtp server hostname or ip address admin ru ÷×ÅÄÉÔÅ IP-ÁÄÒÅÓ ÉÌÉ ÉÍÑ ÷ÁÛÅÇÏ SMTP-ÓÅÒ×ÅÒÁ
enter your smtp server port admin ru ÷×ÅÄÉÔÅ ÐÏÒÔ ÷ÁÛÅÇÏ SMTP-ÓÅÒ×ÅÒÁ
mail settings admin ru õÓÔÁÎÏ×ËÉ ÐÏÞÔÙ

4
admin/setup/phpgw_sl.lang
View File

@ -358,3 +358,7 @@ 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 will need to remove the subcategories before you can delete this category admin sl Preden lahko izbri¹ete to kategorijo, morate izbrisati vse podkategorije!
enter your default mail domain ( from: user@domain ) admin sl Vnesite privzeto po¹tno domeno (oblika: uporabnik@domena)
enter your smtp server hostname or ip address admin sl Vnesite ime ali IP SMTP stre¾nika
enter your smtp server port admin sl Vnesite vrata SMTP stre¾nika
mail settings admin sl Nastavitve po¹te

4
admin/setup/phpgw_zh.lang
View File

@ -371,3 +371,7 @@ you must enter an application title. admin zh 必须为应用程序指定标题.
you must select a file type admin zh 必须选择文件类型
you will need to remove the subcategories before you can delete the parent category admin zt 您需要將所有子分類移除後才可以移除上一層之分類！
you will need to remove the subcategories before you can delete this category admin zh 在删除该类别前，必须删除它的所有子类别!
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 邮件配置

4
admin/setup/phpgw_zt.lang
View File

@ -371,3 +371,7 @@ you must enter an application title. admin zt 您必須輸入應用程式標題
you must select a file type admin zt 您必須選擇一種檔案型態。
you will need to remove the subcategories before you can delete the parent category admin zt 您需要將所有子分類移除後才可以移除上一層之分類！
you will need to remove the subcategories before you can delete this category admin zt 您必須在刪除這個類別前刪除所有的子類別！
enter your default mail domain ( from: user@domain ) admin zt 輸入您的預設郵件網域
enter your smtp server hostname or ip address admin zt 輸入您的SMTP伺服器主機名稱或IP位址
enter your smtp server port admin zt 輸入您的SMTP伺服器連接埠
mail settings admin zt 郵件設定

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

@ -228,6 +228,16 @@
<td>{lang_Enter_your_SMTP_server_port}:</td>
<td><input name="newsettings[smtp_port]" value="{value_smtp_port}"></td>
</tr>
<tr class="row_off">
<td>{lang_User_for_SMTP-authentication_(leave_it_empty_if_no_auth_required)}:</td>
<td><input name="newsettings[smtp_auth_user]" value="{value_smtp_auth_user}"></td>
</tr>
<tr class="row_on">
<td>{lang_Password_for_SMTP-authentication}:</td>
<td><input name="newsettings[smtp_auth_passwd]" value="{value_smtp_auth_passwd}"></td>
</tr>
<!-- END body -->
<!-- BEGIN footer -->

3
phpgwapi/inc/class.send.inc.php
View File

@ -56,6 +56,9 @@ class send extends PHPMailer
$this->IsSmtp();
$this->Host = $GLOBALS['phpgw_info']['server']['smtp_server']?$GLOBALS['phpgw_info']['server']['smtp_server']:'localhost';
$this->Port = $GLOBALS['phpgw_info']['server']['smtp_port']?$GLOBALS['phpgw_info']['server']['smtp_port']:25;
$this->SMPTAuth = !empty($GLOBALS['phpgw_info']['server']['smtp_auth_user']);
$this->Username = $GLOBALS['phpgw_info']['server']['smtp_auth_user'];
$this->Password = $GLOBALS['phpgw_info']['server']['smtp_auth_passwd'];
$this->Hostname = $GLOBALS['phpgw_info']['server']['hostname'];
}