We use cookies to ensure you get the best experience on our website
Головна сторінка Огляд Довідка
Реєстрація Увійти
0ct0pu5
/
squirrelmail
1
0
Відгалуження 0
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

A small start in making Sqm XHTML 1.0 valid

Thijs Kinkhorst 22 роки тому
батько
583d3d87df
коміт
3b7230b66a
9 змінених файлів з 95 додано та 97 видалено
Об'єднаний вигляд Показати статистику Diff
  1. 13 12
      functions/html.php
  2. 16 16
      functions/page_header.php
  3. 42 42
      src/left_main.php
  4. 10 11
      src/login.php
  5. 2 2
      src/printer_friendly_bottom.php
  6. 3 3
      src/printer_friendly_main.php
  7. 2 4
      src/printer_friendly_top.php
  8. 1 1
      src/signout.php
  9. 6 6
      src/webmail.php

+ 13 - 12
functions/html.php
Переглянути файл 

@@ -14,7 +14,7 @@
 
  */
 
  */
 
 
 
     function html_tag( $tag,                // Tag to output
 
     function html_tag( $tag,                // Tag to output
 
-                       $val = '',           // Value between tags (if empty only start tag is issued)
 
+                       $val = '',           // Value between tags
 
                        $align = '',         // Alignment
 
                        $align = '',         // Alignment
 
                        $bgcolor = '',       // Back color
 
                        $bgcolor = '',       // Back color
 
                        $xtra = '' ) {       // Extra options
 
                        $xtra = '' ) {       // Extra options
 
@@ -23,10 +23,10 @@
 
 
 
         $align = strtolower( $align );
 
         $align = strtolower( $align );
 
         $bgc = '';
 
         $bgc = '';
 
-        $tag = strtoupper( $tag );
 
+        $tag = strtolower( $tag );
 
 
 
         if ( isset( $languages[$squirrelmail_language]['DIR']) ) {
 
         if ( isset( $languages[$squirrelmail_language]['DIR']) ) {
 
-        $dir = $languages[$squirrelmail_language]['DIR'];
 
+            $dir = $languages[$squirrelmail_language]['DIR'];
 
         } else {
 
         } else {
 
             $dir = 'ltr';
 
             $dir = 'ltr';
 
         }
 
         }
 
@@ -40,7 +40,7 @@
 
         }
 
         }
 
 
 
         if ( $bgcolor <> '' ) {
 
         if ( $bgcolor <> '' ) {
 
-            $bgc = " BGCOLOR=\"$bgcolor\""; 
+            $bgc = " bgcolor=\"$bgcolor\""; 
         }
 
         }
 
 
 
         switch ( $align ) {
 
         switch ( $align ) {
 
@@ -48,31 +48,32 @@
 
                 $alg = '';
 
                 $alg = '';
 
                 break;
 
                 break;
 
             case 'right':
 
             case 'right':
 
-                $alg = " ALIGN=\"$rgt\"";
 
+                $alg = " align=\"$rgt\"";
 
                 break;
 
                 break;
 
             case 'left':
 
             case 'left':
 
-                $alg = " ALIGN=\"$lft\"";
 
+                $alg = " align=\"$lft\"";
 
                 break;
 
                 break;
 
             default:
 
             default:
 
-                $alg = " ALIGN=\"$align\"";
 
+                $alg = " align=\"$align\"";
 
                 break;
 
                 break;
 
         }
 
         }
 
 
 
         $ret = "<$tag";
 
         $ret = "<$tag";
 
 
 
         if ( $dir <> 'ltr' ) {
 
         if ( $dir <> 'ltr' ) {
 
-            $ret .= " DIR=\"$dir\"";
 
+            $ret .= " dir=\"$dir\"";
 
         }
 
         }
 
-        $ret .= "$bgc$alg";
 
+        $ret .= $bgc . $alg;
 
 
 
         if ( $xtra <> '' ) {
 
         if ( $xtra <> '' ) {
 
             $ret .= " $xtra";
 
             $ret .= " $xtra";
 
         }
 
         }
 
-        $ret .= '>';
 
 
 
         if ( $val <> '' ) {
 
         if ( $val <> '' ) {
 
-            $ret .= "$val</$tag>";
 
-        }
 
+            $ret .= ">$val</$tag>";
 
+        } else {
 
+            $ret .= ' />';
 
+        } 
 
 
         return( $ret );
 
         return( $ret );
 
     }
 
     }

+ 16 - 16
functions/page_header.php
Переглянути файл 

@@ -31,19 +31,19 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
 
     global $theme_css, $custom_css;
 
     global $theme_css, $custom_css;
 
 
 
     echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">' .
 
     echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">' .
 
-         "\n\n<HTML>\n<HEAD>\n";
 
