extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:18:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use new taglist-email for emails with validation

Browse Source
This commit is contained in:
Nathan Gray 2013-07-30 14:20:23 +00:00
parent 72fb016cb4
commit 84b891f979
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mail/inc/class.mail_compose.inc.php
View File

@ -2535,9 +2535,9 @@ $content['mailtext'] = 'garbage';
common::egw_exit();
}
function ajax_searchAddress() {
public static function ajax_searchAddress() {
$_searchString = trim($_REQUEST['query']);
if (strlen($_searchString)>=3 && $GLOBALS['egw_info']['user']['apps']['addressbook']) {
if ($GLOBALS['egw_info']['user']['apps']['addressbook']) {
//error_log(__METHOD__.__LINE__.array2string($_searchString));
if (method_exists($GLOBALS['egw']->contacts,'search')) {
// 1.3+
@ -2573,13 +2573,6 @@ $content['mailtext'] = 'garbage';
}
unset($accounts);
}
} else {
// < 1.3
$contacts = $GLOBALS['egw']->contacts->read(0,20,array(
'fn' => 1,
'email' => 1,
'email_home' => 1,
), $_searchString, 'tid=n', '', 'fn');
}
}
$results = array();
@ -2603,7 +2596,13 @@ $content['mailtext'] = 'garbage';
}
$completeMailString = trim($contact['n_fn'] ? $contact['n_fn'] : $contact['fn']) .' <'. trim($email) .'>';
if(!empty($email) && in_array($completeMailString ,$results) === false) {
$results[] = array('id'=>$completeMailString, 'label' => htmlspecialchars($completeMailString));
$results[] = array(
'id'=>$completeMailString,
'label' => htmlspecialchars($completeMailString),
// Add just name for nice display, with title for hover
'name' => htmlspecialchars($contact['n_fn']),
'title' => $email
);
}
if ($i > 10) break; // we check for # of results here, as we might have empty email addresses
}

10
mail/templates/default/compose.xet
View File

@ -6,23 +6,23 @@
<vbox class="mailCompose mailComposeHeaderSection" width="100%">
<hbox class="mailComposeHeaders" width="99%">
<description value="Identity"/>
<taglist id="SENDER" width="88%" autocomplete_url='mail.mail_compose.ajax_searchAddress' autocomplete_params='' allowFreeEntries="false" maxSelection="1" onclick="app.mail.address_click"/>
<taglist-email id="SENDER" width="88%" allowFreeEntries="false" maxSelection="1" onclick="app.mail.address_click"/>
</hbox>
<hbox class="mailComposeHeaders" width="99%">
<description value="To"/>
<taglist id="TO" width="88%" autocomplete_url='mail.mail_compose.ajax_searchAddress' autocomplete_params='' onclick="app.mail.address_click"/>
<taglist-email id="TO" width="88%" onclick="app.mail.address_click"/>
</hbox>
<hbox class="mailComposeHeaders" width="99%">
<description value="Cc"/>
<taglist id="CC" width="88%" autocomplete_url='mail.mail_compose.ajax_searchAddress' autocomplete_params='' onclick="app.mail.address_click"/>
<taglist-email id="CC" width="88%" onclick="app.mail.address_click"/>
</hbox>
<hbox class="mailComposeHeaders" width="99%">
<description value="Bcc"/>
<taglist id="BCC" width="88%" autocomplete_url='mail.mail_compose.ajax_searchAddress' autocomplete_params='' onclick="app.mail.address_click"/>
<taglist-email id="BCC" width="88%" onclick="app.mail.address_click"/>
</hbox>
<hbox class="mailComposeHeaders" width="99%">
<description value="Reply To"/>
<taglist id="REPLYTO" width="88%" autocomplete_url='mail.mail_compose.ajax_searchAddress' autocomplete_params='' onclick="app.mail.address_click"/>
<taglist-email id="REPLYTO" width="88%" onclick="app.mail.address_click"/>
</hbox>
<hbox class="mailComposeHeaders" width="99%">
<description value="Store to Folder"/>