From 2dcef7e1eb939d3ac4986a272b883c0128b2b83a Mon Sep 17 00:00:00 2001
From: Savetheinternet <savetheinternet@n0v4.com>
Date: Thu, 4 Nov 2010 17:16:47 +1100
Subject: [PATCH] Cleaner code

---
 inc/display.php | 75 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 55 insertions(+), 20 deletions(-)

diff --git a/inc/display.php b/inc/display.php
index 5cf657ec..b988e3bc 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -118,29 +118,64 @@
 		
 		
 		public function build($index=false) {
-			$built = '<p class="fileinfo">
-		File: <a href="' . ROOT . $this->file.'">'.basename($this->file).'</a> <span class="unimportant">('.format_bytes($this->filesize).', '.$this->filex.'x'.$this->filey.', '.$this->filename.')</span>
-	</p>
-	<a href="' . ROOT . $this->file.'"><img src="' . ROOT . $this->thumb.'" style="width:'.$this->thumbx.'px;height:'.$this->thumby.'px;" /></a>
-	<div class="post op">
-		<p class="intro">
-			<span class="subject">
-				'.$this->subject.'
-			</span>
-			' . ( !empty($this->email) ? '<a class="email" href="mailto:' . $this->email . '">':'') .
-			'<span class="name">'
-				. $this->name . 
-			'</span>' . (!empty($this->trip) ? ' <span class="trip">'.$this->trip.'</span>':'')
-			. ( !empty($this->email) ? '</a>':'')
-			. ' ' . date('m/d/y (D) H:i:s', $this->time). '
-			<a class="post_no"' . ($index?'':' onclick="highlightReply(' . $this->id . ');"') . ' href="' . ROOT . DIR_RES . $this->id . '.html' . '#' . $this->id . '">No.</a><a class="post_no"' . ($index?'':'onclick="citeReply(' . $this->id . ');"') . 'href="' . ($index?ROOT . DIR_RES . $this->id . '.html' . '#q' . $this->id:'javascript:void(0);') . '">'.$this->id.'</a>' . ($index ? '<a href="' . ROOT . DIR_RES . $this->id . '.html">[Reply]</a>' : '') . 
-		'</p>'
-		.$this->body.'
-		' . ($this->omitted ? '<span class="omitted">' . $this->omitted . ' post' . ($this->omitted==1?'':'s') . ' omitted. Click reply to view.</span>':'') . '
-	</div>';
+			$built = '<p class="fileinfo">File: <a href="'	. ROOT . $this->file .'">' . basename($this->file) . '</a> <span class="unimportant">(' . 
+			// Filesize
+				format_bytes($this->filesize) . ', ' . 
+			// File dimensions
+				$this->filex . 'x' . $this->filey;
+			// Aspect Ratio
+			if(SHOW_RATIO) {
+				$fraction = fraction($this->filex, $this->filey, ':');
+				$built .= ', ' . $fraction;
+			}
+			// Filename
+				$built .= ', ' . $this->filename . ')</span></p>' . 
+			// Thumbnail
+				'<a href="' . ROOT . $this->file.'"><img src="' . ROOT . $this->thumb.'" style="width:'.$this->thumbx.'px;height:'.$this->thumby.'px;" /></a>';
+			
+			$built .= '<div class="post op"><p class="intro"' . (!$index?' id="' . $this->id . '"':'') . '>';
+			
+			// Subject
+			$built .= '<span class="subject">' . $this->subject . '</span>';
+			// Email
+			if(!empty($this->email))
+				$built .=  '<a class="email" href="mailto:' . $this->email . '">';
+			// Name
+			$built .= '<span class="name">' . $this->name . '</span>'
+			// Trip
+			. (!empty($this->trip) ? ' <span class="trip">'.$this->trip.'</span>':'');
+			
+			// End email
+			if(!empty($this->email))
+				$built .= '</a>';
+			
+			// Date/time
+			$built .= ' ' . date('m/d/y (D) H:i:s', $this->time);
+			
+			$built .= ' <a class="post_no"' . 
+			// JavaScript highlight
+			($index?'':' onclick="highlightReply(' . $this->id . ');"') .
+			' href="' . ROOT . DIR_RES . $this->id . '.html' . '#' . $this->id . '">No.</a>' . 
+			// JavaScript cite
+			'<a class="post_no"' . ($index?'':'onclick="citeReply(' . $this->id . ');"') . 'href="' . ($index?ROOT . DIR_RES . $this->id . '.html' . '#q' . $this->id:'javascript:void(0);') . '">'.$this->id.'</a>' .
+			// [Reply]
+			($index ? '<a href="' . ROOT . DIR_RES . $this->id . '.html">[Reply]</a>' : '') .
+			'</p>';
+		
+			// Body
+			$built .= $this->body .
+			
+			// Omitted posts
+			($this->omitted ? '<span class="omitted">' . $this->omitted . ' post' . ($this->omitted==1?'':'s') . ' omitted. Click reply to view.</span>':'') .
+			
+			// End
+			'</div>';
+			
+			// Replies
 			foreach($this->posts as &$post) {
 				$built .= $post->build($index);
 			}
+			
 			$built .= '<br class="clear"/><hr/>';
 			return $built;
 		}