From 36ee5561035af335bc3c900ded7aa89066421226 Mon Sep 17 00:00:00 2001
From: Loui Chang <louipc.ist@gmail.com>
Date: Tue, 24 Jun 2008 02:53:16 -0400
Subject: Move code out of index.php

Move database queries to functions and html to templates.

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
---
 web/template/stats/general_stats_table.php | 38 ++++++++++++++++++++++++++++
 web/template/stats/updates_table.php       | 40 ++++++++++++++++++++++++++++++
 web/template/stats/user_table.php          | 38 ++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 web/template/stats/general_stats_table.php
 create mode 100644 web/template/stats/updates_table.php
 create mode 100644 web/template/stats/user_table.php

(limited to 'web/template')

diff --git a/web/template/stats/general_stats_table.php b/web/template/stats/general_stats_table.php
new file mode 100644
index 00000000..254b6b64
--- /dev/null
+++ b/web/template/stats/general_stats_table.php
@@ -0,0 +1,38 @@
+<table class='boxSoft'>
+<tr>
+<th colspan='2' class='boxSoftTitle'>
+<span class='f3'><?php print __("Statistics") ?></span>
+</th>
+</tr>
+<tr>
+<td class='boxSoft'>
+<span class='f4'><?php print __("Packages in unsupported"); ?></span>
+</td>
+<td class='boxSoft'><span class='f4'><?php print $unsupported_count; ?></span></td>
+</tr>
+<tr>
+<td class='boxSoft'>
+<span class='f4'><?php print __("Packages in [community]"); ?></span>
+</td>
+<td class='boxSoft'><span class='f4'><?php print $community_count; ?></span></td>
+</tr>
+<tr>
+<td class='boxSoft'>
+<span class='f4'><?php print __("Packages added or updated in the past 7 days"); ?></span>
+</td>
+<td class='boxSoft'><span class='f4'><?php print $update_count; ?></span></td>
+</tr>
+<tr>
+<td class='boxSoft'>
+<span class='blue'><span class='f4'><?php print __("Registered Users"); ?></span></span>
+</td>
+<td class='boxSoft'><span class='f4'><?php print $user_count; ?></span></td>
+</tr>
+<tr>
+<td class='boxSoft'>
+<span class='f4'><?php print __("Trusted Users"); ?></span>
+</td>
+<td class='boxSoft'><span class='f4'><?php print $tu_count; ?></span></td>
+</tr>
+</table>
+
diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php
new file mode 100644
index 00000000..e1eb888e
--- /dev/null
+++ b/web/template/stats/updates_table.php
@@ -0,0 +1,40 @@
+<table class="boxSoft">
+<tr>
+<th colspan="2" class="boxSoftTitle" style="text-align: right">
+<a href="rss2.php"><img src="images/rss.gif"></a>
+<span class="f3"><?php print __("Recent Updates") ?><span class="f5"></span></span>
+</th>
+</tr>
+
+<?php while ($row = mysql_fetch_assoc($newest_packages)): ?>
+
+<tr>
+<td class="boxSoft">
+<span class="f4"><span class="blue">
+<a href="packages.php?ID=<?php print intval($row["ID"]); ?>">
+<?php print $row["Name"] . ' ' . $row["Version"]; ?>
+</a></span>
+</td>
+<td class="boxSoft">
+
+<?php
+$mod_int = intval($row["ModifiedTS"]);
+$sub_int = intval($row["SubmittedTS"]);
+
+if ($mod_int != 0):
+  $modstring = gmdate("r", $mod_int);
+elseif ($sub_int != 0):
+  $modstring = '<img src="images/new.gif" /> ' . gmdate("r", $sub_int);
+else:
+  $modstring = '(unknown)';
+endif;
+?>
+
+<span class="f4"><?php print $modstring; ?></span>
+</td>
+</tr>
+
+<?php endwhile; ?>
+
+</table>
+
diff --git a/web/template/stats/user_table.php b/web/template/stats/user_table.php
new file mode 100644
index 00000000..b8446624
--- /dev/null
+++ b/web/template/stats/user_table.php
@@ -0,0 +1,38 @@
+<table class='boxSoft'>
+<tr>
+<th colspan='2' class='boxSoftTitle'>
+<span class='f3'><?php print __("My Statistics"); ?></span>
+</th>
+</tr>
+<tr>
+<td class='boxSoft'>
+<span class='f4'><?php print __("Packages in unsupported"); ?></span>
+</td>
+<td class='boxSoft'>
+<span class='f4'><?php print $maintainer_unsupported_count; ?></span>
+</td>
+</tr>
+
+<?php if ($atype == 'Trusted User'): ?>
+
+<tr>
+<td class='boxSoft'>
+<span class='f4'><?php print __("Packages in [community]"); ?></span>
+</td>
+<td class='boxSoft'>
+<span class='f4'><?php print $maintainer_community_count; ?></span>
+</td>
+</tr>
+
+<?php endif; ?>
+
+<tr>
+<td class='boxSoft'>
+<span class='f4'><?php print __("Out-of-date"); ?></span>
+</td>
+<td class='boxSoft'>
+<span class='f4'><?php print $flagged_outdated ?></span>
+</td>
+</tr>
+</table>
+
-- 
cgit v1.2.3-24-g4f1b


