external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix broken XHTML.

Browse source 
Fix a lot of invalid XHTML in the templates and actions. There might
still be some legacy code left, but this should cover most of it.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-03-11 18:54:44 +01:00
parent c34bebf428
commit 7f9e498e48
14 changed files with 170 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

25
web/template/actions_form.php
View file

@ -1,7 +1,8 @@
<div class="pgbox">
<form action="packages.php?ID=<?php echo $row['ID'] ?>" method="post">
<input type='hidden' name='IDs[<?php echo $row['ID'] ?>]' value='1'>
<input type='hidden' name='ID' value="<?php echo $row['ID'] ?>">
<fieldset>
<input type='hidden' name='IDs[<?php echo $row['ID'] ?>]' value='1' />
<input type='hidden' name='ID' value="<?php echo $row['ID'] ?>" />
<?php
# Voting Button
#
@ -9,10 +10,10 @@
$q.= " AND PackageID = ".$row["ID"];
if (!mysql_num_rows(db_query($q, $dbh))) {
echo " <input type='submit' class='button' name='do_Vote'";
echo " value='".__("Vote")."'> ";
echo " value='".__("Vote")."' /> ";
} else {
echo "<input type='submit' class='button' name='do_UnVote'";
echo " value='".__("UnVote")."'> ";
echo " value='".__("UnVote")."' /> ";
}
# Comment Notify Button
@ -21,36 +22,36 @@
$q.= " AND PkgID = ".$row["ID"];
if (!mysql_num_rows(db_query($q, $dbh))) {
echo "<input type='submit' class='button' name='do_Notify'";
echo " value='".__("Notify")."' title='".__("New Comment Notification")."'> ";
echo " value='".__("Notify")."' title='".__("New Comment Notification")."' /> ";
} else {
echo "<input type='submit' class='button' name='do_UnNotify'";
echo " value='".__("UnNotify")."' title='".__("No New Comment Notification")."'> ";
echo " value='".__("UnNotify")."' title='".__("No New Comment Notification")."' /> ";
}
if ($row["OutOfDateTS"] === NULL) {
echo "<input type='submit' class='button' name='do_Flag'";
echo " value='".__("Flag Out-of-date")."'>\n";
echo " value='".__("Flag Out-of-date")."' />\n";
} else {
echo "<input type='submit' class='button' name='do_UnFlag'";
echo " value='".__("UnFlag Out-of-date")."'>\n";
echo " value='".__("UnFlag Out-of-date")."' />\n";
}
if ($row["MaintainerUID"] === NULL) {
echo "<input type='submit' class='button' name='do_Adopt'";
echo " value='".__("Adopt Packages")."'>\n";
echo " value='".__("Adopt Packages")."' />\n";
} else if ($uid == $row["MaintainerUID"] ||
$atype == "Trusted User" || $atype == "Developer") {
echo "<input type='submit' class='button' name='do_Disown'";
echo " value='".__("Disown Packages")."'>\n";
echo " value='".__("Disown Packages")."' />\n";
}
if ($atype == "Trusted User" || $atype == "Developer") {
echo "<input type='submit' class='button' name='do_Delete'";
echo " value='".__("Delete Packages")."'>\n";
echo " value='".__("Delete Packages")."' />\n";
echo "<input type='checkbox' name='confirm_Delete' value='1' /> ";
echo __("Confirm")."\n";
}
?>
</fieldset>
</form>
</div>

4
web/template/header.php
View file

@ -37,8 +37,8 @@
<li><a href="http://bugs.archlinux.org/index.php?tasks=all&amp;project=2"><?php print __("Bugs"); ?></a></li>
<li><a href="http://archlinux.org/mailman/listinfo/aur-general"><?php print __("Discussion"); ?></a></li>
<?php if (isset($_COOKIE['AURSID'])): ?>
<?php if (check_user_privileges()): ?><li><a href="tu.php"><?php print __("Trusted User"); ?></a><?php endif; ?>
<li><a href="packages.php?SeB=m&K=<?php print username_from_sid($_COOKIE["AURSID"]); ?>"><?php print __("My Packages"); ?></a></li>
<?php if (check_user_privileges()): ?><li><a href="tu.php"><?php print __("Trusted User"); ?></a></li><?php endif; ?>
<li><a href="packages.php?SeB=m&amp;K=<?php print username_from_sid($_COOKIE["AURSID"]); ?>"><?php print __("My Packages"); ?></a></li>
<li><a href="pkgsubmit.php"><?php print __("Submit"); ?></a></li>
<?php endif; ?>
</ul>

