iframe height option

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9325 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/include/load_prefs.php b/include/load_prefs.php
index 27a998cadbef52ed93670d97411f84e1c28c4639..a64e3b91021842dcbf644581853bd058906ca023 100644 (file)
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -354,6 +354,12 @@ $show_recipient_instead = getPref($data_dir, $username, 'show_recipient_instead'
 
 $delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_display', SMPREF_ON);
 
+/**
+ * Height of iframe that displays html formated emails
+ * @since 1.5.1
+ */
+$iframe_height = getPref($data_dir, $username, 'iframe_height', '300');
+
 do_hook('loading_prefs');
 
 ?>
\ No newline at end of file

diff --git a/include/options/display.php b/include/options/display.php
index 7a79573e834ca1f33fb4afafe4e137581e941833..ba6cbdb7aa667805eb6b6807f3cfcd8358a630bb 100644 (file)
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -33,6 +33,9 @@ if ($use_icons) {
     }
 }
 
+global $use_iframe;
+if (! isset($use_iframe)) $use_iframe=false;
+
 /**
  * This function builds an array with all the information about
  * the options available to the user, and returns it. The options
@@ -49,7 +52,7 @@ if ($use_icons) {
 function load_optpage_data_display() {
     global $theme, $language, $languages,
     $default_use_mdn, $squirrelmail_language, $allow_thread_sort,
-    $show_alternative_names, $available_languages, $use_icons;
+    $show_alternative_names, $available_languages, $use_icons, $use_iframe;
 
     /* Build a simple array into which we will build options. */
     $optgrps = array();
@@ -318,6 +321,16 @@ function load_optpage_data_display() {
         'refresh' => SMOPT_REFRESH_NONE
     );
 
+    if ($use_iframe) {
+        // Type is set to string in order to be able to use 100%.
+        $optvals[SMOPT_GRP_MESSAGE][] = array(
+            'name'    => 'iframe_height',
+            'caption' => _("Height of inline frame"),
+            'type'    => SMOPT_TYPE_STRING,
+            'size'    => SMOPT_SIZE_TINY,
+            'refresh' => SMOPT_REFRESH_NONE
+        );
+    }
     $optvals[SMOPT_GRP_MESSAGE][] = array(
         'name'    => 'enable_forward_as_attachment',
         'caption' => _("Enable Forward as Attachment"),