From 2feee92a75d4fe7042be52d1eef4e6e466af4967 Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <bash.lnx@gmail.com>
Date: Tue, 8 Jul 2008 18:56:42 +0200
Subject: Remember user between sessions.

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
---
 web/template/login_form.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web/template')

diff --git a/web/template/login_form.php b/web/template/login_form.php
index b2ed066f..4bfc579a 100644
--- a/web/template/login_form.php
+++ b/web/template/login_form.php
@@ -16,6 +16,7 @@
       } ?>" />
     <label><?php print __("Password:"); ?></label>
     <input type="password" name="passwd" size="30" maxlength="<?php print PASSWD_MAX_LEN; ?>" />
+    <input type="checkbox" name="remember_me" /><?php print __("Remember me"); ?>
     <input type="submit" class="button" value="<?php  print __("Login"); ?>" />
   </form>
   <?php } ?>
-- 
cgit v1.2.3-24-g4f1b


From b69e2cce56bee61ea445417e29e55d27a15637d5 Mon Sep 17 00:00:00 2001
From: Loui Chang <louipc.ist@gmail.com>
Date: Tue, 19 Aug 2008 18:08:12 -0400
Subject: Move top page template-example to web/template.

Make note in web/README.txt

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
---
 web/template/template.phps | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 web/template/template.phps

(limited to 'web/template')

diff --git a/web/template/template.phps b/web/template/template.phps
new file mode 100644
index 00000000..7a866861
--- /dev/null
+++ b/web/template/template.phps
@@ -0,0 +1,21 @@
+<?php
+
+# This template shows how a front page script is commonly coded.
+
+set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
+
+include("aur.inc");         # access AUR common functions
+include("template_po.inc"); # use some form of this for i18n support
+set_lang();                 # this sets up the visitor's language
+check_sid();                # see if they're still logged in
+html_header();              # print out the HTML header
+
+
+# Any text you print out to the visitor, use the __() function
+# for i18n support. See web/lib/translator.inc for more info.
+#
+print __("Hi, this is worth reading!")."<br />\n";
+
+
+html_footer(AUR_VERSION);
+
-- 
cgit v1.2.3-24-g4f1b


From c7bfd9528473da0886afd328f0fa68e26c97ca3d Mon Sep 17 00:00:00 2001
From: Loui Chang <louipc.ist@gmail.com>
Date: Thu, 18 Sep 2008 22:16:40 -0400
Subject: Take formatting out of version number in web/lib/version.inc

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
Signed-off-by: Callan Barrett <wizzomafizzo@gmail.com>
---
 web/template/footer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/template')

diff --git a/web/template/footer.php b/web/template/footer.php
index 9d85c7da..fe8f89cd 100644
--- a/web/template/footer.php
+++ b/web/template/footer.php
@@ -3,7 +3,7 @@
 	<br />
 <?php
 	if ($ver) {
-		print "<p style=\"text-align: right; font-size: 14px;\">$ver</p>\n";
+		print "<p style=\"text-align: right; font-size: 14px;\"><b>$ver</b></p>\n";
 	}
 ?>
 	</div>
-- 
cgit v1.2.3-24-g4f1b


From 34c8a9cf80fa857f8024eacd65292cd015673165 Mon Sep 17 00:00:00 2001
From: Callan Barrett <wizzomafizzo@gmail.com>
Date: Mon, 6 Oct 2008 06:09:06 +0800
Subject: Major rearrangement of tu.php, strings setup for translation

All the strings are set up to be translated now, HTML of tu.php has been
moved to templates and the worst of it rewritten (there's no longer a
massive function in it)

Signed-off-by: Callan Barrett <wizzomafizzo@gmail.com>
Signed-off-by: Loui Chang <louipc.ist@gmail.com>
---
 web/template/tu_details.php | 62 +++++++++++++++++++++++++++++++++++++++++
 web/template/tu_list.php    | 68 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)
 create mode 100644 web/template/tu_details.php
 create mode 100644 web/template/tu_list.php

