Use echo shortcut syntax

Replace all occurrences of "<?php echo" and "<?php print" by "<?=" to
reduce noise in templates.

Note that as of PHP 5.4.0, "<?=" is always available and no longer
requires "short_open_tag" to be set.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>

17 files changed, 312 insertions, 312 deletions

diff --git a/web/template/account_details.php b/web/template/account_details.php
index 8551533..082a3f7 100644
--- a/web/template/account_details.php
+++ b/web/template/account_details.php
@@ -4,12 +4,12 @@
 	</tr>
 
 	<tr>
-		<td align="left"><?php echo __("Username") . ":" ?></td>
-		<td align="left"><?php echo $row["Username"] ?></td>
+		<td align="left"><?= __("Username") . ":" ?></td>
+		<td align="left"><?= $row["Username"] ?></td>
 	</tr>
 
 	<tr>
-		<td align="left"><?php echo __("Account Type") . ":" ?></td>
+		<td align="left"><?= __("Account Type") . ":" ?></td>
 		<td align="left">
 			<?php
 			if ($row["AccountType"] == "User") {
@@ -24,34 +24,34 @@
 	</tr>
 
 	<tr>
-		<td align="left"><?php echo __("Email Address") . ":" ?></td>
-		<td align="left"><a href="mailto:<?php echo htmlspecialchars($row["Email"], ENT_QUOTES) ?>"><?php echo htmlspecialchars($row["Email"], ENT_QUOTES) ?></a></td>
+		<td align="left"><?= __("Email Address") . ":" ?></td>
+		<td align="left"><a href="mailto:<?= htmlspecialchars($row["Email"], ENT_QUOTES) ?>"><?= htmlspecialchars($row["Email"], ENT_QUOTES) ?></a></td>
 	</tr>
 
 	<tr>
-		<td align="left"><?php echo __("Real Name") . ":" ?></td>
-		<td align="left"><?php echo htmlspecialchars($row["RealName"], ENT_QUOTES) ?></td>
+		<td align="left"><?= __("Real Name") . ":" ?></td>
+		<td align="left"><?= htmlspecialchars($row["RealName"], ENT_QUOTES) ?></td>
 	</tr>
 
 	<tr>
-		<td align="left"><?php echo __("IRC Nick") . ":" ?></td>
-		<td align="left"><?php echo htmlspecialchars($row["IRCNick"], ENT_QUOTES) ?></td>
+		<td align="left"><?= __("IRC Nick") . ":" ?></td>
+		<td align="left"><?= htmlspecialchars($row["IRCNick"], ENT_QUOTES) ?></td>
 	</tr>
 
 	<tr>
-		<td align="left"><?php echo __("PGP Key Fingerprint") . ":" ?></td>
-		<td align="left"><?php echo html_format_pgp_fingerprint($row["PGPKey"]) ?></td>
+		<td align="left"><?= __("PGP Key Fingerprint") . ":" ?></td>
+		<td align="left"><?= html_format_pgp_fingerprint($row["PGPKey"]) ?></td>
 	</tr>
 
 	<tr>
-		<td align="left"><?php echo __("Last Voted") . ":" ?></td>
+		<td align="left"><?= __("Last Voted") . ":" ?></td>
 		<td align="left">
-		<?php print $row["LastVoted"] ? date("Y-m-d", $row["LastVoted"]) : __("Never"); ?>
+		<?= $row["LastVoted"] ? date("Y-m-d", $row["LastVoted"]) : __("Never"); ?>
 		</td>
 	</tr>
 
 	<tr>
-		<td colspan="2"><a href="<?php echo get_uri('/packages/'); ?>?K=<?php echo $row['Username'] ?>&amp;SeB=m"><?php echo __("View this user's packages") ?></a></td>
+		<td colspan="2"><a href="<?= get_uri('/packages/'); ?>?K=<?= $row['Username'] ?>&amp;SeB=m"><?= __("View this user's packages") ?></a></td>
 	</tr>
 
 </table>
diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php
index b1cb749..a1887eb 100644
--- a/web/template/account_edit_form.php
+++ b/web/template/account_edit_form.php
@@ -1,13 +1,13 @@
 <?php if ($A == "UpdateAccount"): ?>
-<form action="<?php echo get_user_uri($U) . 'update/'; ?>" method="post">
+<form action="<?= get_user_uri($U) . 'update/'; ?>" method="post">
 <?php else: ?>
-<form action="<?php echo get_uri('/register/'); ?>" method="post">
+<form action="<?= get_uri('/register/'); ?>" method="post">
 <?php endif; ?>
 	<fieldset>
-		<input type="hidden" name="Action" value="<?php echo $A ?>" />
+		<input type="hidden" name="Action" value="<?= $A ?>" />
 		<?php if ($UID): ?>
-		<input type="hidden" name="ID" value="<?php echo $UID ?>" />
-		<input type="hidden" name="token" value="<?php print htmlspecialchars($_COOKIE['AURSID']) ?>" />
+		<input type="hidden" name="ID" value="<?= $UID ?>" />
+		<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
 		<?php endif; ?>
 	</fieldset>
 	<table>
@@ -16,26 +16,26 @@
 		</tr>
 
 		<tr>
-			<td align="left"><?php echo __("Username") ?>:</td>
-			<td align="left"><input type="text" size="30" maxlength="64" name="U" value="<?php echo htmlspecialchars($U,ENT_QUOTES) ?>" /> (<?php echo __("required") ?>)</td>
+			<td align="left"><?= __("Username") ?>:</td>
+			<td align="left"><input type="text" size="30" maxlength="64" name="U" value="<?= htmlspecialchars($U,ENT_QUOTES) ?>" /> (<?= __("required") ?>)</td>
 		</tr>
 		<?php
 		# Only TUs or Devs can promote/demote/suspend a user
 		if ($UTYPE == "Trusted User" || $UTYPE == "Developer"):
 		?>
 		<tr>
-			<td align="left"><?php echo __("Account Type") ?>:</td>
+			<td align="left"><?= __("Account Type") ?>:</td>
 			<td align="left">
 				<select name=T>
 					<?php if ($T == "User"): ?>
-					<option value="1" selected><?php echo __("Normal user") ?>
+					<option value="1" selected><?= __("Normal user") ?>
 					<?php else: ?>
-					<option value="1"><?php echo __("Normal user") ?>
+					<option value="1"><?= __("Normal user") ?>
 					<?php endif; ?>
 					<?php if ($T == "Trusted User"): ?>
-					<option value="2" selected><?php echo __("Trusted user") ?>
+					<option value="2" selected><?= __("Trusted user") ?>
 					<?php else: ?>
-					<option value="2"><?php echo __("Trusted user") ?>
+					<option value="2"><?= __("Trusted user") ?>
 					<?php endif; ?>
 					<?php
 					# Only developers can make another account a developer
@@ -50,7 +50,7 @@
 		</tr>
 
 		<tr>
-			<td align="left"><?php echo __("Account Suspended") ?>:</td>
+			<td align="left"><?= __("Account Suspended") ?>:</td>
 
 			<?php if ($S): ?>
 			<td align="left"><input type="checkbox" name="S" checked="checked" />
@@ -61,14 +61,14 @@
 		<?php endif; ?>
 
 		<tr>
-			<td align="left"><?php echo __("Email Address") ?>:</td>
-			<td align="left"><input type="text" size="30" maxlength="64" name="E" value="<?php echo htmlspecialchars($E,ENT_QUOTES) ?>" /> (<?php echo __("required") ?>)</td>
+			<td align="left"><?= __("Email Address") ?>:</td>
+			<td align="left"><input type="text" size="30" maxlength="64" name="E" value="<?= htmlspecialchars($E,ENT_QUOTES) ?>" /> (<?= __("required") ?>)</td>
 		</tr>
 
 		<tr>
-			<td align="left"><?php echo __("Password") ?>:</td>
+			<td align="left"><?= __("Password") ?>:</td>
 			<td align="left">
-				<input type="password" size="30" maxlength="32" name="P" value="<?php echo $P ?>" />
+				<input type="password" size="30" maxlength="32" name="P" value="<?= $P ?>" />
 				<?php if ($A != "UpdateAccount"):
 					print " (".__("required").")";
 				endif; ?>
@@ -76,9 +76,9 @@
 		</tr>
 
 		<tr>
-			<td align="left"><?php echo __("Re-type password") ?>:</td>
+			<td align="left"><?= __("Re-type password") ?>:</td>
 			<td align="left">
-				<input type="password" size="30" maxlength="32" name="C" value="<?php echo $C ?>" />
+				<input type="password" size="30" maxlength="32" name="C" value="<?= $C ?>" />
 				<?php if ($A != "UpdateAccount"):
 					print " (".__("required").")";
 				endif; ?>
@@ -86,28 +86,28 @@
 		</tr>
 
 		<tr>
-			<td align="left"><?php echo __("Real Name") ?>:</td>
+			<td align="left"><?= __("Real Name") ?>:</td>
 			<td align="left">
-				<input type="text" size="30" maxlength="32" name="R" value="<?php echo htmlspecialchars($R,ENT_QUOTES) ?>" />
+				<input type="text" size="30" maxlength="32" name="R" value="<?= htmlspecialchars($R,ENT_QUOTES) ?>" />
 			</td>
 		</tr>
 
 		<tr>
-			<td align="left"><?php echo __("IRC Nick") ?>:</td>
+			<td align="left"><?= __("IRC Nick") ?>:</td>
 			<td align="left">
-				<input type="text" size="30" maxlength="32" name="I" value="<?php echo htmlspecialchars($I,ENT_QUOTES) ?>" />
+				<input type="text" size="30" maxlength="32" name="I" value="<?= htmlspecialchars($I,ENT_QUOTES) ?>" />
 			</td>
 		</tr>
 
 		<tr>
-			<td align="left"><?php echo __("PGP Key Fingerprint") ?>:</td>
+			<td align="left"><?= __("PGP Key Fingerprint") ?>:</td>
 <td align="left">
-				<input type="text" size="30" maxlength="50" name="K" value="<?php echo html_format_pgp_fingerprint($K) ?>" />
+				<input type="text" size="30" maxlength="50" name="K" value="<?= html_format_pgp_fingerprint($K) ?>" />
 			</td>
 		</tr>
 
 		<tr>
-			<td align="left"><?php echo __("Language") ?>:</td>
+			<td align="left"><?= __("Language") ?>:</td>
 			<td align="left">
 				<select name=L>
 <?php
@@ -131,11 +131,11 @@
 			<td>&nbsp;</td>
 			<td align="left">
 				<?php if ($A == "UpdateAccount"): ?>
-				<input type="submit" class="button" value="<?php echo __("Update") ?>" /> &nbsp;
+				<input type="submit" class="button" value="<?= __("Update") ?>" /> &nbsp;
 				<?php else: ?>
-				<input type="submit" class="button" value="<?php echo __("Create") ?>" /> &nbsp;
+				<input type="submit" class="button" value="<?= __("Create") ?>" /> &nbsp;
 				<?php endif; ?>
-				<input type="reset" class="button" value="<?php echo __("Reset") ?>" />
+				<input type="reset" class="button" value="<?= __("Reset") ?>" />
 			</td>
 		</tr>
 
diff --git a/web/template/account_search_results.php b/web/template/account_search_results.php
index f67cc6a..ae7c112 100644
--- a/web/template/account_search_results.php
+++ b/web/template/account_search_results.php
@@ -7,14 +7,14 @@ else:
 		<table class="results">
 			<thead>
 				<tr>
-					<th><?php echo __("Username") ?></th>
-					<th><?php echo __("Type") ?></th>
-					<th><?php echo __("Status") ?></th>
-					<th><?php echo __("Real Name") ?></th>
-					<th><?php echo __("IRC Nick") ?></th>
-					<th><?php echo __("PGP Key Fingerprint") ?></th>
-					<th><?php echo __("Last Voted") ?></th>
-					<th><?php echo __("Edit Account") ?></th>
+					<th><?= __("Username") ?></th>
+					<th><?= __("Type") ?></th>
+					<th><?= __("Status") ?></th>
+					<th><?= __("Real Name") ?></th>
+					<th><?= __("IRC Nick") ?></th>
+					<th><?= __("PGP Key Fingerprint") ?></th>
+					<th><?= __("Last Voted") ?></th>
+					<th><?= __("Edit Account") ?></th>
 				</tr>
 			</thead>
 			<?php
@@ -27,9 +27,9 @@ else:
 				endif;
 			?>
 				<tbody>
-				<tr class ="<?php echo $c ?>">
-					<td><a href="<?php echo get_uri('/packages/'); ?>?SeB=m&amp;K=<?php echo $row["Username"] ?>"><?php echo $row["Username"] ?></a></td>
-					<td><?php echo $row["AccountType"] ?></td>
+				<tr class ="<?= $c ?>">
+					<td><a href="<?= get_uri('/packages/'); ?>?SeB=m&amp;K=<?= $row["Username"] ?>"><?= $row["Username"] ?></a></td>
+					<td><?= $row["AccountType"] ?></td>
 					<td>
 						<?php
 						if ($row["Suspended"]):
@@ -50,7 +50,7 @@ else:
 							print "&nbsp;";
 						else:
 					?>
-						<a href="<?php echo get_user_uri($row["Username"]) . "edit/" ?>"><?php echo __("Edit") ?></a>
+						<a href="<?= get_user_uri($row["Username"]) . "edit/" ?>"><?= __("Edit") ?></a>
 					<?php endif; ?>
 					</td>
 				</tr>
@@ -63,32 +63,32 @@ else:
 	<table class="results">
 		<tr>
 			<td align="left">
-			<form action="<?php echo get_uri('/accounts/'); ?>" method="post">
+			<form action="<?= get_uri('/accounts/'); ?>" method="post">
 					<fieldset>
 						<input type="hidden" name="Action" value="SearchAccounts" />
-						<input type="hidden" name="O" value="<?php echo ($OFFSET-$HITS_PER_PAGE) ?>" />
+						<input type="hidden" name="O" value="<?= ($OFFSET-$HITS_PER_PAGE) ?>" />
 						<?php
 						reset($search_vars);
 						while (list($k, $ind) = each($search_vars)):
 						?>
-						<input type="hidden" name="<?php echo $ind ?>" value="<?php echo ${$ind} ?>" />
+						<input type="hidden" name="<?= $ind ?>" value="<?= ${$ind} ?>" />
 						<?php endwhile; ?>
-						<input type="submit" class="button" value="&lt;-- <?php echo __("Less") ?>" />
+						<input type="submit" class="button" value="&lt;-- <?= __("Less") ?>" />
 					</fieldset>
 				</form>
 			</td>
 			<td align="right">
-				<form action="<?php echo get_uri('/accounts/'); ?>" method="post">
+				<form action="<?= get_uri('/accounts/'); ?>" method="post">
 					<fieldset>
 						<input type="hidden" name="Action" value="SearchAccounts" />
-						<input type="hidden" name="O" value="<?php echo ($OFFSET+$HITS_PER_PAGE) ?>" />
+						<input type="hidden" name="O" value="<?= ($OFFSET+$HITS_PER_PAGE) ?>" />
 						<?php
 						reset($search_vars);
 						while (list($k, $ind) = each($search_vars)):
 						?>
-						<input type="hidden" name="<?php echo $ind ?>" value="<?php echo ${$ind} ?>" />
+						<input type="hidden" name="<?= $ind ?>" value="<?= ${$ind} ?>" />
 						<?php endwhile; ?>
-						<input type="submit" class="button" value="<?php echo __("More") ?> --&gt;" />
+						<input type="submit" class="button" value="<?= __("More") ?> --&gt;" />
 					</fieldset>
 				</form>
 			</td>
@@ -96,7 +96,7 @@ else:
 	</table>
 	<?php else: ?>
 		<p style="text-align:center;">
-			<?php print __("No more results to display."); ?>
+			<?= __("No more results to display."); ?>
 		</p>
 	<?php endif; ?>
 <?php endif; ?>
diff --git a/web/template/actions_form.php b/web/template/actions_form.php
index d687f50..650c6c6 100644
--- a/web/template/actions_form.php
+++ b/web/template/actions_form.php
@@ -1,38 +1,38 @@
 <?php if (!$USE_VIRTUAL_URLS || $atype == "Trusted User" || $atype == "Developer" ): ?>
 <div class="box">
-	<form action="<?php echo htmlspecialchars(get_pkg_uri($row['Name']), ENT_QUOTES); ?>" method="post">
+	<form action="<?= htmlspecialchars(get_pkg_uri($row['Name']), ENT_QUOTES); ?>" method="post">
 		<fieldset>
-			<input type="hidden" name="IDs[<?php echo $row['ID'] ?>]" value="1" />
-			<input type="hidden" name="ID" value="<?php echo $row['ID'] ?>" />
-			<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
+			<input type="hidden" name="IDs[<?= $row['ID'] ?>]" value="1" />
+			<input type="hidden" name="ID" value="<?= $row['ID'] ?>" />
+			<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
 
 		<?php if (!$USE_VIRTUAL_URLS): ?>
 		<?php if (user_voted($uid, $row['ID'])): ?>
-			<input type="submit" class="button" name="do_UnVote" value="<?php echo __("UnVote") ?>" />
+			<input type="submit" class="button" name="do_UnVote" value="<?= __("UnVote") ?>" />
 		<?php else: ?>
-			<input type="submit" class="button" name="do_Vote" value="<?php echo __("Vote") ?>" />
+			<input type="submit" class="button" name="do_Vote" value="<?= __("Vote") ?>" />
 		<?php endif; ?>
 
 		<?php if (user_notify($uid, $row['ID'])): ?>
-			<input type="submit" class="button" name="do_UnNotify" value="<?php echo __("UnNotify") ?>" title="<?php echo __("No New Comment Notification") ?>" />
+			<input type="submit" class="button" name="do_UnNotify" value="<?= __("UnNotify") ?>" title="<?= __("No New Comment Notification") ?>" />
 		<?php else: ?>
-			<input type="submit" class="button" name="do_Notify" value="<?php echo __("Notify") ?>" title="<?php echo __("New Comment Notification") ?>" />
+			<input type="submit" class="button" name="do_Notify" value="<?= __("Notify") ?>" title="<?= __("New Comment Notification") ?>" />
 		<?php endif; ?>
 
 		<?php if ($row["OutOfDateTS"] === NULL): ?>
-			<input type="submit" class="button" name="do_Flag" value="<?php echo __("Flag Out-of-date") ?>" />
+			<input type="submit" class="button" name="do_Flag" value="<?= __("Flag Out-of-date") ?>" />
 		<?php elseif (($row["OutOfDateTS"] !== NULL) &&
 		($uid == $row["MaintainerUID"] || $atype == "Trusted User" || $atype == "Developer")): ?>
-			<input type="submit" class="button" name="do_UnFlag" value="<?php echo __("UnFlag Out-of-date") ?>" />
+			<input type="submit" class="button" name="do_UnFlag" value="<?= __("UnFlag Out-of-date") ?>" />
 		<?php endif; ?>
 		<?php endif; ?>
 			
 		<?php if ($atype == "Trusted User" || $atype == "Developer"): ?>
-			<input type="submit" class="button" name="do_Delete" value="<?php echo __("Delete Packages") ?>" />
-			<label for="merge_Into" ><?php echo __("Merge into") ?></label>
+			<input type="submit" class="button" name="do_Delete" value="<?= __("Delete Packages") ?>" />
+			<label for="merge_Into" ><?= __("Merge into") ?></label>
 			<input type="text" id="merge_Into" name="merge_Into" />
 			<input type="checkbox" name="confirm_Delete" value="1" />
-			<?php echo __("Confirm") ?>
+			<?= __("Confirm") ?>
 		<?php endif; ?>
 
 		</fieldset>
diff --git a/web/template/footer.php b/web/template/footer.php
index 1b1b1d2..857211e 100644
--- a/web/template/footer.php
+++ b/web/template/footer.php
@@ -3,10 +3,10 @@
 
 			<div id="footer">
 				<?php if ($ver): ?>
-				<p>AUR <?php echo htmlspecialchars($ver) ?></p>
+				<p>AUR <?= htmlspecialchars($ver) ?></p>
 				<?php endif; ?>
 				<p>Copyright &copy; 2004-2012 AUR Development Team.</p>
-				<p><?php echo __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.') ?></p>
+				<p><?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.') ?></p>
 			</div>
 		</div>
 	</body>
diff --git a/web/template/header.php b/web/template/header.php
index d87ddfe..3179a53 100644
--- a/web/template/header.php
+++ b/web/template/header.php
@@ -1,14 +1,14 @@
-<?php echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
+<?= '<?xml version="1.0" encoding="UTF-8"?>'; ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xml:lang="<?php print htmlspecialchars($LANG, ENT_QUOTES) ?>" lang="<?php print htmlspecialchars($LANG, ENT_QUOTES) ?>">
+	xml:lang="<?= htmlspecialchars($LANG, ENT_QUOTES) ?>" lang="<?= htmlspecialchars($LANG, ENT_QUOTES) ?>">
   <head>
-    <title>AUR (<?php print htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?></title>
+    <title>AUR (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?></title>
 	<link rel='stylesheet' type='text/css' href='/css/archweb.css' />
 	<link rel='stylesheet' type='text/css' href='/css/aur.css' />
 	<link rel='shortcut icon' href='/images/favicon.ico' />
-	<link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='<?php echo get_uri('/rss/'); ?>' />
+	<link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='<?= get_uri('/rss/'); ?>' />
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   </head>
 	<body>
@@ -29,7 +29,7 @@
 
 		<div id="content">
 			<div id="lang_sub">
-				<form method="get" action="<?php echo htmlspecialchars($_SERVER["REQUEST_URI"], ENT_QUOTES) ?>">
+				<form method="get" action="<?= htmlspecialchars($_SERVER["REQUEST_URI"], ENT_QUOTES) ?>">
 					<fieldset>
 						<div>
 							<select name="setlang" id="id_setlang">
@@ -50,20 +50,20 @@
 			</div>
 			<div id="archdev-navbar">
 				<ul>
-					<li><a href="<?php echo get_uri('/'); ?>">AUR <?php print __("Home"); ?></a></li>
-					<li><a href="<?php echo get_uri('/packages/'); ?>"><?php print __("Packages"); ?></a></li>
+					<li><a href="<?= get_uri('/'); ?>">AUR <?= __("Home"); ?></a></li>
+					<li><a href="<?= get_uri('/packages/'); ?>"><?= __("Packages"); ?></a></li>
 					<?php if (isset($_COOKIE['AURSID'])): ?>
-						<li><a href="<?php echo get_uri('/packages/'); ?>?SeB=m&amp;K=<?php print username_from_sid($_COOKIE["AURSID"]); ?>"><?php print __("My Packages"); ?></a></li>
-						<li><a href="<?php echo get_uri('/submit/'); ?>"><?php print __("Submit"); ?></a></li>
+						<li><a href="<?= get_uri('/packages/'); ?>?SeB=m&amp;K=<?= username_from_sid($_COOKIE["AURSID"]); ?>"><?= __("My Packages"); ?></a></li>
+						<li><a href="<?= get_uri('/submit/'); ?>"><?= __("Submit"); ?></a></li>
 						<?php if (check_user_privileges()): ?>
-						<li><a href="<?php echo get_uri('/accounts/') ; ?>"><?php print __("Accounts"); ?></a></li>
+						<li><a href="<?= get_uri('/accounts/') ; ?>"><?= __("Accounts"); ?></a></li>
 						<?php endif; ?>
-						<li><a href="<?php echo get_user_uri(username_from_sid($_COOKIE['AURSID'])) . 'edit/'; ?>"><?php print __(" My Account"); ?></a></li>
-						<?php if (check_user_privileges()): ?><li><a href="<?php echo get_uri('/tu/'); ?>"><?php print __("Trusted User"); ?></a></li><?php endif; ?>
-						<li><a href="<?php echo get_uri('/logout/'); ?>"><?php print __("Logout"); ?></a></li>
+						<li><a href="<?= get_user_uri(username_from_sid($_COOKIE['AURSID'])) . 'edit/'; ?>"><?= __(" My Account"); ?></a></li>
+						<?php if (check_user_privileges()): ?><li><a href="<?= get_uri('/tu/'); ?>"><?= __("Trusted User"); ?></a></li><?php endif; ?>
+						<li><a href="<?= get_uri('/logout/'); ?>"><?= __("Logout"); ?></a></li>
 					<?php else: ?>
-						<li><a href="<?php echo get_uri('/register/'); ?>"><?php print __("Register"); ?></a></li>
-						<li><a href="<?php echo get_uri('/login/'); ?>"><?php print __("Login"); ?></a></li>
+						<li><a href="<?= get_uri('/register/'); ?>"><?= __("Register"); ?></a></li>
+						<li><a href="<?= get_uri('/login/'); ?>"><?= __("Login"); ?></a></li>
 					<?php endif; ?>
 				</ul>
 			</div><!-- #archdev-navbar -->
diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php
index fb3ebff..9315b0a 100644
--- a/web/template/pkg_comment_form.php
+++ b/web/template/pkg_comment_form.php
@@ -1,6 +1,6 @@
 <div id="generic-form" class="box">
-	<h2><?php echo __("Add Comment"); ?></h2>
-	<form call="general-form" action="<?php echo $_SERVER['REQUEST_URI'] ?>" method="post">
+	<h2><?= __("Add Comment"); ?></h2>
+	<form call="general-form" action="<?= $_SERVER['REQUEST_URI'] ?>" method="post">
 		<fieldset>
 <?php
 if (isset($_REQUEST['comment']) && check_token()) {
@@ -8,16 +8,16 @@ if (isset($_REQUEST['comment']) && check_token()) {
 }
 ?>
 			<div>
-				<input type="hidden" name="ID" value="<?php echo intval($row['ID']) ?>" />
-				<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
+				<input type="hidden" name="ID" value="<?= intval($row['ID']) ?>" />
+				<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
 			</div>
 			<p>
-				<label for="id_comment"><?php echo __("Comment") . ':' ?></label>
+				<label for="id_comment"><?= __("Comment") . ':' ?></label>
 				<textarea id="id_comment" name="comment" cols="80" rows="10"></textarea>
 			</p>
 			<p>
 				<label></label>
-				<input type="submit" value="<?php echo __("Add Comment") ?>" />
+				<input type="submit" value="<?= __("Add Comment") ?>" />
 			</p>
 		</fieldset>
 	</form>
diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php
index b0aada2..997b9ca 100644
--- a/web/template/pkg_comments.php
+++ b/web/template/pkg_comments.php
@@ -5,7 +5,7 @@ $pkgname = $row['Name'];
 ?>
 <div id="news">
 	<h3>
-		<a href="<?php echo htmlentities(get_pkg_uri($pkgname), ENT_QUOTES) . '?' . mkurl('comments=all') ?>" title="<?php echo __('View all %s comments' , $count) ?>"><?php echo __('Latest Comments') ?></a>
+		<a href="<?= htmlentities(get_pkg_uri($pkgname), ENT_QUOTES) . '?' . mkurl('comments=all') ?>" title="<?= __('View all %s comments' , $count) ?>"><?= __('Latest Comments') ?></a>
 		<span class="arrow"></span>
 	</h3>
 
@@ -15,21 +15,21 @@ $pkgname = $row['Name'];
 		endif; ?>
 		<h4>
 			<?php if (canDeleteCommentArray($row, $atype, $uid)): ?>
-				<form method="post" action="<?php echo htmlspecialchars(get_pkg_uri($pkgname), ENT_QUOTES); ?>">
+				<form method="post" action="<?= htmlspecialchars(get_pkg_uri($pkgname), ENT_QUOTES); ?>">
 					<fieldset style="display:inline;">
 						<input type="hidden" name="action" value="do_DeleteComment" />
-						<input type="hidden" name="comment_id" value="<?php echo $row['ID'] ?>" />
-						<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
-						<input type="image" src="/images/x.png" alt="<?php echo __('Delete comment') ?>" name="submit" value="1" />
+						<input type="hidden" name="comment_id" value="<?= $row['ID'] ?>" />
+						<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
+						<input type="image" src="/images/x.png" alt="<?= __('Delete comment') ?>" name="submit" value="1" />
 					</fieldset>
 				</form>
 			<?php endif; ?>
-			<?php echo __('Comment by %s', $row['UserName']) ?>
+			<?= __('Comment by %s', $row['UserName']) ?>
 		</h4>
-		<p class="timestamp"><?php echo gmdate('Y-m-d H:i', $row['CommentTS']) ?></p>
+		<p class="timestamp"><?= gmdate('Y-m-d H:i', $row['CommentTS']) ?></p>
 		<div class="article-content">
 			<p>
-				<?php echo parse_comment($row['Comments']) ?>
+				<?= parse_comment($row['Comments']) ?>
 			</p>
 		</div>
 	<?php endwhile; ?>
@@ -38,7 +38,7 @@ $pkgname = $row['Name'];
 <?php if ($count > 10 && !isset($_GET['comments'])): ?>
 <div id="news">
 	<h3>
-		<a href="<?php echo htmlentities(get_pkg_uri($pkgname), ENT_QUOTES) . '?' . mkurl('comments=all') ?>" title="<?php echo __('View all %s comments', $count) ?>"><?php echo __('All comments', $count) ?></a>
+		<a href="<?= htmlentities(get_pkg_uri($pkgname), ENT_QUOTES) . '?' . mkurl('comments=all') ?>" title="<?= __('View all %s comments', $count) ?>"><?= __('All comments', $count) ?></a>
 	</h3>
 </div>
 <?php endif; ?>
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index a4cd347..4e9e073 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -29,46 +29,46 @@ $requiredby = package_required($row["Name"]);
 $sources = package_sources($row["ID"]);
 ?>
 <div id="pkgdetails" class="box">
-	<h2><?php echo __('Package Details') . ': ' . htmlspecialchars($row['Name']) . ' ' . htmlspecialchars($row['Version']) ?></h2>
+	<h2><?= __('Package Details') . ': ' . htmlspecialchars($row['Name']) . ' ' . htmlspecialchars($row['Version']) ?></h2>
 	<div id="detailslinks" class="listing">
 		<div id="actionlist">
 			<h4>Package Actions</h4>
 			<ul class="small">
-				<li><a href="<?php echo $urlpath ?>/PKGBUILD"><?php echo __('View PKGBUILD') ?></a></li>
-				<li><a href="<?php echo $urlpath . '/' . $row['Name'] ?>.tar.gz"><?php echo __('Download tarball') ?></a></li>
+				<li><a href="<?= $urlpath ?>/PKGBUILD"><?= __('View PKGBUILD') ?></a></li>
+				<li><a href="<?= $urlpath . '/' . $row['Name'] ?>.tar.gz"><?= __('Download tarball') ?></a></li>
 				<li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li>
 				<?php if ($USE_VIRTUAL_URLS && $uid): ?>
 				<?php if ($row["OutOfDateTS"] === NULL): ?>
-				<li><a href="<?php echo get_pkg_uri($row['Name']) . 'flag/'; ?>"><?php echo __('Flag package out-of-date'); ?></a></li>
+				<li><a href="<?= get_pkg_uri($row['Name']) . 'flag/'; ?>"><?= __('Flag package out-of-date'); ?></a></li>
 				<?php elseif (($row["OutOfDateTS"] !== NULL) &&
 				($uid == $row["MaintainerUID"] || $atype == "Trusted User" || $atype == "Developer")): ?>
-				<li><a href="<?php echo get_pkg_uri($row['Name']) . 'unflag/'; ?>"><?php echo __('Unflag package'); ?></a></li>
+				<li><a href="<?= get_pkg_uri($row['Name']) . 'unflag/'; ?>"><?= __('Unflag package'); ?></a></li>
 				<?php endif; ?>
 				<?php if (user_voted($uid, $row['ID'])): ?>
-				<li><a href="<?php echo get_pkg_uri($row['Name']) . 'unvote/'; ?>"><?php echo __('Remove vote'); ?></a></li>
+				<li><a href="<?= get_pkg_uri($row['Name']) . 'unvote/'; ?>"><?= __('Remove vote'); ?></a></li>
 				<?php else: ?>
-				<li><a href="<?php echo get_pkg_uri($row['Name']) . 'vote/'; ?>"><?php echo __('Vote for this package'); ?></a></li>
+				<li><a href="<?= get_pkg_uri($row['Name']) . 'vote/'; ?>"><?= __('Vote for this package'); ?></a></li>
 				<?php endif; ?>
 				<?php if (user_notify($uid, $row['ID'])): ?>
-				<li><a href="<?php echo get_pkg_uri($row['Name']) . 'unnotify/'; ?>"><?php echo __('Disable notifications'); ?></a></li>
+				<li><a href="<?= get_pkg_uri($row['Name']) . 'unnotify/'; ?>"><?= __('Disable notifications'); ?></a></li>
 				<?php else: ?>
-				<li><a href="<?php echo get_pkg_uri($row['Name']) . 'notify/'; ?>"><?php echo __('Notify of new comments'); ?></a></li>
+				<li><a href="<?= get_pkg_uri($row['Name']) . 'notify/'; ?>"><?= __('Notify of new comments'); ?></a></li>
 				<?php endif; ?>
 				<?php endif; ?>
 			</ul>
 			<?php if ($uid): ?>
-			<form action="<?php echo htmlspecialchars(get_pkg_uri($row['Name']), ENT_QUOTES); ?>" method="post">
+			<form action="<?= htmlspecialchars(get_pkg_uri($row['Name']), ENT_QUOTES); ?>" method="post">
 				<div>
-					<input type="hidden" name="IDs[<?php echo $row['ID'] ?>]" value="1" />
-					<input type="hidden" name="ID" value="<?php echo $row['ID'] ?>" />
-					<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
+					<input type="hidden" name="IDs[<?= $row['ID'] ?>]" value="1" />
+					<input type="hidden" name="ID" value="<?= $row['ID'] ?>" />
+					<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
 				</div>
 				<p>
 					<?php if ($row["MaintainerUID"] === NULL): ?>
-						<input type="submit" class="button" name="do_Adopt" value="<?php echo __("Adopt Packages") ?>" />
+						<input type="submit" class="button" name="do_Adopt" value="<?= __("Adopt Packages") ?>" />
 					<?php elseif ($uid == $row["MaintainerUID"] ||
 						$atype == "Trusted User" || $atype == "Developer"): ?>
-						<input type="submit" class="button" name="do_Disown" value="<?php echo __("Disown Packages") ?>" />
+						<input type="submit" class="button" name="do_Disown" value="<?= __("Disown Packages") ?>" />
 					<?php endif; ?>
 				</p>
 			</form>
@@ -78,97 +78,97 @@ $sources = package_sources($row["ID"]);
 
 	<table id="pkginfo">
 		<tr>
-			<th><?php echo __('Description') . ': ' ?></th>
-			<td class="wrap"><?php echo htmlspecialchars($row['Description']); ?></td>
+			<th><?= __('Description') . ': ' ?></th>
+			<td class="wrap"><?= htmlspecialchars($row['Description']); ?></td>
 		</tr>
 		<tr>
 			<th>Upstream URL:</th>
-			<td><a href="<?php echo htmlspecialchars($row['URL'], ENT_QUOTES) ?>" title="<?php echo __('Visit the website for') . ' ' . htmlspecialchars( $row['Name'])?>"><?php echo htmlspecialchars($row['URL'], ENT_QUOTES) ?></a></td>
+			<td><a href="<?= htmlspecialchars($row['URL'], ENT_QUOTES) ?>" title="<?= __('Visit the website for') . ' ' . htmlspecialchars( $row['Name'])?>"><?= htmlspecialchars($row['URL'], ENT_QUOTES) ?></a></td>
 		</tr>
 		<tr>
-			<th><?php echo __('Category') . ': ' ?></th>
+			<th><?= __('Category') . ': ' ?></th>
 <?php
 if ($SID && ($uid == $row["MaintainerUID"] ||
 	($atype == "Developer" || $atype == "Trusted User"))):
 ?>
 			<td>
-				<form method="post" action="<?php echo htmlspecialchars(get_pkg_uri($row['Name']), ENT_QUOTES); ?>">
+				<form method="post" action="<?= htmlspecialchars(get_pkg_uri($row['Name']), ENT_QUOTES); ?>">
 					<div>
 						<input type="hidden" name="action" value="do_ChangeCategory" />
 						<?php if ($SID): ?>
-						<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
+						<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
 						<?php endif; ?>
 						<select name="category_id">
 <?php
 	foreach ($catarr as $cid => $catname):
 ?>
-							<option value="<?php echo $cid ?>"<?php if ($cid == $row["CategoryID"]) { ?> selected="selected" <?php } ?>><?php echo $catname ?></option>
+							<option value="<?= $cid ?>"<?php if ($cid == $row["CategoryID"]) { ?> selected="selected" <?php } ?>><?= $catname ?></option>
 	<?php endforeach; ?>
 						</select>
-						<input type="submit" value="<?php echo __('Change category') ?>"/>
+						<input type="submit" value="<?= __('Change category') ?>"/>
 					</div>
 				</form>
 <?php else: ?>
 			<td>
-				<a href="<?php echo get_uri('/packages/'); ?>?C=<?php echo $row['CategoryID'] ?>"><?php print $row['Category'] ?></a>
+				<a href="<?= get_uri('/packages/'); ?>?C=<?= $row['CategoryID'] ?>"><?= $row['Category'] ?></a>
 <?php endif; ?>
 			</td>
 		<tr>
-			<th><?php echo __('License') . ': ' ?></th>
-			<td><?php echo htmlspecialchars($license) ?></td>
+			<th><?= __('License') . ': ' ?></th>
+			<td><?= htmlspecialchars($license) ?></td>
 		</tr>
 		<tr>
-			<th><?php echo __('Submitter') .': ' ?></th>
+			<th><?= __('Submitter') .': ' ?></th>
 <?php
 if ($row["SubmitterUID"]):
 	if ($SID):
 ?>
-			<td><a href="<?php echo get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?php echo htmlspecialchars($row['SubmitterUID'], ENT_QUOTES) ?>" title="<?php echo __('View account information for')?> <?php echo htmlspecialchars($submitter) ?>"><?php echo htmlspecialchars($submitter) ?></a></td>
+			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['SubmitterUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= htmlspecialchars($submitter) ?>"><?= htmlspecialchars($submitter) ?></a></td>
 <?php else: ?>
-		<td><?php echo htmlspecialchars($submitter) ?></td>
+		<td><?= htmlspecialchars($submitter) ?></td>
 	<?php endif; ?>
 <?php else: ?>
 			<td>None</td>
 <?php endif; ?>
 		<tr>
-			<th><?php echo __('Maintainer') .': ' ?></th>
+			<th><?= __('Maintainer') .': ' ?></th>
 <?php
 if ($row["MaintainerUID"]):
 	if ($SID):
 ?>
-			<td><a href="<?php echo get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?php echo htmlspecialchars($row['MaintainerUID'], ENT_QUOTES) ?>" title="<?php echo __('View account information for')?> <?php echo htmlspecialchars($maintainer) ?>"><?php echo htmlspecialchars($maintainer) ?></a></td>
+			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['MaintainerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= htmlspecialchars($maintainer) ?>"><?= htmlspecialchars($maintainer) ?></a></td>
 	<?php else: ?>
-		<td><?php echo htmlspecialchars($maintainer) ?></td>
+		<td><?= htmlspecialchars($maintainer) ?></td>
 	<?php endif; ?>
 <?php else: ?>
 			<td>None</td>
 <?php endif; ?>
 		</tr>
 		<tr>
-			<th><?php echo __('Votes') . ': ' ?></th>
+			<th><?= __('Votes') . ': ' ?></th>
 <?php if ($atype == "Developer" || $atype == "Trusted User"): ?>
 <?php if ($USE_VIRTUAL_URLS): ?>
-			<td><a href="<?php echo get_pkg_uri($row['Name']); ?>voters/"><?php echo $votes ?></a>
+			<td><a href="<?= get_pkg_uri($row['Name']); ?>voters/"><?= $votes ?></a>
 <?php else: ?>
-			<td><a href="<?php echo get_uri('/voters/'); ?>?ID=<?php echo $pkgid ?>"><?php echo $votes ?></a>
+			<td><a href="<?= get_uri('/voters/'); ?>?ID=<?= $pkgid ?>"><?= $votes ?></a>
 <?php endif; ?>
 <?php else: ?>
-			<td><?php echo $votes ?></td>
+			<td><?= $votes ?></td>
 <?php endif; ?>
 		</tr>
 		<tr>
-			<th><?php echo __('First Submitted') . ': ' ?></th>
-			<td><?php echo $submitted_time ?></td>
+			<th><?= __('First Submitted') . ': ' ?></th>
+			<td><?= $submitted_time ?></td>
 		</tr>
 		<tr>
-			<th><?php echo __('Last Updated') . ': ' ?></th>
-			<td><?php echo $updated_time ?></td>
+			<th><?= __('Last Updated') . ': ' ?></th>
+			<td><?= $updated_time ?></td>
 		</tr>
 	</table>
 
 	<div id="metadata">
 		<div id="pkgdeps" class="listing">
-			<h3><?php echo __('Dependencies') . " (" . count($deps) . ")"?></h3>
+			<h3><?= __('Dependencies') . " (" . count($deps) . ")"?></h3>
 <?php if (count($deps) > 0): ?>
 			<ul>
 <?php
@@ -176,29 +176,29 @@ if ($row["MaintainerUID"]):
 		# darr: (DepName, DepCondition, PackageID), where ID is NULL if it didn't exist
 		if (!is_null($darr[2])):
 ?>
-				<li><a href="<?php echo htmlspecialchars(get_pkg_uri($darr[0]), ENT_QUOTES); ?>" title="<?php echo __('View packages details for').' '.$darr[0].$darr[1]?>"><?php echo $darr[0].$darr[1]?></a></li>
+				<li><a href="<?= htmlspecialchars(get_pkg_uri($darr[0]), ENT_QUOTES); ?>" title="<?= __('View packages details for').' '.$darr[0].$darr[1]?>"><?= $darr[0].$darr[1]?></a></li>
 		<?php else: ?>
-				<li><a href="http://www.archlinux.org/packages/?q=<?php echo urlencode($darr[0])?>" title="<?php echo __('View packages details for').' '.$darr[0].$darr[1] ?>"><?php echo $darr[0].$darr[1] ?></a></li>
+				<li><a href="http://www.archlinux.org/packages/?q=<?= urlencode($darr[0])?>" title="<?= __('View packages details for').' '.$darr[0].$darr[1] ?>"><?= $darr[0].$darr[1] ?></a></li>
 		<?php endif; ?>
 	<?php endwhile; ?>
 			</ul>
 <?php endif; ?>
 		</div>
 		<div id="pkgreqs" class="listing">
-			<h3><?php echo __('Required by') . " (" . count($requiredby) . ")"?></h3>
+			<h3><?= __('Required by') . " (" . count($requiredby) . ")"?></h3>
 <?php if (count($requiredby) > 0): ?>
 			<ul>
 <?php
 	# darr: (PackageName, PackageID)
 	while (list($k, $darr) = each($requiredby)):
 ?>
-				<li><a href="<?php echo htmlspecialchars(get_pkg_uri($darr[0]), ENT_QUOTES); ?>" title="<?php echo __('View packages details for').' '.$darr[0]?>"><?php echo $darr[0] ?></a></li>
+				<li><a href="<?= htmlspecialchars(get_pkg_uri($darr[0]), ENT_QUOTES); ?>" title="<?= __('View packages details for').' '.$darr[0]?>"><?= $darr[0] ?></a></li>
 	<?php endwhile; ?>
 			</ul>
 <?php endif; ?>
 		</div>
 		<div id="pkgfiles" class="listing">
-			<h3><?php echo __('Sources') ?></h3>
+			<h3><?= __('Sources') ?></h3>
 		</div>
 <?php if (count($sources) > 0): ?>
 		<div>
@@ -211,13 +211,13 @@ if ($row["MaintainerUID"]):
 		# It is an external source
 		if (isset($parsed_url['scheme']) || isset($src[1])):
 ?>
-				<li><a href="<?php echo htmlspecialchars((isset($src[1]) ? $src[1] : $src[0]), ENT_QUOTES) ?>"><?php echo htmlspecialchars($src[0]) ?> </a></li>
+				<li><a href="<?= htmlspecialchars((isset($src[1]) ? $src[1] : $src[0]), ENT_QUOTES) ?>"><?= htmlspecialchars($src[0]) ?> </a></li>
 <?php
 		else:
 			# It is presumably an internal source
 			$src = $src[0];
 ?>
-				<li><?php echo htmlspecialchars($src) ?></li>
+				<li><?= htmlspecialchars($src) ?></li>
 		<?php endif; ?>
 	<?php endwhile; ?>
 			</ul>
diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php
index 49ca876..588b4d4 100644
--- a/web/template/pkg_search_form.php
+++ b/web/template/pkg_search_form.php
@@ -34,94 +34,94 @@ $per_page = array(50, 100, 250);
 ?>
 
 <div id="pkglist-search" class="box filter-criteria">
-<h2><?php print __("Search Criteria"); ?></h2>
+<h2><?= __("Search Criteria"); ?></h2>
 
-<form action='<?php echo get_uri('/packages/'); ?>' method='get'>
+<form action='<?= get_uri('/packages/'); ?>' method='get'>
 	<p><input type='hidden' name='O' value='0' /></p>
 
 	<fieldset>
-		<legend><?php echo __('Enter search criteria') ?></legend>
+		<legend><?= __('Enter search criteria') ?></legend>
 		<div>
-			<label for="id_category"><?php print __("Category"); ?></label>
+			<label for="id_category"><?= __("Category"); ?></label>
 			<select name='C' id="id_category">
-				<option value='0'><?php print __("Any"); ?></option>
+				<option value='0'><?= __("Any"); ?></option>
 				<?php foreach (pkgCategories() as $id => $cat): ?>
 				<?php if (isset($_REQUEST['C']) && $_REQUEST['C'] == $id): ?>
-				<option value="<?php print $id ?>" selected="selected"><?php print $cat; ?></option>
+				<option value="<?= $id ?>" selected="selected"><?= $cat; ?></option>
 				<?php else: ?>
-				<option value="<?php print $id ?>"><?php print $cat; ?></option>
+				<option value="<?= $id ?>"><?= $cat; ?></option>
 				<?php endif; ?>
 				<?php endforeach; ?>
 			</select>
 		</div>
 		<div>
-			<label for="id_method"><?php print __("Search by"); ?></label>
+			<label for="id_method"><?= __("Search by"); ?></label>
 			<select name='SeB'>
 				<?php foreach ($searchby as $k => $v): ?>
 				<?php if (isset($_REQUEST['SeB']) && $_REQUEST['SeB'] == $k): ?>
-				<option value="<?php print $k; ?>" selected="selected"><?php print $v; ?></option>
+				<option value="<?= $k; ?>" selected="selected"><?= $v; ?></option>
 				<?php else: ?>
-				<option value="<?php print $k; ?>"><?php print $v; ?></option>
+				<option value="<?= $k; ?>"><?= $v; ?></option>
 				<?php endif; ?>
 				<?php endforeach; ?>
 			</select>
 		</div>
 		<div>
-			<label for="id_q"><?php print __("Keywords"); ?></label>
+			<label for="id_q"><?= __("Keywords"); ?></label>
 			<input type='text' name='K' size='30' value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength='35' />
 		</div>
 		<div>
-			<label for="id_out_of_date"><?php echo __('Out of Date'); ?></label>
+			<label for="id_out_of_date"><?= __('Out of Date'); ?></label>
 			<select name='outdated'>
 				<?php foreach ($outdated_flags as $k => $v): ?>
 				<?php if (isset($_REQUEST['outdated']) && $_REQUEST['outdated'] == $k): ?>
-				<option value='<?php print $k; ?>' selected="selected"><?php print $v; ?></option>
+				<option value='<?= $k; ?>' selected="selected"><?= $v; ?></option>
 				<?php else: ?>
-				<option value='<?php print $k; ?>'><?php print $v; ?></option>
+				<option value='<?= $k; ?>'><?= $v; ?></option>
 				<?php endif; ?>
 				<?php endforeach; ?>
 			</select>
 		</div>
 		<div>
-			<label for="id_sort_by"><?php print __("Sort by"); ?></label>
+			<label for="id_sort_by"><?= __("Sort by"); ?></label>
 			<select name='SB'>
 				<?php foreach ($sortby as $k => $v): ?>
 				<?php if (isset($_REQUEST['SB']) && $_REQUEST['SB'] == $k): ?>
-				<option value='<?php print $k; ?>' selected="selected"><?php print $v; ?></option>
+				<option value='<?= $k; ?>' selected="selected"><?= $v; ?></option>
 				<?php else: ?>
-				<option value='<?php print $k; ?>'><?php print $v; ?></option>
+				<option value='<?= $k; ?>'><?= $v; ?></option>
 				<?php endif; ?>
 				<?php endforeach; ?>
 			</select>
 		</div>
 		<div>
-			<label for="id_order_by"><?php print __("Sort order"); ?></label>
+			<label for="id_order_by"><?= __("Sort order"); ?></label>
 			<select name='SO'>
 				<?php foreach ($orderby as $k => $v): ?>
 				<?php if (isset($_REQUEST['SO']) && $_REQUEST['SO'] == $k): ?>
-				<option value='<?php print $k; ?>' selected="selected"><?php print $v; ?></option>
+				<option value='<?= $k; ?>' selected="selected"><?= $v; ?></option>
 				<?php else: ?>
-				<option value='<?php print $k; ?>'><?php print $v; ?></option>
+				<option value='<?= $k; ?>'><?= $v; ?></option>
 				<?php endif; ?>
 				<?php endforeach; ?>
 			</select>
 		</div>
 		<div>
-			<label for="id_per_page"><?php print __("Per page"); ?></label>
+			<label for="id_per_page"><?= __("Per page"); ?></label>
 			<select name='PP'>
 				<?php foreach ($per_page as $i): ?>
 				<?php if (isset($_REQUEST['PP']) && $_REQUEST['PP'] == $i): ?>
-				<option value="<?php print $i; ?>" selected="selected"><?php print $i; ?></option>
+				<option value="<?= $i; ?>" selected="selected"><?= $i; ?></option>
 				<?php else: ?>
-				<option value="<?php print $i; ?>"><?php print $i; ?></option>
+				<option value="<?= $i; ?>"><?= $i; ?></option>
 				<?php endif; ?>
 				<?php endforeach; ?>
 			</select>
 		</div>
 		<div>
 			<label>&nbsp;</label>
-			<input type='submit' class='button' name='do_Search' value='<?php print __("Go"); ?>' />
-			<input type='submit' class='button' name='do_Orphans' value='<?php print __("Orphans"); ?>' />
+			<input type='submit' class='button' name='do_Search' value='<?= __("Go"); ?>' />
+			<input type='submit' class='button' name='do_Orphans' value='<?= __("Orphans"); ?>' />
 		</div>
 	</fieldset>
 </form>
diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php
index 13e0b44..9d40d80 100644
--- a/web/template/pkg_search_results.php
+++ b/web/template/pkg_search_results.php
@@ -6,74 +6,74 @@ if (isset($_COOKIE['AURSID'])) {
 }
 
 if (!$result): ?>
-	<div class="box"><p><?php echo __("Error retrieving package list.") ?></p></div>
+	<div class="box"><p><?= __("Error retrieving package list.") ?></p></div>
 <?php elseif ($total == 0): ?>
-	<div class="box"><p><?php echo __("No packages matched your search criteria.") ?></p></div>
+	<div class="box"><p><?= __("No packages matched your search criteria.") ?></p></div>
 <?php else: ?>
 	<div id="pkglist-results" class="box">
 		<div class="pkglist-stats">
-			<p><?php echo __('%d packages found. Page %d of %d.', $total, $current, $pages) ?></p>
+			<p><?= __('%d packages found. Page %d of %d.', $total, $current, $pages) ?></p>
 			<?php if (count($templ_pages) > 1): ?>
 			<p class="pkglist-nav">
 				<?php foreach ($templ_pages as $pagenr => $pagestart): ?>
 					<?php if ($pagestart === false): ?>
-						<span class="page"><?php echo $pagenr ?></span>
+						<span class="page"><?= $pagenr ?></span>
 					<?php elseif ($pagestart + 1 == $first): ?>
-						<span class="page"><?php echo $pagenr ?></span>
+						<span class="page"><?= $pagenr ?></span>
 					<?php else: ?>
-						<a class="page" href="<?php echo get_uri('/packages/'); ?>?<?php echo mkurl('O=' . $pagestart) ?>"><?php echo $pagenr ?></a>
+						<a class="page" href="<?= get_uri('/packages/'); ?>?<?= mkurl('O=' . $pagestart) ?>"><?= $pagenr ?></a>
 					<?php endif; ?>
 				<?php endforeach; ?>
 			</p>
 			<?php endif; ?>
 		</div>
 
-		<form id="pkglist-results-form" method="post" action="<?php echo get_uri('/packages/'); ?>?<?php echo htmlentities($_SERVER['QUERY_STRING']) ?>">
+		<form id="pkglist-results-form" method="post" action="<?= get_uri('/packages/'); ?>?<?= htmlentities($_SERVER['QUERY_STRING']) ?>">
 			<table class="results">
 			<thead>
 				<tr>
 					<?php if ($SID): ?>
 					<th>&nbsp;</th>
 					<?php endif; ?>
-					<th><a href="?<?php echo mkurl('SB=c&SO=' . $SO_next) ?>"><?php echo __("Category") ?></a></th>
-					<th><a href="?<?php echo mkurl('SB=n&SO=' . $SO_next) ?>"><?php echo __("Name") ?></a></th>
-					<th><a href="?<?php echo mkurl('SB=v&SO=' . $SO_next) ?>"><?php echo __("Votes") ?></a></th>
+					<th><a href="?<?= mkurl('SB=c&SO=' . $SO_next) ?>"><?= __("Category") ?></a></th>
+					<th><a href="?<?= mkurl('SB=n&SO=' . $SO_next) ?>"><?= __("Name") ?></a></th>
+					<th><a href="?<?= mkurl('SB=v&SO=' . $SO_next) ?>"><?= __("Votes") ?></a></th>
 					<?php if ($SID): ?>
-					<th><a href="?<?php echo mkurl('SB=w&SO=' . $SO_next) ?>"><?php echo __("Voted") ?></a></th>
-					<th><a href="?<?php echo mkurl('SB=o&SO=' . $SO_next) ?>"><?php echo __("Notify") ?></a></th>
+					<th><a href="?<?= mkurl('SB=w&SO=' . $SO_next) ?>"><?= __("Voted") ?></a></th>
+					<th><a href="?<?= mkurl('SB=o&SO=' . $SO_next) ?>"><?= __("Notify") ?></a></th>
 					<?php endif; ?>
-					<th><?php echo __("Description") ?></th>
-					<th><a href="?<?php echo mkurl('SB=m&SO=' . $SO_next) ?>"><?php echo __("Maintainer") ?></a></th>
+					<th><?= __("Description") ?></th>
+					<th><a href="?<?= mkurl('SB=m&SO=' . $SO_next) ?>"><?= __("Maintainer") ?></a></th>
 				</tr>
 			</thead>
 			<tbody>
 
 	<?php while (list($indx, $row) = each($searchresults)): ?>
-		<tr class="<?php echo ($indx % 2 == 0) ? 'odd' : 'even' ?>">
+		<tr class="<?= ($indx % 2 == 0) ? 'odd' : 'even' ?>">
 		<?php if ($SID): ?>
-		<td><input type="checkbox" name="IDs[<?php echo $row["ID"] ?>]" value="1" /></td>
+		<td><input type="checkbox" name="IDs[<?= $row["ID"] ?>]" value="1" /></td>
 		<?php endif; ?>
-		<td><?php echo htmlspecialchars($row["Category"]) ?></td>
-		<td><a href="<?php echo htmlspecialchars(get_pkg_uri($row["Name"]), ENT_QUOTES); ?>"><?php echo htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]) ?></a></td>
-		<td><?php echo $row["NumVotes"] ?></td>
+		<td><?= htmlspecialchars($row["Category"]) ?></td>
+		<td><a href="<?= htmlspecialchars(get_pkg_uri($row["Name"]), ENT_QUOTES); ?>"><?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]) ?></a></td>
+		<td><?= $row["NumVotes"] ?></td>
 		<?php if ($SID): ?>
 		<td>
 		<?php if (isset($row["Voted"])): ?>
-		<?php echo __("Yes") ?>
+		<?= __("Yes") ?>
 		<?php endif; ?>
 		</td>
 		<td>
 		<?php if (isset($row["Notify"])): ?>
-		<?php echo __("Yes") ?>
+		<?= __("Yes") ?>
 		<?php endif; ?>
 		</td>
 		<?php endif; ?>
-		<td><?php echo htmlspecialchars($row['Description'], ENT_QUOTES); ?></td>
+		<td><?= htmlspecialchars($row['Description'], ENT_QUOTES); ?></td>
 		<td>
 		<?php if (isset($row["Maintainer"])): ?>
-		<a href="<?php echo get_uri('/packages/'); ?>?K=<?php echo htmlspecialchars($row['Maintainer'], ENT_QUOTES) ?>&amp;SeB=m"><?php echo htmlspecialchars($row['Maintainer']) ?></a>
+		<a href="<?= get_uri('/packages/'); ?>?K=<?= htmlspecialchars($row['Maintainer'], ENT_QUOTES) ?>&amp;SeB=m"><?= htmlspecialchars($row['Maintainer']) ?></a>
 		<?php else: ?>
-		<span><?php echo __("orphan") ?></span>
+		<span><?= __("orphan") ?></span>
 		<?php endif; ?>
 		</td>
 	</tr>
@@ -83,16 +83,16 @@ if (!$result): ?>
 			</table>
 
 			<div class="pkglist-stats">
-				<p><?php echo __('%d packages found. Page %d of %d.', $total, $current, $pages) ?></p>
+				<p><?= __('%d packages found. Page %d of %d.', $total, $current, $pages) ?></p>
 				<?php if (count($templ_pages) > 1): ?>
 				<p class="pkglist-nav">
 					<?php foreach ($templ_pages as $pagenr => $pagestart): ?>
 						<?php if ($pagestart === false): ?>
-							<span class="page"><?php echo $pagenr ?></span>
+							<span class="page"><?= $pagenr ?></span>
 						<?php elseif ($pagestart + 1 == $first): ?>
-							<span class="page"><?php echo $pagenr ?></span>
+							<span class="page"><?= $pagenr ?></span>
 						<?php else: ?>
-							<a class="page" href="<?php echo get_uri('/packages/'); ?>?<?php echo mkurl('O=' . $pagestart) ?>"><?php echo $pagenr ?></a>
+							<a class="page" href="<?= get_uri('/packages/'); ?>?<?= mkurl('O=' . $pagestart) ?>"><?= $pagenr ?></a>
 						<?php endif; ?>
 					<?php endforeach; ?>
 				</p>
@@ -102,24 +102,24 @@ if (!$result): ?>
 			<?php if ($SID): ?>
 				<p>
 					<select name="action">
-						<option><?php echo __("Actions") ?></option>
-						<option value="do_Flag"><?php echo __("Flag Out-of-date") ?></option>
-						<option value="do_UnFlag"><?php echo __("Unflag Out-of-date") ?></option>
-						<option value="do_Adopt"><?php echo __("Adopt Packages") ?></option>
-						<option value="do_Disown"><?php echo __("Disown Packages") ?></option>
+						<option><?= __("Actions") ?></option>
+						<option value="do_Flag"><?= __("Flag Out-of-date") ?></option>
+						<option value="do_UnFlag"><?= __("Unflag Out-of-date") ?></option>
+						<option value="do_Adopt"><?= __("Adopt Packages") ?></option>
+						<option value="do_Disown"><?= __("Disown Packages") ?></option>
 						<?php if ($atype == "Trusted User" || $atype == "Developer"): ?>
-						<option value="do_Delete"><?php echo __("Delete Packages") ?></option>
+						<option value="do_Delete"><?= __("Delete Packages") ?></option>
 						<?php endif; ?>
-						<option value="do_Notify"><?php echo __("Notify") ?></option>
-						<option value="do_UnNotify"><?php echo __("UnNotify") ?></option>
+						<option value="do_Notify"><?= __("Notify") ?></option>
+						<option value="do_UnNotify"><?= __("UnNotify") ?></option>
 					</select>
 					<?php if ($atype == "Trusted User" || $atype == "Developer"): ?>
-						<label for="merge_Into"><?php echo __("Merge into") ?></label>
+						<label for="merge_Into"><?= __("Merge into") ?></label>
 						<input type="text" id="merge_Into" name="merge_Into" />
-						<input type="checkbox" name="confirm_Delete" value="1" /> <?php echo __("Confirm") ?>
+						<input type="checkbox" name="confirm_Delete" value="1" /> <?= __("Confirm") ?>
 					<?php endif; ?>
-					<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
-					<input type="submit" class="button" style="width: 80px" value="<?php echo __("Go") ?>" />
+					<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
+					<input type="submit" class="button" style="width: 80px" value="<?= __("Go") ?>" />
 				</p>
 			<?php endif; # if ($SID) ?>
 		</form>
diff --git a/web/template/search_accounts_form.php b/web/template/search_accounts_form.php
index 2fd003a..202b1aa 100644
--- a/web/template/search_accounts_form.php
+++ b/web/template/search_accounts_form.php
@@ -1,63 +1,63 @@
 <br />
-<form action="<?php echo get_uri('/accounts/'); ?>" method="post">
+<form action="<?= get_uri('/accounts/'); ?>" method="post">
 	<table>
 
 		<tr>
-			<td align="left"><?php print __("Username"); ?>:</td>
+			<td align="left"><?= __("Username"); ?>:</td>
 			<td align="left">
 				<input type="text" size="30" maxlength="64" name="U" />
 			</td>
 		</tr>
 
 		<tr>
-			<td align="left"><?php print __("Account Type"); ?>:</td>
+			<td align="left"><?= __("Account Type"); ?>:</td>
 			<td align="left">
 				<select name="T">
-					<option value=""><?php print __("Any type"); ?></option>
-					<option value="u"><?php print __("Normal user"); ?></option>
-					<option value="t"><?php print __("Trusted user"); ?></option>
-					<option value="d"><?php print __("Developer"); ?></option>
+					<option value=""><?= __("Any type"); ?></option>
+					<option value="u"><?= __("Normal user"); ?></option>
+					<option value="t"><?= __("Trusted user"); ?></option>
+					<option value="d"><?= __("Developer"); ?></option>
 				</select>
 			</td>
 		</tr>
 
 		<tr>
-			<td align="left"><?php print __("Account Suspended"); ?>:</td>
+			<td align="left"><?= __("Account Suspended"); ?>:</td>
 			<td align="left">
 				<input type="checkbox" name="S" />
 			</td>
 		</tr>
 
 		<tr>
-			<td align="left"><?php print __("Email Address"); ?>:</td>
+			<td align="left"><?= __("Email Address"); ?>:</td>
 			<td align="left">
 				<input type="text" size="30" maxlength="64" name="E" />
 			</td>
 		</tr>
 
 		<tr>
-			<td align="left"><?php print __("Real Name"); ?>:</td>
+			<td align="left"><?= __("Real Name"); ?>:</td>
 			<td align="left">
 				<input type="text" size="30" maxlength="32" name="R" />
 			</td>
 		</tr>
 
 		<tr>
-			<td align="left"><?php print __("IRC Nick"); ?>:</td>
+			<td align="left"><?= __("IRC Nick"); ?>:</td>
 			<td align="left">
 				<input type="text" size="30" maxlength="32" name="I" />
 			</td>
 		</tr>
 
 		<tr>
-			<td align="left"><?php print __("Sort by"); ?>:</td>
+			<td align="left"><?= __("Sort by"); ?>:</td>
 			<td align="left">
 				<select name="SB">
-					<option value="u"><?php print __("Username"); ?></option>
-					<option value="t"><?php print __("Account Type"); ?></option>
-					<option value="r"><?php print __("Real Name"); ?></option>
-					<option value="i"><?php print __("IRC Nick"); ?></option>
-					<option value="v"><?php print __("Last vote"); ?></option>
+					<option value="u"><?= __("Username"); ?></option>
+					<option value="t"><?= __("Account Type"); ?></option>
+					<option value="r"><?= __("Real Name"); ?></option>
+					<option value="i"><?= __("IRC Nick"); ?></option>
+					<option value="v"><?= __("Last vote"); ?></option>
 				</select>
 			</td>
 		</tr>
@@ -67,8 +67,8 @@
 			<td align="left">
 				<br />
 				<input type="hidden" name="Action" value="SearchAccounts" />
-				<input type="submit" class="button" value="<?php print __("Search"); ?>" />
-				<input type="reset" class="button" value="<?php print __("Reset"); ?>" />
+				<input type="submit" class="button" value="<?= __("Search"); ?>" />
+				<input type="reset" class="button" value="<?= __("Reset"); ?>" />
 			</td>
 		</tr>
 
diff --git a/web/template/stats/general_stats_table.php b/web/template/stats/general_stats_table.php
index e2b12c7..6a92c3b 100644
--- a/web/template/stats/general_stats_table.php
+++ b/web/template/stats/general_stats_table.php
@@ -1,36 +1,36 @@
-<h3><?php echo __("Statistics") ?></h3>
+<h3><?= __("Statistics") ?></h3>
 
 <table>
 	<tr>
-		<td><?php print __("Packages"); ?></td>
-		<td><?php print $unsupported_count; ?></td>
+		<td><?= __("Packages"); ?></td>
+		<td><?= $unsupported_count; ?></td>
 	</tr>
 	<tr>
-		<td><?php print __("Orphan Packages"); ?></td>
-		<td><?php print $orphan_count; ?></td>
+		<td><?= __("Orphan Packages"); ?></td>
+		<td><?= $orphan_count; ?></td>
 	</tr>
 	<tr>
-		<td><?php print __("Packages added in the past 7 days"); ?></td>
-		<td><?php print $add_count; ?></td>
+		<td><?= __("Packages added in the past 7 days"); ?></td>
+		<td><?= $add_count; ?></td>
 	</tr>
 	<tr>
-		<td><?php print __("Packages updated in the past 7 days"); ?></td>
-		<td><?php print $update_count; ?></td>
+		<td><?= __("Packages updated in the past 7 days"); ?></td>
+		<td><?= $update_count; ?></td>
 	</tr>
 	<tr>
-		<td><?php print __("Packages updated in the past year"); ?></td>
-		<td><?php print $update_year_count; ?></td>
+		<td><?= __("Packages updated in the past year"); ?></td>
+		<td><?= $update_year_count; ?></td>
 	</tr>
 	<tr>
-		<td><?php print __("Packages never updated"); ?></td>
-		<td><?php print $never_update_count; ?></td>
+		<td><?= __("Packages never updated"); ?></td>
+		<td><?= $never_update_count; ?></td>
 	</tr>
 	<tr>
-		<td><?php print __("Registered Users"); ?></td>
-		<td><?php print $user_count; ?></td>
+		<td><?= __("Registered Users"); ?></td>
+		<td><?= $user_count; ?></td>
 	</tr>
 	<tr>
-		<td><?php print __("Trusted Users"); ?></td>
-		<td><?php print $tu_count; ?></td>
+		<td><?= __("Trusted Users"); ?></td>
+		<td><?= $tu_count; ?></td>
 	</tr>
 </table>
diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php
index 2220d6a..11f0a00 100644
--- a/web/template/stats/updates_table.php
+++ b/web/template/stats/updates_table.php
@@ -1,13 +1,13 @@
-<h3><?php echo __("Recent Updates") ?></h3>
+<h3><?= __("Recent Updates") ?></h3>
 
-<a href="<?php echo get_uri('/rss/') ?>" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="/images/feed-icon-14x14.png" alt="RSS Feed" /></a>
+<a href="<?= get_uri('/rss/') ?>" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="/images/feed-icon-14x14.png" alt="RSS Feed" /></a>
 
 <table>
 	<tbody>
 		<?php foreach ($newest_packages->getIterator() as $row): ?>
 		<tr>
 			<td class="pkg-name">
-				<a href="<?php echo get_pkg_uri($row["Name"]); ?>"><?php print htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?></a>
+				<a href="<?= get_pkg_uri($row["Name"]); ?>"><?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?></a>
 			</td>
 			<td class="pkg-new">
 				<?php if ($row["ModifiedTS"] === $row["SubmittedTS"]): ?>
@@ -15,7 +15,7 @@
 				<?php endif; ?>
 			</td>
 			<td>
-				<span><?php print gmdate("Y-m-d H:i", intval($row["ModifiedTS"])); ?></span>
+				<span><?= gmdate("Y-m-d H:i", intval($row["ModifiedTS"])); ?></span>
 			</td>
 		</tr>
 		<?php endforeach; ?>
diff --git a/web/template/stats/user_table.php b/web/template/stats/user_table.php
index 3620798..ba6751f 100644
--- a/web/template/stats/user_table.php
+++ b/web/template/stats/user_table.php
@@ -2,20 +2,20 @@
 $username = username_from_sid($_COOKIE["AURSID"]);
 ?>
 
-<h3><?php echo __("My Statistics"); ?></h3>
+<h3><?= __("My Statistics"); ?></h3>
 
 <table>
 	<tr>
 		<td>
-			<a href="<?php echo get_uri('/packages/'); ?>?SeB=m&amp;L=2&amp;K=<?php echo $username; ?>">
-<?php print __("Packages in unsupported"); ?></a>
+			<a href="<?= get_uri('/packages/'); ?>?SeB=m&amp;L=2&amp;K=<?= $username; ?>">
+<?= __("Packages in unsupported"); ?></a>
 		</td>
-		<td><?php print $maintainer_unsupported_count; ?></td>
+		<td><?= $maintainer_unsupported_count; ?></td>
 	</tr>
 	<tr>
 		<td>
-			<a href="<?php echo get_uri('/packages/'); ?>?SeB=m&amp;outdated=on&amp;K=<?php echo $username; ?>"><?php print __("Out of Date"); ?></a>
+			<a href="<?= get_uri('/packages/'); ?>?SeB=m&amp;outdated=on&amp;K=<?= $username; ?>"><?= __("Out of Date"); ?></a>
 		</td>
-		<td><?php echo $flagged_outdated ?></td>
+		<td><?= $flagged_outdated ?></td>
 	</tr>
 </table>
diff --git a/web/template/tu_details.php b/web/template/tu_details.php
index 3ec05ad..035cc8d 100644
--- a/web/template/tu_details.php
+++ b/web/template/tu_details.php
@@ -1,50 +1,50 @@
 <div class="box">
-	<h2><?php print __("Proposal Details") ?></h2>
+	<h2><?= __("Proposal Details") ?></h2>
 
 	<?php if ($isrunning == 1): ?>
 	<p style="font-weight: bold; color: red">
-		<?php print __("This vote is still running.") ?>
+		<?= __("This vote is still running.") ?>
 	</p>
 	<?php endif; ?>
 
 	<p>
-		<?php echo __("User") ?>:
+		<?= __("User") ?>:
 		<b>
 			<?php if (!empty($row['User'])): ?>
-			<a href="<?php echo get_uri('/packages/'); ?>?K=<?php print $row['User'] ?>&amp;SeB=m"><?php print $row['User'] ?></a>
+			<a href="<?= get_uri('/packages/'); ?>?K=<?= $row['User'] ?>&amp;SeB=m"><?= $row['User'] ?></a>
 			<?php else: ?>
 			N/A
 			<?php endif; ?>
 		</b>
 		<br />
-		<?php print __("Submitted: %s by %s", "<b>" . gmdate("Y-m-d H:i", $row['Submitted']) . "</b>", "<b>" . username_from_id($row['SubmitterID']) . "</b>") ?>
+		<?= __("Submitted: %s by %s", "<b>" . gmdate("Y-m-d H:i", $row['Submitted']) . "</b>", "<b>" . username_from_id($row['SubmitterID']) . "</b>") ?>
 		<br />
-		<?php print __("End") ?>:
-		<b><?php print gmdate("Y-m-d H:i", $row['End']) ?></b>
+		<?= __("End") ?>:
+		<b><?= gmdate("Y-m-d H:i", $row['End']) ?></b>
 	</p>
 
 	<p>
-		<?php print str_replace("\n", "<br />\n", htmlspecialchars($row['Agenda'])) ?>
+		<?= str_replace("\n", "<br />\n", htmlspecialchars($row['Agenda'])) ?>
 	</p>
 
 	<table>
 		<tr>
-			<th><?php print __("Yes") ?></th>
-			<th><?php print __("No") ?></th>
-			<th><?php print __("Abstain") ?></th>
-			<th><?php print __("Total") ?></th>
-			<th><?php print __('Voted') ?></th>
+			<th><?= __("Yes") ?></th>
+			<th><?= __("No") ?></th>
+			<th><?= __("Abstain") ?></th>
+			<th><?= __("Total") ?></th>
+			<th><?= __('Voted') ?></th>
 		</tr>
 		<tr>
-			<td><?php print $row['Yes'] ?></td>
-			<td><?php print $row['No'] ?></td>
-			<td><?php print $row['Abstain'] ?></td>
-			<td><?php print ($row['Yes'] + $row['No'] + $row['Abstain']) ?></td>
+			<td><?= $row['Yes'] ?></td>
+			<td><?= $row['No'] ?></td>
+			<td><?= $row['Abstain'] ?></td>
+			<td><?= ($row['Yes'] + $row['No'] + $row['Abstain']) ?></td>
 			<td>
 				<?php if ($hasvoted == 0): ?>
-				<span style="color: red; font-weight: bold"><?php print __("No") ?></span>
+				<span style="color: red; font-weight: bold"><?= __("No") ?></span>
 				<?php else: ?>
-				<span style="color: green; font-weight: bold"><?php print __("Yes") ?></span>
+				<span style="color: green; font-weight: bold"><?= __("Yes") ?></span>
 				<?php endif; ?>
 			</td>
 		</tr>
@@ -53,21 +53,21 @@
 
 <?php if (!$isrunning): ?>
 <div class="box">
-	<h2><?php echo __("Voters"); ?></h2>
-	<?php echo $whovoted; ?>
+	<h2><?= __("Voters"); ?></h2>
+	<?= $whovoted; ?>
 </div>
 <?php endif; ?>
 
 <div class="box">
 
 <?php if ($canvote == 1): ?>
-	<form action="<?php echo get_uri('/tu/'); ?>?id=<?php print $row['ID'] ?>" method="post">
+	<form action="<?= get_uri('/tu/'); ?>?id=<?= $row['ID'] ?>" method="post">
 		<fieldset>
-			<input type="submit" class="button" name="voteYes" value="<?php print __("Yes") ?>" />
-			<input type="submit" class="button" name="voteNo" value="<?php print __("No") ?>" />
-			<input type="submit" class="button" name="voteAbstain" value="<?php print __("Abstain") ?>" />
+			<input type="submit" class="button" name="voteYes" value="<?= __("Yes") ?>" />
+			<input type="submit" class="button" name="voteNo" value="<?= __("No") ?>" />
+			<input type="submit" class="button" name="voteAbstain" value="<?= __("Abstain") ?>" />
 			<input type="hidden" name="doVote" value="1" />
-			<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
+			<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
 		</fieldset>
 	</form>
 <?php else:
diff --git a/web/template/tu_list.php b/web/template/tu_list.php
index eed7f74..566cb17 100644
--- a/web/template/tu_list.php
+++ b/web/template/tu_list.php
@@ -1,21 +1,21 @@
 <div class="box">
-	<h2><?php print $type ?></h2>
+	<h2><?= $type ?></h2>
 	<table class="results">
 		<thead>
 			<tr>
-				<th><?php print __("Proposal") ?></th>
-				<th><a href="?off=<?php print $off ?>&amp;by=<?php print $by_next ?>"><?php print __("Start") ?></a></th>
-				<th><?php print __("End") ?></th>
-				<th><?php print __("User") ?></th>
-				<th><?php print __("Yes") ?></th>
-				<th><?php print __("No") ?></th>
-				<th><?php print __('Voted') ?></th>
+				<th><?= __("Proposal") ?></th>
+				<th><a href="?off=<?= $off ?>&amp;by=<?= $by_next ?>"><?= __("Start") ?></a></th>
+				<th><?= __("End") ?></th>
+				<th><?= __("User") ?></th>
+				<th><?= __("Yes") ?></th>
+				<th><?= __("No") ?></th>
+				<th><?= __('Voted') ?></th>
 			</tr>
 		</thead>
 
 		<tbody>
 			<?php if (empty($result)): ?>
-			<tr><td align="center" colspan="0"><?php print __("No results found.") ?></td></tr>
+			<tr><td align="center" colspan="0"><?= __("No results found.") ?></td></tr>
 			<?php else: while (list($indx, $row) = each($result)):
 				if ($indx % 2):
 					$c = "even";
@@ -23,27 +23,27 @@
 					$c = "odd";
 				endif;
 			?>
-			<tr class="<?php print $c ?>">
+			<tr class="<?= $c ?>">
 				<td><?php $row["Agenda"] = htmlspecialchars(substr($row["Agenda"], 0, $prev_Len)); ?>
-					<a href="<?php echo get_uri('/tu/'); ?>?id=<?php print $row['ID'] ?>"><?php print $row["Agenda"] ?></a></span></span>
+					<a href="<?= get_uri('/tu/'); ?>?id=<?= $row['ID'] ?>"><?= $row["Agenda"] ?></a></span></span>
 				</td>
-				<td><?php print gmdate("Y-m-d", $row["Submitted"]) ?></td>
-				<td><?php print gmdate("Y-m-d", $row["End"]) ?></td>
+				<td><?= gmdate("Y-m-d", $row["Submitted"]) ?></td>
+				<td><?= gmdate("Y-m-d", $row["End"]) ?></td>
 				<td>
 				<?php if (!empty($row['User'])): ?>
-					<a href="<?php echo get_uri('/packages/'); ?>?K=<?php echo $row['User'] ?>&amp;SeB=m"><?php echo $row['User'] ?></a>
+					<a href="<?= get_uri('/packages/'); ?>?K=<?= $row['User'] ?>&amp;SeB=m"><?= $row['User'] ?></a>
 				<?php else:
 					print "N/A";
 				endif;
 				?>
 				</td>
-				<td><?php print $row['Yes'] ?></td>
-				<td><?php print $row['No'] ?></td>
+				<td><?= $row['Yes'] ?></td>
+				<td><?= $row['No'] ?></td>
 				<td>
 					<?php if (tu_voted($row['ID'], uid_from_sid($_COOKIE["AURSID"]))): ?>
-					<span style="color: green; font-weight: bold"><?php print __("Yes") ?></span>
+					<span style="color: green; font-weight: bold"><?= __("Yes") ?></span>
 					<?php else: ?>
-					<span style="color: red; font-weight: bold"><?php print __("No") ?></span>
+					<span style="color: red; font-weight: bold"><?= __("No") ?></span>
 					<?php endif; ?>
 				</td>
 			</tr>