+         "\n\n<html>\n<head>\n";
 
 
 
     if ( !isset( $custom_css ) || $custom_css == 'none' ) {
 
     if ( !isset( $custom_css ) || $custom_css == 'none' ) {
 
         if ($theme_css != '') {
 
         if ($theme_css != '') {
 
-            echo "<LINK REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"$theme_css\">";
 
+            echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"$theme_css\" />";
 
         }
 
         }
 
     } else {
 
     } else {
 
-        echo '<LINK REL="stylesheet" TYPE="text/css" HREF="' .
 
-             $base_uri . 'themes/css/'.$custom_css.'">';
 
+        echo '<link rel="stylesheet" type="text/css" href="' .
 
+             $base_uri . 'themes/css/'.$custom_css.'" />';
 
     }
 
     }
 
     
     
     if ($do_hook) {
 
     if ($do_hook) {
 
-       do_hook("generic_header");
 
+        do_hook('generic_header');
 
     }
 
     }
 
     
     
     echo "\n<title>$title</title>$xtra\n";
 
     echo "\n<title>$title</title>$xtra\n";
 
@@ -100,7 +100,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
 
     }
 
     }
 
 
 
     if ($session) {
 
     if ($session) {
 
-	$compose_uri = $base_uri.'src/compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session";
 
+	$compose_uri = $base_uri.'src/compose.php?mailbox='.urlencode($mailbox).'&amp;attachedmessages=true&amp;session='."$session";
 
     } else {
 
     } else {
 
         $compose_uri = $base_uri.'src/compose.php?newmessage=1';
 
         $compose_uri = $base_uri.'src/compose.php?newmessage=1';
 
 	$session = 0;
 
 	$session = 0;
 
@@ -166,7 +166,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
 
 	    
 	    
         $js .= "// -->\n".
 
         $js .= "// -->\n".
 
         	 "</script>\n";
 
         	 "</script>\n";
 
-        $onload = "onLoad=\"checkForm();\"";
 
+        $onload = 'onload="checkForm();"';
 
         displayHtmlHeader ('SquirrelMail', $js);
 
         displayHtmlHeader ('SquirrelMail', $js);
 
         break;   
         break;   
 
 
@@ -215,7 +215,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
 
         $js .= "// -->\n". "</script>\n";
 
         $js .= "// -->\n". "</script>\n";
 
 	
 	
 
 
-        $onload = "onLoad=\"checkForm();\"";
 
+        $onload = 'onload="checkForm();"';
 
         displayHtmlHeader ('SquirrelMail', $js);
 
         displayHtmlHeader ('SquirrelMail', $js);
 
         break;   
         break;   
 
 
@@ -246,24 +246,24 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
 
         . html_tag( 'td', '', 'left' ) ."\n";
 
         . html_tag( 'td', '', 'left' ) ."\n";
 
     $urlMailbox = urlencode($mailbox);
 
     $urlMailbox = urlencode($mailbox);
 
     if ($compose_new_win == '1') {
 
     if ($compose_new_win == '1') {
 
-        echo "<a href=\"javascript:void(0)\" onclick=\"comp_in_new()\">". _("Compose"). '</a>';
 
+        echo '<a href="javascript:void(0)" onclick="comp_in_new()">'. _("Compose").'</a>';
 
     }
 
     }
 
     else {
 
     else {
 
         displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right');
 
         displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right');
 
     } 
     } 
     echo "&nbsp;&nbsp;\n";
 
     echo "&nbsp;&nbsp;\n";
 
-    displayInternalLink ("src/addressbook.php", _("Addresses"), 'right');
 
+    displayInternalLink ('src/addressbook.php', _("Addresses"), 'right');
 
     echo "&nbsp;&nbsp;\n";
 
     echo "&nbsp;&nbsp;\n";
 
-    displayInternalLink ("src/folders.php", _("Folders"), 'right');
 
+    displayInternalLink ('src/folders.php', _("Folders"), 'right');
 
     echo "&nbsp;&nbsp;\n";
 
     echo "&nbsp;&nbsp;\n";
 
-    displayInternalLink ("src/options.php", _("Options"), 'right');
 
+    displayInternalLink ('src/options.php', _("Options"), 'right');
 
     echo "&nbsp;&nbsp;\n";
 
     echo "&nbsp;&nbsp;\n";
 
     displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"), 'right');
 
     displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"), 'right');
 
     echo "&nbsp;&nbsp;\n";
 
     echo "&nbsp;&nbsp;\n";
 
-    displayInternalLink ("src/help.php", _("Help"), 'right');
 
+    displayInternalLink ('src/help.php', _("Help"), 'right');
 
     echo "&nbsp;&nbsp;\n";
 
     echo "&nbsp;&nbsp;\n";
 
 
 
-    do_hook("menuline");
 
+    do_hook('menuline');
 
 
 
     echo "      </td>\n"
 
     echo "      </td>\n"
 
         . html_tag( 'td', '', 'right' ) ."\n";
 
         . html_tag( 'td', '', 'right' ) ."\n";
 
@@ -294,7 +294,7 @@ function compose_Header($color, $mailbox) {
 
     switch ( $module ) {
 
     switch ( $module ) {
 
     case 'src/search.php':
 
     case 'src/search.php':
 
         $pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1;
 
         $pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1;
 
-        $onload = "onLoad=\"document.forms[$pos].elements[2].focus();\"";
 
+        $onload = "onload=\"document.forms[$pos].elements[2].focus();\"";
 
         displayHtmlHeader (_("Compose"));
 
         displayHtmlHeader (_("Compose"));
 
         break;
 
         break;
 
     default:
 
     default:
 
@@ -321,7 +321,7 @@ function compose_Header($color, $mailbox) {
 
             "}\n";
 
             "}\n";
 
         $js .= "// -->\n".
 
         $js .= "// -->\n".
 
         	 "</script>\n";
 
         	 "</script>\n";
 
-        $onload = "onLoad=\"checkForm();\"";
 
+        $onload = 'onload="checkForm();"';
 
         displayHtmlHeader (_("Compose"), $js);
 
         displayHtmlHeader (_("Compose"), $js);
 
         break;   
         break;

+ 42 - 42
src/left_main.php
Переглянути файл 

@@ -336,33 +336,33 @@ function listBoxes ($boxes, $j=0 ) {
 
     	    if ($numMessages > 0) {
 
     	    if ($numMessages > 0) {
 
         	$urlMailbox = urlencode($mailbox);
 
         	$urlMailbox = urlencode($mailbox);
 
         	$pre .= "\n<small>\n" .
 
         	$pre .= "\n<small>\n" .
 
-                	"&nbsp;&nbsp;(<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A>)" .
 
+                	"&nbsp;&nbsp;(<a href=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</a>)" .
 
                 	"</small>";
 
                 	"</small>";
 
     	    }
 
     	    }
 
 	} else {
 
 	} else {
 
 	    if (!$boxes->is_noselect) {
 
 	    if (!$boxes->is_noselect) {
 
-		$pre .= "<a HREF=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" TARGET=\"right\">";
 
+		$pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">";
 
 		$end .= '</a>';
 
 		$end .= '</a>';
 
 	    }
 
 	    }
 
 	}
 
 	}
 
 
 
 	/* If there are unseen message, close bolding. */
 
 	/* If there are unseen message, close bolding. */
 
-	if ($unseen > 0) { $end .= "</B>"; }
 
+	if ($unseen > 0) { $end .= "</b>"; }
 
 
 
 	/* Print unseen information. */
 
 	/* Print unseen information. */
 
 	if (isset($unseen_found) && $unseen_found) {
 
 	if (isset($unseen_found) && $unseen_found) {
 
-    	    $end .= "&nbsp;<SMALL>$unseen_string</SMALL>";
 
+    	    $end .= "&nbsp;<small>$unseen_string</small>";
 
 	}
 
 	}
 
 
 
 	$font = '';
 
 	$font = '';
 
 	$fontend = '';
 
 	$fontend = '';
 
 	if ($boxes->is_special) {
 
 	if ($boxes->is_special) {
 
-    	    $font = "<FONT COLOR=\"$color[11]\">";
 
-	    $fontend = "</FONT>";    
+    	    $font = "<font color=\"$color[11]\">";
 
+	    $fontend = "</font>";    
 	}
 
 	}
 
 	
 	
 	if (!$boxes->is_root) { 
 	if (!$boxes->is_root) { 
-	    echo "" . $pre .$font. $boxes->mailboxname_sub .$fontend . $end. '<br>';
 
+	    echo "" . $pre .$font. $boxes->mailboxname_sub .$fontend . $end. '<br />';
 
 	    $j++;
 
 	    $j++;
 
 	}
 
 	}
 
 	if (!$collapse || $boxes->is_root) {
 
 	if (!$collapse || $boxes->is_root) {
 
@@ -401,16 +401,16 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
 
 	} else $unseen = 0;
 
 	} else $unseen = 0;
 
 
 
 	/* If there are unseen message, bold the line. */
 
 	/* If there are unseen message, bold the line. */
 
-	if ($unseen > 0) { $pre .= '<B>'; }
 
+	if ($unseen > 0) { $pre .= '<b>'; }
 
 
 
 	/* color special boxes */
 
 	/* color special boxes */
 
 	if ($boxes->is_special) {
 
 	if ($boxes->is_special) {
 
-    	    $pre .= "<FONT COLOR=\"$color[11]\">";
 
-	    $end .= "</FONT>";    
+    	    $pre .= "<font color=\"$color[11]\">";
 
+	    $end .= '</font>';    
 	}
 
 	}
 
 
 
 	/* If there are unseen message, close bolding. */
 
 	/* If there are unseen message, close bolding. */
 
-	if ($unseen > 0) { $end .= "</B>"; }
 
+	if ($unseen > 0) { $end .= '</b>'; }
 
 
 
 	/* Print unseen information. */
 
 	/* Print unseen information. */
 
 	if (isset($unseen_found) && $unseen_found) {
 
 	if (isset($unseen_found) && $unseen_found) {
 
@@ -424,12 +424,12 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
 
     	    if ($numMessages > 0) {
 
     	    if ($numMessages > 0) {
 
         	$urlMailbox = urlencode($mailbox);
 
         	$urlMailbox = urlencode($mailbox);
 
         	$pre .= "\n<small>\n" .
 
         	$pre .= "\n<small>\n" .
 
-                	"&nbsp;&nbsp;(<a class=\"mbx_link\" HREF=\"empty_trash.php\">"._("purge")."</a>)" .
 
+                	"&nbsp;&nbsp;(<a class=\"mbx_link\" href=\"empty_trash.php\">"._("purge")."</a>)" .
 
                 	"</small>";
 
                 	"</small>";
 
     	    }
 
     	    }
 
 	} else {
 
 	} else {
 
 	    if (!$boxes->is_noselect) { /* \Noselect boxes can't be selected */
 
 	    if (!$boxes->is_noselect) { /* \Noselect boxes can't be selected */
 
-		$pre .= "<a class=\"mbx_link\" HREF=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" TARGET=\"right\">";
 
+		$pre .= "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">";
 
 		$end .= '</a>';
 
 		$end .= '</a>';
 
 	    }
 
 	    }
 
 	}
 
 	}
 
@@ -445,7 +445,7 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
 
 	      } else if ($boxes->is_draft) {
 
 	      } else if ($boxes->is_draft) {
 
 		$folder_img = '../images/draft.gif';
 
 		$folder_img = '../images/draft.gif';
 
 	      } else $folder_img = '../images/folder.gif';
 
 	      } else $folder_img = '../images/folder.gif';
 
-	      $folder_img = '&nbsp;<img src="'.$folder_img.'" height="15" valign="center">&nbsp;';
 
+	      $folder_img = '&nbsp;<img src="'.$folder_img.'" height="15" valign="center" />&nbsp;';
 
 	    } else $folder_img = '';
 
 	    } else $folder_img = '';
 
 	    if (!isset($boxes->mbxs[0])) {
 
 	    if (!isset($boxes->mbxs[0])) {
 
 	        echo '   ' . html_tag( 'div',
 
 	        echo '   ' . html_tag( 'div',
 
@@ -469,9 +469,9 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
 
     			$collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
 
     			$collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
 
 		    }
 
 		    }
 
 		    if ($collapse) {
 
 		    if ($collapse) {
 
-    			$link = '<a href="javascript:void(0)">'." <img src=\"../images/plus.gif\" border=\"1\" id=$j onclick=\"hidechilds(this)\"></A>";
 
+    			$link = '<a href="javascript:void(0)">'." <img src=\"../images/plus.gif\" border=\"1\" id=$j onclick=\"hidechilds(this)\" /></a>";
 
 		    } else {
 
 		    } else {
 
-    			$link = '<a href="javascript:void(0)">'."<img src=\"../images/minus.gif\" border=\"1\" id=$j onclick=\"hidechilds(this)\"></a>";
 
+    			$link = '<a href="javascript:void(0)">'."<img src=\"../images/minus.gif\" border=\"1\" id=$j onclick=\"hidechilds(this)\" /></a>";
 
 		    }
 
 		    }
 
 		    $collapse_link = $link;
 
 		    $collapse_link = $link;
 
 		} else $collapse_link='';
 
 		} else $collapse_link='';
 
@@ -479,13 +479,13 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
 
 	                        $collapse_link . $pre . $folder_img . '&nbsp;'. $boxes->mailboxname_sub . $end ,
 
 	                        $collapse_link . $pre . $folder_img . '&nbsp;'. $boxes->mailboxname_sub . $end ,
 
 	                'left', '', 'class="mbx_par" id="' .$j. 'P"' )
 
 	                'left', '', 'class="mbx_par" id="' .$j. 'P"' )
 
 		        . "\n";
 
 		        . "\n";
 
