From b116fd78fe16a46736d204d8f81b558e2ea508f7 Mon Sep 17 00:00:00 2001 From: jervfors Date: Mon, 12 Mar 2007 12:16:17 +0000 Subject: [PATCH] Going XHTML. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12335 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/global.php | 6 ++---- functions/page_header.php | 4 ++-- functions/template/general_util.php | 10 ++-------- plugins/newmail/newmail_opt.php | 2 +- src/options_identities.php | 2 +- templates/default/addrbook_addedit.tpl | 4 ++-- templates/default/addrbook_search_list.tpl | 8 ++++---- templates/default/addressbook_search_form.tpl | 4 ++-- templates/default/compose_attachments.tpl | 2 +- templates/default/folder_manip.tpl | 6 +++--- templates/default/folder_manip_dialog.tpl | 2 +- templates/default/message_list_controls.tpl | 2 +- templates/default/options_order.tpl | 4 ++-- templates/default/protocol_header.tpl | 4 ++-- templates/default/read_menubar_buttons.tpl | 4 ++-- templates/default_advanced/read_menubar_buttons.tpl | 4 ++-- 16 files changed, 30 insertions(+), 38 deletions(-) diff --git a/functions/global.php b/functions/global.php index 73f4ef9b..8d28dd24 100644 --- a/functions/global.php +++ b/functions/global.php @@ -136,8 +136,8 @@ function sqsession_is_registered ($name) { * input we should retrieve. An example is if we have: * - * - * + * + * * and we want to know which one of the select inputs should be * returned as $startMessage (without the suffix!), this function * decides by looking for either "form_submit_1" or "form_submit_2" @@ -638,5 +638,3 @@ function sm_print_r() { print htmlentities($buffer); print ''; } - - diff --git a/functions/page_header.php b/functions/page_header.php index c181479d..aff1feb3 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -46,7 +46,7 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE $header_tags = ''; - $header_tags .= "\n"; + $header_tags .= "\n"; $used_fontset = (!empty($chosen_fontset) ? $chosen_fontset : $default_fontset); $used_fontsize = (!empty($chosen_fontsize) ? $chosen_fontsize : $default_fontsize); @@ -103,7 +103,7 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE * recommendations and switch to unicode. */ $header_tags .= "\n"; - $header_tags .= '' . "\n"; + $header_tags .= '' . "\n"; } if ($do_hook) { // NOTE! plugins here MUST assign output to template diff --git a/functions/template/general_util.php b/functions/template/general_util.php index 8ea12de5..bfc50caa 100644 --- a/functions/template/general_util.php +++ b/functions/template/general_util.php @@ -21,18 +21,14 @@ * @param boolean $alt Whether or not this is an alternate * stylesheet (optional; default TRUE). * @param string $mtype The target media display type (optional; default "screen"). - * @param string $xhtml_end The XHTML-compliant close tag syntax to - * use (optional; default "/") * * @return string The full text of the stylesheet link. * */ -function create_css_link($uri, $name='', $alt=TRUE, $mtype='screen', $xhtml_end='/') { +function create_css_link($uri, $name='', $alt=TRUE, $mtype='screen') { // FIXME: Add closing / to link and meta elements only after // switching to xhtml 1.0 Transitional. // It is not compatible with html 4.01 Transitional -$xhtml_end=''; - if (empty($uri)) { return ''; } @@ -72,7 +68,7 @@ $xhtml_end=''; $rel = 'rel="'.( $alt ? 'alternate ' : '' ).'stylesheet" '; } - return '\n"; + return '\n"; } @@ -177,5 +173,3 @@ function displayErrors () { function humanReadableSize ($size) { return show_readable_size($size); } - - diff --git a/plugins/newmail/newmail_opt.php b/plugins/newmail/newmail_opt.php index 24678eef..f8a4ba27 100644 --- a/plugins/newmail/newmail_opt.php +++ b/plugins/newmail/newmail_opt.php @@ -191,7 +191,7 @@ if ($newmail_allowsound) { // upload form echo html_tag('tr') . html_tag('td',_("Upload Media File:"),'right','','style="white-space: nowrap;"') - . html_tag('td','') + . html_tag('td','') . "\n"; // display currently uploaded file information echo html_tag('tr') diff --git a/src/options_identities.php b/src/options_identities.php index 7a49817c..33c5c730 100644 --- a/src/options_identities.php +++ b/src/options_identities.php @@ -196,7 +196,7 @@ function sti_input( $title, $name, $data, $bgcolor ) { $str = ''; $str .= '\n"; $str .= ' ' . $title . ' ' . "\n"; - $str .= ' ' . "\n"; + $str .= ' ' . "\n"; $str .= ''; return $str; diff --git a/templates/default/addrbook_addedit.tpl b/templates/default/addrbook_addedit.tpl index 8164aa75..6bc5fc64 100644 --- a/templates/default/addrbook_addedit.tpl +++ b/templates/default/addrbook_addedit.tpl @@ -113,7 +113,7 @@ $formname = $edit ? 'editaddr' : 'addaddr'; '."\n"; + echo ''."\n"; } } ?> @@ -123,4 +123,4 @@ $formname = $edit ? 'editaddr' : 'addaddr'; - \ No newline at end of file + diff --git a/templates/default/addrbook_search_list.tpl b/templates/default/addrbook_search_list.tpl index d581f499..6ba660ea 100644 --- a/templates/default/addrbook_search_list.tpl +++ b/templates/default/addrbook_search_list.tpl @@ -73,9 +73,9 @@ if ($use_js) { - value= id=> - value= id=> - value= id=> + value= id= /> + value= id= /> + value= id= /> @@ -99,4 +99,4 @@ if (!$use_js) { echo ''."\n"; } ?> - \ No newline at end of file + diff --git a/templates/default/addressbook_search_form.tpl b/templates/default/addressbook_search_form.tpl index 8f6cb696..980dca9d 100644 --- a/templates/default/addressbook_search_form.tpl +++ b/templates/default/addressbook_search_form.tpl @@ -54,7 +54,7 @@ extract($t); - + @@ -79,4 +79,4 @@ extract($t); - \ No newline at end of file + diff --git a/templates/default/compose_attachments.tpl b/templates/default/compose_attachments.tpl index dd66910a..e4234881 100644 --- a/templates/default/compose_attachments.tpl +++ b/templates/default/compose_attachments.tpl @@ -25,7 +25,7 @@ extract($t); : - +   " />   diff --git a/templates/default/folder_manip.tpl b/templates/default/folder_manip.tpl index 010b7474..63cb8266 100644 --- a/templates/default/folder_manip.tpl +++ b/templates/default/folder_manip.tpl @@ -92,7 +92,7 @@ extract($t); if ( !empty($rendel_folder_list) ) { ?>
- + + + " />
diff --git a/templates/default/folder_manip_dialog.tpl b/templates/default/folder_manip_dialog.tpl index 0cb7a1f7..d2e033fe 100644 --- a/templates/default/folder_manip_dialog.tpl +++ b/templates/default/folder_manip_dialog.tpl @@ -69,7 +69,7 @@ if ( $dialog_type == 'rename' ) {

- + " /> " /> diff --git a/templates/default/message_list_controls.tpl b/templates/default/message_list_controls.tpl index 5ca52d9f..038a18a7 100644 --- a/templates/default/message_list_controls.tpl +++ b/templates/default/message_list_controls.tpl @@ -95,7 +95,7 @@ extract($t); } break; case 'hidden': - echo '\n"; + echo '\n"; break; default: break; } diff --git a/templates/default/options_order.tpl b/templates/default/options_order.tpl index 1113be5d..defc61a4 100644 --- a/templates/default/options_order.tpl +++ b/templates/default/options_order.tpl @@ -67,7 +67,7 @@ extract($t);
method="GET"> - + + " /> - +
- + '; ?> - +