Template set selection

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

diff --git a/include/options/display.php b/include/options/display.php
index 813589acf56ced46eba42fcfb5a61a9424b294e6..039d5560ee7615032013be0af8c861e058097533 100644 (file)
--- a/include/options/display.php
+++ b/include/options/display.php
@@ -49,9 +49,9 @@ if (! isset($use_iframe)) $use_iframe=false;
  * @return array all option information
  */
 function load_optpage_data_display() {
  * @return array all option information
  */
 function load_optpage_data_display() {

-    global $theme, $fontsets, $language, $languages,
+    global $theme, $fontsets, $language, $languages,$aTemplateSet,

     $default_use_mdn, $squirrelmail_language, $allow_thread_sort,
     $default_use_mdn, $squirrelmail_language, $allow_thread_sort,

-    $show_alternative_names, $use_icons, $use_iframe;
+    $show_alternative_names, $use_icons, $use_iframe, $sTplDir;

 
     /* Build a simple array into which we will build options. */
     $optgrps = array();
 
     /* Build a simple array into which we will build options. */
     $optgrps = array();


@@ -65,6 +65,24 @@ function load_optpage_data_display() {
     $optgrps[SMOPT_GRP_GENERAL] = _("General Display Options");
     $optvals[SMOPT_GRP_GENERAL] = array();
 
     $optgrps[SMOPT_GRP_GENERAL] = _("General Display Options");
     $optvals[SMOPT_GRP_GENERAL] = array();
 

+    /* load the template set option */
+    $templateset_values = array();
+
+    foreach ($aTemplateSet as $sKey => $aTemplateSetAttributes) {
+        $templateset_values[$aTemplateSetAttributes['NAME']] = $aTemplateSetAttributes['PATH'];
+    }
+    ksort($templateset_values);
+    $templateset_values = array_flip($templateset_values);
+    $optvals[SMOPT_GRP_GENERAL][] = array(
+        'name'    => 'sTplDir',
+        'caption' => _("Template"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_ALL,
+        'posvals' => $templateset_values,
+        'save'    => 'save_option_template'
+    );
+
+

     /* Load the theme option. */
     $theme_values = array();
     foreach ($theme as $theme_key => $theme_attributes) {
     /* Load the theme option. */
     $theme_values = array();
     foreach ($theme as $theme_key => $theme_attributes) {


@@ -153,7 +171,7 @@ function load_optpage_data_display() {
         array_merge(array('' => _("Default")), $language_values);
     $language = $squirrelmail_language;
 
         array_merge(array('' => _("Default")), $language_values);
     $language = $squirrelmail_language;
 

-    // add language selection only when more than 2 languages are available 
+    // add language selection only when more than 2 languages are available

     // (default, English and some other)
     if (count($language_values)>2) {
         $optvals[SMOPT_GRP_GENERAL][] = array(
     // (default, English and some other)
     if (count($language_values)>2) {
         $optvals[SMOPT_GRP_GENERAL][] = array(


@@ -394,6 +412,29 @@ function load_optpage_data_display() {
 /** Define any specialized save functions for this option page. ***/
 /******************************************************************/
 
 /** Define any specialized save functions for this option page. ***/
 /******************************************************************/
 

+/**
+ * This function saves a new template setting.
+ * It updates the template array.
+ */
+function save_option_template($option) {
+    global $aTemplateSet;
+
+    /* Do checking to make sure $new_theme is in the array. */
+    $templateset_in_array = false;
+    for ($i = 0; $i < count($aTemplateSet); ++$i) {
+        if ($aTemplateSet[$i]['PATH'] == $option->new_value) {
+            $templateset_in_array = true;
+            break;
+        }
+    }
+
+    if (!$templateset_in_array) {
+        $option->new_value = '';
+    }
+    /* Save the option like normal. */
+    save_option($option);
+}
+

 /**
  * This function saves a new theme setting.
  * It updates the theme array.
 /**
  * This function saves a new theme setting.
  * It updates the theme array.