-		echo '   <INPUT TYPE="hidden" name=mbx['.$j. 'F] value="'.$collapse.'" id="mbx['.$j.'F]">'."\n";
 
+		echo '   <input type="hidden" name="mbx['.$j. 'F]" value="'.$collapse.'" id="mbx['.$j.'F]" />'."\n";
 
 	    }
 
 	    }
 
 	}
 
 	}
 
 	if ($collapse) {
 
 	if ($collapse) {
 
-	    $visible = ' STYLE="display:none;"';
 
+	    $visible = ' style="display:none;"';
 
 	} else {
 
 	} else {
 
-	    $visible = ' STYLE="display:block;"';
 
+	    $visible = ' style="display:block;"';
 
 	}
 
 	}
 
 
 
 	if (isset($boxes->mbxs[0]) && !$boxes->is_root) /* mailbox contains childs */
 
 	if (isset($boxes->mbxs[0]) && !$boxes->is_root) /* mailbox contains childs */
 
@@ -526,10 +526,10 @@ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1
 
  * Using stristr since older preferences may contain "None" and "none".
 
  * Using stristr since older preferences may contain "None" and "none".
 
  */
 
  */
 
 if (isset($left_refresh) && ($left_refresh != '') &&
 
 if (isset($left_refresh) && ($left_refresh != '') &&
 
-    !stristr($left_refresh, "none")){
 
-    $xtra =  "\n<META HTTP-EQUIV=\"Expires\" CONTENT=\"Thu, 01 Dec 1994 16:00:00 GMT\">\n" .
 
-             "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">\n".
 
-             "<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"$left_refresh;URL=left_main.php\">\n";
 
+    !stristr($left_refresh, 'none')){
 
+    $xtra =  "\n<meta http-equiv=\"Expires\" content=\"Thu, 01 Dec 1994 16:00:00 GMT\" />\n" .
 
+             "<meta http-equiv=\"Pragma\" content=\"no-cache\" />\n".
 
+             "<meta http-equiv=\"REFRESH\" content=\"$left_refresh;URL=left_main.php\" />\n";
 
 } else {
 
 } else {
 
     $xtra = '';
 
     $xtra = '';
 
 }
 
 }
 
