From 244a64a4ace53a95f318aa692bbe9f21c7e5fd4a Mon Sep 17 00:00:00 2001 From: pdontthink Date: Tue, 26 Feb 2008 18:52:18 +0000 Subject: [PATCH] Remove some HTML from the core git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12966 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/options.php | 20 ++++++++--------- templates/default/form_close.tpl | 20 +++++++++++++++++ templates/default/table.tpl | 31 ++++++++++++++++++++++++++ templates/default/table_close.tpl | 20 +++++++++++++++++ templates/default/table_data.tpl | 31 ++++++++++++++++++++++++++ templates/default/table_data_close.tpl | 20 +++++++++++++++++ templates/default/table_row.tpl | 31 ++++++++++++++++++++++++++ templates/default/table_row_close.tpl | 20 +++++++++++++++++ 8 files changed, 183 insertions(+), 10 deletions(-) create mode 100644 templates/default/form_close.tpl create mode 100644 templates/default/table.tpl create mode 100644 templates/default/table_close.tpl create mode 100644 templates/default/table_data.tpl create mode 100644 templates/default/table_data_close.tpl create mode 100644 templates/default/table_row.tpl create mode 100644 templates/default/table_row_close.tpl diff --git a/src/options.php b/src/options.php index b13e04a0..88ca5a65 100644 --- a/src/options.php +++ b/src/options.php @@ -65,6 +65,7 @@ function process_optionmode_submit($optpage, $optpage_data) { echo "name = '$option->name', " . "value = '$option->value', " . "new_value = '$option->new_value'\n"; +//FIXME: NO HTML IN THE CORE! echo "
"; */ if ($option->changed()) { @@ -420,11 +421,12 @@ if ($optpage == SMOPT_PAGE_MAIN) { . create_optpage_element($optpage) . create_optmode_element(SMOPT_MODE_SUBMIT); -//FIXME: NO HTML IN THE CORE!! // Wrap the template in a table to keep from breaking the hooks below - echo "\n" . - " \n" . - " \n" . - " \n"; + $oTemplate->display('table_data_close.tpl'); + $oTemplate->display('table_row_close.tpl'); /* If it is not empty, trigger the inside hook. */ if ($inside_hook_name != '') { do_hook($inside_hook_name, $null); } -//FIXME: need to remove HTML from here! - echo "
\n"; + $oTemplate->assign('attributes', array('cellspacing' => 0, 'class' => 'table_blank')); + $oTemplate->display('table.tpl'); + $oTemplate->display('table_row.tpl'); + $oTemplate->assign('attributes', array('colspan' => 2)); + $oTemplate->display('table_data.tpl'); // This is the only variable that is needed by *just* the template. $oTemplate->assign('options', $optpage_data['options']); @@ -456,18 +458,16 @@ if ($optpage == SMOPT_PAGE_MAIN) { $oTemplate->assign('submit_name', $submit_name); $oTemplate->display('options.tpl'); -//FIXME: need to remove HTML from here! - echo "
\n" . - "\n"; + $oTemplate->display('table_close.tpl'); + $oTemplate->display('form_close.tpl'); /* If it is not empty, trigger the bottom hook. */ if ($bottom_hook_name != '') { diff --git a/templates/default/form_close.tpl b/templates/default/form_close.tpl new file mode 100644 index 00000000..5649c984 --- /dev/null +++ b/templates/default/form_close.tpl @@ -0,0 +1,20 @@ + + * + * @copyright © 1999-2008 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id: form_close.tpl 12078 2007-01-07 07:28:11Z pdontthink $ + * @package squirrelmail + * @subpackage templates + */ + + +?> + diff --git a/templates/default/table.tpl b/templates/default/table.tpl new file mode 100644 index 00000000..b528660c --- /dev/null +++ b/templates/default/table.tpl @@ -0,0 +1,31 @@ + $value) { + echo ' ' . $key . (is_null($value) ? '' : '="' . $value . '"'); +} + +echo ">\n"; + diff --git a/templates/default/table_close.tpl b/templates/default/table_close.tpl new file mode 100644 index 00000000..22cde079 --- /dev/null +++ b/templates/default/table_close.tpl @@ -0,0 +1,20 @@ + + * + * @copyright © 1999-2008 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id: table_close.tpl 12078 2007-01-07 07:28:11Z pdontthink $ + * @package squirrelmail + * @subpackage templates + */ + + +?> + diff --git a/templates/default/table_data.tpl b/templates/default/table_data.tpl new file mode 100644 index 00000000..083b36ed --- /dev/null +++ b/templates/default/table_data.tpl @@ -0,0 +1,31 @@ + $value) { + echo ' ' . $key . (is_null($value) ? '' : '="' . $value . '"'); +} + +echo ">\n"; + diff --git a/templates/default/table_data_close.tpl b/templates/default/table_data_close.tpl new file mode 100644 index 00000000..6f2a8674 --- /dev/null +++ b/templates/default/table_data_close.tpl @@ -0,0 +1,20 @@ + + * + * @copyright © 1999-2008 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id: table_data_close.tpl 12078 2007-01-07 07:28:11Z pdontthink $ + * @package squirrelmail + * @subpackage templates + */ + + +?> + diff --git a/templates/default/table_row.tpl b/templates/default/table_row.tpl new file mode 100644 index 00000000..9b5811b7 --- /dev/null +++ b/templates/default/table_row.tpl @@ -0,0 +1,31 @@ + $value) { + echo ' ' . $key . (is_null($value) ? '' : '="' . $value . '"'); +} + +echo ">\n"; + diff --git a/templates/default/table_row_close.tpl b/templates/default/table_row_close.tpl new file mode 100644 index 00000000..4b2c9e46 --- /dev/null +++ b/templates/default/table_row_close.tpl @@ -0,0 +1,20 @@ + + * + * @copyright © 1999-2008 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id: table_row_close.tpl 12078 2007-01-07 07:28:11Z pdontthink $ + * @package squirrelmail + * @subpackage templates + */ + + +?> + -- 2.25.1