summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorswiergot <swiergot>2006-08-22 14:18:28 +0000
committerswiergot <swiergot>2006-08-22 14:18:28 +0000
commitdce2f7044384c5a94a5c361e8cb715fa00676ae4 (patch)
treeda528b7702664a21f628d5358279f8353ea355f4
parent6cca148648d31fed4827fc3b5a5e3f841e4e82a3 (diff)
Applied license patch from dsa (closes #4085).
-rw-r--r--support/schema/aur-schema.sql1
-rw-r--r--web/html/pkgsubmit.php6
-rw-r--r--web/lib/pkgfuncs.inc10
3 files changed, 15 insertions, 2 deletions
diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql
index ca63ef3..d3e0fff 100644
--- a/support/schema/aur-schema.sql
+++ b/support/schema/aur-schema.sql
@@ -114,6 +114,7 @@ CREATE TABLE Packages (
DummyPkg TINYINT UNSIGNED NOT NULL DEFAULT 0, -- 1=>dummy
FSPath CHAR(255) NOT NULL DEFAULT '',
URLPath CHAR(255) NOT NULL DEFAULT '',
+ License CHAR(40) NOT NULL DEFAULT '',
LocationID TINYINT UNSIGNED NOT NULL DEFAULT 1,
NumVotes INTEGER UNSIGNED NOT NULL DEFAULT 0,
OutOfDate TINYINT UNSIGNED DEFAULT 0,
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
index 9ae74c7..52e23aa 100644
--- a/web/html/pkgsubmit.php
+++ b/web/html/pkgsubmit.php
@@ -396,7 +396,8 @@ if ($_COOKIE["AURSID"]) {
$q.="Version='".mysql_escape_string($new_pkgbuild['pkgver'])."-".
mysql_escape_string($new_pkgbuild['pkgrel'])."',";
$q.="CategoryID=".mysql_escape_string($_REQUEST['category']).", ";
- $q.="Description='".mysql_escape_string($new_pkgbuild['pkgdesc'])."', ";
+ $q.="License='".mysql_escape_string($new_pkgbuild['license'])."', ";
+ $q.="Description='".mysql_escape_string($new_pkgbuild['pkgdesc'])."', ";
$q.="URL='".mysql_escape_string($new_pkgbuild['url'])."', ";
$q.="LocationID=2, ";
if (account_from_sid($_COOKIE["AURSID"]) == "Trusted User" || account_from_sid($_COOKIE["AURSID"]) == "Developer") {
@@ -460,13 +461,14 @@ if ($_COOKIE["AURSID"]) {
# this is a brand new package
#
$q = "INSERT INTO Packages ";
- $q.= " (Name, Version, CategoryID, Description, URL, LocationID, ";
+ $q.= " (Name, License, Version, CategoryID, Description, URL, LocationID, ";
if (account_from_sid($_COOKIE["AURSID"]) == "Trusted User" || account_from_sid($_COOKIE["AURSID"]) == "Developer") {
$q.= "Safe, VerifiedBy,";
}
$q.= " SubmittedTS, SubmitterUID, MaintainerUID, FSPath, URLPath) ";
$q.= "VALUES ('";
$q.= mysql_escape_string($new_pkgbuild['pkgname'])."', '";
+ $q.= mysql_escape_string($new_pkgbuild['license'])."', '";
$q.= mysql_escape_string($new_pkgbuild['pkgver'])."-".
mysql_escape_string($new_pkgbuild['pkgrel'])."', ";
$q.= mysql_escape_string($_REQUEST['category']).", '";
diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index 950de71..96bb1b7 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -333,6 +333,16 @@ function package_details($id=0, $SID="") {
print " <td class='boxSoft' colspan='2'><span class='f3'>".__("Votes").": ";
print $row["NumVotes"] . "</span></td>";
print "</tr>\n";
+
+ # In case of wanting to put a custom message
+ # Added by: dsa <dsandrade@gmail.com>
+ $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>";