From cda193ba66a40ce64ba5bd6d5a588484cd593350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cornelius=20Wei=C3=9F?= Date: Fri, 11 Nov 2005 20:50:12 +0000 Subject: [PATCH] - a few buxfixes - new view dialog --- addressbook/inc/class.bocontacts.inc.php | 21 ++- addressbook/inc/class.so_ldap.inc.php | 2 +- addressbook/inc/class.uiaddressbook.inc.php | 4 +- addressbook/inc/class.uicontacts.inc.php | 157 +++++++++++++++++- addressbook/setup/etemplates.inc.php | 19 ++- .../templates/default/images/email_icon.png | Bin 0 -> 1015 bytes 6 files changed, 183 insertions(+), 20 deletions(-) create mode 100755 addressbook/templates/default/images/email_icon.png diff --git a/addressbook/inc/class.bocontacts.inc.php b/addressbook/inc/class.bocontacts.inc.php index 1229bd61e6..c9cd4988b8 100755 --- a/addressbook/inc/class.bocontacts.inc.php +++ b/addressbook/inc/class.bocontacts.inc.php @@ -17,7 +17,7 @@ require_once(EGW_INCLUDE_ROOT.'/addressbook/inc/class.socontacts.inc.php'); /** * General business object of the adressbook * -* @package adressbook +* @package addressbook * @author Cornelius Weiss * @copyright (c) 2005 by Cornelius Weiss * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License @@ -124,8 +124,7 @@ class bocontacts extends socontacts // last modified $contact['last_mod'] = time(); // only owner can set access status - $contact['access'] = $contact['owner'] == $this->user ? (!empty($contact['access']) ? $contact['access'] : 'public') : 'public'; - $contact['private'] = $contact['owner'] == $this->user ? $contact['private'] : 0; + $contact['access'] = $contact['owner'] == $this->user ? ($contact['private'] ? 'private': 'public') : $contact['access']; // convert bithdate format $tmp_bday = $contact['bday']; $contact['bday'] = $contact['bday'] ? date('m/d/Y',$contact['bday']) : ''; @@ -135,12 +134,19 @@ class bocontacts extends socontacts ($contact['n_middle'] ? ' '.$contact['n_middle'] : ''). ($contact['n_family'] ? ' '.$contact['n_family'] : ''). ($contact['n_suffix'] ? ' '.$contact['n_suffix'] : ''); + // for some bad historical reasons we mainfileds saved in cf :-((( + $data['#ophone'] = $data['ophone']; unset($data['ophone']); + $data['#address2'] = $data['address2']; unset($data['address2']); + $data['#address3'] = $data['address3']; unset($data['address3']); $error_nr = parent::save($contact); //reconvert bday as we are dealing with references $contact['bday'] = $tmp_bday; - + // for some bad historical reasons we mainfileds saved in cf :-((( + $data['ophone'] = $data['#ophone']; unset($data['#ophone']); + $data['address2'] = $data['#address2']; unset($data['#address2']); + $data['address3'] = $data['#address3']; unset($data['#address3']); $contact['msg'] = $error_nr ? lang('Something went wrong by saving this contact. Errorcode %1',$error_nr) : lang('Contact saved'); @@ -173,8 +179,11 @@ class bocontacts extends socontacts list($m,$d,$y) = explode('/',$data['bday']); $data['bday'] = strpos($data['bday'],'/') ? mktime(0,0,0,$m,$d,$y) : ''; // convert access into private for historical reasons - $data['private'] = $data['access'] == 'private' ? 1 : $data['private']; - $data['access'] = $data['private'] ? 'private' : 'public'; + $data['private'] = $data['access'] == 'private' ? 1 : 0; + // for some bad historical reasons we mainfileds saved in cf :-((( + $data['ophone'] = $data['#ophone']; unset($data['#ophone']); + $data['address2'] = $data['#address2']; unset($data['#address2']); + $data['address3'] = $data['#address3']; unset($data['#address3']); return $data; } diff --git a/addressbook/inc/class.so_ldap.inc.php b/addressbook/inc/class.so_ldap.inc.php index faf7933da3..5d49f06747 100644 --- a/addressbook/inc/class.so_ldap.inc.php +++ b/addressbook/inc/class.so_ldap.inc.php @@ -19,7 +19,7 @@ require_once(EGW_INCLUDE_ROOT.'/phpgwapi/inc/class.contacts.inc.php'); * This makes it compatible with vars and parameters of so_sql * Maybe one day this becomes a generalized ldap storage object :-) * - * @package contacts + * @package addressbook * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License */ class so_ldap extends contacts diff --git a/addressbook/inc/class.uiaddressbook.inc.php b/addressbook/inc/class.uiaddressbook.inc.php index edf5708161..f2603b9ff9 100644 --- a/addressbook/inc/class.uiaddressbook.inc.php +++ b/addressbook/inc/class.uiaddressbook.inc.php @@ -598,8 +598,8 @@ $actions = ' ',320','style' => '','modified' => '1130408337',); -$templ_data[] = array('name' => 'addressbook.edit.personal','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:12:{i:0;a:2:{s:2:"c9";s:4:",top";s:3:"h11";s:4:"100%";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"personal";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"prefix";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:6:"prefix";s:4:"size";s:2:"40";s:8:"tabindex";i:1;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"time zone";}s:1:"F";a:5:{s:4:"type";s:6:"select";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}s:4:"name";s:2:"tz";s:7:"no_lang";s:1:"1";}}i:2;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"first name";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:7:"n_given";s:4:"size";s:2:"40";s:8:"tabindex";i:2;}s:1:"D";a:2:{s:4:"type";s:5:"image";s:4:"name";s:12:"kaddressbook";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"home phone";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_home";s:4:"size";s:2:"30";s:8:"tabindex";i:6;}}i:3;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:" middle name";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_middle";s:4:"size";s:2:"40";s:8:"tabindex";i:3;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"business phone";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_work";s:4:"size";s:2:"30";s:8:"tabindex";i:7;}}i:4;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"last name";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_family";s:4:"size";s:2:"40";s:8:"tabindex";i:4;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_cell";s:4:"size";s:2:"30";s:8:"tabindex";i:8;}}i:5;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"suffix";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_suffix";s:4:"size";s:2:"40";s:8:"tabindex";i:5;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:5:{s:4:"type";s:6:"button";s:5:"label";s:17:"more phonenumbers";s:7:"onclick";s:36:"showphones(this.form); return false;";s:8:"tabindex";i:9;s:9:"accesskey";s:1:"m";}}i:6;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"email";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"home email";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"email_home";s:4:"size";s:2:"30";s:8:"tabindex";i:10;}}i:7;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:" birthday";}s:1:"C";a:3:{s:4:"type";s:4:"date";i:1;a:1:{s:4:"type";s:5:"label";}s:4:"name";s:4:"bday";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"business email";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:5:"email";s:4:"size";s:2:"30";s:8:"tabindex";i:11;}}i:8;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:9;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"category";}s:1:"C";a:5:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:1:"3";s:4:"span";s:1:"4";s:8:"tabindex";i:13;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:10;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"password";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"private";}s:1:"C";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"private";s:8:"tabindex";i:14;}s:1:"D";a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"package_network";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:3:"url";s:4:"size";s:2:"30";s:8:"tabindex";i:12;}}i:11;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:11;s:4:"cols";i:6;s:4:"size";s:4:",320";s:7:"options";a:1:{i:1;s:3:"320";}}}','size' => ',320','style' => '','modified' => '1130404323',); +$templ_data[] = array('name' => 'addressbook.edit.personal','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:12:{i:0;a:2:{s:2:"c9";s:4:",top";s:3:"h11";s:4:"100%";}i:1;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"personal";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"prefix";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_prefix";s:4:"size";s:2:"40";s:8:"tabindex";i:1;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"time zone";}s:1:"F";a:5:{s:4:"type";s:6:"select";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}s:4:"name";s:2:"tz";s:7:"no_lang";s:1:"1";}}i:2;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"first name";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:7:"n_given";s:4:"size";s:2:"40";s:8:"tabindex";i:2;}s:1:"D";a:2:{s:4:"type";s:5:"image";s:4:"name";s:12:"kaddressbook";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"home phone";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_home";s:4:"size";s:2:"30";s:8:"tabindex";i:6;}}i:3;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:" middle name";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_middle";s:4:"size";s:2:"40";s:8:"tabindex";i:3;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"business phone";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_work";s:4:"size";s:2:"30";s:8:"tabindex";i:7;}}i:4;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"last name";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_family";s:4:"size";s:2:"40";s:8:"tabindex";i:4;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_cell";s:4:"size";s:2:"30";s:8:"tabindex";i:8;}}i:5;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"suffix";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_suffix";s:4:"size";s:2:"40";s:8:"tabindex";i:5;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:5:{s:4:"type";s:6:"button";s:5:"label";s:17:"more phonenumbers";s:7:"onclick";s:36:"showphones(this.form); return false;";s:8:"tabindex";i:9;s:9:"accesskey";s:1:"m";}}i:6;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:2:{s:4:"type";s:5:"image";s:4:"name";s:10:"email_icon";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"home email";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"email_home";s:4:"size";s:2:"30";s:8:"tabindex";i:10;}}i:7;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:" birthday";}s:1:"C";a:3:{s:4:"type";s:4:"date";i:1;a:1:{s:4:"type";s:5:"label";}s:4:"name";s:4:"bday";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"business email";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:5:"email";s:4:"size";s:2:"30";s:8:"tabindex";i:11;}}i:8;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:9;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"category";}s:1:"C";a:5:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:1:"3";s:4:"span";s:1:"4";s:8:"tabindex";i:13;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:10;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"password";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"private";}s:1:"C";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"private";s:8:"tabindex";i:14;}s:1:"D";a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"package_network";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:3:"url";s:4:"size";s:2:"30";s:8:"tabindex";i:12;}}i:11;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:11;s:4:"cols";i:6;s:4:"size";s:4:",320";s:7:"options";a:1:{i:1;s:3:"320";}}}','size' => ',320','style' => '','modified' => '1130404323',); $templ_data[] = array('name' => 'addressbook.editphones','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:19:{i:0;a:1:{s:2:"c3";s:2:"th";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";s:4:"span";s:16:"all,windowheader";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:20:"Edit Phonenumbers - ";s:5:"align";s:5:"right";}i:2;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:2:"fn";}}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Number";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"pref";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"home phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_home2";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:8:"tel_home";s:4:"name";s:10:"tel_prefer";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"business phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_work2";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:8:"tel_work";s:4:"name";s:10:"tel_prefer";}}i:6;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_cell2";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:8:"tel_cell";s:4:"name";s:10:"tel_prefer";}}i:7;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"fax";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:7:"tel_fax";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"tel_fax";s:4:"name";s:10:"tel_prefer";}}i:8;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"car phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:7:"tel_car";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"tel_car";s:4:"name";s:10:"tel_prefer";}}i:9;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"video phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_video";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:9:"tel_video";s:4:"name";s:10:"tel_prefer";}}i:10;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"pager";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_pager";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:9:"tel_pager";s:4:"name";s:10:"tel_prefer";}}i:11;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"voice phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_voice";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:9:"tel_voice";s:4:"name";s:10:"tel_prefer";}}i:12;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"message phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:7:"tel_msg";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"tel_msg";s:4:"name";s:10:"tel_prefer";}}i:13;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"bbs phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:7:"tel_bbs";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"tel_bbs";s:4:"name";s:10:"tel_prefer";}}i:14;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"modem phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_modem";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:9:"tel_modem";s:4:"name";s:10:"tel_prefer";}}i:15;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"isdn phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:8:"tel_isdn";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:8:"tel_isdn";s:4:"name";s:10:"tel_prefer";}}i:16;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:" Other Phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:6:"ophone";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:6:"ophone";s:4:"name";s:10:"tel_prefer";}}i:17;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:18;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";s:4:"span";s:1:"3";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:2:"Ok";s:7:"onclick";s:36:"hidephones(this.form); return false;";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:18;s:4:"cols";i:4;s:4:"size";s:13:",,,editphones";s:7:"options";a:1:{i:3;s:10:"editphones";}}}','size' => ',,,editphones','style' => '.editphones{ position: fixed; @@ -37,3 +37,18 @@ border-bottom: #9c9c9c 1px solid; $templ_data[] = array('name' => 'addressbook.search','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:14:"advancedsearch";s:4:"name";s:4:"advs";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1130609044',); +$templ_data[] = array('name' => 'addressbook.view','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:1:{s:1:"A";s:3:"750";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}i:2;a:1:{s:1:"A";a:3:{s:4:"type";s:3:"tab";s:5:"label";s:28:"overview|link|details|custom";s:4:"name";s:28:"overview|link|details|custom";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"owner";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:5:"owner";s:8:"readonly";s:1:"1";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:5:"align";s:5:"right";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"last modified";}i:2;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:8:"last_mod";s:8:"readonly";s:1:"1";}}}}i:4;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:5:{s:4:"name";s:15:"button[private]";s:7:"onclick";s:13:"return false;";s:5:"label";s:7:"private";s:4:"size";s:8:"password";s:4:"type";s:6:"button";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:213:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$cont[id]\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:222:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$cont[id]&makecp=1\'),\'\',\'dependent=yes,width=800,height=600,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes\'); return false;";}i:4;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Vcard";s:4:"name";s:13:"button[vcard]";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";}}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";s:5:"align";s:5:"right";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:60:"return confirm(\'Do you really want do delte this contact?\');";}}}}}s:4:"rows";i:4;s:4:"cols";i:1;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '.contactviewblock{ +vertical-align: top; +} +.contactviewicon{ +vertical-align: top; +}','modified' => '1131713623',); + +$templ_data[] = array('name' => 'addressbook.view.custom','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:4:",280";s:7:"options";a:1:{i:1;s:3:"280";}}}','size' => ',280','style' => '','modified' => '1131720533',); + +$templ_data[] = array('name' => 'addressbook.view.details','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:2:"c1";s:4:",top";s:2:"c2";s:4:",top";s:2:"c3";s:4:",top";}i:1;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"notes";}s:1:"C";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"4,80";s:7:"no_lang";s:1:"1";s:4:"name";s:4:"note";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Label";}s:1:"C";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"4,80";s:4:"name";s:5:"label";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"public key";}s:1:"C";a:4:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"4,80";s:7:"no_lang";s:1:"1";s:4:"name";s:6:"pubkey";}}}s:4:"rows";i:3;s:4:"cols";i:3;s:4:"size";s:4:",280";s:7:"options";a:1:{i:1;s:3:"280";}}}','size' => ',280','style' => '','modified' => '1131721350',); + +$templ_data[] = array('name' => 'addressbook.view.link','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:4:",280";s:7:"options";a:1:{i:1;s:3:"280";}}}','size' => ',280','style' => '','modified' => '1131721121',); + +$templ_data[] = array('name' => 'addressbook.view.overview','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:7:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:3:{s:2:"c2";s:4:",top";s:1:"A";s:4:"100%";s:2:"c3";s:4:",top";}i:1;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:5:"label";s:4:"size";s:1:"b";s:4:"name";s:2:"fn";s:7:"no_lang";s:1:"1";}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:5:"label";s:4:"name";s:2:"tz";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:5:"label";s:9:"time zone";}i:2;a:5:{s:4:"type";s:4:"date";s:5:"label";s:8:"birthday";s:4:"name";s:4:"bday";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:5:"align";s:5:"right";}s:4:"span";s:3:"all";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"span";s:17:",contactviewblock";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:2:"h1";s:19:",@!personal_entries";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"personal";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"name";s:16:"personal_entries";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:3:"nmr";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"b";s:4:"name";s:13:"${row}[field]";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[value]";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}}s:4:"rows";i:1;s:4:"cols";i:2;}i:2;a:6:{s:4:"type";s:4:"grid";s:4:"span";s:17:",contactviewblock";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:2:"h1";s:23:",@!organisation_entries";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"gohome";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"name";s:20:"organisation_entries";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:3:"nmr";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"b";s:4:"name";s:13:"${row}[field]";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[value]";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"span";s:17:",contactviewblock";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:2:"h1";s:16:",@!phone_entries";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:12:"kaddressbook";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"name";s:13:"phone_entries";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:3:"nmr";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"b";s:4:"name";s:13:"${row}[field]";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[value]";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}}s:4:"rows";i:1;s:4:"cols";i:2;}i:2;a:5:{s:4:"type";s:4:"grid";s:4:"span";s:17:",contactviewblock";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:2:"h1";s:16:",@!email_entries";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:10:"email_icon";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"name";s:13:"email_entries";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:3:"nmr";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"b";s:4:"name";s:13:"${row}[field]";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[value]";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}}s:4:"rows";i:1;s:4:"cols";i:2;}i:3;a:5:{s:4:"type";s:4:"grid";s:4:"span";s:17:",contactviewblock";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:4:",top";s:2:"h1";s:14:",@!url_entries";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"package_network";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"name";s:11:"url_entries";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:3:"nmr";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:1:"b";s:4:"name";s:13:"${row}[field]";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[value]";}}}s:4:"rows";i:1;s:4:"cols";i:2;}}}s:4:"rows";i:1;s:4:"cols";i:2;}}}}s:4:"rows";i:1;s:4:"cols";i:2;}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:10:"select-cat";s:4:"size";s:1:"3";s:4:"name";s:6:"cat_id";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"span";s:16:",contactviewicon";s:4:"size";s:4:",280";s:7:"options";a:1:{i:1;s:3:"280";}}}','size' => ',280','style' => '','modified' => '1131713767',); + diff --git a/addressbook/templates/default/images/email_icon.png b/addressbook/templates/default/images/email_icon.png new file mode 100755 index 0000000000000000000000000000000000000000..45f313f07535a3df902d92e392061243ac002f89 GIT binary patch literal 1015 zcmV!;c@o8UFnF4;1?$!oa_fy&C{$PXXh-va3Z2p|@0rh;7c_wQfEfB*iO^YC!RC@4q=NlA%Fva_=>@bmL9 zC@E=0pF4N75vcSZKmef_0Mr1~_)nOTktIM}TqH(JOxRXPh>w|-m5t%ouip%B-h5(^ zmKJBQv2ph}fBx89phb@W0*Hl=j}K%c%h#{pOgT9?qGcq-0tJNxr8qb_8U6u-=lAbF zAlERwfB%_*iHV7UlaqzP($c|T^=etG=g%KK0tg`HmoHv096NfL-@(!4u&BJ6<2Md| z-hcmD7}%NqGO#cKy#fr6FJHa^!{ZkNH#a8(GczLt4-X&n#fvw--??*nCqMwP2uO-E z{AJ;ky8cIyiR~TG#y|fUo__ep!1(hYgRS^i21P+8hR>hBG4S#6FtD&NgTqHkN&x5$ zSBC=!)@c9)5cA%Xr({IT+;+3_@kpCVGBSt@0W|=fdi6Ck!;UL|806VMFvy8=GjMTp z0lmNo#vB|hK$mdwpFDZuHb4L|ZNB)m=FTGqMQtu%ME+r9c>j}u;qPw-pcfbz-u&fZ z*mj$nK|qL`fsKs`h*=o8xY!xk*_jzsRTUUaOx%3{0*K}O6GlI8BL)UWpoY_L7#N;> zVPN?98K@aZ{|5%(&SPI0O1*g*1i6{PG4=ZOcZL%uuKwG#YtN%ASB~5U2mnCP!l_5c9*=<)#V>-hld^8*0w=IH>wzsT{ox3$*H z%)rLy=iSHs{r=Meh~@pW?|*LJ`^KQcC(7V!$j%_k`=4Ra)vpYq?7tZPzxm7{BF@dQ zaL$6q`?oAVarOGSBcDFKKMQooJs<{J#qbLtfLIuQzB((-D&}k~&&t3I^o9&C1A`I& zcLrH$HikoQxfs5EdG>9|+=jW29z0nE)bIp|zk<>nEb##Z5QDOPf`8@4zyGg%|Ns93 zFpmBJ@k<~+^7{Y(NvHq+w+YVP15{@X%`6xIAb^-ZJidIBm51>^zqFzC-G}VVAiuu` z;z#elGc4$CJa%+t?<}CYV?g{Jn*jg;#0X>X$mj)dN;!nFF|!FXvHbn}_37cO@9v%1 l4U_`;`5h>aVKV?AzyJ($Un+X`6rcbA002ovPDHLkV1m!k;Z^_u literal 0 HcmV?d00001