Remove embedded HTML for displaying submit buttons on option pages, also display...

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

diff --git a/functions/options.php b/functions/options.php
index 7b60af67ea5b414d51ad394437ac07a85b677bf0..ccd40206c444d340f50c6bba31ea208fe5b0e6f0 100644 (file)
--- a/functions/options.php
+++ b/functions/options.php
@@ -689,48 +689,4 @@ function create_option_groups($optgrps, $optvals) {
     return ($result);
 }
 
-/**
- * @param array $option_groups
- */
-function print_option_groups($option_groups) {
-    /* Print each option group. */
-    foreach ($option_groups as $next_optgrp) {
-        /* If it is not blank, print the name for this option group. */
-        if ($next_optgrp['name'] != '') {
-            echo html_tag( 'tr', "\n".
-                        html_tag( 'td',
-                            '<b>' . $next_optgrp['name'] . '</b>' ,
-                        'center' ,'', 'valign="middle" colspan="2" style="white-space: nowrap;"' )
-                    ) ."\n";
-        }
-
-        /* Print each option in this option group. */
-        foreach ($next_optgrp['options'] as $option) {
-            if ($option->type != SMOPT_TYPE_HIDDEN) {
-                echo html_tag( 'tr', "\n".
-                           html_tag( 'td', $option->caption . ':', 'right' ,'', 'valign="middle"' ) .
-                           html_tag( 'td', $option->createHTMLWidget(), 'left' )
-                       ) ."\n";
-            } else {
-                echo $option->createHTMLWidget();
-            }
-        }
-
-        /* Print an empty row after this option group. */
-        echo html_tag( 'tr',
-                   html_tag( 'td', '&nbsp;', 'left', '', 'colspan="2"' )
-                ) . "\n";
-    }
-}
-
-/**
- * Create submit button inside table row.
- * @param string $name
- */
-function OptionSubmit( $name ) {
-        echo html_tag( 'tr',
-                   html_tag( 'td', '<input type="submit" value="' . _("Submit") . '" name="' . $name . '" />&nbsp;&nbsp;&nbsp;&nbsp;', 'right', '', 'colspan="2"' )
-                ) . "\n";
-}
-
 // vim: et ts=4

diff --git a/src/options.php b/src/options.php
index 6ef511f044ae210a4079363f56637a55e6574600..a376454af2c28a87bfc9f748af4fb95ea55a473d 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -406,7 +406,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
     /**
      * The variables below should not be needed by the template since all plugin
      * hooks are called here, not in the template.  If we find otherwise, these
-     * variables can be passed to the template.  Commenting out for not.
+     * variables can be passed to the template.  Commenting out for now.
      */
 /*
     $oTemplate->assign('max_refresh', isset($max_refresh) ? $max_refresh : NULL);
@@ -420,8 +420,10 @@ if ($optpage == SMOPT_PAGE_MAIN) {
      * END comment block
      */    
      
+    $oTemplate->assign('submit_name', $submit_name);
     $oTemplate->display('options.tpl');
 
+//FIXME: need to remove HTML from here!
     echo "  </td>\n" .
          " </tr>\n";
 
@@ -430,8 +432,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
         do_hook($inside_hook_name);
     }
 
-    /* Spit out a submit button. */
-    OptionSubmit($submit_name);
+//FIXME: need to remove HTML from here!
     echo "</table>\n" .
          "</form>\n";
 
@@ -443,4 +444,4 @@ if ($optpage == SMOPT_PAGE_MAIN) {
 }
 
 $oTemplate->display('footer.tpl');
-?>
\ No newline at end of file
+?>

diff --git a/templates/default/options.tpl b/templates/default/options.tpl
index 246523355c2361c6dafa3d39a667e1c8df7c0d11..31e317c23ad7bdf326b148f5caceb97c1c060a14 100644 (file)
--- a/templates/default/options.tpl
+++ b/templates/default/options.tpl
@@ -50,7 +50,11 @@ foreach ($options as $option) {
         }
     }
 
+    echo " <tr>\n  <td colspan=\"2\" align=\"right\">\n"
+       . "   <input type=\"submit\" value=\"" . _("Submit") 
+       . "\" name=\"" . $submit_name . "\" />&nbsp;&nbsp;&nbsp;&nbsp;\n  </td>\n </tr>\n";
+
     echo "</table>\n";
 }
 ?>
-</div>
\ No newline at end of file
+</div>