From 06c990ead24edee69f07912f8169a0422c411422 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 13 Feb 2012 08:39:39 +0000
Subject: - Added mailto: protocol handler registration link in User
 Preferences (#1486580)

---
 program/steps/settings/edit_prefs.inc |  9 +++++++--
 program/steps/settings/func.inc       | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'program/steps')

diff --git a/program/steps/settings/edit_prefs.inc b/program/steps/settings/edit_prefs.inc
index 6e03b0808..d0abb2843 100644
--- a/program/steps/settings/edit_prefs.inc
+++ b/program/steps/settings/edit_prefs.inc
@@ -51,8 +51,13 @@ function rcmail_user_prefs_form($attrib)
         if ($option['advanced'])
 	      $table->set_row_attribs('advanced');
 
-        $table->add('title', $option['title']);
-	    $table->add(null, $option['content']);
+        if (isset($option['title'])) {
+          $table->add('title', $option['title']);
+  	      $table->add(null, $option['content']);
+        }
+        else {
+          $table->add(array('colspan' => 2), $option['content']);
+        }
       }
 
       $out .= html::tag('fieldset', null, html::tag('legend', null, $block['name']) . $table->show($attrib));
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 35e015dc8..fc836ed50 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -159,7 +159,8 @@ function rcmail_user_prefs($current=null)
     case 'general':
 
     $blocks = array(
-      'main' => array('name' => Q(rcube_label('mainoptions'))),
+      'main'    => array('name' => Q(rcube_label('mainoptions'))),
+      'browser' => array('name' => Q(rcube_label('browseroptions'))),
     );
 
     // language selection
@@ -263,6 +264,16 @@ function rcmail_user_prefs($current=null)
       }
     }
 
+    $product_name = $RCMAIL->config->get('product_name', 'Roundcube Webmail');
+    $RCMAIL->output->add_script(sprintf("%s.check_protocol_handler('%s', '#mailtoprotohandler');",
+      JS_OBJECT_NAME, JQ($product_name)), 'foot');
+
+    $blocks['browser']['options']['mailtoprotohandler'] = array(
+      'content' => html::a(array(
+        'href' => '#',
+        'id' => 'mailtoprotohandler'), Q(rcube_label('mailtoprotohandler'))),
+    );
+
     break;
 
     // Mailbox view (mail screen)
-- 
cgit v1.2.3