summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/README.txt8
-rw-r--r--web/html/account.php9
-rw-r--r--web/html/css/arch.css460
-rw-r--r--web/html/css/containers.css429
-rw-r--r--web/html/css/fonts.css9
-rw-r--r--web/html/hacker.php2
-rw-r--r--web/html/images/logo.pngbin0 -> 15730 bytes
-rw-r--r--web/html/images/tab.pngbin0 -> 107 bytes
-rw-r--r--web/html/images/title.pngbin0 -> 6465 bytes
-rw-r--r--web/html/images/title_back.pngbin0 -> 168 bytes
-rw-r--r--web/html/index.php19
-rw-r--r--web/html/logout.php7
-rw-r--r--web/html/packages.php23
-rw-r--r--web/html/pkgedit.php12
-rw-r--r--web/html/pkgsubmit.php74
-rw-r--r--web/html/template.php2
-rw-r--r--web/html/timeout.php2
-rw-r--r--web/html/xml/README.txt2
-rw-r--r--web/lang/en/index_po.inc2
-rw-r--r--web/lang/en/pkgfuncs_po.inc10
-rw-r--r--web/lang/it/account_po.inc14
-rw-r--r--web/lang/it/acctfuncs_po.inc6
-rw-r--r--web/lang/it/index_po.inc20
-rw-r--r--web/lang/it/pkgedit_po.inc12
-rw-r--r--web/lang/it/pkgfuncs_po.inc62
-rw-r--r--web/lang/it/search_po.inc30
-rw-r--r--web/lang/it/submit_po.inc18
-rw-r--r--web/lang/it/test_po.inc2
-rw-r--r--web/lang/it/timeout_po.inc4
-rw-r--r--web/lang/ru/index_po.inc2
-rw-r--r--web/lang/ru/pkgfuncs_po.inc16
-rw-r--r--web/lib/aur.inc199
-rw-r--r--web/lib/config.inc.proto41
-rw-r--r--web/lib/pkgfuncs.inc412
-rw-r--r--web/lib/version.inc3
35 files changed, 1198 insertions, 713 deletions
diff --git a/web/README.txt b/web/README.txt
index aae2c690..09a0c286 100644
--- a/web/README.txt
+++ b/web/README.txt
@@ -1,7 +1,7 @@
Setup on ArchLinux:
===================
-1) Install Apache, MySQL, PHP, and Subversion
- # pacman -Sy apache mysql php subversion
+1) Install Apache, MySQL, PHP, and git
+ # pacman -Sy apache mysql php git
2) Set a local 'hostname' of 'aur'
- Edit /etc/hosts and append 'aur' to loopback address
@@ -31,9 +31,9 @@ Setup on ArchLinux:
- Edit /etc/php.ini and uncomment the mysql extension line:
extension=mysql.so
-5) Check out the AUR project (using the MYUSER from above)
+5) Clone the AUR project (using the MYUSER from above)
$ cd
- $ svn co https://xentac.net/svn/aur/trunk aur
+ $ git clone http://projects.archlinux.org/git/aur.git
6) Configure MySQL
- Connect to the mysql client
diff --git a/web/html/account.php b/web/html/account.php
index fd9cc617..9caada42 100644
--- a/web/html/account.php
+++ b/web/html/account.php
@@ -13,6 +13,10 @@ html_header(); # print out the HTML header
# Main page processing here
#
+echo "<div class=\"pgbox\">\n";
+echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Accounts")."</span></div>\n";
+echo " <div class=\"pgboxbody\">\n";
+
if (isset($_COOKIE["AURSID"])) {
# visitor is logged in
#
@@ -148,6 +152,9 @@ if (isset($_COOKIE["AURSID"])) {
}
}
-html_footer("\$Id$");
+echo " </div>";
+echo "</div>";
+
+html_footer(AUR_VERSION);
# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/html/css/arch.css b/web/html/css/arch.css
new file mode 100644
index 00000000..9fa38e58
--- /dev/null
+++ b/web/html/css/arch.css
@@ -0,0 +1,460 @@
+* { margin: 0; padding: 0; }
+* ul { padding: 20px; }
+body {
+ background: url("/images/title_back.png") repeat-x top left #fbf8f1;
+ padding: 0 30px;
+ color: #46494d;
+ font-family: Bitstream Vera Sans, Lucida Grande, Arial, sans-serif;
+}
+/*
+ * Divs
+ */
+#head_container {
+ height: 175px;
+}
+#main_nav ul {
+ list-style: none;
+ padding-right: 10px;
+ padding-top: 48px;
+}
+#main_nav ul li {
+ display: block;
+ float: right;
+ width: 67px;
+ height: 20px;
+ padding-top: 2px;
+ margin-left: 3px;
+ background: url("/images/tab.png") repeat-x bottom left #fbf8f1;
+ text-align: center;
+ font-size: 13px;
+}
+#main_nav ul li[class~=selected] {
+ background: #fbf8f1;
+}
+#main_nav ul li a {
+ text-decoration: none;
+}
+#sub_nav ul {
+ list-style: none;
+ padding-right: 10px;
+ padding-top: 5px;
+}
+#sub_nav ul li {
+ display: block;
+ float: right;
+ width: 87px;
+ height: 20px;
+ padding-top: 2px;
+ margin-left: 3px;
+ background: url("/images/tab.png") repeat-x bottom left #fbf8f1;
+ border: 1px solid #cccccc;
+ text-align: center;
+ font-size: 13px;
+}
+#sub_nav ul li[class~=selected] {
+ background: #fbf8f1;
+}
+#sub_nav ul li a {
+ text-decoration: none;
+}
+
+#lang_sub {
+ display: block;
+ position: absolute;
+ top: 0;
+ right: 20px;
+}
+#lang_sub ul {
+ list-style: none;
+}
+#lang_sub ul a {
+ text-decoration: none;
+ color: #000000;
+}
+#lang_sub ul a:hover {
+ color: #FF0000;
+}
+#lang_sub ul li {
+ display: block;
+ float: right;
+ margin-left: 6px;
+ font-size: 10px;
+ text-align: center;
+}
+
+#title {
+ height: 140px;
+ float: left;
+}
+#updates {
+ font-size: small;
+ /*position: relative;*/
+ top: 0px;
+ background: #f6efe0;
+ border: 1px solid #eee4cb;
+ padding: 10px;
+}
+#ads {
+ float: right;
+}
+#logo {
+ float: left;
+ width: 140px;
+ height: 140px;
+}
+#titleimg {
+ float: left;
+}
+#devlist {
+ width: 80%;
+ padding: 10px;
+ margin-left: auto;
+ margin-right: auto;
+ border-top: 1px dashed black;
+ border-bottom: 1px dashed black;
+ text-align: center;
+}
+.clear {
+ clear: both;
+ margin: 0;
+ padding: 0;
+}
+.right {
+ float: right;
+ width: 320px;
+ padding: 0 10px 10px 0;
+}
+.left {
+ padding: 10px;
+ margin: 0 360px 0 0;
+}
+.left p {
+ text-align: justify;
+ padding-bottom: 10px;
+}
+.box {
+ padding: 10px;
+ background: #e1e3e6;
+ border: 1px solid #8faecd;
+}
+.greybox {
+ padding: 10px;
+ background: #f6efe0;
+ border: 1px solid #eee4cb;
+}
+div.listing {
+ padding-right: 10px;
+ border-left: 1px solid #387cbf;
+}
+.error {
+ color: #dd0000;
+ font-size: small;
+}
+.foot {
+ clear: both;
+ text-align: center;
+ font-size: 0.8em;
+}
+#search {
+ float: right;
+ position: relative;
+ top: -2em;
+ font-size: 0.8em;
+}
+#search input {
+ background: #f6efe0;
+ border: 1px solid #eee4cb;
+}
+.smalltext {
+ text-align: right;
+ font-size: x-small;
+}
+/*
+ * Headers
+ */
+h2 {
+ margin: 20px 0 10px 0;
+}
+h2.title {
+ border-bottom: 1px solid #46494d;
+}
+h3 {
+ margin-bottom: 10px;
+}
+h3.title {
+ text-align: right;
+ border-bottom: 1px solid #46494d;
+}
+h4.title {
+ text-align: left;
+ border-bottom: 1px solid #46494d;
+}
+h4.news {
+ border-bottom: 1px dotted #8faecd;
+}
+div.listing h4 {
+ background: #d1d3d6;
+ border-top: 1px double #387cbf;
+ padding: 3px;
+}
+/*
+ * Paragraphs, Anchors, Images
+ */
+p {
+ padding-bottom: 20px;
+}
+p.news {
+ text-align: left;
+ font-size: small;
+}
+a {
+ color: #35526f;
+ font-weight: bold;
+ text-decoration: underline;
+}
+.news a {
+ text-decoration: none;
+}
+#about {
+ position: relative;
+ top: -9px;
+}
+#about a {
+ text-decoration: none;
+}
+.community a {
+ text-decoration: none;
+}
+ol {
+ padding-left: 45px;
+}
+ul.small {
+ list-style: none;
+ font-size: x-small;
+}
+ul.links {
+ list-style: none;
+ font-size: small;
+ padding: 0px 0px 20px 20px;
+}
+img {
+ border: none;
+}
+hr {
+ border: none;
+ border-top: 1px solid #46494d;
+}
+.greybox input, button, textarea, select {
+ background: #e1e3e6;
+ border: 1px solid #8faecd;
+}
+.box input, button {
+ padding: 2px;
+ background: #c1c3f6;
+ font-size: x-small;
+ border: 1px solid #8faecd;
+}
+button#f_trigger {
+ background: #e1e3e6;
+}
+/*
+ * Table stuff
+ */
+table.center {
+ margin-left: auto;
+ margin-right: auto;
+}
+table#releases {
+ font-size: small;
+ width: 100%;
+}
+table#releases td {
+ padding-right: 20px;
+}
+table#repolinks {
+ font-size: small;
+ width: 100%;
+}
+table#repolinks td {
+ text-align: right;
+}
+table#repolinks th {
+ text-align: left;
+}
+table#art {
+ text-align: center;
+ margin-left: auto;
+ margin-right: auto;
+}
+.devpic {
+ vertical-align: top;
+ padding-right: 15px;
+}
+table.deventry {
+ padding-bottom: 25px;
+}
+.deventry th {
+ text-align: left;
+ vertical-align: top;
+ white-space: nowrap;
+}
+.deventry td {
+ border-bottom: 1px solid black;
+ width: 100%;
+}
+table.results {
+ padding: 0px;
+ border-collapse: collapse;
+}
+.results th {
+ background: #e1e3e6;
+ border-bottom: 1px solid #46494d;
+ border-top: 1px solid #46494d;
+ text-align: left;
+ padding-top: 0px;
+ padding-bottom: 0px;
+ padding-right: 5px;
+}
+.results th>a {
+ text-decoration: none;
+ color: #46494d;
+}
+.results td {
+ padding-right: 5px;
+ vertical-align: top;
+ font-size: 0.8em;
+}
+.listing th {
+ background: #d1d3d6;
+ border-left: 1px solid #387cbf;
+ font-size: small;
+ vertical-align: top;
+ text-align: left;
+ padding: 2px;
+}
+.listing td {
+ font-size: small;
+ padding: 2px;
+}
+blockquote.code {
+ background: #c1c3f6;
+ border: 1px solid #8faecd;
+ margin-left: auto;
+ margin-right: auto;
+ white-space: nowrap;
+ padding: 5px;
+ font-family: Courier, Courier New, Monospace;
+}
+/*
+ * Wiki Styles
+ */
+h1.wiki {
+ border-bottom: 1px solid #46494d;
+}
+div.wikifoot_l {
+ font-size: x-small;
+ text-align: left;
+ padding-top: 25px;
+}
+div.wikifoot_r {
+ font-size: x-small;
+ text-align: right;
+ float: right;
+ padding-top: 25px;
+}
+.wikibody {
+ padding-top: 15px;
+}
+.wikibody ol {
+ padding-left: 28px;
+ padding-top: 0px;
+}
+.wikibody ul {
+ padding-left: 25px;
+ padding-top: 0px;
+}
+.wikibody dd {
+ padding-left: 30px;
+}
+.wikibody pre code {
+ background: #c1c3f6;
+ border: 1px solid #8faecd;
+ margin-left: auto;
+ margin-right: auto;
+ white-space: nowrap;
+ padding: 5px;
+ font-family: Courier, Courier New, Monospace;
+}
+.wikibody blockquote {
+ padding-left: 30px;
+}
+.wikibody td {
+ padding: 5px;
+ border: 1px solid black;
+}
+
+/* Used by Django's FormWrappers */
+textarea.vLargeTextField {
+ width: 450px;
+ height: 250px;
+}
+.pkgr2 {
+ background-color: #eee4cb;
+}
+#maincontent {
+ width: 100%;
+ text-align: left;
+}
+#maincontent > table {
+ width: 90%;
+ margin-left: 5%;
+ margin-right: 5%;
+}
+.pgbox {
+ width: 90%;
+ margin-left: 5%;
+ margin-right: 5%;
+ background-color: #ffffff;
+ border-width: 2px;
+ border-color: #dddddd;
+ border-style: solid;
+ text-align: left;
+ padding: 3px;
+}
+.frontpgboxbody {
+ padding: 10px;
+}
+.frontpgboxbody > table {
+ width: 100%;
+}
+.boxSoftTitle {
+ text-align: right;
+}
+
+.pgboxtitle {
+ border-width: 2px;
+ border-style: solid;
+ border-color: #dddddd;
+ border-top-width: 1px;
+ border-top-color: #ffffff;
+ border-left-width: 1px;
+ border-left-color: #ffffff;
+ background-color: #f1f2f4;
+ text-align: left;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-right: 10px;
+ padding-left: 10px;
+}
+.pgboxbody, .pgboxbody-comment {
+ padding: 10px;
+}
+.pgboxbody input {
+ margin-right: 10px;
+}
+
+.pgboxbody-comment > table {
+ border-collapse: separate;
+ border-spacing: 0 15px;
+}
+
diff --git a/web/html/css/containers.css b/web/html/css/containers.css
index 2a0a0e4b..e42bd5a1 100644
--- a/web/html/css/containers.css
+++ b/web/html/css/containers.css
@@ -1,215 +1,214 @@
- body,table,td,img
- {
- border: 0px;
- margin: 0px;
- padding: 0px;
- font-family: arial,verdana,tahoma;
- }
-
-/* Main Wrapper Data Format */
- td.preHeader
- {
- background-color: #000;
- border-bottom: 1px solid rgb( 69, 84, 113 );
- height: 16px;
- text-align: right;
- }
- td.headerFill
- {
- background-color: rgb( 108, 131, 176 );
- border-bottom: 1px solid #000;
- }
- td.headerDisplay
- {
- background-color: rgb( 108, 131, 176 );
- padding-left: 16px;
- }
- td.mainLinks
- {
- background-color: #eee;
- border-bottom: 1px solid #000;
- height: 22px;
- padding-left: 12px;
- }
- td.sideBar
- {
- background-color: #fff;
- text-align: center;
- vertical-align: top;
- width: 150px;
- }
- td.sideBarGrey
- {
- background-color: #eee;
- border-bottom: 1px solid #000;
- text-align: left;
- vertical-align: top;
- width: 150px;
- }
- td.sideBarSmall
- {
- background-color: rgb( 108, 131, 176 );
- border-bottom: 1px solid #000;
- height: 16px;
- text-align: right;
- width: 150px;
- }
- td.sideBarSmallHeader
- {
- background-color: rgb(108,131,176);
- vertical-align: top;
- height: 16px;
- padding-top: 1px;
- padding-bottom: 2px;
- text-align: right;
- width: 150px;
- }
- td.subLinks
- {
- background-color: rgb( 225, 228, 232 );
- border-right: 1px solid #000;
- color: rgb( 120, 120, 120 );
- padding-left: 12px;
- height: 19px;
- }
- td.contentDisplay
- {
- background-color: #ffffff;
- border-right: 1px solid #000;
- border-left: 1px solid #000;
- border-bottom: 1px solid #000;
- text-align: center;
- vertical-align: top;
- padding: 10;
- }
-
- td.footerDisplay
- {
- background-color: #eee;
- border-bottom: 1px solid #000;
- text-align: center;
- }
-
-/* Containers Used Globally */
- table.boxSoft
- {
- width: 90%;
- background-color: #ddd;
- text-align: left;
- }
- td.boxSoft
- {
- background-color: #fff;
- padding: 10;
- text-align: left;
- }
- td.boxSoftColumn
- {
- padding-left: 16;
- padding-right: 16;
- text-align: justify;
- vertical-align: top;
- text-indent: 20px;
- }
- td.div
- {
- background-color: #eee;
- width: 3px;
- }
- td.boxSoftTitle
- {
- border-bottom: 1px solid #fff;
- border-top: 1px solid #fff;
- background-color: rgb( 241, 242, 244 );
- padding-left: 10;
- padding-top: 1;
- padding-bottom: 1;
- }
- table.boxSoftSmall
- {
- width: 94%;
- background-color: #ddd;
- }
- td.boxSoftSmall
- {
- background-color: #fff;
- text-align: center;
- padding-top: 2;
- padding-bottom: 2;
- }
- td.boxSoftSmallTitle
- {
- border-bottom: 1px solid #ccc;
- background-color: rgb( 241, 242, 244 );
- padding-left: 10;
- }
- td.ss /* ss = small space */
- {
- padding-left: 6px;
- vertical-align: top;
- }
- td.display
- {
- border-bottom: 1px solid #000;
- padding-bottom: 6px;
- }
- td.features
- {
- padding: 4px;
- text-align: justify;
- vertical-align:top;
- }
- td.formLeft
- {
- padding: 6px;
- text-align: left;
- vertical-align: top;
- }
- td.data1
- {
- background-color: #eee;
- vertical-align: top;
- padding-left: .3em;
- text-align: left;
- }
- td.data2
- {
- background-color: #ddd;
- vertical-align: top;
- padding-left: .3em;
- text-align: left;
- }
- td.text
- {
- color: #000;
- font-family: verdana;
- font-size: 12px;
- }
- th
- {
- text-align: left;
- }
- th.header
- {
- border-bottom: #666 1px solid;
- vertical-align: bottom;
- }
-
- input,textarea,select
- {
- background-color: rgb(108,131,176);
- font-family: courier;
- font-size: 12px;
- background-color: #ccc;
- border: #000000 1px solid;
- color: #111111;
- }
-
- input.button
- {
- background-color: #fff;
- color: rgb(108,131,176);
- border: 1px dashed rgb(108,131,176);
- font-family: trebuchet ms, tahoma, verdana;
- font-size: 12px;
- }
+ body,table,td,img
+ {
+ border: 0px;
+ margin: 0px;
+ padding: 0px;
+ }
+
+/* Main Wrapper Data Format */
+ td.preHeader
+ {
+ background-color: #000;
+ border-bottom: 1px solid rgb( 69, 84, 113 );
+ height: 16px;
+ text-align: right;
+ }
+ td.headerFill
+ {
+ background-color: rgb( 108, 131, 176 );
+ border-bottom: 1px solid #000;
+ }
+ td.headerDisplay
+ {
+ background-color: rgb( 108, 131, 176 );
+ padding-left: 16px;
+ }
+ td.mainLinks
+ {
+ background-color: #eee;
+ border-bottom: 1px solid #000;
+ height: 22px;
+ padding-left: 12px;
+ }
+ td.sideBar
+ {
+ background-color: #fff;
+ text-align: center;
+ vertical-align: top;
+ width: 150px;
+ }
+ td.sideBarGrey
+ {
+ background-color: #eee;
+ border-bottom: 1px solid #000;
+ text-align: left;
+ vertical-align: top;
+ width: 150px;
+ }
+ td.sideBarSmall
+ {
+ background-color: rgb( 108, 131, 176 );
+ border-bottom: 1px solid #000;
+ height: 16px;
+ text-align: right;
+ width: 150px;
+ }
+ td.sideBarSmallHeader
+ {
+ background-color: rgb(108,131,176);
+ vertical-align: top;
+ height: 16px;
+ padding-top: 1px;
+ padding-bottom: 2px;
+ text-align: right;
+ width: 150px;
+ }
+ td.subLinks
+ {
+ background-color: rgb( 225, 228, 232 );
+ border-right: 1px solid #000;
+ color: rgb( 120, 120, 120 );
+ padding-left: 12px;
+ height: 19px;
+ }
+ td.contentDisplay
+ {
+ background-color: #ffffff;
+ border-right: 1px solid #000;
+ border-left: 1px solid #000;
+ border-bottom: 1px solid #000;
+ text-align: center;
+ vertical-align: top;
+ padding: 10;
+ }
+
+ td.footerDisplay
+ {
+ background-color: #eee;
+ border-bottom: 1px solid #000;
+ text-align: center;
+ }
+
+/* Containers Used Globally */
+ table.boxSoft
+ {
+ width: 90%;
+ background-color: #ddd;
+ text-align: left;
+ }
+ td.boxSoft
+ {
+ background-color: #fff;
+ padding: 10;
+ text-align: left;
+ }
+ td.boxSoftColumn
+ {
+ padding-left: 16;
+ padding-right: 16;
+ text-align: justify;
+ vertical-align: top;
+ text-indent: 20px;
+ }
+ td.div
+ {
+ background-color: #eee;
+ width: 3px;
+ }
+ td.boxSoftTitle
+ {
+ border-bottom: 1px solid #fff;
+ border-top: 1px solid #fff;
+ background-color: rgb( 241, 242, 244 );
+ padding-left: 10;
+ padding-top: 1;
+ padding-bottom: 1;
+ text-align: left;
+ }
+ table.boxSoftSmall
+ {
+ width: 94%;
+ background-color: #ddd;
+ }
+ td.boxSoftSmall
+ {
+ background-color: #fff;
+ text-align: center;
+ padding-top: 2;
+ padding-bottom: 2;
+ }
+ td.boxSoftSmallTitle
+ {
+ border-bottom: 1px solid #ccc;
+ background-color: rgb( 241, 242, 244 );
+ padding-left: 10;
+ }
+ td.ss /* ss = small space */
+ {
+ padding-left: 6px;
+ vertical-align: top;
+ }
+ td.display
+ {
+ border-bottom: 1px solid #000;
+ padding-bottom: 6px;
+ }
+ td.features
+ {
+ padding: 4px;
+ text-align: justify;
+ vertical-align:top;
+ }
+ td.formLeft
+ {
+ padding: 6px;
+ text-align: left;
+ vertical-align: top;
+ }
+ td.data1
+ {
+ background-color: #eee;
+ vertical-align: top;
+ padding-left: .3em;
+ text-align: left;
+ }
+ td.data2
+ {
+ background-color: #ddd;
+ vertical-align: top;
+ padding-left: .3em;
+ text-align: left;
+ }
+ td.text
+ {
+ color: #000;
+ font-size: 12px;
+ }
+ th
+ {
+ text-align: left;
+ }
+ th.header
+ {
+ border-bottom: #666 1px solid;
+ vertical-align: bottom;
+ }
+
+ input,textarea,select
+ {
+ background-color: rgb(108,131,176);
+ font-family: monospace;
+ font-size: 12px;
+ background-color: #ccc;
+ border: #000000 1px solid;
+ color: #111111;
+ }
+
+ input.button
+ {
+ background-color: #fff;
+ color: rgb(108,131,176);
+ border: 1px solid rgb(108,131,176);
+ font-size: 12px;
+ }
+
diff --git a/web/html/css/fonts.css b/web/html/css/fonts.css
index 8a60e05d..fdeddbed 100644
--- a/web/html/css/fonts.css
+++ b/web/html/css/fonts.css
@@ -2,11 +2,10 @@
span /* Applicable by default in all fonts */
{
color: #666;
- font-family: verdana, trebuchet ms, tahoma, luxi sans;
+ font-family: Bitstream Vera Sans, Lucida Grande, Arial, sans-serif;
}
span.f1 /* Important */
{
- font-family: verdana;
font-size: 20px;
letter-spacing: 1px;
}
@@ -25,13 +24,11 @@
span.f4 /* Content Text */
{
color: #444;
- font-family: verdana;
font-size: 12px;
}
span.f5 /* Content Small */
{
color: #333;
- font-family: trebuchet ms, tahoma, verdana;
font-size: 11px;
}
span.f6 /* Red Message */
@@ -55,13 +52,11 @@
span.error /* Content Text */
{
color: #900;
- font-family: verdana;
font-size: 12px;
}
span.warning /* Content Text */
{
color: #C0C000;
- font-family: verdana;
font-size: 12px;
}
@@ -95,7 +90,6 @@
color: rgb( 201, 209, 226 );
font-weight: bold;
font-size: 11px;
- font-family: tahoma, trebuchet ms, verdana;
padding-right: 8px;
word-spacing: 8px;
}
@@ -104,7 +98,6 @@
color: #fff;
font-weight: bold;
font-size: 11px;
- font-family: tahoma, trebuchet ms, verdana;
padding-right: 8px;
}
diff --git a/web/html/hacker.php b/web/html/hacker.php
index ef54bb63..d288a5e6 100644
--- a/web/html/hacker.php
+++ b/web/html/hacker.php
@@ -12,6 +12,6 @@ print "<p>\n";
print __("If this problem persists, please contact the site administrator.");
print "</p>\n";
-html_footer("\$Id$");
+html_footer(AUR_VERSION);
# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/html/images/logo.png b/web/html/images/logo.png
new file mode 100644
index 00000000..b2b6d863
--- /dev/null
+++ b/web/html/images/logo.png
Binary files differ
diff --git a/web/html/images/tab.png b/web/html/images/tab.png
new file mode 100644
index 00000000..56d2e617
--- /dev/null
+++ b/web/html/images/tab.png
Binary files differ
diff --git a/web/html/images/title.png b/web/html/images/title.png
new file mode 100644
index 00000000..e16971a1
--- /dev/null
+++ b/web/html/images/title.png
Binary files differ
diff --git a/web/html/images/title_back.png b/web/html/images/title_back.png
new file mode 100644
index 00000000..95c98d7a
--- /dev/null
+++ b/web/html/images/title_back.png
Binary files differ
diff --git a/web/html/index.php b/web/html/index.php
index d1757977..b379d4d1 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -79,19 +79,19 @@ if (isset($_REQUEST["user"]) || isset($_REQUEST["pass"])) {
html_header();
# Big Top Level Table (Table 1)
-print "<table border='0' cellpadding='0' cellspacing='3' width='90%'>\n";
-print "<tr>\n";
+echo "<div class=\"pgbox\">\n";
+echo " <div class=\"pgboxtitle\"><span class=\"f3\">AUR ".__("Home")."</span></div>\n";
+echo " <div class=\"frontpgboxbody\">\n";
+echo "<table border='0' cellpadding='0' cellspacing='3' width='90%'>\n";
+echo "<tr>\n";
# MAIN: Top Left
print "<td class='boxSoft' valign='top'>";
print "<p>".__("Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information.", array('<a href="http://wiki.archlinux.org/index.php/AUR_User_Guidelines">', '</a>', '<a href="http://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines">', '</a>'))."<br>";
print __("Contributed PKGBUILDs <b>must</b> conform to the %hArch Packaging Standards%h otherwise they will be deleted!", array('<a href="http://wiki.archlinux.org/index.php/Arch_Packaging_Standards">', '</a>'))."</p>";
-#print "<p>".__("If you have feedback about the AUR, please leave it in %hFlyspray%h.", array('<a href="http://bugs.archlinux.org/index.php?tasks=all&amp;project=2">', '</a>'))."<br>";
-#print __("Email discussion about the AUR takes place on the %sTUR Users List%s.", array('<a href="http://www.archlinux.org/mailman/listinfo/tur-users">', '</a>'))."</p>";
print "<p>".__("Remember to vote for your favourite packages!")."<br>";
print __("The most popular packages will be provided as binary packages in [community].")."</p>";
-#print "<p>".__("Though we can't vouch for their contents, we provide a %hlist of user repositories%h for your convenience.", array('<a href="http://wiki2.archlinux.org/index.php/Unofficial%20Repositories">', '</a>'))."</p>";
# MAIN: Top Right
print "</td>";
@@ -178,9 +178,6 @@ print "</tr>";
print "</table>";
# End Table 2
-#print " <td>&nbsp;&nbsp;</td>";
-#print " <td align='left' valign='top' nowrap>\n";
-
# MAIN: Bottom Right
print "</td>";
print "<td class='boxSoft' valign='top'>";
@@ -357,8 +354,10 @@ print "</table>";
print " </td>";
print "</tr>\n";
print "</table>\n";
+echo "</div>\n";
# End Table 1
-
-html_footer("<b>Version 1.3.1</b> \$Id$");
+echo " </div>";
+echo "</div>";
+html_footer(AUR_VERSION);
# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/html/logout.php b/web/html/logout.php
index 76736b7e..0b275b86 100644
--- a/web/html/logout.php
+++ b/web/html/logout.php
@@ -19,10 +19,9 @@ if (isset($_COOKIE["AURSID"])) {
setcookie("AURLANG", "", time() - (60*60*24*30), "/");
}
-html_header(); # print out the HTML header
-print __("You have been successfully logged out.")."<br />\n";
+header('Location: index.php');
+exit;
-
-html_footer("\$Id$");
+html_footer(AUR_VERSION);
# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/html/packages.php b/web/html/packages.php
index 4cb8c478..2ae3bf00 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -66,6 +66,27 @@ if (isset($_REQUEST["do_Flag"])) {
print "<p>\n";
print __("The selected packages have been flagged out-of-date.");
print "</p>\n";
+
+ # notification by tardo.
+ $f_name = username_from_sid($_COOKIE['AURSID']);
+ $f_email = email_from_sid($_COOKIE['AURSID']);
+ $f_uid = uid_from_sid($_COOKIE['AURSID']);
+ $q = "SELECT Packages.Name, Users.Email, Packages.ID ";
+ $q.= "FROM Packages, Users ";
+ $q.= "WHERE Packages.ID IN (" . $flag .") ";
+ $q.= "AND Users.ID = Packages.MaintainerUID ";
+ $q.= "AND Users.ID != " . $f_uid;
+ $result = db_query($q, $dbh);
+ if (mysql_num_rows($result)) {
+ while ($row = mysql_fetch_assoc($result)) {
+ # construct email
+ $body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . ". You may view your package at:\nhttp://aur.archlinux.org/packages.php?do_Details=1&ID=" . $row['ID'];
+ $body = wordwrap($body, 70);
+ $headers = "To: ".$row['Email']."\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n";
+ @mail(' ', "AUR Out-of-date Notification for ".$row['Name'], $body, $headers);
+ }
+ }
+
} else {
print "<p>\n";
print __("You did not select any packages to flag.");
@@ -579,6 +600,6 @@ if (isset($_REQUEST["do_Flag"])) {
}
-html_footer("\$Id$");
+html_footer(AUR_VERSION);
# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php
index e617b75e..c1169f48 100644
--- a/web/html/pkgedit.php
+++ b/web/html/pkgedit.php
@@ -27,7 +27,7 @@ if (isset($_COOKIE["AURSID"])) {
if (!$atype) {
print __("You must be logged in before you can edit package information.");
print "<br />\n";
- html_footer($svn_idstr);
+ html_footer(AUR_VERSION);
exit();
}
@@ -36,7 +36,7 @@ if (!$atype) {
if (!$_REQUEST["ID"]) {
print __("Missing package ID.");
print "<br />\n";
- html_footer($svn_idstr);
+ html_footer(AUR_VERSION);
}
@@ -59,7 +59,7 @@ if ($_REQUEST["del_Comment"]) {
print __("Missing comment ID.")."<br />\n";
}
pkgdetails_link($_REQUEST["ID"]);
- html_footer($svn_idstr);
+ html_footer(AUR_VERSION);
exit();
}
@@ -120,7 +120,7 @@ if ($_REQUEST["add_Comment"]) {
print "<input type='reset' value=\"".__("Reset")."\">\n";
print "</form>\n";
}
- html_footer($svn_idstr);
+ html_footer(AUR_VERSION);
exit();
}
@@ -171,13 +171,13 @@ if ($_REQUEST["change_Category"]) {
print "</form>\n";
}
- html_footer($svn_idstr);
+ html_footer(AUR_VERSION);
exit();
}
print __("You've found a bug if you see this....")."<br />\n";
-html_footer($svn_idstr); # Use the $Id$ keyword
+html_footer(AUR_VERSION); # Use the $Id$ keyword
# NOTE: when checking in a new file, use
# 'svn propset svn:keywords "Id" filename.php'
# to tell svn to expand the "Id" keyword.
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
index 89ecfa44..6e754bf6 100644
--- a/web/html/pkgsubmit.php
+++ b/web/html/pkgsubmit.php
@@ -9,7 +9,9 @@ include("config.inc"); # configuration file with dir locations
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
-print "<center>\n";
+echo "<div class=\"pgbox\">\n";
+echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Submit")."</span></div>\n";
+echo " <div class=\"pgboxbody\">\n";
# Debugging
$DBUG = 0;
@@ -88,15 +90,15 @@ if ($_COOKIE["AURSID"]) {
# the uploaded package file.
#
- $upload_file = $UPLOAD_DIR . $_FILES["pfile"]["name"];
+ $upload_file = UPLOAD_DIR . $_FILES["pfile"]["name"];
if (move_uploaded_file($_FILES["pfile"]["tmp_name"], $upload_file)) {
# ok, we can proceed
#
- if (file_exists($INCOMING_DIR . $pkg_name)) {
+ if (file_exists(INCOMING_DIR . $pkg_name)) {
# blow away the existing file/dir and contents
#
- rm_rf($INCOMING_DIR . $pkg_name);
+ rm_rf(INCOMING_DIR . $pkg_name);
}
} else {
@@ -111,13 +113,13 @@ if ($_COOKIE["AURSID"]) {
#
if (!$error) {
- if (!@mkdir($INCOMING_DIR.$pkg_name)) {
+ if (!@mkdir(INCOMING_DIR.$pkg_name)) {
$error = __("Could not create incoming directory: %s.",
- array($INCOMING_DIR.$pkg_name));
+ array(INCOMING_DIR.$pkg_name));
} else {
- if (!@chdir($INCOMING_DIR.$pkg_name)) {
+ if (!@chdir(INCOMING_DIR.$pkg_name)) {
$error = __("Could not change directory to %s.",
- array($INCOMING_DIR.$pkg_name));
+ array(INCOMING_DIR.$pkg_name));
} else {
# try .gz first
#
@@ -135,40 +137,40 @@ if ($_COOKIE["AURSID"]) {
}
# At this point, if no error exists, the package has been extracted
- # There should be a $INCOMING_DIR.$pkg_name."/".$pkg_name directory
+ # There should be a INCOMING_DIR.$pkg_name."/".$pkg_name directory
# if the user packaged it correctly. However, if the file was
# packaged without the $pkg_name subdirectory, try and create it
# and move the package contents into the new sub-directory.
#
if (!$error) {
- if (is_dir($INCOMING_DIR.$pkg_name."/".$pkg_name) &&
- is_file($INCOMING_DIR.$pkg_name."/".$pkg_name."/PKGBUILD")) {
+ if (is_dir(INCOMING_DIR.$pkg_name."/".$pkg_name) &&
+ is_file(INCOMING_DIR.$pkg_name."/".$pkg_name."/PKGBUILD")) {
# the files were packaged correctly
#
- if (!@chdir($INCOMING_DIR.$pkg_name."/".$pkg_name)) {
+ if (!@chdir(INCOMING_DIR.$pkg_name."/".$pkg_name)) {
$error = __("Could not change to directory %s.",
- array($INCOMING_DIR.$pkg_name."/".$pkg_name));
+ array(INCOMING_DIR.$pkg_name."/".$pkg_name));
}
- $pkg_dir = $INCOMING_DIR.$pkg_name."/".$pkg_name;
- } elseif (is_file($INCOMING_DIR.$pkg_name."/PKGBUILD")) {
+ $pkg_dir = INCOMING_DIR.$pkg_name."/".$pkg_name;
+ } elseif (is_file(INCOMING_DIR.$pkg_name."/PKGBUILD")) {
# not packaged correctly, but recovery may be possible.
- # try and create $INCOMING_DIR.$pkg_name."/".$pkg_name and
+ # try and create INCOMING_DIR.$pkg_name."/".$pkg_name and
# move package contents into the new dir
#
- if (!@mkdir($INCOMING_DIR.$pkg_name."/".$pkg_name)) {
+ if (!@mkdir(INCOMING_DIR.$pkg_name."/".$pkg_name)) {
$error = __("Could not create directory %s.",
- array($INCOMING_DIR.$pkg_name."/".$pkg_name));
+ array(INCOMING_DIR.$pkg_name."/".$pkg_name));
} else {
exec("/bin/sh -c 'mv * ".$pkg_name."'");
- if (!file_exists($INCOMING_DIR.$pkg_name."/".$pkg_name."/PKGBUILD")) {
+ if (!file_exists(INCOMING_DIR.$pkg_name."/".$pkg_name."/PKGBUILD")) {
$error = __("Error exec'ing the mv command.");
}
}
- if (!@chdir($INCOMING_DIR.$pkg_name."/".$pkg_name)) {
+ if (!@chdir(INCOMING_DIR.$pkg_name."/".$pkg_name)) {
$error = __("Could not change to directory %s.",
- array($INCOMING_DIR.$pkg_name."/".$pkg_name));
+ array(INCOMING_DIR.$pkg_name."/".$pkg_name));
}
- $pkg_dir = $INCOMING_DIR.$pkg_name."/".$pkg_name;
+ $pkg_dir = INCOMING_DIR.$pkg_name."/".$pkg_name;
} else {
# some wierd packaging/extraction error - baal
#
@@ -177,7 +179,7 @@ if ($_COOKIE["AURSID"]) {
}
$shcmd = "/bin/mv ".$upload_file." ";
- $shcmd.= escapeshellarg($INCOMING_DIR.$pkg_name."/".$_FILES["pfile"]["name"]);
+ $shcmd.= escapeshellarg(INCOMING_DIR.$pkg_name."/".$_FILES["pfile"]["name"]);
@exec($shcmd);
# if no error, get list of directory contents and process PKGBUILD
@@ -353,9 +355,9 @@ if ($_COOKIE["AURSID"]) {
# Re-tar the package for consistency's sake
#
if (!$error) {
- if (!@chdir($INCOMING_DIR.$pkg_name)) {
+ if (!@chdir(INCOMING_DIR.$pkg_name)) {
$error = __("Could not change directory to %s.",
- array($INCOMING_DIR.$pkg_name));
+ array(INCOMING_DIR.$pkg_name));
}
}
if (!$error) {
@@ -415,9 +417,9 @@ if ($_COOKIE["AURSID"]) {
} else {
$q.="Safe=0, ";
}
- $fspath=$INCOMING_DIR.$pkg_name."/".$_FILES["pfile"]["name"];
+ $fspath=INCOMING_DIR.$pkg_name."/".$_FILES["pfile"]["name"];
$q.="FSPath='".mysql_real_escape_string($fspath)."', ";
- $urlpath=$URL_DIR.$pkg_name."/".$_FILES["pfile"]["name"];
+ $urlpath=URL_DIR.$pkg_name."/".$_FILES["pfile"]["name"];
$q.="URLPath='".mysql_real_escape_string($urlpath)."' ";
$q.="WHERE ID = " . $pdata["ID"];
$result = db_query($q, $dbh);
@@ -428,8 +430,8 @@ if ($_COOKIE["AURSID"]) {
$q = "INSERT INTO PackageContents ";
$q.= "(PackageID, FSPath, URLPath, FileSize) VALUES (";
$q.= $pdata['ID'].", ";
- $q.= "'".$INCOMING_DIR.$pkg_name."/".$pkg_name."/".$k."', ";
- $q.= "'".$URL_DIR.$pkg_name."/".$pkg_name."/".$k."', ";
+ $q.= "'".INCOMING_DIR.$pkg_name."/".$pkg_name."/".$k."', ";
+ $q.= "'".URL_DIR.$pkg_name."/".$pkg_name."/".$k."', ";
$q.= $v.")";
db_query($q);
}
@@ -498,9 +500,9 @@ if ($_COOKIE["AURSID"]) {
$q.= "UNIX_TIMESTAMP(), ";
$q.= uid_from_sid($_COOKIE["AURSID"]).", ";
$q.= uid_from_sid($_COOKIE["AURSID"]).", '";
- $fspath=$INCOMING_DIR.$pkg_name."/".$_FILES["pfile"]["name"];
+ $fspath=INCOMING_DIR.$pkg_name."/".$_FILES["pfile"]["name"];
$q.= mysql_real_escape_string($fspath)."', '";
- $urlpath=$URL_DIR.$pkg_name."/".$_FILES["pfile"]["name"];
+ $urlpath=URL_DIR.$pkg_name."/".$_FILES["pfile"]["name"];
$q.= mysql_real_escape_string($urlpath)."')";
$result = db_query($q, $dbh);
# print $result . "<br>";
@@ -513,8 +515,8 @@ if ($_COOKIE["AURSID"]) {
$q = "INSERT INTO PackageContents ";
$q.= "(PackageID, FSPath, URLPath, FileSize) VALUES (";
$q.= $packageID.", ";
- $q.= "'".$INCOMING_DIR.$pkg_name."/".$pkg_name."/".$k."', ";
- $q.= "'".$URL_DIR.$pkg_name."/".$pkg_name."/".$k."', ";
+ $q.= "'".INCOMING_DIR.$pkg_name."/".$pkg_name."/".$k."', ";
+ $q.= "'".URL_DIR.$pkg_name."/".$pkg_name."/".$k."', ";
$q.= $v.")";
db_query($q);
}
@@ -665,8 +667,8 @@ if ($_COOKIE["AURSID"]) {
print __("You must create an account before you can upload packages.");
print "<br />\n";
}
-
-print "</center>\n";
-html_footer("\$Id$");
+echo " </div>\n";
+echo "</div>\n";
+html_footer(AUR_VERSION);
# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/html/template.php b/web/html/template.php
index 175ba0b4..6a158de8 100644
--- a/web/html/template.php
+++ b/web/html/template.php
@@ -15,7 +15,7 @@ html_header(); # print out the HTML header
print __("Hi, this is worth reading!")."<br />\n";
-html_footer("\$Id$"); # Use the $Id$ keyword
+html_footer(AUR_VERSION); # Use the $Id$ keyword
# NOTE: when checking in a new file, use
# 'svn propset svn:keywords "Id" filename.php'
# to tell svn to expand the "Id" keyword.
diff --git a/web/html/timeout.php b/web/html/timeout.php
index 94a86373..96a3e2ee 100644
--- a/web/html/timeout.php
+++ b/web/html/timeout.php
@@ -12,6 +12,6 @@ print "<p>\n";
print __("Click on the Home link above to log in.");
print "</p>\n";
-html_footer("\$Id$");
+html_footer(AUR_VERSION);
# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/html/xml/README.txt b/web/html/xml/README.txt
new file mode 100644
index 00000000..fb37d7ab
--- /dev/null
+++ b/web/html/xml/README.txt
@@ -0,0 +1,2 @@
+This is where the server will create the RSS feed file.
+This directory should be writeable by the the webserver.
diff --git a/web/lang/en/index_po.inc b/web/lang/en/index_po.inc
index abd93fe8..e8a292e0 100644
--- a/web/lang/en/index_po.inc
+++ b/web/lang/en/index_po.inc
@@ -71,6 +71,8 @@ $_t["en"]["My Statistics"] = "My Statistics";
$_t["en"]["Flagged as safe by me"] = "Flagged as safe by me";
+$_t["en"]["Flagged as safe"] = "Flagged as safe";
+
$_t["en"]["User Statistics"] = "User Statistics";
$_t["en"]["Registered Users"] = "Registered Users";
diff --git a/web/lang/en/pkgfuncs_po.inc b/web/lang/en/pkgfuncs_po.inc
index 220cdb37..634f45af 100644
--- a/web/lang/en/pkgfuncs_po.inc
+++ b/web/lang/en/pkgfuncs_po.inc
@@ -31,7 +31,7 @@ $_t["en"]["Error retrieving package details."] = "Error retrieving package detai
$_t["en"]["Description"] = "Description";
-$_t["en"]["My Packages"] = "My Packages";
+$_t["en"]["My Packages"] = "My Pkgs";
$_t["en"]["Keywords"] = "Keywords";
@@ -151,4 +151,10 @@ $_t["en"]["License"] = "License";
$_t["en"]["unknown"] = "unknown";
-?> \ No newline at end of file
+$_t["en"]["Required by"] = "Required by";
+
+$_t["en"]["The above files have been verified (by %h%s%h) and are safe to use."] = "The above files have been verified (by %h%s%h) and are safe to use.";
+
+$_t["en"]["This package has been flagged out of date."] = "This package has been flagged out of date.";
+
+?>
diff --git a/web/lang/it/account_po.inc b/web/lang/it/account_po.inc
index 8c656975..87de33de 100644
--- a/web/lang/it/account_po.inc
+++ b/web/lang/it/account_po.inc
@@ -5,20 +5,20 @@
include_once("translator.inc");
global $_t;
-$_t["it"]["Use this form to update your account."] = "Utilizzare questo modulo per aggiornare un account.";
+$_t["it"]["Use this form to update your account."] = "Utilizza questo modulo per aggiornare un account.";
-$_t["it"]["Leave the password fields blank to keep your same password."] = "Lasciare vuoti i campi relativi alla password per mantenerla invariata.";
+$_t["it"]["Leave the password fields blank to keep your same password."] = "Lascia vuoti i campi relativi alla password per mantenerla invariata.";
-$_t["it"]["You are not allowed to access this area."] = "Non si dispone dei permessi necessari per accedere.";
+$_t["it"]["You are not allowed to access this area."] = "Non disponi dei permessi necessari per accedere.";
$_t["it"]["Could not retrieve information for the specified user."] = "Non è stato possibile trovare le informazioni sull'utente specificato.";
-$_t["it"]["Use this form to search existing accounts."] = "Utilizzare questo modulo per cercare account esistenti.";
+$_t["it"]["Use this form to search existing accounts."] = "Utilizza questo modulo per cercare account esistenti.";
-$_t["it"]["You do not have permission to edit this account."] = "Non si dispone dei permessi necessari per modificare questo account.";
+$_t["it"]["You do not have permission to edit this account."] = "Non disponi dei permessi necessari per modificare questo account.";
-$_t["it"]["Use this form to create an account."] = "Utilizzare questo modulo per creare un account.";
+$_t["it"]["Use this form to create an account."] = "Utilizza questo modulo per creare un account.";
-$_t["it"]["You must log in to view user information."] = "Bisogna essere autenticati per poter visualizzare le informazioni sull'utente.";
+$_t["it"]["You must log in to view user information."] = "Devi autenticarti per poter visualizzare le informazioni sull'utente.";
?> \ No newline at end of file
diff --git a/web/lang/it/acctfuncs_po.inc b/web/lang/it/acctfuncs_po.inc
index 26c4d4d2..e08d342d 100644
--- a/web/lang/it/acctfuncs_po.inc
+++ b/web/lang/it/acctfuncs_po.inc
@@ -47,7 +47,7 @@ $_t["it"]["Last Voted"] = "Ultimo votato";
$_t["it"]["Real Name"] = "Nome reale";
-$_t["it"]["Edit Account"] = "Modificare l'account";
+$_t["it"]["Edit Account"] = "Modifica l'account";
$_t["it"]["Password fields do not match."] = "I campi password non corrispondono.";
@@ -61,11 +61,11 @@ $_t["it"]["No more results to display."] = "Non vi sono ulteriori risultati da v
$_t["it"]["Type"] = "Tipo";
-$_t["it"]["Click on the Home link above to login."] = "Fare clic su Inizio per autenticarsi.";
+$_t["it"]["Click on the Home link above to login."] = "Clicca su Inizio per autenticarti.";
$_t["it"]["Sort by"] = "Ordina per";
-$_t["it"]["Re-type password"] = "Riscrivere la password";
+$_t["it"]["Re-type password"] = "Riscrivi la password";
$_t["it"]["Language is not currently supported."] = "Lingua attualmente non supportata.";
diff --git a/web/lang/it/index_po.inc b/web/lang/it/index_po.inc
index cef6e8ce..e3e7a8c9 100644
--- a/web/lang/it/index_po.inc
+++ b/web/lang/it/index_po.inc
@@ -5,9 +5,9 @@
include_once("translator.inc");
global $_t;
-$_t["it"]["You must supply a password."] = "E' necessario inserire una password.";
+$_t["it"]["You must supply a password."] = "È necessario inserire una password.";
-$_t["it"]["You must supply a username."] = "E' necessario inserire il nome utente.";
+$_t["it"]["You must supply a username."] = "È necessario inserire il nome utente.";
$_t["it"]["After that, this can be filled in with more meaningful text."] = "Dopotutto, questo potrebbe essere riempito con un messaggio più significativo.";
@@ -27,7 +27,7 @@ $_t["it"]["Error trying to generate session id."] = "Errore durante la generazio
$_t["it"]["For now, it's just a place holder."] = "Per adesso, è solo un segnaposto.";
-$_t["it"]["It's more important to get the login functionality finished."] = "E' più importante avere la funzionalità di autenticazione completata.";
+$_t["it"]["It's more important to get the login functionality finished."] = "È più importante avere la funzionalità di autenticazione completata.";
$_t["it"]["Error looking up username, %s."] = "Errore durante la ricerca del nome utente %s.";
@@ -47,13 +47,13 @@ $_t["it"]["Email discussion about the AUR takes place on the %sTUR Users List%s.
$_t["it"]["Recent Updates"] = "Aggiornamenti recenti";
-$_t["it"]["Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information. Contributed PKGBUILDs <b>must</b> conform to the %hArch Packaging Standards%h otherwise they will be deleted!"] = "Benvenuto in AUR! Per ottenere maggiori informazioni, leggere %hAUR User Guidelines%h e %hAUR TU Guidelines%h. I PKGBUILD inviati <b>devono</b> essere conformi agli %hArch Packaging Standards%h altrimenti saranno cancellati!";
+$_t["it"]["Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information. Contributed PKGBUILDs <b>must</b> conform to the %hArch Packaging Standards%h otherwise they will be deleted!"] = "Benvenuto in AUR! Per ottenere maggiori informazioni, leggi le %hAUR User Guidelines%h e %hAUR TU Guidelines%h. I PKGBUILD inviati <b>devono</b> essere conformi agli %hArch Packaging Standards%h altrimenti saranno cancellati!";
$_t["it"]["Community"] = "Community";
$_t["it"]["Package Counts"] = "Conteggio dei pacchetti";
-$_t["it"]["Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information."] = "Benvenuto in AUR! Per ottenere maggiori informazioni, leggere %hAUR User Guidelines%h e %hAUR TU Guidelines%h.";
+$_t["it"]["Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information."] = "Benvenuto in AUR! Per ottenere maggiori informazioni, leggi le %hAUR User Guidelines%h e %hAUR TU Guidelines%h.";
$_t["it"]["Unsupported"] = "Unsupported";
@@ -69,9 +69,9 @@ $_t["it"]["Packages in unsupported"] = "Pacchetti in unsupported";
$_t["it"]["Packages in [community]"] = "Pacchetti in [community]";
-$_t["it"]["Remember to vote for your favourite packages! The most popular packages are provided as binary packages in [community]."] = "Ricordate di votare i vostri pacchetti preferiti! I pacchetti più votati sono disponibili in [community] come precompilati.";
+$_t["it"]["Remember to vote for your favourite packages! The most popular packages are provided as binary packages in [community]."] = "Ricorda di votare i tuoi pacchetti preferiti! I pacchetti più votati saranno disponibili in [community] come precompilati.";
-$_t["it"]["Remember to vote for your favourite packages!"] = "Ricordate di votare i vostri pacchetti preferiti!";
+$_t["it"]["Remember to vote for your favourite packages!"] = "Ricorda di votare i tuoi pacchetti preferiti!";
$_t["it"]["The most popular packages will be provided as binary packages in [community]."] = "I pacchetti più votati saranno disponibili in [community] come precompilati.";
@@ -85,10 +85,12 @@ $_t["it"]["Out-of-date"] = "Non aggiornati";
$_t["it"]["User Statistics"] = "Statistiche dell'utente";
-$_t["it"]["Flagged as safe by me"] = "Segnato come sicuro da me";
+$_t["it"]["Flagged as safe by me"] = "Pacchetti verificati";
-$_t["it"]["Flagged as safe"] = "Segnato come sicuro";
+$_t["it"]["Flagged as safe"] = "Considerato sicuro";
$_t["it"]["My Statistics"] = "Le mie statistiche";
+$_t["it"]["Home"] = "Inizio";
+
?> \ No newline at end of file
diff --git a/web/lang/it/pkgedit_po.inc b/web/lang/it/pkgedit_po.inc
index 731904ad..96f4d44a 100644
--- a/web/lang/it/pkgedit_po.inc
+++ b/web/lang/it/pkgedit_po.inc
@@ -9,22 +9,22 @@ $_t["it"]["Missing package ID."] = "Manca l'ID del pacchetto.";
$_t["it"]["Invalid category ID."] = "ID della categoria non valido.";
-$_t["it"]["Enter your comment below."] = "Inserire un commento qui sotto.";
+$_t["it"]["Enter your comment below."] = "Inserisci un commento qui sotto.";
-$_t["it"]["You are not allowed to delete this comment."] = "Non è possibile cancellare questo commento.";
+$_t["it"]["You are not allowed to delete this comment."] = "Non puoi cancellare questo commento.";
$_t["it"]["Missing comment ID."] = "Manca l'ID del commento.";
$_t["it"]["Package category updated."] = "La categoria del pacchetto è stata aggiornata.";
-$_t["it"]["You must be logged in before you can edit package information."] = "Bisogna autenticarsi prima di poter modificare le informazioni sul pacchetto.";
+$_t["it"]["You must be logged in before you can edit package information."] = "Devi autenticarti prima di poter modificare le informazioni sul pacchetto.";
-$_t["it"]["Comment has been deleted."] = "Il commento è stato cancellato.";
+$_t["it"]["Comment has been deleted."] = "Il commento è stato rimosso.";
$_t["it"]["You've found a bug if you see this...."] = "Se vedi questo, hai appena trovato un bug....";
-$_t["it"]["Comment has been added."] = "Il commento è stato aggiunto.";
+$_t["it"]["Comment has been added."] = "Il commento è stato inserito.";
-$_t["it"]["Select new category"] = "Selezionare una nuova categoria";
+$_t["it"]["Select new category"] = "Seleziona una nuova categoria";
?> \ No newline at end of file
diff --git a/web/lang/it/pkgfuncs_po.inc b/web/lang/it/pkgfuncs_po.inc
index b6746874..6acccbd4 100644
--- a/web/lang/it/pkgfuncs_po.inc
+++ b/web/lang/it/pkgfuncs_po.inc
@@ -13,15 +13,15 @@ $_t["it"]["Comment by: %h%s%h on %h%s%h"] = "Commento lasciato da: %h%s%h il %h%
$_t["it"]["Location"] = "Posizione";
-$_t["it"]["Delete comment"] = "Eliminare il commento";
+$_t["it"]["Delete comment"] = "Elimina il commento";
$_t["it"]["Go"] = "Cerca";
-$_t["it"]["Unflag Out-of-date"] = "Segnare come aggiornato";
+$_t["it"]["Unflag Out-of-date"] = "Il pacchetto è aggiornato";
-$_t["it"]["Go back to %hpackage details view%h."] = "Ritornare alla %hvista dettagli del pacchetto%h.";
+$_t["it"]["Go back to %hpackage details view%h."] = "Ritorna alla %hvista dettagli del pacchetto%h.";
-$_t["it"]["Error retrieving package details."] = "Errore nel recupero dei dettagli del pacchetto.";
+$_t["it"]["Error retrieving package details."] = "Si è verificato un errore durante il recupero dei dettagli del pacchetto.";
$_t["it"]["Description"] = "Descrizione";
@@ -31,13 +31,13 @@ $_t["it"]["Keywords"] = "Parola chiave";
$_t["it"]["Dependencies"] = "Dipendenze";
-$_t["it"]["Disown Packages"] = "Abbandonare i pacchetti";
+$_t["it"]["Disown Packages"] = "Abbandona il pacchetto";
$_t["it"]["Package details could not be found."] = "Impossibile trovare i dettagli del pacchetto.";
$_t["it"]["Package Details"] = "Dettagli del pacchetto";
-$_t["it"]["Error retrieving package list."] = "Errore nel recupero della lista dei pacchetti.";
+$_t["it"]["Error retrieving package list."] = "Si è verificato un errore durante il recupero della lista dei pacchetti.";
$_t["it"]["Files"] = "File";
@@ -47,7 +47,7 @@ $_t["it"]["Name"] = "Nome";
$_t["it"]["Per page"] = "Per pagina";
-$_t["it"]["Go back to %hsearch results%h."] = "Ritornare ai %hrisultati della ricerca%h.";
+$_t["it"]["Go back to %hsearch results%h."] = "Ritorna ai %hrisultati della ricerca%h.";
$_t["it"]["No packages matched your search criteria."] = "Nessun pacchetto corrisponde ai criteri della ricerca.";
@@ -55,21 +55,21 @@ $_t["it"]["O%hrphan"] = "O%hrfano";
$_t["it"]["orphan"] = "orfano";
-$_t["it"]["Un-Vote"] = "Rimuovere il voto";
+$_t["it"]["Un-Vote"] = "Rimuovi il voto";
-$_t["it"]["change category"] = "Cambiare categoria";
+$_t["it"]["change category"] = "Cambia categoria";
-$_t["it"]["UnNotify"] = "Togliere la notifica";
+$_t["it"]["UnNotify"] = "Togli la notifica";
-$_t["it"]["Delete Packages"] = "Eliminare i pacchetti";
+$_t["it"]["Delete Packages"] = "Elimina il pacchetto";
$_t["it"]["Maintainer"] = "Responsabile";
-$_t["it"]["Add Comment"] = "Aggiungere un commento";
+$_t["it"]["Add Comment"] = "Aggiungi un commento";
$_t["it"]["Tarball"] = "Archivio";
-$_t["it"]["Flag Out-of-date"] = "Segnare come non aggiornato";
+$_t["it"]["Flag Out-of-date"] = "Il pacchetto non è aggiornato";
$_t["it"]["Manage"] = "Organizza";
@@ -87,7 +87,7 @@ $_t["it"]["O%hut-of-Date"] = "N%hon aggiornato";
$_t["it"]["Vote"] = "Vota";
-$_t["it"]["Adopt Packages"] = "Adottare i pacchetti";
+$_t["it"]["Adopt Packages"] = "Adotta il pacchetto";
$_t["it"]["Yes"] = "Si";
@@ -101,7 +101,7 @@ $_t["it"]["Voted"] = "Votato";
$_t["it"]["No New Comment Notification"] = "Nessuna notifica di nuovo commento";
-$_t["it"]["New Comment Notification"] = "Notifica di nuovo commento";
+$_t["it"]["New Comment Notification"] = "Notifica di un nuovo commento";
$_t["it"]["Comments"] = "Commenti";
@@ -109,19 +109,19 @@ $_t["it"]["The above files have been verified (by %s) and are safe to use."] = "
$_t["it"]["Be careful! The above files may contain malicious code that can damage your system."] = "Attenzione! I file potrebbero contenere codice pericoloso in grado di danneggiare il vostro sistema.";
-$_t["it"]["Flag Safe"] = "Segnare come sicuro";
+$_t["it"]["Flag Safe"] = "Il pacchetto è sicuro";
-$_t["it"]["Flag Package Safe To Use"] = "Segnare il pacchetto come sicuro da utilizzare";
+$_t["it"]["Flag Package Safe To Use"] = "Il pacchetto è sicuro";
-$_t["it"]["Unflag Safe"] = "Segnare come non sicuro";
+$_t["it"]["Unflag Safe"] = "Il pacchetto non è sicuro";
-$_t["it"]["Unflag Package Safe To Use"] = "Segnare il pacchetto come non sicuro da utilizzare";
+$_t["it"]["Unflag Package Safe To Use"] = "Il pacchetto non è sicuro";
$_t["it"]["Safe"] = "Sicuri";
$_t["it"]["Age"] = "Data";
-$_t["it"]["First Submitted"] = "Primo invio";
+$_t["it"]["First Submitted"] = "Data di primo invio";
$_t["it"]["Last Updated"] = "Ultimo aggiornamento";
@@ -135,23 +135,23 @@ $_t["it"]["Search by"] = "Cerca per";
$_t["it"]["Submitter"] = "Contributore";
-$_t["it"]["Leave the password fields blank to keep your same password."] = "Lasciare vuoti i campi relativi alla password per mantenerla invariata.";
+$_t["it"]["Leave the password fields blank to keep your same password."] = "Lascia vuoti i campi relativi alla password per mantenerla invariata.";
$_t["it"]["You have been successfully logged out."] = "Disconnesso.";
-$_t["it"]["You must log in to view user information."] = "Bisogna autenticarsi per visualizzare queste informazioni.";
+$_t["it"]["You must log in to view user information."] = "Devi autenticarti per visualizzare queste informazioni.";
$_t["it"]["Could not retrieve information for the specified user."] = "Non è stato possibile trovare le informazioni sull'utente specificato.";
-$_t["it"]["You do not have permission to edit this account."] = "Non si dispone dei permessi necessari per modificare questo account.";
+$_t["it"]["You do not have permission to edit this account."] = "Non disponi dei permessi necessari per modificare questo account.";
-$_t["it"]["Use this form to search existing accounts."] = "Utilizzare questo modulo per cercare account esistenti.";
+$_t["it"]["Use this form to search existing accounts."] = "Utilizza questo modulo per cercare account esistenti.";
-$_t["it"]["Use this form to create an account."] = "Utilizzare questo modulo per creare un account.";
+$_t["it"]["Use this form to create an account."] = "Utilizza questo modulo per creare un account.";
-$_t["it"]["Use this form to update your account."] = "Utilizzare questo modulo per aggiornare il vostro account.";
+$_t["it"]["Use this form to update your account."] = "Utilizza questo modulo per aggiornare il vostro account.";
-$_t["it"]["You are not allowed to access this area."] = "Non si dispone dei permessi necessari per accedere.";
+$_t["it"]["You are not allowed to access this area."] = "Non disponi dei permessi necessari per accedere.";
$_t["it"]["Status"] = "Stato";
@@ -163,4 +163,12 @@ $_t["it"]["All"] = "Tutti";
$_t["it"]["Unsafe"] = "Non sicuri";
+$_t["it"]["Accounts"] = "Account";
+
+$_t["it"]["This package has been flagged out of date."] = "Questo pacchetto è stato contrassegnato come non aggiornato.";
+
+$_t["it"]["The above files have been verified (by %h%s%h) and are safe to use."] = "I file sono stati verificati (da %h%s%h) ed il loro utilizzo è da considerarsi sicuro.";
+
+$_t["it"]["Required by"] = "Richiesto da";
+
?> \ No newline at end of file
diff --git a/web/lang/it/search_po.inc b/web/lang/it/search_po.inc
index 0c83ca5c..6430ee96 100644
--- a/web/lang/it/search_po.inc
+++ b/web/lang/it/search_po.inc
@@ -9,25 +9,25 @@ $_t["it"]["None of the selected packages could be deleted."] = "Nessuno dei pacc
$_t["it"]["Your votes have been removed from the selected packages."] = "I voti sono stati rimossi dai pacchetti selezionati.";
-$_t["it"]["You did not select any packages to un-vote for."] = "Non è stato selezionato nessun pacchetto a cui rimuovere il voto.";
+$_t["it"]["You did not select any packages to un-vote for."] = "Non hai selezionato nessun pacchetto a cui rimuovere il voto.";
$_t["it"]["The selected packages have been unflagged."] = "I pacchetti selezionati non sono più contrassegnati.";
-$_t["it"]["You did not select any packages to adopt."] = "Non è stato selezionato nessun pacchetto da adottare.";
+$_t["it"]["You did not select any packages to adopt."] = "Non hai selezionato nessun pacchetto da adottare.";
-$_t["it"]["You must be logged in before you can flag packages."] = "Bisogna autenticarsi prima di poter contrassegnare i pacchetti.";
+$_t["it"]["You must be logged in before you can flag packages."] = "Devi autenticarti prima di poter contrassegnare i pacchetti.";
-$_t["it"]["You must be logged in before you can get notifications on comments."] = "Bisogna autenticarsi prima di poter ricevere le notifiche sui commenti.";
+$_t["it"]["You must be logged in before you can get notifications on comments."] = "Devi autenticarti prima di poter ricevere le notifiche sui commenti.";
-$_t["it"]["You must be logged in before you can vote for packages."] = "Bisogna autenticarsi prima di poter votare i pacchetti.";
+$_t["it"]["You must be logged in before you can vote for packages."] = "Devi autenticarti prima di poter votare i pacchetti.";
$_t["it"]["The selected packages have been flagged out-of-date."] = "I pacchetti selezionati sono stati contrassegnati come non aggiornati.";
$_t["it"]["The selected packages have been deleted."] = "I pacchetti selezionati sono stati eliminati.";
-$_t["it"]["You did not select any packages to vote for."] = "Non è stato selezionato nessun pacchetto a cui assegnare il voto.";
+$_t["it"]["You did not select any packages to vote for."] = "Non hai selezionato nessun pacchetto a cui assegnare il voto.";
-$_t["it"]["You must be logged in before you can disown packages."] = "Bisogna autenticarsi prima di poter abbandonare i pacchetti.";
+$_t["it"]["You must be logged in before you can disown packages."] = "Devi autenticarti prima di poter abbandonare i pacchetti.";
$_t["it"]["Error trying to retrieve package details."] = "Errore durante il recupero dei dettagli del pacchetto.";
@@ -37,25 +37,25 @@ $_t["it"]["You have been removed from the comment notification list."] = "Sei st
$_t["it"]["Your votes have been cast for the selected packages."] = "I voti sono stati assegnati ai pacchetti selezionati.";
-$_t["it"]["You must be logged in before you can cancel notification on comments."] = "Bisogna autenticarsi prima di poter cancellare le notifiche sui commenti.";
+$_t["it"]["You must be logged in before you can cancel notification on comments."] = "Devi autenticarti prima di poter cancellare le notifiche sui commenti.";
-$_t["it"]["You must be logged in before you can adopt packages."] = "Bisogna autenticarsi prima di poter adottare dei pacchetti.";
+$_t["it"]["You must be logged in before you can adopt packages."] = "Devi autenticarti prima di poter adottare dei pacchetti.";
$_t["it"]["You have been added to the comment notification list."] = "Sei stato aggiunto alla lista di notifica dei commenti.";
-$_t["it"]["You did not select any packages to disown."] = "Non è stato selezionato nessun pacchetto da abbandonare.";
+$_t["it"]["You did not select any packages to disown."] = "Non hai selezionato nessun pacchetto da abbandonare.";
-$_t["it"]["You must be logged in before you can un-vote for packages."] = "Bisogna autenticarsi prima di poter rimuovere il voto ai pacchetti.";
+$_t["it"]["You must be logged in before you can un-vote for packages."] = "Devi autenticarti prima di poter rimuovere il voto ai pacchetti.";
-$_t["it"]["You must be logged in before you can unflag packages."] = "Bisogna autenticarsi prima di poter rimuovere il contrassegno ai pacchetti.";
+$_t["it"]["You must be logged in before you can unflag packages."] = "Devi autenticarti prima di poter rimuovere il contrassegno ai pacchetti.";
-$_t["it"]["You did not select any packages to unflag."] = "Non è stato selezionato nessun pacchetto da segnare come aggiornato.";
+$_t["it"]["You did not select any packages to unflag."] = "Non hai selezionato nessun pacchetto da contrassegnare come aggiornato.";
-$_t["it"]["You did not select any packages to delete."] = "Non è stato selezionato nessun pacchetto da eliminare.";
+$_t["it"]["You did not select any packages to delete."] = "Non hai selezionato nessun pacchetto da eliminare.";
$_t["it"]["Couldn't add to notification list."] = "Impossibile aggiungere alla lista di notifica.";
-$_t["it"]["You did not select any packages to flag."] = "Non è stato selezionato nessun pacchetto da segnare come non aggiornato.";
+$_t["it"]["You did not select any packages to flag."] = "Non hai selezionato nessun pacchetto da contrassegnare come non aggiornato.";
$_t["it"]["The selected packages have been disowned."] = "I pacchetti selezionati sono stati abbandonati.";
diff --git a/web/lang/it/submit_po.inc b/web/lang/it/submit_po.inc
index f2dc8e54..9b5c439e 100644
--- a/web/lang/it/submit_po.inc
+++ b/web/lang/it/submit_po.inc
@@ -17,13 +17,13 @@ $_t["it"]["Error trying to upload file - please try again."] = "Errore durante l
$_t["it"]["Error exec'ing the mv command."] = "Errore nell'esecuzione del comando mv.";
-$_t["it"]["You must create an account before you can upload packages."] = "Bisogna creare un account prima di poter inviare i pacchetti.";
+$_t["it"]["You must create an account before you can upload packages."] = "Devi creare un account prima di poter inviare i pacchetti.";
$_t["it"]["Package upload successful."] = "Invio completato con successo.";
-$_t["it"]["Overwrite existing package?"] = "Sovrascrivere il pacchetto esistente?";
+$_t["it"]["Overwrite existing package?"] = "Sovrascrivi il pacchetto esistente?";
-$_t["it"]["You did not specify a package name."] = "Non è stato specificato un nome per il pacchetto.";
+$_t["it"]["You did not specify a package name."] = "Non hai inserito il nome del pacchetto.";
$_t["it"]["Error trying to unpack upload - PKGBUILD does not exist."] = "Errore nello scompattare il file inviato. Non esiste il PKGBUILD.";
@@ -41,7 +41,7 @@ $_t["it"]["Package Category"] = "Categoria del pacchetto";
$_t["it"]["Could not change to directory %s."] = "Impossibile cambiare la directory in %s.";
-$_t["it"]["You did not tag the 'overwrite' checkbox."] = "Non è stata selezionata l'opzione 'sovrascrivi'.";
+$_t["it"]["You did not tag the 'overwrite' checkbox."] = "Non hai selezionato l'opzione 'sovrascrivi'.";
$_t["it"]["Invalid name: only lowercase letters are allowed."] = "Nome non valido: sono consentite solo lettere minuscole.";
@@ -59,11 +59,11 @@ $_t["it"]["Missing pkgname variable in PKGBUILD."] = "Manca la variabile pkgname
$_t["it"]["Error - No file uploaded"] = "Errore, nessun file inviato.";
-$_t["it"]["You are not allowed to overwrite the %h%s%h package."] = "Non si dispone dei permessi per poter sovrascrivere il pacchetto %h%s%h.";
+$_t["it"]["You are not allowed to overwrite the %h%s%h package."] = "Non disponi dei permessi per poter sovrascrivere il pacchetto %h%s%h.";
-$_t["it"]["Select Location"] = "Selezionare la posizione";
+$_t["it"]["Select Location"] = "Seleziona la posizione";
-$_t["it"]["Select Category"] = "Selezionare la categoria";
+$_t["it"]["Select Category"] = "Seleziona la categoria";
$_t["it"]["Comment"] = "Commento";
@@ -75,13 +75,13 @@ $_t["it"]["Missing source variable in PKGBUILD."] = "Manca la variabile source n
$_t["it"]["Sorry, uploads are not permitted by this server."] = "Spiacente, gli invii non sono consentiti da questo server.";
-$_t["it"]["You must supply a comment for this upload/change."] = "Bisogna aggiungere un commento per questo cambiamento/invio.";
+$_t["it"]["You must supply a comment for this upload/change."] = "Devi inserire un commento.";
$_t["it"]["Yes"] = "Si";
$_t["it"]["Package URL is missing a protocol (ie. http:// ,ftp://)"] = "Manca un protocollo nell'url del pacchetto (es. http:// ,ftp://)";
-$_t["it"]["Could not re-tar"] = "Impossibile ri-archiviare";
+$_t["it"]["Could not re-tar"] = "Impossibile riarchiviare";
$_t["it"]["Binary packages and filelists are not allowed for upload."] = "Non è consentito inviare pacchetti contenenti binari e filelist.";
diff --git a/web/lang/it/test_po.inc b/web/lang/it/test_po.inc
index 40be5138..55c0a4c4 100644
--- a/web/lang/it/test_po.inc
+++ b/web/lang/it/test_po.inc
@@ -5,7 +5,7 @@
include_once("translator.inc");
global $_t;
-$_t["it"]["Select your language here: %h%s%h, %h%s%h, %h%s%h, %h%s%h."] = "Scegli la tua lingua qui: %h%s%h, %h%s%h, %h%s%h, %h%s%h.";
+$_t["it"]["Select your language here: %h%s%h, %h%s%h, %h%s%h, %h%s%h."] = "Scegli la tua lingua: %h%s%h, %h%s%h, %h%s%h, %h%s%h.";
$_t["it"]["Hello, world!"] = "Ciao, mondo!";
diff --git a/web/lang/it/timeout_po.inc b/web/lang/it/timeout_po.inc
index 2d52bc88..8bbf6556 100644
--- a/web/lang/it/timeout_po.inc
+++ b/web/lang/it/timeout_po.inc
@@ -5,8 +5,8 @@
include_once("translator.inc");
global $_t;
-$_t["it"]["Click on the Home link above to log in."] = "Fare clic su Inizio per autenticarsi.";
+$_t["it"]["Click on the Home link above to log in."] = "Clicca su Inizio per autenticarti.";
-$_t["it"]["Your session has timed out. You must log in again."] = "La sessione è scaduta. Autenticarsi di nuovo.";
+$_t["it"]["Your session has timed out. You must log in again."] = "La sessione è scaduta. Devi autenticarti di nuovo.";
?> \ No newline at end of file
diff --git a/web/lang/ru/index_po.inc b/web/lang/ru/index_po.inc
index 653511a9..45b2d402 100644
--- a/web/lang/ru/index_po.inc
+++ b/web/lang/ru/index_po.inc
@@ -67,4 +67,6 @@ $_t["ru"]["Flagged as safe"] = "Отмечено как безопасный";
$_t["ru"]["My Statistics"] = "Моя статистика";
+$_t["ru"]["Home"] = "Заглавная страница";
+
?> \ No newline at end of file
diff --git a/web/lang/ru/pkgfuncs_po.inc b/web/lang/ru/pkgfuncs_po.inc
index c78157e3..dc8df56b 100644
--- a/web/lang/ru/pkgfuncs_po.inc
+++ b/web/lang/ru/pkgfuncs_po.inc
@@ -147,16 +147,24 @@ $_t["ru"]["Could not retrieve information for the specified user."] = "Нево
$_t["ru"]["You do not have permission to edit this account."] = "Вы не имеете прав для редактирования этой учетной записи.";
-$_t["ru"]["Use this form to search existing accounts."] = "Используйте эту форму для поиска существующих учетных записей.";
+$_t["ru"]["Use this form to search existing accounts."] = "Используйте эту форму для поиска существующих учетных записей.";
$_t["ru"]["All"] = "Все";
-$_t["ru"]["Use this form to create an account."] = "Испольщзуйте эту форму для создания учетной записи.";
+$_t["ru"]["Use this form to create an account."] = "Используйте эту форму для создания учетной записи.";
-$_t["ru"]["Use this form to update your account."] = "Используйте эту форму для изменения вашей учетной записи.";
+$_t["ru"]["Use this form to update your account."] = "Используйте эту форму для изменения вашей учетной записи.";
-$_t["ru"]["You are not allowed to access this area."] = "ВДосДоступ сюда вам запрещен.";
+$_t["ru"]["You are not allowed to access this area."] = "Доступ сюда вам запрещен.";
$_t["ru"]["Unsafe"] = "Небезопаный";
+$_t["ru"]["This package has been flagged out of date."] = "Пакет отмечен как устаревший.";
+
+$_t["ru"]["The above files have been verified (by %h%s%h) and are safe to use."] = "Файлы проверены %h%s%h и могут быть безопасно использованы.";
+
+$_t["ru"]["Required by"] = "Требуется пакетами";
+
+$_t["ru"]["Accounts"] = "Учетные записи";
+
?> \ No newline at end of file
diff --git a/web/lib/aur.inc b/web/lib/aur.inc
index cce53848..d7ffbb89 100644
--- a/web/lib/aur.inc
+++ b/web/lib/aur.inc
@@ -3,6 +3,7 @@ header('Content-Type: text/html; charset=utf-8');
header('Cache-Control: no-cache, must-revalidate');
header('Expires: Tue, 11 Oct 1988 22:00:00 GMT'); // quite a special day
header('Pragma: no-cache');
+include_once("version.inc");
include_once("config.inc");
include_once("aur_po.inc");
@@ -12,26 +13,6 @@ include_once("aur_po.inc");
# is using...
#
-# Define global variables
-#
-$LOGIN_TIMEOUT = 7200; # number of idle seconds before timeout
-$SUPPORTED_LANGS = array( # what languages we have translations for
- "en" => "English",
- "pl" => "Polski",
- "it" => "Italiano",
- "ca" => "Català",
- "pt" => "Português",
- # Eventually we will comment these in, when they are ready - PJM - 4/2005
- "es" => "Español",
- "de" => "Deutsch",
- "ru" => "Русский",
- "fr" => "Français",
-);
-
-# debugging variables
-#
-$QBUG = 1; # toggle query logging to /var/tmp/aurq.log
-$DBUG = 1; # use dbug($msg) to log to /var/tmp/aurd.log
# return an array of info for each Trusted user
@@ -268,17 +249,13 @@ function uid_from_sid($sid="") {
# connect to the database
#
function db_connect() {
- global $AUR_db_host;
- global $AUR_db_name;
- global $AUR_db_user;
- global $AUR_db_pass;
- $handle = mysql_pconnect($AUR_db_host, $AUR_db_user, $AUR_db_pass);
+ $handle = mysql_pconnect(AUR_db_host, AUR_db_user, AUR_db_pass);
if (!$handle) {
die("Error connecting to AUR database: " . mysql_error());
}
- mysql_select_db($AUR_db_name, $handle) or
+ mysql_select_db(AUR_db_name, $handle) or
die("Error selecting AUR database: " . mysql_error());
return $handle;
@@ -296,7 +273,7 @@ function db_query($query="", $db_handle="") {
$db_handle = db_connect();
}
if ($QBUG) {
- $fp = fopen("/var/tmp/aurq.log", "a");
+ $fp = fopen(AURQ_LOG, "a");
fwrite($fp, $query . "\n");
fclose($fp);
}
@@ -359,100 +336,77 @@ function html_header() {
global $_SERVER;
global $_COOKIE;
global $LANG;
- print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
- print "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"";
- print " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
- print "<html xmlns=\"http://www.w3.org/1999/xhtml\"";
- print " xml:lang=\"".$LANG."\" lang=\"".$LANG."\">\n";
- print "<head>\n";
- print "<title>AUR (".$LANG.")</title>\n";
- print "<link rel='stylesheet' type='text/css' href='/css/fonts.css'/>\n";
- print "<link rel='stylesheet' type='text/css' href='/css/containers.css'/>\n";
- print "<link rel='shortcut icon' href='/images/favicon.ico'/>\n";
- print "<link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='/rss2.php' />\n";
- print "<meta http-equiv=\"Content-Type\"";
- print " content=\"text/html; charset=UTF-8\" />\n";
- print "</head>\n";
- print "<body bgcolor='white'>\n";
- print "<table cellspacing='0' ";
- print "style='background-color: #000; width: 100%;'>\n";
- print " <tr>\n";
- print " <td class='preHeader'><span class='preHeader'>";
- print __("%s: %sAn ArchLinux project%s", array("AUR", "<a href=\"http://www.archlinux.org\">", "</a>"));
- print "</span></td>\n";
- print " </tr>\n";
- print " <tr>\n";
- print " <td class='headerFill'>\n";
- print " <table width='100%'>\n";
- print " <tr>\n";
- print " <td class='headerDisplay'><a href='/index.php'>";
-
- # XXX Can I scale a PNG like this?
- #
- print "<img src='/images/AUR-logo-80.png' width='85' height='45' ";
- print "alt='AUR' border='0' /></a></td>\n";
- print " <td class='headerDisplay' valign='top' align='right'>";
- print "<span class='preHeader'>ArchLinux User-community Repository</span><br />";
-
- # XXX CSS help - a:link, a:visited, etc are defined, but I don't want to
- # use the defaults. Is this the way to override them?
- #
- print "<a href='".$_SERVER["PHP_SELF"]."?setlang=en'><span class='sideBarSmallHeader'>English</span></a> ";
- print "<a href='".$_SERVER["PHP_SELF"]."?setlang=pl'><span class='sideBarSmallHeader'>Polski</span></a> ";
- print "<a href='".$_SERVER["PHP_SELF"]."?setlang=it'><span class='sideBarSmallHeader'>Italiano</span></a> ";
- print "<a href='".$_SERVER["PHP_SELF"]."?setlang=ca'><span class='sideBarSmallHeader'>Català</span></a> ";
- print "<a href='".$_SERVER["PHP_SELF"]."?setlang=pt'><span class='sideBarSmallHeader'>Português</span></a> ";
- print "<a href='".$_SERVER["PHP_SELF"]."?setlang=es'><span class='sideBarSmallHeader'>Español</span></a> ";
- print "<a href='".$_SERVER["PHP_SELF"]."?setlang=de'><span class='sideBarSmallHeader'>Deutsch</span></a> ";
- print "<a href='".$_SERVER["PHP_SELF"]."?setlang=fr'><span class='sideBarSmallHeader'>Français</span></a>";
- print "<a href='".$_SERVER["PHP_SELF"]."?setlang=ru'><span class='sideBarSmallHeader'>Русский</span></a>";
- print " </td>\n";
- print " </tr>\n";
- print " </table>\n";
- print " </td>\n";
- print " </tr>\n";
-
- # Menu items
- #
- print " <tr>\n";
- print " <td class='mainLinks' align='center'>";
- print " <span class='f2'><span class='black'>.:</span>";
- print " <a href='/index.php'>".__("Home")."</a> ";
- print " <span class='black'> - </span> ";
- print " <a href='/account.php'>".__("Accounts")."</a> ";
- print " <span class='black'> - </span> ";
- print " <a href='/packages.php'>".__("Packages")."</a> ";
+ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+ echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"";
+ echo " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
+ echo "<html xmlns=\"http://www.w3.org/1999/xhtml\"";
+ echo " xml:lang=\"".$LANG."\" lang=\"".$LANG."\">\n";
+ echo "<head>\n";
+ echo "<title>AUR (".$LANG.")</title>\n";
+ echo "<link rel='stylesheet' type='text/css' href='/css/fonts.css'/>\n";
+ echo "<link rel='stylesheet' type='text/css' href='/css/containers.css'/>\n";
+ echo "<link rel='stylesheet' type='text/css' href='/css/arch.css'/>\n";
+ echo "<link rel='shortcut icon' href='/images/favicon.ico'/>\n";
+ echo "<link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='/rss2.php' />\n";
+ echo "<meta http-equiv=\"Content-Type\"";
+ echo " content=\"text/html; charset=UTF-8\" />\n";
+ echo "</head>\n";
+ echo "<body bgcolor='white'>\n";
+ echo <<<END1
+<div id="head_container">
+ <div id="title">
+ <div id="logo"><a href="/"><img src="/images/logo.png" alt="Arch Logo" /></a></div>
+ <div id="titleimg"><a href="/"><img src="/images/title.png" alt="Arch Linux" /></a></div>
+ </div>
+ <div style="float: right; color: #eeeeee; font-size: small">
+ </div>
+ <div id="main_nav">
+ <ul>
+ <li><a href="http://www.archlinux.org/download/">Get Arch</a></li>
+ <li class="selected"><a href="http://aur.archlinux.org">AUR</a></li>
+ <li><a href="http://bugs.archlinux.org">Bugs</a></li>
+ <li><a href="http://wiki.archlinux.org">Wiki</a></li>
+ <li><a href="http://bbs.archlinux.org">Forums</a></li>
+ <li><a href="http://www.archlinux.org">Home</a></li>
+ </ul>
+ </div>
+ <div id="sub_nav">
+ <ul>
+
+END1;
if ($_COOKIE["AURSID"]) {
- # Only display these items if the visitor is logged in. This should
- # be a safe check because check_sid() has been called prior to
- # html_header().
- #
- print " <span class='black'> - </span> ";
- print " <a href='/pkgsubmit.php'>".__("Submit")."</a> ";
- }
- print " <span class='black'> - </span> ";
- print " <a href='http://bugs.archlinux.org/index.php?tasks=all&project=2'>".__("Bugs")."</a> ";
- print " <span class='black'> - </span> ";
- print " <a href='http://www.archlinux.org/mailman/listinfo/tur-users'>".__("Discussion")."</a> ";
- if ($_COOKIE["AURSID"]) {
- # This is a usability change, so we can go to My Packages page
- # with just one click
- # Added by: dsa <dsandrade@gmail.com>
- print " <span class='black'> - </span> ";
- print " <a href='/packages.php?do_MyPackages=1'>".__("My Packages")."</a> ";
-
- print " <span class='black'> - </span> ";
- print " <a href='/logout.php'>".__("Logout")."</a> ";
+ # This is a usability change, so we can go to My Packages page
+ # with just one click
+ # Added by: dsa <dsandrade@gmail.com>
+ echo ' <li><a href="/logout.php">'.__("Logout")."</a></li>\n";
+ echo ' <li><a href="/pkgsubmit.php">'.__("Submit")."</a></li>\n";
+ echo ' <li><a href="/packages.php?do_MyPackages=1">'.__("My Packages")."</a></li>\n";
}
- print " <span class='black'>:.</span></span>";
- print " </td>";
- print " </tr>";
- print " <tr>\n";
- print " <td class='contentDisplay'>\n";
- print " &nbsp;<br />\n";
- print "<!-- Start of main content -->\n\n";
-
- return;
+ echo ' <li><a href="http://www.archlinux.org/mailman/listinfo/tur-users/">'.__("Discussion")."</a></li>\n";
+ echo ' <li><a href="http://bugs.archlinux.org/index.php?tasks=all&project=2">'.__("Bugs")."</a></li>\n";
+ echo ' <li><a href="/packages.php">'.__("Packages")."</a></li>\n";
+ echo ' <li><a href="/account.php">'.__("Accounts")."</a></li>\n";
+ echo ' <li><a href="/index.php">AUR '.__("Home")."</a></li>\n";
+ echo " </ul>\n";
+ echo " </div>\n";
+ echo ' <div id="lang_sub">'."\n";
+ echo " <ul>\n";
+ echo " <li><a href='".$_SERVER["PHP_SELF"]."?setlang=ru' title='Русский'>RU</a></li>\n";
+ echo " <li><a href='".$_SERVER["PHP_SELF"]."?setlang=fr' title='Français'>FR</a></li>\n";
+ echo " <li><a href='".$_SERVER["PHP_SELF"]."?setlang=de' title='Deutsch'>DE</a></li>\n";
+ echo " <li><a href='".$_SERVER["PHP_SELF"]."?setlang=es' title='Español'>ES</a></li>\n";
+ echo " <li><a href='".$_SERVER["PHP_SELF"]."?setlang=pt' title='Português'>PT</a></li>\n";
+ echo " <li><a href='".$_SERVER["PHP_SELF"]."?setlang=ca' title='Català'>CA</a></li>\n";
+ echo " <li><a href='".$_SERVER["PHP_SELF"]."?setlang=it' title='Italiano'>IT</a></li>\n";
+ echo " <li><a href='".$_SERVER["PHP_SELF"]."?setlang=pl' title='Polski'>PL</a></li>\n";
+ echo " <li><a href='".$_SERVER["PHP_SELF"]."?setlang=en' title='English'>EN</a></li>\n";
+ echo " <li>Lang: </li>\n";
+ echo " </ul>\n";
+ echo " </div>\n";
+ echo "</div>\n";
+ echo "<div id=\"maincontent\">\n";
+ echo "<!-- Start of main content -->\n\n";
+ return;
}
@@ -461,9 +415,6 @@ function html_header() {
function html_footer($ver="") {
print "\n\n<!-- End of main content -->\n";
print " <br />\n";
- print " </td>\n";
- print " </tr>\n";
- print "</table>\n";
if ($ver) {
print "<p>\n";
print "<table border='0' cellpadding='0' cellspacing='0' width='97%'>\n";
@@ -471,7 +422,7 @@ function html_footer($ver="") {
print "</table>\n";
print "</p>\n";
}
- print "<br />\n";
+ print "</div>\n";
print "</body>\n</html>";
return;
}
@@ -479,7 +430,7 @@ function html_footer($ver="") {
# debug logging
#
function dbug($msg) {
- $fp = fopen("/var/tmp/aurd.log", "a");
+ $fp = fopen(AURD_LOG, "a");
fwrite($fp, $msg . "\n");
fclose($fp);
return;
diff --git a/web/lib/config.inc.proto b/web/lib/config.inc.proto
index fcb8b3a2..11c0cb41 100644
--- a/web/lib/config.inc.proto
+++ b/web/lib/config.inc.proto
@@ -1,15 +1,42 @@
<?php
# NOTE: modify these variables if your MySQL setup is different
#
-$AUR_db_host = "localhost:/tmp/mysql.sock";
-$AUR_db_name = "aur";
-$AUR_db_user = "aur";
-$AUR_db_pass = "aur";
+define( "AUR_db_host", "localhost:/tmp/mysql.sock" );
+define( "AUR_db_name", "aur" );
+define( "AUR_db_user", "aur" );
+define( "AUR_db_pass", "aur" );
# Configuration of directories where things live
-$UPLOAD_DIR = "/home/aur/unsupported-temp/";
-$INCOMING_DIR = "/home/aur/unsupported/";
-$URL_DIR = "/packages/";
+define( "UPLOAD_DIR", "/home/aur/unsupported-temp/" );
+define( "INCOMING_DIR", "/home/aur/unsupported/" );
+define( "URL_DIR", "/packages/" );
+
+define( "AURQ_LOG", "/home/aur/aurq.log" );
+define( "AURD_LOG", "/home/aur/aurd.log" );
+
+define( "USERNAME_MIN_LEN", 3 );
+define( "USERNAME_MAX_LEN", 16 );
+define( "PASSWD_MIN_LEN", 4 );
+define( "PASSWD_MAX_LEN", 128 );
+
+$LOGIN_TIMEOUT = 7200; # number of idle seconds before timeout
+
+# debugging variables
+#
+$QBUG = 1; # toggle query logging to /var/tmp/aurq.log
+$DBUG = 1; # use dbug($msg) to log to /var/tmp/aurd.log
+
+$SUPPORTED_LANGS = array( # what languages we have translations for
+ "en" => "English",
+ "pl" => "Polski",
+ "it" => "Italiano",
+ "ca" => "Català",
+ "pt" => "Português",
+ "es" => "Español",
+ "de" => "Deutsch",
+ "ru" => "Русский",
+ "fr" => "Français"
+);
# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index b9ad0d4a..66fa9ec9 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -33,8 +33,10 @@ function pkgsearch_results_link() {
}
}
$url_data .= "'>";
+ print "<center>";
print __("Go back to %hsearch results%h.",
array($url_data, "</a>"));
+ print "</center>";
print "\n<br />\n";
return;
@@ -108,7 +110,7 @@ function pkgCategories() {
function pkgLocations() {
$locs = array();
$dbh = db_connect();
- $q = "SELECT * FROM PackageLocations WHERE ID != 1 ";
+ $q = "SELECT * FROM PackageLocations WHERE ID != 1 AND ID < 4 ";
$q.= "ORDER BY Location ASC";
$result = db_query($q, $dbh);
if ($result) {
@@ -152,6 +154,25 @@ function package_dependencies($pkgid=0) {
return $deps;
}
+# reverse deps by tardo
+#
+function package_required($pkgid=0) {
+ $deps = array();
+ if ($pkgid) {
+ $dbh = db_connect();
+ $q = "SELECT PackageID, Name, DummyPkg from PackageDepends, Packages ";
+ $q.= "WHERE PackageDepends.PackageID = Packages.ID ";
+ $q.= "AND PackageDepends.DepPkgID = ";
+ $q.= mysql_real_escape_string($pkgid);
+ $result = db_query($q, $dbh);
+ if (!$result) {return array();}
+ while ($row = mysql_fetch_row($result)) {
+ $deps[] = $row;
+ }
+ }
+ return $deps;
+}
+
# create a dummy package and return it's Packages.ID if it already exists,
# return the existing ID
#
@@ -268,36 +289,19 @@ function package_details($id=0, $SID="") {
} else {
# print out package details
- #
- print "<br />\n";
- print "<center>\n";
- print "<table cellspacing='3' class='boxSoft'>\n";
- print "<tr>\n";
- print " <td class='boxSoftTitle' align='right'>";
- print "<span class='f3'>".__("Package Details")."</span></td>\n";
- print "</tr>\n";
- print "<tr>\n";
- print " <td class='boxSoft'>\n";
- print "<center>\n";
- print "<table>\n";
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'><span class='f2'>";
- print $row["Name"] . " " . $row["Version"]."</span></td>\n";
- print "</tr>\n";
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'><span class='f3'>";
- print "<a href='".$row["URL"]."'>".$row["URL"]."</a></span></td>\n";
- print "</tr>\n";
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'><span class='f3'>".$row["Description"];
- print "</a></span></td>\n";
- print "</tr>\n";
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'><img src='/images/pad.gif' height='30'></td>";
- print "</tr>\n";
-
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'><span class='f3'>";
+ #
+ echo "<div class=\"pgbox\">\n";
+ echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Package Details")."</span></div>\n";
+ echo " <div class=\"pgboxbody\">\n";
+ echo " <table>\n";
+ echo " <tr><td class='boxSoft' colspan='2'><span class='f2'>";
+ echo $row["Name"] . " " . $row["Version"]."</span></td></tr>\n";
+ echo " <tr><td class='boxSoft' colspan='2'><span class='f3'>";
+ echo "<a href='".$row["URL"]."'>".$row["URL"]."</a></span></td></tr>\n";
+ echo " <tr><td class='boxSoft' colspan='2'><span class='f3'>".$row["Description"];
+ echo "</a></span></td></tr>\n";
+ echo " <tr><td class='boxSoft' colspan='2'><img src='/images/pad.gif' height='30'></td></tr>\n";
+ echo " <tr><td class='boxSoft' colspan='2'><span class='f3'>";
if ($row["Location"] == "unsupported" and (
uid_from_sid($SID) == $row["MaintainerUID"] or
(account_from_sid($SID) == "Developer" or
@@ -309,87 +313,68 @@ function package_details($id=0, $SID="") {
} else {
$edit_cat = $row["Category"];
}
- print $row["Location"]." :: ".$edit_cat."</span></td>";
-
- print "</tr>\n";
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'><span class='f3'>".__("Maintainer").": ";
+ echo $row["Location"]." :: ".$edit_cat."</span></td></tr>\n";
+ echo " <tr><td class='boxSoft' colspan='2'><span class='f3'>".__("Maintainer").": ";
if ($row["MaintainerUID"]) {
$maintainer = username_from_id($row["MaintainerUID"]);
if ($SID) {
- print "<a href='/account.php?Action=AccountInfo&ID=";
- print $row["MaintainerUID"] . "'>";
- print $maintainer . "</a></span></td>";
+ echo "<a href='/account.php?Action=AccountInfo&ID=";
+ echo $row["MaintainerUID"] . "'>";
+ echo $maintainer . "</a></span></td>";
} else {
- print $maintainer . "</span></td>";
+ echo $maintainer . "</span></td>";
}
} else {
$maintainer = "None";
- print $maintainer . "</span></td>";
+ echo $maintainer . "</span></td>";
}
- print "</tr>\n";
-
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'><span class='f3'>".__("Votes").": ";
- print $row["NumVotes"] . "</span></td>";
- print "</tr>\n";
+ echo " </tr>\n";
+ echo " <tr><td class='boxSoft' colspan='2'><span class='f3'>".__("Votes").": ";
+ echo $row["NumVotes"] . "</span></td></tr>\n";
# In case of wanting to put a custom message
$msg = __("unknown");
$license = $row["License"] == "" ? $msg : $row["License"];
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'><br><span class='f3'>".__("License").": ".$license;
- print "</a></span></td>\n";
- print "</tr>\n";
-
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'><img src='/images/pad.gif' height='15'></td>";
- print "</tr>\n";
+ echo " <tr><td class='boxSoft' colspan='2'><br><span class='f3'>".__("License").": ".$license;
+ echo "</a></span></td></tr>\n";
+ echo " <tr><td class='boxSoft' colspan='2'><img src='/images/pad.gif' height='15'></td></tr>\n";
# Print the timestamps for last updates
$updated_time = ($row["ModifiedTS"] == 0) ? "(unknown)" : gmdate("r", intval($row["ModifiedTS"]));
$submitted_time = ($row["SubmittedTS"] == 0) ? "(unknown)" : gmdate("r", intval($row["SubmittedTS"]));
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'>";
- print "<span class='f3'>";
- print __("Last Updated").": ".$updated_time."<br>";
- print __("First Submitted").": ".$submitted_time;
- print "</span>";
- print "</td>\n";
- print "</tr>\n";
-
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'><img src='/images/pad.gif' height='15'></td>";
- print "</tr>\n";
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'><span class='f3'>";
+ echo " <tr><td class='boxSoft' colspan='2'><span class='f3'>";
+ echo __("Last Updated").": ".$updated_time."<br>";
+ echo __("First Submitted").": ".$submitted_time."</span></td></tr>\n";
+ echo " <tr><td class='boxSoft' colspan='2'><img src='/images/pad.gif' height='15'></td></tr>\n";
+ echo " <tr><td class='boxSoft' colspan='2'><span class='f3'>";
if ($row["LocationID"] == 2) {
- global $URL_DIR;
- $urlpath = $URL_DIR.$row["Name"]."/".$row["Name"];
+ $urlpath = URL_DIR.$row["Name"]."/".$row["Name"];
print "<a href='$urlpath.tar.gz'>".__("Tarball")."</a> :: <a href='$urlpath'>".__("Files")."</a> :: <a href='$urlpath/PKGBUILD'>PKGBUILD</a></span></td>";
} elseif ($row["LocationID"] == 3) {
- print "<a href='http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/" . $row["Category"] . "/" . $row["Name"] . "/?cvsroot=AUR&only_with_tag=CURRENT'>CVS</td>";
+ echo "<a href='http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/" . $row["Category"] . "/" . $row["Name"] . "/?cvsroot=AUR&only_with_tag=CURRENT'>CVS</td>";
}
- print "</tr>\n";
+ echo "</tr>\n";
if ($row["LocationID"] == 2) {
- print "<tr>\n";
- print " <td colspan='2'>";
+ echo " <tr><td colspan='3'>";
if ($row["Safe"]) {
- print "<span class='f7'>".__("The above files have been verified (by %s) and are safe to use.", array(username_from_id($row["VerifiedBy"])))."</span></td>";
+ echo "<span class='f7'>".__("The above files have been verified (by %h%s%h) and are safe to use.", array("<a href='/account.php?Action=AccountInfo&ID=".$row["VerifiedBy"]."'>", username_from_id($row["VerifiedBy"]), "</a>"))."</span></td>";
} else {
- print "<span class='f6'>".__("Be careful! The above files may contain malicious code that can damage your system.")."</span></td>";
- }
+ echo "<span class='f6'>".__("Be careful! The above files may contain malicious code that can damage your system.")."</span></td>";
+ }
+ echo " </tr>\n";
}
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'><img src='/images/pad.gif' height='30'></td>";
- print "</tr>\n";
- print "<tr>\n";
- print " <td valign='top' style='padding-right: 10'>";
- print "<table class='boxSoft' style='width: 200px'>";
- print "<tr><td class='boxSoftTitle'><span class='f3'>";
- print __("Dependencies")."</span></td></tr>\n";
- print "<tr><td class='boxSoft'>";
+ if ($row["OutOfDate"] == 1) {
+ echo "\n<tr><td colspan='2'>";
+ echo "<span class='f6'>".__("This package has been flagged out of date.")."</span></td></tr>";
+ }
+ echo " <tr><td class='boxSoft' colspan='2'><img src='/images/pad.gif' height='30'></td></tr>\n";
+ echo " <tr>\n";
+ echo " <td valign='top' style='padding-right: 10'>\n";
+ echo " <table class='boxSoft' style='width: 200px'>\n";
+ echo " <tr><td class='boxSoftTitle'><span class='f3'>";
+ echo __("Dependencies")."</span></td></tr>\n";
+ echo " <tr><td class='boxSoft'>";
$deps = package_dependencies($row["ID"]); # $deps[0] = array('id','name', 'dummy');
while (list($k, $darr) = each($deps)) {
$url = "<a href='/packages.php?do_Details=1&ID=".$darr[0];
@@ -404,196 +389,205 @@ function package_details($id=0, $SID="") {
// $darr[3] is the DepCondition
+ if ($darr[2] == 0) echo $url."'>".$darr[1].$darr[3]."</a><br />\n";
+ else echo "<a href='http://archlinux.org/packages/search/".$darr[1]."'>".$darr[1].$darr[3]."</a><br />\n";
+ }
+ echo "</td></tr>\n";
+ echo "</table></td>";
+
+ # reverse-deps by tardo - could use some beautification
+ echo " <td valign='top'>";
+ echo "<table class='boxSoft' style='width: 200px'>";
+ echo "<tr><td class='boxSoftTitle'><span class='f3'>";
+ echo __("Required by")."</span></td></tr>\n";
+ echo "<tr><td class='boxSoft'>";
+ $deps = package_required($row["ID"]);
+ while (list($k, $darr) = each($deps)) {
+ $url = "<a href='/packages.php?do_Details=1&ID=".$darr[0];
+ while(list($k, $var) = each($pkgsearch_vars)) {
+ if (($var == "do_MyPackages" || $var == "do_Orphans") && $_REQUEST[$var]) {
+ $url .= "&".$var."=1";
+ } else {
+ $url .= "&".$var."=".rawurlencode(stripslashes($_REQUEST[$var]));
+ }
+ }
+ reset($pkgsearch_vars);
+
+ // $darr[3] is the DepCondition
+
if ($darr[2] == 0) print $url."'>".$darr[1].$darr[3]."</a><br />\n";
- else print "<a href='#'>".$darr[1].$darr[3]."</a><br />\n";
+ else print "<a href='http://archlinux.org/packages/search/".$darr[1]."'>".$darr[1].$darr[3]."</a><br />\n";
}
- print "</td></tr>\n";
- print "</table></td>";
-
- print " <td valign='top'>";
- print "<table class='boxSoft' style='width: 200px'>";
- print "<tr><td class='boxSoftTitle'><span class='f3'>";
- print __("Sources")."</span></td></tr>\n";
- print "<tr><td class='boxSoft'>";
+ echo "</td></tr>\n";
+ echo " </table>\n";
+ echo " </td>\n";
+ echo " <td valign='top'>\n";
+ echo " <table class='boxSoft' style='width: 200px'>\n";
+ echo " <tr><td class='boxSoftTitle'><span class='f3'>";
+ echo __("Sources")."</span></td></tr>\n";
+ echo " <tr><td class='boxSoft'>";
$sources = package_sources($row["ID"]); # $sources[0] = 'src';
while (list($k, $src) = each($sources)) {
$parsed_url = parse_url($src);
if ($parsed_url['scheme'])
{
//It is an external source
- print "<a href='".$src."'>".$src."</a><br />\n";
+ echo "<a href='".$src."'>".$src."</a><br />\n";
}
else
{
//It is presumably an internal source
if ($row["LocationID"] == 2) {
- print "<a href='".dirname($row['URLPath'])."/".$row['Name'];
- print "/".$src."'>".$src."</a><br />\n";
+ echo "<a href='".dirname($row['URLPath'])."/".$row['Name'];
+ echo "/".$src."'>".$src."</a><br />\n";
} elseif ($row["LocationID"] == 3) {
- print "<a href='http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/*checkout*/".$row["Category"]."/".$row["Name"]."/".$src."/?rev=HEAD&cvsroot=AUR&only_with_tag=CURRENT'>";
- print $src."</a><br />\n";
+ echo "<a href='http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/*checkout*/".$row["Category"]."/".$row["Name"]."/".$src."/?rev=HEAD&cvsroot=AUR&only_with_tag=CURRENT'>";
+ echo $src."</a><br />\n";
}
}
}
- print "</td></tr>\n";
- print "</table></td>";
- print "</tr>\n";
- print "<tr>\n";
- print " <td colspan='2'><img src='/images/pad.gif' height='2'>";
- print "</td></tr>\n";
- print "</table>\n";
- print "</center>\n";
- print " </td>\n";
- print "</tr>\n";
+ echo "</td></tr>\n";
+ echo " </table>\n";
+ echo " </td>\n";
+ echo " </tr>\n";
+ echo " </table>\n";
+ echo " </div>\n";
+ echo "</div>\n\n";
+ echo "<br />\n\n";
- print "</table><br />\n";
# Actions Bar
#
if ($SID) {
- print "<table cellspacing='3' class='boxSoft'>\n";
- print "<tr><td class='boxSoftTitle' align='right'><span class='f3'>".__("Actions")."</span></td></tr>\n";
- print "<tr>\n";
- print "<td class='boxSoft'><form action='/packages.php' method='post'>\n";
- print "<input type='hidden' name='IDs[".$row["ID"]."]' value='1'>\n";
- print "<input type='hidden' name='ID' value='".$row["ID"]."'>\n";
+ echo "<div class=\"pgbox\">\n";
+ echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Actions")."</span></div>\n";
+ echo " <div class=\"pgboxbody\">\n";
+ echo " <form action='/packages.php' method='post'>\n";
+ echo " <input type='hidden' name='IDs[".$row["ID"]."]' value='1'>\n";
+ echo " <input type='hidden' name='ID' value='".$row["ID"]."'>\n";
# Voting Button
#
$q = "SELECT * FROM PackageVotes WHERE UsersID = ".uid_from_sid($SID);
$q.= " AND PackageID = ".$row["ID"];
if (!mysql_num_rows(db_query($q, $dbh))) {
- print "<input type='submit' class='button' name='do_Vote'";
- print " value='".__("Vote")."'>";
+ echo " <input type='submit' class='button' name='do_Vote'";
+ echo " value='".__("Vote")."'>";
} else {
- print "<input type='submit' class='button' name='do_UnVote'";
- print " value='".__("Un-Vote")."'>";
+ echo "<input type='submit' class='button' name='do_UnVote'";
+ echo " value='".__("Un-Vote")."'>";
}
# Comment Nofify Button
#
$q = "SELECT * FROM CommentNotify WHERE UserID = ".uid_from_sid($SID);
$q.= " AND PkgID = ".$row["ID"];
if (!mysql_num_rows(db_query($q, $dbh))) {
- print "<input type='submit' class='button' name='do_Notify'";
- print " value='".__("Notify")."' title='".__("New Comment Notification")."'>";
+ echo "<input type='submit' class='button' name='do_Notify'";
+ echo " value='".__("Notify")."' title='".__("New Comment Notification")."'>";
} else {
- print "<input type='submit' class='button' name='do_UnNotify'";
- print " value='".__("UnNotify")."' title='".__("No New Comment Notification")."'>";
+ echo "<input type='submit' class='button' name='do_UnNotify'";
+ echo " value='".__("UnNotify")."' title='".__("No New Comment Notification")."'>";
}
# Flag Safe Button
#
- if ($row["LocationID"] == 2 && (account_from_sid($SID) == "Trusted User" || account_from_sid($SID) == "Developer"))
- {
- if ($row["Safe"] == 0)
- {
- print "<input type='submit' class='button' name='do_FlagSafe'";
- print " value='".__("Flag Safe")."' title='".__("Flag Package Safe To Use")."'>";
- }
- else
- {
- print "<input type='submit' class='button' name='do_UnFlagSafe'";
- print " value='".__("Unflag Safe")."' title='".__("Unflag Package Safe To Use")."'>";
+ if ($row["LocationID"] == 2 && (account_from_sid($SID) == "Trusted User" || account_from_sid($SID) == "Developer")) {
+ if ($row["Safe"] == 0) {
+ echo "<input type='submit' class='button' name='do_FlagSafe'";
+ echo " value='".__("Flag Safe")."' title='".__("Flag Package Safe To Use")."'>";
+ } else {
+ echo "<input type='submit' class='button' name='do_UnFlagSafe'";
+ echo " value='".__("Unflag Safe")."' title='".__("Unflag Package Safe To Use")."'>";
}
+ }
+
+ if ($row["OutOfDate"] == 0) {
+ echo "<input type='submit' class='button' name='do_Flag'";
+ echo " value='".__("Flag Out-of-date")."'>\n";
+ } else {
+ echo "<input type='submit' class='button' name='do_UnFlag'";
+ echo " value='".__("Unflag Out-of-date")."'>\n";
}
- if ($row["OutOfDate"] == 0)
- {
- print "<input type='submit' class='button' name='do_Flag'";
- print " value='".__("Flag Out-of-date")."'>\n";
- }
- else
- {
- print "<input type='submit' class='button' name='do_UnFlag'";
- print " value='".__("Unflag Out-of-date")."'>\n";
- }
- if ($row["AURMaintainerUID"] == 0 && $row["MaintainerUID"] == 0)
- {
- print "<input type='submit' class='button' name='do_Adopt'";
- print " value='".__("Adopt Packages")."'>\n";
- }
+ if ($row["AURMaintainerUID"] == 0 && $row["MaintainerUID"] == 0) {
+ echo "<input type='submit' class='button' name='do_Adopt'";
+ echo " value='".__("Adopt Packages")."'>\n";
+ }
- if ($row["MaintainerUID"] == uid_from_sid($SID))
- {
- print "<input type='submit' class='button' name='do_Disown'";
- print " value='".__("Disown Packages")."'>\n";
- }
+ if ($row["MaintainerUID"] == uid_from_sid($SID)) {
+ echo "<input type='submit' class='button' name='do_Disown'";
+ echo " value='".__("Disown Packages")."'>\n";
+ }
- if ($row["MaintainerUID"] == uid_from_sid($SID) ||
- account_from_sid($SID) == "Trusted User" ||
- account_from_sid($SID) == "Developer")
- {
- print "<input type='submit' class='button' name='do_Delete'";
- print " value='".__("Delete Packages")."'>\n";
- }
+ if ($row["MaintainerUID"] == uid_from_sid($SID) ||
+ account_from_sid($SID) == "Trusted User" ||
+ account_from_sid($SID) == "Developer") {
+ echo "<input type='submit' class='button' name='do_Delete'";
+ echo " value='".__("Delete Packages")."'>\n";
+ }
- print "</form></td></tr>\n";
- print "</table><br />\n";
+ echo " </form>\n";
+ echo " </div>\n";
+ echo "</div>\n";
+ echo "\n<br />\n\n";
}
# Comments
#
- print "<table cellspacing='3' class='boxSoft'>\n";
- print "<tr><td class='boxSoftTitle' align='right'><span class='f3'>".__("Comments")."</span></td></tr>\n";
- print "<tr>\n";
- print "<td class='boxSoft'>";
-
- print "<table width='100%'>\n";
+ echo "<div class=\"pgbox\">\n";
+ echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Comments")."</span></div>\n";
+ echo " <div class=\"pgboxbody-comment\">\n";
+ echo " <table width='100%'>\n";
+ echo " <tr>\n";
+ echo " <td colspan='2'>\n";
+ echo " <form action='/pkgedit.php' method='post'>\n";
+ echo " <input type='hidden' name='ID' value='".$row["ID"]."'>\n";
+ echo " <input type='submit' class='button' name='add_Comment' value=\"";
+ echo __("Add Comment")."\">\n";
+ echo " </form>\n";
+ echo " </td>\n";
+ echo " </tr>\n";
$comments = package_comments($row["ID"]);
if (!empty($comments)) {
while (list($indx, $carr) = each($comments)) {
- print "<tr>\n";
- print " <td class='boxSoft' colspan='2'>";
- print "<img src='/images/pad.gif' height='2'></td></tr>\n";
-
- print "<tr>\n";
- print " <td valign='top' style='padding-right: 10' colspan='2'>";
- print "<table class='boxSoft' width='100%'>";
- print "<tr><td class='boxSoftTitle'><span class='f3'>";
+
+ echo " <tr>\n";
+ echo " <td valign='top' style='padding-right: 10' colspan='2'>\n";
+ echo " <table class='boxSoft' width='100%'>\n";
+ echo " <tr>\n";
+ echo " <td class='boxSoftTitle'><span class='f3'>";
if (canDeleteComment($carr["ID"], account_from_sid($SID), $SID)) {
$durl = "<a href='/pkgedit.php?del_Comment=1";
$durl.= "&comment_id=".$carr["ID"]."&ID=".$row["ID"];
$durl.= "'><img src='/images/x.png' border='0'";
$durl.= " alt=\"".__("Delete comment")."\"></a>";
- print $durl . "&nbsp;&nbsp;";
+ echo $durl . "&nbsp;&nbsp;";
}
if ($SID) {
- print __("Comment by: %h%s%h on %h%s%h",
+ echo __("Comment by: %h%s%h on %h%s%h",
array("<a href='/account.php?Action=AccountInfo&ID=".$carr["UsersID"]."'><b>",$carr["UserName"],"</b></a>",
"<i>",gmdate("Ymd [H:i:s]",$carr["CommentTS"]),"</i>"));
} else {
- print __("Comment by: %h%s%h on %h%s%h",
+ echo __("Comment by: %h%s%h on %h%s%h",
array("<b>",$carr["UserName"],"</b>",
"<i>",gmdate("Ymd [H:i:s]",$carr["CommentTS"]),"</i>"));
}
- print "</span>";
- print "<tr><td class='boxSoft'>";
- print "<code>\n";
- print str_replace("\n", "<br>", str_replace('"',"&quot;", htmlspecialchars(strip_tags(stripslashes($carr["Comments"])))));
- print "</code>\n";
- print "</td></tr>\n";
- print "</table>\n";
- print " </td>\n";
- print "</tr>\n";
+ echo "</span></td>\n";
+ echo " </tr>\n";
+ echo " <tr>\n";
+ echo " <td class='boxSoft'>";
+ echo "<code>\n";
+ echo nl2br(htmlspecialchars($carr["Comments"]));
+ echo "</code></td>\n";
+ echo " </tr>\n";
+ echo " </table>\n";
+ echo " </td>\n";
+ echo " </tr>\n";
}
}
- print "<tr>\n";
- print " <td colspan='2'><img src='/images/pad.gif' height='2'>";
- print "</td></tr>\n";
- print "<tr>\n";
- print " <td colspan='2'>";
- print "<form action='/pkgedit.php' method='post'>\n";
- print "<input type='hidden' name='ID' value='".$row["ID"]."'>\n";
- print "<input type='submit' class='button' name='add_Comment' value=\"";
- print __("Add Comment")."\">";
- print "</form>\n";
- print " </td>";
- print "</tr>\n";
-
- print "</table>\n";
-
-
- print "</td></tr></table>\n";
+ echo " </table>\n";
+ echo " </div>\n";
+ echo "</div>\n";
}
}
diff --git a/web/lib/version.inc b/web/lib/version.inc
new file mode 100644
index 00000000..af9cc447
--- /dev/null
+++ b/web/lib/version.inc
@@ -0,0 +1,3 @@
+<?php
+define( "AUR_VERSION", "<b>Version 1.4.0</b>" );
+?>