(limited to 'web/template')

diff --git a/web/template/tu_details.php b/web/template/tu_details.php
new file mode 100644
index 00000000..b1d69f6e
--- /dev/null
+++ b/web/template/tu_details.php
@@ -0,0 +1,62 @@
+<div class="pgbox">
+<div class="pgboxtitle"><span class="f3"><?php print __("Proposal Details") ?></span></div>
+<div class="pgboxbody">
+<?php if ($isrunning == 1) { ?>
+<div style='text-align: center; font-weight: bold; color: red'><?php print __("This vote is still running.") ?></div>
+<br />
+<?php } ?>
+User: <b>
+<?php if (!empty($row['User'])) { ?>
+<a href='packages.php?K=<?php print $row['User'] ?>&amp;SeB=m'><?php print $row['User'] ?></a>
+<?php } else { ?>
+N/A
+<?php } ?>
+</b><br />
+<?php print __("Submitted: %s by %s", "<b>" . gmdate("r", $row['Submitted']) . "</b>", "<b>" . username_from_id($row['SubmitterID']) . "</b>") ?><br />
+<?php print __("End: ") ?><b><?php print gmdate("r", $row['End']) ?></b><br /><br />
+<?php print str_replace("\n", "<br />\n", htmlentities($row['Agenda'])) ?><br /><br />
+<center>
+<table cellspacing='3' class='boxSoft' style='width: 50%'>
+</tr>
+<tr>
+<td class='boxSoft'>
+<table width='100%' cellspacing='0' cellpadding='2'>
+<tr>
+<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Yes") ?></span></th>
+<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("No") ?></span></th>
+<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Abstain") ?></span></th>
+<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Total") ?></span></th>
+<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Voted?") ?></span></th>
+</tr>
+<tr>
+<td class='data1'><span class='f5'><span class='blue'><?php print $row['Yes'] ?></span></span></td>
+<td class='data1'><span class='f5'><span class='blue'><?php print $row['No'] ?></span></span></td>
+<td class='data1'><span class='f5'><span class='blue'><?php print $row['Abstain'] ?></span></span></td>
+<td class='data1'><span class='f5'><span class='blue'><?php print ($row['Yes'] + $row['No'] + $row['Abstain']) ?></span></span></td>
+<td class='data1'><span class='f5'><span class='blue'>
+<?php if ($hasvoted == 0) { ?>
+<span style='color: red; font-weight: bold'><?php print __("No") ?></span>
+<?php } else { ?>
+<span style='color: green; font-weight: bold'><?php print __("Yes") ?></span>
+<?php } ?>
+</span></span></td>
+</tr>
+</table>
+</table>
+</div></div>
+<br />
+<div class='pgbox'>
+<div class='pgboxtitle'><span class='f3'><?php print __("Vote Actions") ?></span></div>
+<div class='pgboxbody'>
+<?php if ($canvote == 1) { ?>
+<center><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'>
+</form></center>
+<?php } else { ?>
+<center><?php print $errorvote ?></center>
+<?php } ?>
+</div></div>
+<br /><center><a href='tu.php'><?php print __("Back") ?></a></center>
diff --git a/web/template/tu_list.php b/web/template/tu_list.php
new file mode 100644
index 00000000..bec29850
--- /dev/null
+++ b/web/template/tu_list.php
@@ -0,0 +1,68 @@
+<center>
+<table cellspacing='3' class='boxSoft'>
+	<tr>
+		<td class='boxSoftTitle' align='right'>
+			<span class='f3'><?php print $type ?></span>
+		</td>
+	</tr>
+	<tr>
+		<td class='boxSoft'>
+			<table width='100%' cellspacing='0' cellpadding='2'>
+				<tr>
+					<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Proposal") ?></span></th>
+					<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'>
+						<a href='?off=<?php print $off ?>&amp;by=<?php print $by_next ?>'><?php print __("Start") ?></a>
+					</span></th>
+					<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("End") ?></span></th>
+					<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("User") ?></span></th>
+					<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Yes") ?></span></th>
+					<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("No") ?></span></th>
+					<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Voted?") ?></span></th>
+				</tr>
+				<?php if (mysql_num_rows($result) == 0) { ?>
+				<tr><td align='center' colspan='0'><?php print __("No results found.") ?></td></tr>
+				<?php } else { for ($i = 0; $row = mysql_fetch_assoc($result); $i++) { (($i % 2) == 0) ? $c = "data1" : $c = "data2"; ?>
+				<tr>
+					<td class='<?php print $c ?>'><span class='f4'><span class='blue'>
+						<?php
+						if (strlen($row["Agenda"]) >= $prev_Len) {
+							$row["Agenda"] = htmlentities(substr($row["Agenda"], 0, $prev_Len)) . "... - ";
+						} else {
+							$row["Agenda"] = htmlentities($row["Agenda"]) . " - ";
+						}
+						?>
+						<?php print $row["Agenda"] ?><a href='/tu.php?id=<?php print $row['ID'] ?>'>[<?php print __("More") ?>]</a></span></span>
+					</td>
+					<td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print gmdate("j M y", $row["Submitted"]) ?></span></span></td>
+					<td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print gmdate("j M y", $row["End"]) ?></span></span></td>
+					<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>";
+					} else {
+						print "N/A";
+					}
+					?>
+					</span></span></td>
+					<td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row['Yes'] ?></span></span></td>
+					<td class='<?php print $c ?>'><span class='f5'><span class='blue'><?php print $row['No'] ?></span></span></td>
+					<td class='<?php print $c ?>'>
+						<?php
+						$q = "SELECT * FROM TU_Votes WHERE VoteID = " . $row['ID'] . " AND UserID = " . uid_from_sid($_COOKIE["AURSID"]);
+						$hasvoted = mysql_num_rows(db_query($q, $dbh));
+						?>
+						<span class='f5'><span class='blue'>
+						<?php if ($hasvoted == 0) { ?>
+						<span style='color: red; font-weight: bold'><?php print __("No") ?></span>
+						<?php } else { ?>
+						<span style='color: green; font-weight: bold'><?php print __("Yes") ?></span>
+						<?php } ?>
+						</span></span>
+					</td>
+				</tr>
+				<?php } } ?>
+			</table>
+		</td>
+	</tr>
+</table>
+</center>
-- 
cgit v1.2.3-24-g4f1b


