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

fix bug found by sven kloeckner: addressbook does not work, when template is not set correctly in customfields section

Browse Source
This commit is contained in:
Cornelius Weiß 2007-06-17 13:09:28 +00:00
parent 2f9ed542ee
commit a76112c613
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addressbook/inc/class.uicontacts.inc.php
View File

@ -1331,8 +1331,13 @@ class uicontacts extends bocontacts
if ($content['private']) $content['owner'] .= 'p'; if ($content['private']) $content['owner'] .= 'p';
$GLOBALS['egw_info']['flags']['include_xajax'] = true; $GLOBALS['egw_info']['flags']['include_xajax'] = true;
$this->tmpl->read($this->content_types[$content['tid']]['options']['template']); if (!$this->tmpl->read($this->content_types[$content['tid']]['options']['template']))
{
$content['msg'] = lang('WARNING: Template "%1" not found, using default template instead.', $this->content_types[$content['tid']]['options']['template'])."\n";
$content['msg'] .= lang('Please update the templatename in your customfields section!');
$this->tmpl->read('addressbook.edit');
}
return $this->tmpl->exec('addressbook.uicontacts.edit',$content,$sel_options,$readonlys,$content, 2); return $this->tmpl->exec('addressbook.uicontacts.edit',$content,$sel_options,$readonlys,$content, 2);
} }
@ -1510,13 +1515,12 @@ $readonlys['button[vcard]'] = true;
{ {
$content['no_tid'] = true; $content['no_tid'] = true;
} }
/* Conny: what's that? if (!$this->tmpl->read($this->content_types[$content['tid']]['options']['template']))
foreach(explode(',',$content['published_groups']) as $id)
{ {
$sel_options['published_groups'][$id] = $GLOBALS['egw']->accounts->id2name($id); $content['msg'] = lang('WARNING: Template "%1" not found, using default template instead.', $this->content_types[$content['tid']]['options']['template'])."\n";
$content['msg'] .= lang('Please update the templatename in your customfields section!');
$this->tmpl->read('addressbook.edit');
} }
*/
$this->tmpl->read($this->content_types[$content['tid']]['options']['template']);
foreach(array('email','email_home','url','url_home') as $name) foreach(array('email','email_home','url','url_home') as $name)
{ {
if ($content[$name] ) if ($content[$name] )

3
addressbook/setup/phpgw_de.lang
View File

@ -197,6 +197,7 @@ link title for contacts show addressbook de Titel der Verkn
links addressbook de Verknüpfungen links addressbook de Verknüpfungen
list all categories addressbook de Liste alle Kategorien list all categories addressbook de Liste alle Kategorien
list all customfields addressbook de Liste alle benutzerdefinierten Felder list all customfields addressbook de Liste alle benutzerdefinierten Felder
list already exists! addressbook de Liste existiert bereits!
list created addressbook de Verteiler erzeugt list created addressbook de Verteiler erzeugt
list creation failed, no rights! addressbook de Verteiler erzeugen fehlgeschlagen, keine Rechte! list creation failed, no rights! addressbook de Verteiler erzeugen fehlgeschlagen, keine Rechte!
load vcard addressbook de VCard laden load vcard addressbook de VCard laden
@ -236,6 +237,7 @@ phone numbers common de Telefonnummern
photo addressbook de Foto photo addressbook de Foto
please enter a name for that field ! addressbook de Bitte geben sie einen Namen für das Feld an! please enter a name for that field ! addressbook de Bitte geben sie einen Namen für das Feld an!
please select only one category addressbook de Bitte nur eine Kategorie auswählen please select only one category addressbook de Bitte nur eine Kategorie auswählen
please update the templatename in your customfields section! addressbook de Passen Sie bitte in der Sektion "Benutzerdefinierte Felder" Ihren Templatenamen an!
postal common de Postanschrift postal common de Postanschrift
pref addressbook de präf pref addressbook de präf
preferred phone addressbook de präferierte Telefonnummer preferred phone addressbook de präferierte Telefonnummer
@ -302,6 +304,7 @@ vcards require a last name entry. addressbook de VCards ben
view linked infolog entries addressbook de Verknüpfte InfoLog Einträge anzeigen view linked infolog entries addressbook de Verknüpfte InfoLog Einträge anzeigen
warning!! ldap is valid only if you are not using contacts for accounts storage! admin de WARNUNG!! LDAP darf nur verwendet werden, wenn sie die Benutzerkonten nicht im Adressbuch speichern! warning!! ldap is valid only if you are not using contacts for accounts storage! admin de WARNUNG!! LDAP darf nur verwendet werden, wenn sie die Benutzerkonten nicht im Adressbuch speichern!
warning: all contacts found will be deleted! addressbook de WARNUNG: Alle gefundenen Kontakte werden gelöscht! warning: all contacts found will be deleted! addressbook de WARNUNG: Alle gefundenen Kontakte werden gelöscht!
warning: template "%1" not found, using default template instead. addressbook de WARNUNG: Template "%1" nicht gefunden, das Standard-Template wird stattdessen benutzt.
what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting! addressbook de Was sollen Verknüpfungen zum Adressbuch in anderen Anwendungen anzeigen. Leere Werte werden ausgelassen. Sie müssen sich neu anmelden, wenn Sie hier eine Änderung vornehmen! what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting! addressbook de Was sollen Verknüpfungen zum Adressbuch in anderen Anwendungen anzeigen. Leere Werte werden ausgelassen. Sie müssen sich neu anmelden, wenn Sie hier eine Änderung vornehmen!
which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting. addressbook de Welches Format soll das Adressbuch für Adressen verwenden deren landesübliches Adressformat unbekannt ist. Wenn das Adressformat eines Landes dem Adressbuch bekannt ist, wird das unabhänig von dieser Einstellung benutzt. which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting. addressbook de Welches Format soll das Adressbuch für Adressen verwenden deren landesübliches Adressformat unbekannt ist. Wenn das Adressformat eines Landes dem Adressbuch bekannt ist, wird das unabhänig von dieser Einstellung benutzt.
which addressbook should be selected when adding a contact and you have no add rights to the current addressbook. addressbook de Welches Adressbuch soll ausgewählt sein beim Hinzufügen von Kontakten, wenn Sie keine Hinzufügen Rechte zum aktuellen Adressbuch haben. which addressbook should be selected when adding a contact and you have no add rights to the current addressbook. addressbook de Welches Adressbuch soll ausgewählt sein beim Hinzufügen von Kontakten, wenn Sie keine Hinzufügen Rechte zum aktuellen Adressbuch haben.

2
addressbook/setup/phpgw_en.lang
View File

@ -237,6 +237,7 @@ phone numbers common en Phone Numbers
photo addressbook en Photo photo addressbook en Photo
please enter a name for that field ! addressbook en Please enter a name for that field ! please enter a name for that field ! addressbook en Please enter a name for that field !
please select only one category addressbook en Please select only one category please select only one category addressbook en Please select only one category
please update the templatename in your customfields section! addressbook en Please update the templatename in your customfields section!
postal common en Postal postal common en Postal
pref addressbook en pref pref addressbook en pref
preferred phone addressbook en preferred phone preferred phone addressbook en preferred phone
@ -303,6 +304,7 @@ vcards require a last name entry. addressbook en Vcards require a last name entr
view linked infolog entries addressbook en View linked InfoLog entries view linked infolog entries addressbook en View linked InfoLog entries
warning!! ldap is valid only if you are not using contacts for accounts storage! admin en WARNING!! LDAP is valid only if you are NOT using contacts for accounts storage! warning!! ldap is valid only if you are not using contacts for accounts storage! admin en WARNING!! LDAP is valid only if you are NOT using contacts for accounts storage!
warning: all contacts found will be deleted! addressbook en WARNING: All contacts found will be deleted! warning: all contacts found will be deleted! addressbook en WARNING: All contacts found will be deleted!
warning: template "%1" not found, using default template instead. addressbook en WARNING: Template "%1" not found, using default template instead.
what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting! addressbook en What should links to the addressbook display in other applications. Empty values will be left out. You need to log in anew, if you change this setting! what should links to the addressbook display in other applications. empty values will be left out. you need to log in anew, if you change this setting! addressbook en What should links to the addressbook display in other applications. Empty values will be left out. You need to log in anew, if you change this setting!
which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting. addressbook en Which address format should the addressbook use for countries it does not know the address format. If the address format of a country is known, it uses it independent of this setting. which address format should the addressbook use for countries it does not know the address format. if the address format of a country is known, it uses it independent of this setting. addressbook en Which address format should the addressbook use for countries it does not know the address format. If the address format of a country is known, it uses it independent of this setting.
which addressbook should be selected when adding a contact and you have no add rights to the current addressbook. addressbook en Which addressbook should be selected when adding a contact AND you have no add rights to the current addressbook. which addressbook should be selected when adding a contact and you have no add rights to the current addressbook. addressbook en Which addressbook should be selected when adding a contact AND you have no add rights to the current addressbook.