@@ -714,7 +714,7 @@ ECHO;
 
 
 
 $xtra .= <<<ECHO
 
 $xtra .= <<<ECHO
 
 
 
-<STYLE TYPE="text/css">
 
+<style type="text/css">
 
 <!--
 
 <!--
 
   body {
 
   body {
 
      margin: 0px 0px 0px 0px;
 
      margin: 0px 0px 0px 0px;
 
@@ -786,7 +786,7 @@ $xtra .= <<<ECHO
 
 
 
 -->
 
 -->
 
 
 
-</STYLE>
 
+</style>
 
 
 
 ECHO;
 
 ECHO;
 
 
 
@@ -815,23 +815,23 @@ if ($auto_create_special && !isset($auto_create_done)) {
 
     sqsession_register($auto_create_done, 'auto_create_done');
 
     sqsession_register($auto_create_done, 'auto_create_done');
 
 }
 
 }
 
 
 
-echo "\n<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\">\n";
 
+echo "\n<body bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
 
 
 
 do_hook('left_main_before');
 
 do_hook('left_main_before');
 
 if ($advanced_tree) {
 
 if ($advanced_tree) {
 
    /* nice future feature, needs layout !! volunteers?   */  
    /* nice future feature, needs layout !! volunteers?   */  
    $right_pos = $left_size - 20;
 
    $right_pos = $left_size - 20;
 
    echo '<div style="position:absolute;top:0;border=solid;border-width:0.1em;border-color:blue;"><div ID="hidef" style="width=20;font-size:12"><A HREF="javascript:hideframe(true)"><b><<</b></a></div>';
 
    echo '<div style="position:absolute;top:0;border=solid;border-width:0.1em;border-color:blue;"><div ID="hidef" style="width=20;font-size:12"><A HREF="javascript:hideframe(true)"><b><<</b></a></div>';
 
-   echo '<div ID="showf" style="width=20;font-size:12;display:none;"><A HREF="javascript:hideframe(false)"><b>>></b></a></div>';
 
-   echo '<div ID="incrf" style="width=20;font-size:12"><A HREF="javascript:resizeframe(true)"><b>></b></a></div>';
 
-   echo '<div ID="decrf" style="width=20;font-size:12"><A HREF="javascript:resizeframe(false)"><b><</b></a></div></div>';
 
-   echo '<div ID="leftframe"><br><br>';
 
+   echo '<div ID="showf" style="width=20;font-size:12;display:none;"><a href="javascript:hideframe(false)"><b>>></b></a></div>';
 
+   echo '<div ID="incrf" style="width=20;font-size:12"><a href="javascript:resizeframe(true)"><b>></b></a></div>';
 
+   echo '<div ID="decrf" style="width=20;font-size:12"><a href="javascript:resizeframe(false)"><b><</b></a></div></div>';
 
+   echo '<div ID="leftframe"><br /><br />';
 
 }
 
 }
 
 
 
 echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cellpadding="0" width="99%"' ) . 
 echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cellpadding="0" width="99%"' ) . 
     html_tag( 'tr' ) . 
     html_tag( 'tr' ) . 
     html_tag( 'td', '', 'left' ) . 
     html_tag( 'td', '', 'left' ) . 
-    '<center><font size="4"><b>'. _("Folders") . "</b><br></font>\n\n";
 
+    '<center><font size="4"><b>'. _("Folders") . "</b><br /></font>\n\n";
 
 
 
 if ($date_format != 6) {
 
 if ($date_format != 6) {
 
     /* First, display the clock. */
 
     /* First, display the clock. */
 
@@ -870,7 +870,7 @@ if ($date_format != 6) {
 
 
 
 /* Next, display the refresh button. */
 
 /* Next, display the refresh button. */
 
 echo '<small>(<a href="../src/left_main.php" target="left">'.
 
 echo '<small>(<a href="../src/left_main.php" target="left">'.
 
-     _("refresh folder list") . '</a>)</small></center><br>';
 
+     _("refresh folder list") . '</a>)</small></center><br />';
 
 
 
 /* Lastly, display the folder list. */
 
 /* Lastly, display the folder list. */
 
 if ( $collapse_folders ) {
 
 if ( $collapse_folders ) {
 
@@ -910,7 +910,7 @@ for ($i = 0; $i < count($boxes); $i++) {
 
         } else {
 
         } else {
 
             $prefix = str_replace(' ','&nbsp;',$prefix);
 
             $prefix = str_replace(' ','&nbsp;',$prefix);
 
         }
 
         }
 
-        $line = "<NOBR><TT>$prefix</TT>";
 
+        $line = "<nobr><tt>$prefix</tt>";
 
 
 
         /* Add the folder name and link. */
 
         /* Add the folder name and link. */
 
         if (! isset($color[15])) {
 
         if (! isset($color[15])) {
 
@@ -919,21 +919,21 @@ for ($i = 0; $i < count($boxes); $i++) {
 
 
 
         if (in_array('noselect', $boxes[$i]['flags'])) {
 
         if (in_array('noselect', $boxes[$i]['flags'])) {
 
             if( isSpecialMailbox( $boxes[$i]['unformatted']) ) {
 
             if( isSpecialMailbox( $boxes[$i]['unformatted']) ) {
 
-                $line .= "<FONT COLOR=\"$color[11]\">";
 
+                $line .= "<font color=\"$color[11]\">";
 
             } else {
 
             } else {
 
-                $line .= "<FONT COLOR=\"$color[15]\">";
 
+                $line .= "<font color=\"$color[15]\">";
 
             }
 
             }
 
             if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
 
             if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
 
                 $mailbox = str_replace('&nbsp;','',$mailbox);
 
                 $mailbox = str_replace('&nbsp;','',$mailbox);
 
                 $line .= str_replace(' ', '&nbsp;', $mailbox);
 
                 $line .= str_replace(' ', '&nbsp;', $mailbox);
 
             }
 
             }
 
-            $line .= '</FONT>';
 
+            $line .= '</font>';
 
         } else {
 
         } else {
 
             $line .= formatMailboxName($imapConnection, $boxes[$i]);
 
             $line .= formatMailboxName($imapConnection, $boxes[$i]);
 
         }
 
         }
 
 
 
         /* Put the final touches on our folder line. */
 
         /* Put the final touches on our folder line. */
 
-        $line .= "</NOBR><BR>\n";
 
+        $line .= "</nobr><br>\n";
 
 
 
         /* Output the line for this folder. */
 
         /* Output the line for this folder. */
 
         echo $line;
 
         echo $line;
 
@@ -942,14 +942,14 @@ for ($i = 0; $i < count($boxes); $i++) {
 
 } else {  /* expiremental code */ 
 } else {  /* expiremental code */ 
     $boxes = sqimap_mailbox_tree($imapConnection);
 
     $boxes = sqimap_mailbox_tree($imapConnection);
 
     if (isset($advanced_tree) && $advanced_tree) {
 
     if (isset($advanced_tree) && $advanced_tree) {
 
-	echo '<FORM name=collapse action="left_main.php" METHOD=POST ' .
 
-            'ENCTYPE="multipart/form-data"'."\n";
 
-	echo '<small><button type="submit" class="button" onmouseover="buttonover(this,true)" onmouseout="buttonover(this,false)" onmousedown="buttonclick(this,true)" onmouseup="buttonclick(this,false)">'. _("Save folder tree") .'</button><br><br>';
 
-	echo '<DIV ID=mailboxes CLASS=mailboxes>'."\n\n";
 
+	echo '<form name="collapse" action="left_main.php" method="post" ' .
 
+            'enctype="multipart/form-data"'."\n";
 
+	echo '<small><button type="submit" class="button" onmouseover="buttonover(this,true)" onmouseout="buttonover(this,false)" onmousedown="buttonclick(this,true)" onmouseup="buttonclick(this,false)">'. _("Save folder tree") .'</button><br /><br />';
 
+	echo '<div id="mailboxes" class="mailboxes">'."\n\n";
 
 	if (!isset($mbx)) $mbx=NULL; 
 	if (!isset($mbx)) $mbx=NULL; 
 	    ListAdvancedBoxes($boxes, $mbx);
 
 	    ListAdvancedBoxes($boxes, $mbx);
 
 	echo '</div></small>'."\n";
 
 	echo '</div></small>'."\n";
 
-	echo '</FORM>'."\n";
 
+	echo '</form>'."\n";
 
     } else {
 
     } else {
 
 	ListBoxes($boxes);
 
 	ListBoxes($boxes);
 
     }
 
     }

+ 10 - 11
src/login.php
Переглянути файл 

@@ -52,7 +52,7 @@ do_hook('login_cookie');
 
 
 
 /* Output the javascript onload function. */
 
 /* Output the javascript onload function. */
 
 
 
-$header = "<SCRIPT LANGUAGE=\"JavaScript\" type=\"text/javascript\">\n" .
 
+$header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
 
           "<!--\n".
 
           "<!--\n".
 
           "  function squirrelmail_loginpage_onload() {\n".
 
           "  function squirrelmail_loginpage_onload() {\n".
 
           "    document.forms[0].js_autodetect_results.value = '" . SMPREF_JS_ON . "';\n".
 
           "    document.forms[0].js_autodetect_results.value = '" . SMPREF_JS_ON . "';\n".
 
@@ -63,8 +63,7 @@ $header = "<SCRIPT LANGUAGE=\"JavaScript\" type=\"text/javascript\">\n" .
 
 $custom_css = 'none';          
 $custom_css = 'none';          
 displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
 
 displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
 
 
 
-/* Set the title of this page. */
 
-echo '<body text="#000000" bgcolor="#FFFFFF" link="#0000CC" vlink="#0000CC" alink="#0000CC" onLoad="squirrelmail_loginpage_onload();">';
 
+echo '<body text="#000000" bgcolor="#FFFFFF" link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="squirrelmail_loginpage_onload();">';
 
 
 
 $username_form_name = 'login_username';
 
 $username_form_name = 'login_username';
 
 $password_form_name = 'secretkey';
 
 $password_form_name = 'secretkey';
 
@@ -87,10 +86,10 @@ html_tag( 'table',
 
         html_tag( 'td',
 
         html_tag( 'td',
 
             '<center>'.
 
             '<center>'.
 
             '<img src="' . $org_logo . '" alt="' . sprintf(_("%s Logo"), $org_name) .'"' .
 
             '<img src="' . $org_logo . '" alt="' . sprintf(_("%s Logo"), $org_name) .'"' .
 
-            $width_and_height .'><br>' . "\n".
 
+            $width_and_height .' /><br />' . "\n".
 
             ( $hide_sm_attributions ? '' :
 
             ( $hide_sm_attributions ? '' :
 
-            '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br>' ."\n".
 
-            '  ' . _("By the SquirrelMail Development Team") . '<br></small>' . "\n" ) .
 
+            '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br />' ."\n".
 
+            '  ' . _("By the SquirrelMail Development Team") . '<br /></small>' . "\n" ) .
 
             html_tag( 'table',
 
             html_tag( 'table',
 
                 html_tag( 'tr',
 
                 html_tag( 'tr',
 
                     html_tag( 'td',
 
                     html_tag( 'td',
 
@@ -105,7 +104,7 @@ html_tag( 'table',
 
                                     _("Name:") ,
 
                                     _("Name:") ,
 
                                 'right', '', 'width="30%"' ) .
 
                                 'right', '', 'width="30%"' ) .
 
                                 html_tag( 'td',
 
                                 html_tag( 'td',
 
-                                    '<input type="text" name="' . $username_form_name .'" value="' . $loginname_value .'">' ,
 
+                                    '<input type="text" name="' . $username_form_name .'" value="' . $loginname_value .'" />' ,
 
                                 'left', '', 'width="*"' )
 
                                 'left', '', 'width="*"' )
 
                                 ) . "\n" .
 
                                 ) . "\n" .
 
                             html_tag( 'tr',
 
                             html_tag( 'tr',
 
@@ -113,9 +112,9 @@ html_tag( 'table',
 
                                     _("Password:") ,
 
                                     _("Password:") ,
 
                                 'right', '', 'width="30%"' ) .
 
                                 'right', '', 'width="30%"' ) .
 
                                 html_tag( 'td',
 
                                 html_tag( 'td',
 
-                                    '<input type="password" name="' . $password_form_name . '">' . "\n" .
 
-                                    '<input type=hidden name="js_autodetect_results" value="SMPREF_JS_OFF">' . "\n" .
 
-                                    '<input type=hidden name="just_logged_in" value=1>' . "\n",
 
+                                    '<input type="password" name="' . $password_form_name . '" />' . "\n" .
 
+                                    '<input type="hidden" name="js_autodetect_results" value="SMPREF_JS_OFF" />' . "\n" .
 
+                                    '<input type="hidden" name="just_logged_in" value="1" />' . "\n",
 
                                 'left', '', 'width="*"' )
 
                                 'left', '', 'width="*"' )
 
                             ) ,
 
                             ) ,
 
                         'center', '#ffffff', 'border="0" width="100%"' ) ,
 
                         'center', '#ffffff', 'border="0" width="100%"' ) ,
 
@@ -123,7 +122,7 @@ html_tag( 'table',
 
                 ) . 
                 ) . 
                 html_tag( 'tr',
 
                 html_tag( 'tr',
 
                     html_tag( 'td',
 
                     html_tag( 'td',
 
-                        '<center><input type="submit" value="' . _("Login") . '"></center>',
 
+                        '<center><input type="submit" value="' . _("Login") . '" /></center>',
 
                     'left' )
 
                     'left' )
 
                 ),
 
                 ),
 
             '', '#ffffff', 'border="0" width="350"' ) . '</center>',
 
             '', '#ffffff', 'border="0" width="350"' ) . '</center>',

+ 2 - 2
src/printer_friendly_bottom.php
Переглянути файл 

@@ -75,7 +75,7 @@ $body = '';
 
 if ($ent_ar[0] != '') {
 
 if ($ent_ar[0] != '') {
 
   for ($i = 0; $i < count($ent_ar); $i++) {
 
   for ($i = 0; $i < count($ent_ar); $i++) {
 
      $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
 
      $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
 
-     $body .= '<hr noshade size=1>';
 
+     $body .= '<hr noshade size="1" />';
 
   }
 
   }
 
   $hookResults = do_hook('message_body', $body);
 
   $hookResults = do_hook('message_body', $body);
 
   $body = $hookResults[1];
 
   $body = $hookResults[1];
 
@@ -138,7 +138,7 @@ echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"
 
      }
 
      }
 
      /* body */
 
      /* body */
 
      echo html_tag( 'tr',
 
      echo html_tag( 'tr',
 
-         html_tag( 'td', '<hr noshade size=1><br>' . "\n" . $body, 'left', '', 'colspan="2"' )
 
+         html_tag( 'td', '<hr noshade size="1" /><br>' . "\n" . $body, 'left', '', 'colspan="2"' )
 
      ) . "\n" .
 
      ) . "\n" .
 
 
 
      '</table>' . "\n" .
 
      '</table>' . "\n" .

+ 3 - 3
src/printer_friendly_main.php
Переглянути файл 

@@ -25,12 +25,12 @@ $mailbox = $_GET['mailbox'];
 
 /* end globals */
 
 /* end globals */
 
 
 
 echo "<frameset rows=\"60, *\" noresize border=\"0\">\n".
 
 echo "<frameset rows=\"60, *\" noresize border=\"0\">\n".
 
-     "<frame src=\"printer_friendly_top.php\" name=\"top_frame\" scrolling=\"no\">".
 
+     '<frame src="printer_friendly_top.php" name="top_frame" scrolling="no" />'.
 
      '<frame src="printer_friendly_bottom.php?passed_ent_id='.
 
      '<frame src="printer_friendly_bottom.php?passed_ent_id='.
 
      urlencode($passed_ent_id) . '&amp;mailbox=' . urlencode($mailbox) .
 
      urlencode($passed_ent_id) . '&amp;mailbox=' . urlencode($mailbox) .
 
      '&amp;passed_id=' . $passed_id .
 
      '&amp;passed_id=' . $passed_id .
 
-     "\" name=\"bottom_frame\">".
 
-     "</frameset>\n".
 
+     '" name="bottom_frame" />'.
 
+     "\n</frameset>\n".
 
      "</html>\n";
 
      "</html>\n";
 
 
 
 ?>
 
 ?>

+ 2 - 4
src/printer_friendly_top.php
Переглянути файл 

@@ -35,16 +35,14 @@ displayHtmlHeader( _("Printer Friendly"),
 
 
 
 
 
 echo "<body text='$color[8]' bgcolor='$color[3]' link='$color[7]' vlink='$color[7]' alink='$color[7]'>\n" .
 
 echo "<body text='$color[8]' bgcolor='$color[3]' link='$color[7]' vlink='$color[7]' alink='$color[7]'>\n" .
 
-     //'<table width="100%" height="100%" cellpadding="0" cellspacing="0" border="0"><tr><td valign="middle" align="center">'.
 
      html_tag( 'div',
 
      html_tag( 'div',
 
          '<b>'.
 
          '<b>'.
 
          '<form>'.
 
          '<form>'.
 
-         '<input type="button" value="' . _("Print") . '" onClick="printPopup()"> '.
 
-         '<input type="button" value="' . _("Close") . '" onClick="window.parent.close()">'.
 
+         '<input type="button" value="' . _("Print") . '" onclick="printPopup()" /> '.
 
+         '<input type="button" value="' . _("Close") . '" onclick="window.parent.close()" />'.
 
          '</form>'.
 
          '</form>'.
 
          '</b>',
 
          '</b>',
 
      'right' );
 
      'right' );
 
-     //'</td></tr></table>'.
 
      '</body></html>'. "\n";
 
      '</body></html>'. "\n";
 
 
 
 ?>
 
 ?>

+ 1 - 1
src/signout.php
Переглянути файл 

@@ -64,7 +64,7 @@ if ($signout_page) {
 
 <?php
 
 <?php
 
     if ($theme_css != '') {
 
     if ($theme_css != '') {
 
 ?>
 
 ?>
 
-   <link rel="stylesheet" type="text/css" href="<?php echo $theme_css ?>">
 
+   <link rel="stylesheet" type="text/css" href="<?php echo $theme_css ?>" />
 
 <?php
 
 <?php
 
     }
 
     }
 
 ?>
 
 ?>

+ 6 - 6
src/webmail.php
Переглянути файл 

@@ -130,14 +130,14 @@ if ($right_frame == 'right_main.php') {
 
 }
 
 }
 
 
 
 if ($location_of_bar == 'right') {
 
 if ($location_of_bar == 'right') {
 
-    echo "<FRAME SRC=\"$right_frame_url\" NAME=\"right\" frameborder=\"1\">\n" .
 
-         "<FRAME SRC=\"left_main.php\" NAME=\"left\" frameborder=\"1\">\n";
 
+    echo "<frame src=\"$right_frame_url\" name=\"right\" frameborder=\"1\" />\n" .
 
+         "<frame src=\"left_main.php\" name=\"left\" frameborder=\"1\" />\n";
 
 }
 
 }
 
 else {
 
 else {
 
-    echo "<FRAME SRC=\"left_main.php\" NAME=\"left\" frameborder=\"1\">\n".
 
-         "<FRAME SRC=\"$right_frame_url\"  NAME=\"right\" frameborder=\"1\">\n";
 
+    echo "<frame src=\"left_main.php\" name=\"left\" frameborder=\"1\" />\n".
 
+         "<frame src=\"$right_frame_url\" name=\"right\" frameborder=\"1\" />\n";
 
 }
 
 }
 
 do_hook('webmail_bottom');
 
 do_hook('webmail_bottom');
 
 ?>
 
 ?>
 
-</FRAMESET>
 
-</HTML>
 
+</frameset>
 
+</html>

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5