XHTML fixes

functions/addressbook.php

@@ -639,7 +639,7 @@ function show_abook_sort_button($abook_sort_order, $alt_tag, $Down, $Up ) {
     return ' <a href="' . $form_url .'?abook_sort_order=' . $which
          . '"><img src="../images/' . $img
          . '" border="0" width="12" height="10" alt="' . $alt_tag . '" title="'
-         . _("Click here to change the sorting of the address list") .'"></a>';
+         . _("Click here to change the sorting of the address list") .'" /></a>';
 }
 
 /*
@@ -669,4 +669,4 @@ if((isset($addrbook_dsn) && !empty($addrbook_dsn)) ||
  */
 do_hook('abook_add_class');
 
-?>
+?>

functions/mime.php

@@ -1081,7 +1081,7 @@ function sq_getnxtag($body, $offset){
      * 2. Closing tag, e.g.:
      *    </a>
      * 3. XHTML-style content-less tag, e.g.:
-     *    <img src="blah"/>
+     *    <img src="blah" />
      */
     $tagtype = false;
     switch (substr($body, $pos, 1)){
@@ -1139,7 +1139,7 @@ function sq_getnxtag($body, $offset){
         case '/':
             /**
              * This is an xhtml-style tag with a closing / at the
-             * end, like so: <img src="blah"/>. Check if it's followed
+             * end, like so: <img src="blah" />. Check if it's followed
              * by the closing bracket. If not, then this tag is invalid
              */
             if (substr($body, $pos, 2) == "/>"){
@@ -1241,7 +1241,7 @@ function sq_getnxtag($body, $offset){
             case '/':
                 /**
                  * This is an xhtml-style tag with a closing / at the
-                 * end, like so: <img src="blah"/>. Check if it's followed
+                 * end, like so: <img src="blah" />. Check if it's followed
                  * by the closing bracket. If not, then this tag is invalid
                  */
                 if (substr($body, $pos, 2) == "/>"){

plugins/message_details/message_details_bottom.php

@@ -39,24 +39,24 @@ function CalcEntity($entString, $direction) {
     }
 
     switch ($direction) {
-       case 0:
-          $pos = strrpos($entString,'.');
-          if ($pos === false) {
-         $entString++;
-	     $result= $entString;
-          } 
-	  else {
-             $level = substr($entString,0,$pos);
-	     $sublevel = substr($entString,$pos+1);
-	     $sublevel++;
-	     $result = "$level".'.'."$sublevel";
-	  }
-	  break;
-       case 1:
-          $result = "$entString".".0";
-	  break;
-       default:
-          break;
+        case 0:
+            $pos = strrpos($entString,'.');
+            if ($pos === false) {
+                $entString++;
+                $result= $entString;
+            } 
+            else {
+                $level = substr($entString,0,$pos);
+                $sublevel = substr($entString,$pos+1);
+                $sublevel++;
+                $result = "$level".'.'."$sublevel";
+            }
+            break;
+        case 1:
+            $result = "$entString".".0";
+            break;
+        default:
+            break;
     }
     return ($result);
 }
@@ -96,159 +96,159 @@ $body[$count-1] = substr($body[$count-1], -1);
 for ($i=1; $i < $count; $i++) {
     $line = trim($body[$i]);
     if ($line == '') {
-	$pre = '';
-	$end = '';
+        $pre = '';
+        $end = '';
         if ($bnd_end) {
-	    $header = true;
-	    $mimepart = false;
-	} else if ($messageheader) {
-	    if ($header) {
-		$header=false;
-		$end = "\n \n".'</div>'."\n \n".'<div class="ent_body" ID="'.$entStr.'B">'."\n \n"; 
-	    }
-	    $mimepart = -$header;
-	    $bnd_end = false;
-	    if ($messageheaderstart) {
-		$messageheaderstart=false;
-	    }
-	} else if ($messageheaderstart) {
-	    $messageheader= false;
-	} else {
-	    if ($header) {
-	        $pre = '';
-		$end = "\n \n".'</div>'."\n \n".'<div class="ent_body" ID="'.$entStr.'B">'."\n \n"; 
-	    }
-	    $header = false;
-	    $mimepart=true;
-	}  
-	$contentset = false;
-	$nameset = false;
+            $header = true;
+            $mimepart = false;
+        } else if ($messageheader) {
+            if ($header) {
+                $header=false;
+                $end = "\n \n".'</div>'."\n \n".'<div class="ent_body" ID="'.$entStr.'B">'."\n \n"; 
+            }
+            $mimepart = -$header;
+            $bnd_end = false;
+            if ($messageheaderstart) {
+                $messageheaderstart=false;
+            }
+        } else if ($messageheaderstart) {
+            $messageheader= false;
+        } else {
+            if ($header) {
+                $pre = '';
+                $end = "\n \n".'</div>'."\n \n".'<div class="ent_body" ID="'.$entStr.'B">'."\n \n"; 
+            }
+            $header = false;
+            $mimepart=true;
+        }  
+        $contentset = false;
+        $nameset = false;
     } else {
         if (!$header && $messageheader) {
-	    $messageheaderstart=true;
-	    if ($pre != '<b>') {
-		$pre = '<i><font color ='."$color[1]>";
-		$end = '</i></font>';
-	    }
-	}     
-	if (!$messageheader && !$header ) {
-	    $mimepart=true;
-	}  else {
-	    $mimepart=false;
-	}
-	$pre = '';
-	$end = '';
+            $messageheaderstart=true;
+            if ($pre != '<b>') {
+                $pre = '<i><font color ="'.$color[1].'">';
+                $end = '</i></font>';
+            }
+        }     
+        if (!$messageheader && !$header ) {
+            $mimepart=true;
+        }  else {
+            $mimepart=false;
+        }
+        $pre = '';
+        $end = '';
     }
     if (  ( $header || $messageheader) && (preg_match("/^.*boundary=\"?(.+(?=\")|.+).*/i",$line,$reg)) )  {
-	$bnd = $reg[1];
-	$bndreg = $bnd;    
-	$bndreg = str_replace("\\","\\\\",$bndreg);	
-	$bndreg = str_replace("?","\\?",$bndreg);
-	$bndreg = str_replace("+","\\+",$bndreg);		
-	$bndreg = str_replace(".","\\.",$bndreg);			
-	$bndreg = str_replace("/","\\/",$bndreg);
-	$bndreg = str_replace("-","\\-",$bndreg);
-	$bndreg = str_replace("(","\\(",$bndreg);
-	$bndreg = str_replace(")","\\)",$bndreg);
+        $bnd = $reg[1];
+        $bndreg = $bnd;    
+        $bndreg = str_replace("\\","\\\\",$bndreg);
+        $bndreg = str_replace("?","\\?",$bndreg);
+        $bndreg = str_replace("+","\\+",$bndreg);
+        $bndreg = str_replace(".","\\.",$bndreg);
+        $bndreg = str_replace("/","\\/",$bndreg);
+        $bndreg = str_replace("-","\\-",$bndreg);
+        $bndreg = str_replace("(","\\(",$bndreg);
+        $bndreg = str_replace(")","\\)",$bndreg);
 
-	$boundaries[] = array( 'bnd' => $bnd, 'bndreg' => $bndreg);
-	$messageheader = false;
-	$messageheaderstart=false;
-	$mimepart=false;
-	if ($entStr=='') {
-	    $entStr='0';
-	} else {
-	    $entStr = CalcEntity("$entStr",1);
-	}
+        $boundaries[] = array( 'bnd' => $bnd, 'bndreg' => $bndreg);
+        $messageheader = false;
+        $messageheaderstart=false;
+        $mimepart=false;
+        if ($entStr=='') {
+            $entStr='0';
+        } else {
+            $entStr = CalcEntity("$entStr",1);
+        }
     }
     
     if (($line != '' && $line{0} == '-' || $header)  && isset($boundaries[0])) {
         $cnt=count($boundaries)-1;
-	$bnd = $boundaries[$cnt]['bnd'];
-	$bndreg = $boundaries[$cnt]['bndreg'];
+        $bnd = $boundaries[$cnt]['bnd'];
+        $bndreg = $boundaries[$cnt]['bndreg'];
       
-	$regstr = '/^--'."($bndreg)".".*".'/';
-	if (preg_match($regstr,$line,$reg) ) {
-	    $bndlen = strlen($reg[1]);
-	    $bndend = false;	    
+        $regstr = '/^--'."($bndreg)".".*".'/';
+        if (preg_match($regstr,$line,$reg) ) {
+            $bndlen = strlen($reg[1]);
+            $bndend = false;            
             if (strlen($line) > ($bndlen + 3)) {
-		if ($line{$bndlen+2} == '-' && $line{$bndlen+3} == '-') 
-		    $bndend = true;
-	    }
-	    if ($bndend) {
-		$entStr = CalcEntity("$entStr",-1);
-		array_pop($boundaries);
-		$pre .= '<b><font color ='."$color[2]>";
-		$end .= '</font></b>';
-		$header = true;
-		$mimepart = false;
-		$bnd_end = true;
-		$encoding = '';
-	    } else {
-		$header = true;
-		$bnd_end = false;
-		$entStr = CalcEntity("$entStr",0);
-		$content_indx++;
-		$content[$content_indx]=array();		
-		$content[$content_indx]['ent'] = '<A HREF="#'."$entStr \">$entStr".'</a>';
-		$pre .= "\n \n".'</div>'."\n \n".'<div class="entheader" ID="'.$entStr.'H"><a name="'."$entStr".'"><b><font color ='."$color[2]>";
-		$end .= '</font></b>'."\n";
-		$header = true;
-		$mimepart = false;
-		$encoding = '';
-	    }
-	}  else {
-	    if ($header) {
-		if (!$contentset && preg_match("/^.*(content-type:)\s*(\w+)\/(\w+).*/i",$line,$reg)) {
-		    if (strtolower($reg[2]) == 'message' && strtolower($reg[3]) == 'rfc822') {
-			$messageheader = true;
-		    }
-		    $content[$content_indx]['type'] = "$reg[2]/$reg[3]";
-		    $contentset = true;
-		    if ($reg[2] == 'image') {
-			$entities["$entStr"] = array();
-			$entities["$entStr"]['entity'] = $entStr;
-			$entities["$entStr"]['contenttype']=$reg[2].'/'.$reg[3];
-		    }	
-   		} else if (!$nameset && preg_match("/^.*(name=\s*)\"(.*)\".*/i",$line,$reg)) {
-		    $name = htmlspecialchars($reg[2]);
-		    $content[$content_indx]['name'] = decodeHeader($name);
-		    $nameset = true;
-		    if (isset($entities["$entStr"])) {
-			$entities["$entStr"]['name'] = urlEncode($reg[2]);
-		    }
-   		} else if (preg_match("/^.*(content-transfer-encoding:)\s*(\w+-?(\w+)?).*/i",$line,$reg) ) {
-		    $encoding = $reg[2];
-		    if (isset($entities["$entStr"])) {
-			$entities["$entStr"]['encoding']=$reg[2];
-		    }
-		    $content[$content_indx]['encoding'] = $encoding;
-		    $mimeentity = '';
-		}
+                if ($line{$bndlen+2} == '-' && $line{$bndlen+3} == '-') 
+                    $bndend = true;
+            }
+            if ($bndend) {
+                $entStr = CalcEntity("$entStr",-1);
+                array_pop($boundaries);
+                $pre .= '<b><font color ="'.$color[2].'">';
+                $end .= '</font></b>';
+                $header = true;
+                $mimepart = false;
+                $bnd_end = true;
+                $encoding = '';
+            } else {
+                $header = true;
+                $bnd_end = false;
+                $entStr = CalcEntity("$entStr",0);
+                $content_indx++;
+                $content[$content_indx]=array();
+                $content[$content_indx]['ent'] = '<a href="#'."$entStr \">$entStr".'</a>';
+                $pre .= "\n \n".'</div>'."\n \n".'<div class="entheader" ID="'.$entStr.'H"><a name="'."$entStr".'"><b><font color="'.$color[2].'">';
+                $end .= '</font></b>'."\n";
+                $header = true;
+                $mimepart = false;
+                $encoding = '';
+            }
+        }  else {
+            if ($header) {
+                if (!$contentset && preg_match("/^.*(content-type:)\s*(\w+)\/(\w+).*/i",$line,$reg)) {
+                    if (strtolower($reg[2]) == 'message' && strtolower($reg[3]) == 'rfc822') {
+                        $messageheader = true;
+                    }
+                    $content[$content_indx]['type'] = "$reg[2]/$reg[3]";
+                    $contentset = true;
+                    if ($reg[2] == 'image') {
+                        $entities["$entStr"] = array();
+                        $entities["$entStr"]['entity'] = $entStr;
+                        $entities["$entStr"]['contenttype']=$reg[2].'/'.$reg[3];
+                    }        
+                   } else if (!$nameset && preg_match("/^.*(name=\s*)\"(.*)\".*/i",$line,$reg)) {
+                    $name = htmlspecialchars($reg[2]);
+                    $content[$content_indx]['name'] = decodeHeader($name);
+                    $nameset = true;
+                    if (isset($entities["$entStr"])) {
+                        $entities["$entStr"]['name'] = urlEncode($reg[2]);
+                    }
+                   } else if (preg_match("/^.*(content-transfer-encoding:)\s*(\w+-?(\w+)?).*/i",$line,$reg) ) {
+                    $encoding = $reg[2];
+                    if (isset($entities["$entStr"])) {
+                        $entities["$entStr"]['encoding']=$reg[2];
+                    }
+                    $content[$content_indx]['encoding'] = $encoding;
+                    $mimeentity = '';
+                }
 
-		$pre .= '<b><font color ='."$color[7]>";
-		$end .= '</font></b>';
-		//$mimepart=false;
-	    } 		  
-	}
-    }  
+                $pre .= '<b><font color='.$color[7].'">';
+                $end .= '</font></b>';
+                //$mimepart=false;
+            }
+        }
+    }
 /*
     if ($mimepart) {
-    	if (isset($entities["$entStr"])) {
-	    if (isset($encoding) && $encoding == 'base64') {
-    		if (!isset( $entities["$entStr"]['content'])) $entities[$entStr]['content'] = '';
-		$entities["$entStr"]['content'] .= $line;
-	    }
+            if (isset($entities["$entStr"])) {
+            if (isset($encoding) && $encoding == 'base64') {
+                    if (!isset( $entities["$entStr"]['content'])) $entities[$entStr]['content'] = '';
+                $entities["$entStr"]['content'] .= $line;
+            }
         }
-    } 	
+    }
 */
     $line = htmlspecialchars($line);
-    $message_body .= "$pre"."$line"."$end".'<BR>'."\r\n";
+    $message_body .= "$pre"."$line"."$end".'<br />'."\r\n";
 }
-//echo returnTime($start).'<BR>';
+//echo returnTime($start).'<br />';
 $xtra = <<<ECHO
 
-<STYLE>
+<style>
 
 <!--
 .ent_body {
@@ -265,7 +265,7 @@ $xtra = <<<ECHO
 }
 //-->
 
-</STYLE>
+</style>
 
 ECHO;
 
@@ -273,8 +273,8 @@ displayHtmlHeader( _("Message Details"), $xtra, FALSE );
 /* body */
 echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\">\n";
 echo '<code>'."\n";
-echo '<font face = "monospace">'."\n";
-echo '<BR>'."\n";
+echo '<font face="monospace">'."\n";
+echo '<br />'."\n";
 
 
 //session_register("entities");
@@ -283,7 +283,7 @@ echo '<BR>'."\n";
 //foreach ($keys as $key) {
 //    if (isset($entities[$key])) {
 //    if ($entities[$key]['encoding'] == 'base64') {
-//	echo '<img src="message_viewentity.php?ent='.$entities[$key]['entity'].'&amp;name='.$entities[$key]['name'].'"><br>';
+//        echo '<img src="message_viewentity.php?ent='.$entities[$key]['entity'].'&amp;name='.$entities[$key]['name'].'"><br />';
 //    }
 //    }
 //}
@@ -291,32 +291,31 @@ echo '<BR>'."\n";
 
 if (count($content) > 0) {
     echo '<h2> Bodystructure </h2>'."\n\n";
-    echo '<table border=1 width="98%"><thead>'.
-	  '<tr bgcolor="'."$color[7]".'">'.
-	    '<td><b><font color="'."$color[5]".'">Entity</font></b></td>'.
-	    '<td><b><font color="'."$color[5]".'">Content-Type</font></b></td>'.
-	    '<td><b><font color="'."$color[5]".'">Name</font></b></td>'.
-	    '<td><b><font color="'."$color[5]".'">Encoding</font></b></td>'.
-
-	  '</tr>'.
-	  '</thead><tbody>';
+    echo '<table border="1" width="98%"><thead>'.
+         '<tr bgcolor="'.$color[7].'">'.
+         '<td><b><font color="'.$color[5].'">Entity</font></b></td>'.
+         '<td><b><font color="'.$color[5].'">Content-Type</font></b></td>'.
+         '<td><b><font color="'.$color[5].'">Name</font></b></td>'.
+         '<td><b><font color="'.$color[5].'">Encoding</font></b></td>'.
+         '</tr>'.
+         '</thead><tbody>';
     for ($i = 0; $i < count($content);$i++) {
-	echo '<tr><td>';
-	echo $content[$i]['ent'].'</td><td>';
-	if (isset($content[$i]['type'])) {
-	    echo $content[$i]['type'];
-	} else echo 'TEXT/PLAIN';
-	echo '</td><td>';
-	if (isset($content[$i]['name'])) {
-	    echo $content[$i]['name'];
-	} else echo '&nbsp;';
-	echo '</td><td>';
-	if (isset($content[$i]['encoding'])) {
-	    echo $content[$i]['encoding'];
-	} else echo '&nbsp;';
-	echo '</td></tr>'."\n";
+        echo '<tr><td>';
+        echo $content[$i]['ent'].'</td><td>';
+        if (isset($content[$i]['type'])) {
+            echo $content[$i]['type'];
+        } else echo 'TEXT/PLAIN';
+        echo '</td><td>';
+        if (isset($content[$i]['name'])) {
+            echo $content[$i]['name'];
+        } else echo '&nbsp;';
+        echo '</td><td>';
+        if (isset($content[$i]['encoding'])) {
+            echo $content[$i]['encoding'];
+        } else echo '&nbsp;';
+        echo '</td></tr>'."\n";
     }
-    echo '</tbody></table><br>'."\n";
+    echo '</tbody></table><br />'."\n";
 }
 echo '<h2> RFC822 Message body </h2>'."\n\n";
 echo '<div><div class="header">'."\n\n";

plugins/message_details/message_details_main.php

@@ -28,7 +28,7 @@ sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
 sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
 
 echo "<frameset rows=\"60, *\" noresize border=\"0\">\n";
-echo '<frame src="message_details_top.php?mailbox=' . urlencode($mailbox) .'&passed_id=' . "$passed_id". '" name="top_frame" scrolling="off">';
-echo '<frame src="message_details_bottom.php?mailbox=' . urlencode($mailbox) .'&passed_id=' . "$passed_id" . '" name="bottom_frame">';
+echo '<frame src="message_details_top.php?mailbox=' . urlencode($mailbox) .'&passed_id=' . "$passed_id". '" name="top_frame" scrolling="off" />';
+echo '<frame src="message_details_bottom.php?mailbox=' . urlencode($mailbox) .'&passed_id=' . "$passed_id" . '" name="bottom_frame" />';
 echo  '</frameset>'."\n"."</html>\n";
-?>
+?>

src/image.php

@@ -37,11 +37,11 @@ sqgetGlobalVar('ent_id',        $ent_id,        SQ_GET);
 sqgetGlobalVar('QUERY_STRING',  $QUERY_STRING,  SQ_SERVER);
 /* end globals */
 
-echo '<BR>' . 
-    '<TABLE WIDTH="100%" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>' .
+echo '<br />' . 
+    '<table width="100%" border="0" cellspacing="0" cellpadding="2" align="center">' .
     "\n" .
-    '<TR><TD BGCOLOR="' . $color[0] . '">' .
-    '<B><CENTER>' .
+    '<tr><td bgcolor="' . $color[0] . '">' .
+    '<b><center>' .
     _("Viewing an image attachment") . " - ";
 
 $msg_url = 'read_body.php?' . $QUERY_STRING;
@@ -52,18 +52,15 @@ echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
 $DownloadLink = '../src/download.php?passed_id=' . $passed_id .
                '&amp;mailbox=' . urlencode($mailbox) . 
                '&amp;ent_id=' . urlencode($ent_id) . '&amp;absolute_dl=true';
+?>
+</b></td></tr>
+<tr><td align="center">
+<a href="<?php echo $DownloadLink; ?>"><?php echo _("Download this as a file"); ?></a>
+<br />&nbsp;</td></tr></table>
 
-echo '</b></td></tr>' . "\n" .
-    '<tr><td align=center><A HREF="' . $DownloadLink . '">' .
-    _("Download this as a file") .
-    '</A></B><BR>&nbsp;' . "\n" .
-    '</TD></TR></TABLE>' . "\n" .
-
-    '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>' . "\n" .
-    '<TR><TD BGCOLOR="' . $color[4] . '">' .
-    '<img src="' . $DownloadLink . '">' .
-
-    '</TD></TR></TABLE>' . "\n";
-    '</body></html>' . "\n";
+<table border="0" cellspacing="0" cellpadding="2" align="center">
+<tr><td bgcolor="<?php echo $color[4]; ?>">
+<img src="<?php echo $DownloadLink; ?>" />
 
-?>
+</td></tr></table>
+</body></html>

src/left_main.php

@@ -90,7 +90,7 @@ function formatMailboxName($imapConnection, $box_array) {
 
     /* Print unseen information. */
     if ($unseen_string != '') {
-        $line .= "&nbsp;<SMALL>$unseen_string</SMALL>";
+        $line .= "&nbsp;<small>$unseen_string</small>";
     }
 
     /* If it's the trash folder, show a purge link when needed */
@@ -181,13 +181,13 @@ function create_collapse_link($boxnum) {
             'href="left_main.php?';
     if ($boxes[$boxnum]['collapse'] == SM_BOX_COLLAPSED) {
         if ($use_icons && $icon_theme != 'none') {
-            $link .= "unfold=$mailbox\"><IMG src=\"" . SM_PATH . "images/plus.png\" border=\"0\" height=\"7\" width=\"7\">";
+            $link .= "unfold=$mailbox\"><img src=\"" . SM_PATH . 'images/plus.png" border="0" height="7" width="7" />';
         } else {
             $link .= "unfold=$mailbox\">+";
         }
     } else {
         if ($use_icons && $icon_theme != 'none') {
-            $link .= "fold=$mailbox\"><IMG src=\"" . SM_PATH . "images/minus.png\" border=\"0\" height=\"7\" width=\"7\">";
+            $link .= "fold=$mailbox\"><img src=\"" . SM_PATH . 'images/minus.png" border="0" height="7" width="7" />';
         } else {
             $link .= "fold=$mailbox\">-";
         }
@@ -355,13 +355,13 @@ function ListBoxes ($boxes, $j=0 ) {
         $link = '<a target="left" style="text-decoration:none" ' .'href="left_main.php?';
         if ($collapse) {
             if ($use_icons && $icon_theme != 'none') {
-                $link .= "unfold=$mailboxURL\">$leader<IMG src=\"" . SM_PATH . "images/plus.png\" border=\"0\" height=\"7\" width=\"7\">&nbsp;</tt>";
+                $link .= "unfold=$mailboxURL\">$leader<img src=\"" . SM_PATH . 'images/plus.png" border="0" height="7" width="7" />&nbsp;</tt>';
             } else {
                 $link .= "unfold=$mailboxURL\">$leader+&nbsp;</tt>";
             }
         } else {
             if ($use_icons && $icon_theme != 'none') {
-                $link .= "fold=$mailboxURL\">$leader<IMG src=\"" . SM_PATH . "images/minus.png\" border=\"0\" height=\"7\" width=\"7\">&nbsp;</tt>";
+                $link .= "fold=$mailboxURL\">$leader<img src=\"" . SM_PATH . 'images/minus.png" border="0" height="7" width="7" />&nbsp;</tt>';
             } else {
                 $link .= "fold=$mailboxURL\">$leader-&nbsp;</tt>";
             }