8
web/template/pkg_comment_form.php
View file

@ -57,11 +57,11 @@ if (isset($_REQUEST['comment'])) {
echo '<b>' . __('Comment has been added.') . '</b>';
}
?>
<input type='hidden' name='ID' value="<?php echo $_REQUEST['ID'] ?>">
<input type='hidden' name='ID' value="<?php echo $_REQUEST['ID'] ?>" />
<?php echo __('Enter your comment below.') ?><br />
<textarea name='comment' rows='10' style="width: 100%"></textarea><br />
<input type='submit' value="<?php echo __("Submit") ?>">
<input type='reset' value="<?php echo __("Reset") ?>">
<textarea name='comment' cols='80' rows='10' style="width: 100%"></textarea><br />
<input type='submit' value="<?php echo __("Submit") ?>" />
<input type='reset' value="<?php echo __("Reset") ?>" />
</div>
</form>
</div>

14
web/template/pkg_comments.php
View file

@ -8,15 +8,17 @@ while (list($indx, $carr) = each($comments)) { ?>
$carr['UserName'] = "<a href=\"account.php?Action=AccountInfo&amp;ID={$carr['UsersID']}\">{$carr['UserName']}</a>";
}
$commentHeader =__('Comment by: %s on %s', $carr['UserName'], gmdate('r', $carr['CommentTS']));
$commentHeader = '<p style="display:inline;">' . __('Comment by: %s on %s', $carr['UserName'], gmdate('r', $carr['CommentTS'])) . '</p>';
if (canDeleteCommentArray($carr, $atype, $uid)) {
$durl = '<form method="POST" action="packages.php?ID='.$row['ID'].'">';
$durl.= '<input type="hidden" name="action" value="do_DeleteComment">';
$durl.= '<input type="hidden" name="comment_id" value="'.$carr['ID'].'">';
$durl.= '<input type="image" src="images/x.png" border="0" ';
$durl = '<form method="post" action="packages.php?ID='.$row['ID'].'">';
$durl.= '<fieldset style="display:inline;">';
$durl.= '<input type="hidden" name="action" value="do_DeleteComment" />';
$durl.= '<input type="hidden" name="comment_id" value="'.$carr['ID'].'" />';
$durl.= '<input type="image" src="images/x.png" ';
$durl.= ' alt="'.__("Delete comment").'" name="submit" value="1" ';
$durl.= ' width="19" height="18">&nbsp;';
$durl.= ' />&nbsp;';
$durl.= '</fieldset>';
$commentHeader = $durl.$commentHeader."</form>";
}

17
web/template/pkg_details.php
View file

