1 files changed, 12 insertions, 17 deletions

diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc
index c3cbcadca..f5ff20bc0 100644
--- a/program/steps/addressbook/mailto.inc
+++ b/program/steps/addressbook/mailto.inc
@@ -5,7 +5,7 @@
  | program/steps/addressbook/mailto.inc                                  |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2007, The Roundcube Dev Team                            |
+ | Copyright (C) 2007-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -19,30 +19,27 @@
  +-----------------------------------------------------------------------+
 */
 
-$cids   = rcmail_get_cids();
-$mailto = array();
+$cids       = rcmail_get_cids();
+$mailto     = array();
 $recipients = null;
 
-foreach ($cids as $source => $cid)
-{
+foreach ($cids as $source => $cid) {
     $CONTACTS = $RCMAIL->get_address_book($source);
 
-    if ($CONTACTS->ready)
-    {
+    if ($CONTACTS->ready) {
         $CONTACTS->set_page(1);
         $CONTACTS->set_pagesize(count($cid) + 2); // +2 to skip counting query
         $recipients = $CONTACTS->search($CONTACTS->primary_key, $cid, 0, true, true, 'email');
     }
 }
 
-if (!empty($_REQUEST['_gid']) && isset($_REQUEST['_source']))
-{
-    $source = get_input_value('_source', RCUBE_INPUT_GPC);
+if (!empty($_REQUEST['_gid']) && isset($_REQUEST['_source'])) {
+    $source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
     $CONTACTS = $RCMAIL->get_address_book($source);
-    
-    $group_id = get_input_value('_gid', RCUBE_INPUT_GPC);
+
+    $group_id = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_GPC);
     $group_data = $CONTACTS->get_group($group_id);
-    
+
     // group has an email address assigned: use that
     if ($group_data['email']) {
         $mailto[] = format_email_recipient($group_data['email'][0], $group_data['name']);
@@ -55,16 +52,14 @@ if (!empty($_REQUEST['_gid']) && isset($_REQUEST['_source']))
     }
 }
 
-if ($recipients)
-{
+if ($recipients) {
     while (is_object($recipients) && ($rec = $recipients->iterate())) {
         $emails = $CONTACTS->get_col_values('email', $rec, true);
         $mailto[] = format_email_recipient($emails[0], $rec['name']);
     }
 }
 
-if (!empty($mailto))
-{
+if (!empty($mailto)) {
     $mailto_str = join(', ', $mailto);
     $mailto_id = substr(md5($mailto_str), 0, 16);
     $_SESSION['mailto'][$mailto_id] = urlencode($mailto_str);