Applied license patch from dsa (closes #4085).

This commit is contained in:
swiergot 2006-08-22 14:18:28 +00:00
parent 6cca148648
commit dce2f70443
3 changed files with 15 additions and 2 deletions

View file

@ -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']).", '";

View file

@ -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>";