@ -5,23 +5,25 @@ if ($uid == $row["MaintainerUID"] or
($atype == "Developer" or $atype == "Trusted User")) {
$catarr = pkgCategories();
$edit_cat = "<form method='POST' action='packages.php?ID=".$pkgid."'>\n";
$edit_cat.= "<input type='hidden' name='action' value='do_ChangeCategory'>";
$edit_cat.= "Category: ";
$edit_cat = "<form method='post' action='packages.php?ID=".$pkgid."'>\n";
$edit_cat.= "<p>";
$edit_cat.= "<input type='hidden' name='action' value='do_ChangeCategory' />";
$edit_cat.= "<span class='f3'>Category:</span> ";
$edit_cat.= "<select name='category_id'>\n";
foreach ($catarr as $cid => $catname) {
$edit_cat.= "<option value='$cid'";
if ($cid == $row["CategoryID"]) {
$edit_cat.="selected";
$edit_cat.=" selected='selected'";
}
$edit_cat.=">".$catname."</option>";
}
$edit_cat.= "</select>&nbsp;<input type='submit' value='Change category'>";
$edit_cat.= "</select>&nbsp;<input type='submit' value='Change category' />";
$edit_cat.= "</p>";
$edit_cat.= "</form>";
}
else {
$edit_cat = "Category: ".$row['Category'];
$edit_cat = "<span class='f3'>Category: " . $row['Category'] . "</span>";
}
if ($row["SubmitterUID"]) {
@ -69,8 +71,9 @@ $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("r", intval($row[
<span class='f3'><?php echo htmlspecialchars($row['Description'], ENT_QUOTES); ?></span>
</p>
<?php echo $edit_cat ?>
<p>
<span class='f3'><?php echo $edit_cat ?></span><br />
<span class='f3'><?php echo __('Submitter') .': ' . $submitter ?></span><br />
<span class='f3'><?php echo __('Maintainer') .': ' . $maintainer ?></span><br />
<span class='f3'><?php echo $votes ?></span>

10
web/template/pkg_search_results.php
View file

@ -54,7 +54,7 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) {
?>
<tr>
<?php if ($SID): ?>
<td class='<?php print $c ?>'><input type='checkbox' name='IDs[<?php print $row["ID"] ?>]' value='1'></td>
<td class='<?php print $c ?>'><input type='checkbox' name='IDs[<?php print $row["ID"] ?>]' value='1' /></td>
<?php endif; ?>
<td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row["Category"] ?></span></span></td>
<td class='<?php print $c ?>'><span class='f4'><a href='packages.php?ID=<?php print $row["ID"] ?>'><span class='black'><?php print $row["Name"] ?> <?php print $row["Version"] ?></span></a></span></td>
@ -62,15 +62,15 @@ for ($i = 0; $row = mysql_fetch_assoc($result); $i++) {
<?php if ($SID): ?>
<td class='<?php print $c ?>'><span class='f5'><span class='blue'>
<?php if (isset($row["Voted"])): ?>
<?php print __("Yes") ?></span></td>
<?php print __("Yes") ?></span></span></td>
<?php else: ?>
</span></td>
</span></span></td>
<?php endif; ?>
<td class='<?php print $c ?>'><span class='f5'><span class='blue'>
<?php if (isset($row["Notify"])): ?>
<?php print __("Yes") ?></span></td>
<?php print __("Yes") ?></span></span></td>
<?php else: ?>
</span></td>
</span></span></td>
<?php endif; ?>
<?php endif; ?>
<td class='<?php print $c ?>'><span class='f4'><span class='blue'>

130
web/template/search_accounts_form.php
View file

@ -1,78 +1,76 @@
<br />
<form action='account.php' method='post'>
<input type='hidden' name='Action' value='SearchAccounts' />
<center>
<table border='0' cellpadding='0' cellspacing='0' width='80%'>
<table border='0' cellpadding='0' cellspacing='0' width='80%' style="margin:0 auto;">
<tr>
<td align='left'><?php print __("Username"); ?>:</td>
<td align='left'>
<input type='text' size='30' maxlength='64' name='U' />
</td>
</tr>
<tr>
<td align='left'><?php print __("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'>
<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>
</select>
</td>
</tr>
<tr>
<td align='left'><?php print __("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>
</select>
</td>
</tr>
<tr>
<td align='left'><?php print __("Account Suspended"); ?>:</td>
<td align='left'>
<input type='checkbox' name='S' />
</td>
</tr>
<tr>
<td align='left'><?php print __("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'>
<input type='text' size='30' maxlength='64'name='E' />
</td>
</tr>
<tr>
<td align='left'><?php print __("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'>
<input type='text' size='30' maxlength='32' name='R' />
</td>
</tr>
<tr>
<td align='left'><?php print __("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'>
<input type='text' size='30' maxlength='32' name='I' />
</td>
</tr>
<tr>
<td align='left'><?php print __("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'>
<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>
</select>
</td>
</tr>
<tr>
<td align='left'><?php print __("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>
</select>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td align='left'>
<br />
<input type='submit' class='button' value="<?php print __("Search"); ?>" />
<input type='reset' class='button' value="<?php print __("Reset"); ?>" />
</td>
</tr>
<tr>
<td>&nbsp;</td>
<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"); ?>" />
</td>
</tr>
</table>
</center>
</table>
</form>

10
web/template/tu_details.php
View file

@ -65,10 +65,12 @@ if (!$isrunning) { ?>
<div class='pgboxbody'>
<?php if ($canvote == 1) { ?>
<form action='tu.php?id=<?php print $row['ID'] ?>' method='post'>
<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='hidden' name='doVote' value='1'>
<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='hidden' name='doVote' value='1' />
</fieldset>
</form>
<?php } else { ?>
<?php print $errorvote ?>

4
web/template/tu_list.php
View file

@ -1,5 +1,5 @@
<div class="pgbox">
<div class="pgboxtitle" align="right">
<div class="pgboxtitle" style="text-align:right;">
<span class='f3'><?php print $type ?></span>
</div>
<table width='100%' cellspacing='0' cellpadding='2'>
@ -29,7 +29,7 @@
<td class='<?php print $c ?>'><span class='f6'><span class='blue'>
<?php
if (!empty($row['User'])) {
print "<a href='packages.php?K=" . $row['User'] . "&SeB=m'>" . $row['User'] . "</a>";
print "<a href='packages.php?K=" . $row['User'] . "&amp;SeB=m'>" . $row['User'] . "</a>";
} else {
print "N/A";
}