From 4b616e20ba11314616ae42fdcd3f7bf6fbb8c4bd Mon Sep 17 00:00:00 2001
From: Callan Barrett <wizzomafizzo@gmail.com>
Date: Sun, 5 Oct 2008 06:40:18 +0800
Subject: Move logout link from main menu to login bar

Signed-off-by: Callan Barrett <wizzomafizzo@gmail.com>
Signed-off-by: Loui Chang <louipc.ist@gmail.com>
---
 web/template/header.php     | 1 -
 web/template/login_form.php | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'web/template')

diff --git a/web/template/header.php b/web/template/header.php
index 88fd6f65..f60acb4f 100644
--- a/web/template/header.php
+++ b/web/template/header.php
@@ -46,7 +46,6 @@
 <?php
 if (isset($_COOKIE["AURSID"])) {
 ?>
-	      <li><a href="/logout.php"><?php print __("Logout"); ?></a></li>
 	      <li><a href="/pkgsubmit.php"><?php print __("Submit"); ?></a></li>
           <li><a href="/packages.php?SeB=m&K=<?php print username_from_sid($_COOKIE["AURSID"]); ?>"><?php print __("My Packages"); ?></a></li>
 <?php
diff --git a/web/template/login_form.php b/web/template/login_form.php
index 4bfc579a..727afd0a 100644
--- a/web/template/login_form.php
+++ b/web/template/login_form.php
@@ -2,6 +2,9 @@
   <?php
   if (isset($_COOKIE["AURSID"])) {
     print __("Logged-in as: %h%s%h", array("<b>", username_from_sid($_COOKIE["AURSID"]), "</b>"));
+?>
+<br /><a href="/logout.php"><?php print __("Logout"); ?></a>
+<?php
   }
   else {
     if ($login_error) {
-- 
cgit v1.2.3-24-g4f1b


From 78ace0914eb6a8c6cc39306ab586ab741aa25187 Mon Sep 17 00:00:00 2001
From: Loui Chang <louipc.ist@gmail.com>
Date: Sun, 5 Oct 2008 20:24:57 -0400
Subject: Show developer-TUs their total community packages.

This closes:
FS#11561 - Devs in AUR can't see their packages in Community

Thanks to Hugo Doria for the original patch.

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
Signed-off-by: Callan Barrett <wizzomafizzo@gmail.com>
---
 web/template/stats/user_table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/template')

diff --git a/web/template/stats/user_table.php b/web/template/stats/user_table.php
index b8446624..ec719996 100644
--- a/web/template/stats/user_table.php
+++ b/web/template/stats/user_table.php
@@ -13,7 +13,7 @@
 </td>
 </tr>
 
-<?php if ($atype == 'Trusted User'): ?>
+<?php if (($atype == 'Trusted User') || ($atype == 'Developer')) : ?>
 
 <tr>
 <td class='boxSoft'>
-- 
cgit v1.2.3-24-g4f1b