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

Define "Packages.SubmitterUID" and "Packages.MaintainerUID" as "NULL".

Browse source 
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-02-27 17:12:43 +01:00
parent 84c2491e63
commit 1e3fa38de5
8 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
UPGRADING
View file

@ -28,6 +28,11 @@ ALTER TABLE TU_Votes
ALTER TABLE PackageComments ALTER TABLE PackageComments
MODIFY DelUsersID INTEGER UNSIGNED NULL DEFAULT NULL; MODIFY DelUsersID INTEGER UNSIGNED NULL DEFAULT NULL;
UPDATE PackageComments SET DelUsersID = NULL WHERE DelUsersID = 0; UPDATE PackageComments SET DelUsersID = NULL WHERE DelUsersID = 0;
ALTER TABLE Packages
MODIFY SubmitterUID INTEGER UNSIGNED NULL DEFAULT NULL,
MODIFY MaintainerUID INTEGER UNSIGNED NULL DEFAULT NULL;
UPDATE Packages SET SubmitterUID = NULL WHERE SubmitterUID = 0;
UPDATE Packages SET MaintainerUID = NULL WHERE MaintainerUID = 0;
---- ----
3. (optional) If you converted your database from MyISAM to InnoDB during the 3. (optional) If you converted your database from MyISAM to InnoDB during the

4
support/schema/aur-schema.sql
View file

@ -104,8 +104,8 @@ CREATE TABLE Packages (
OutOfDateTS BIGINT UNSIGNED NULL DEFAULT NULL, OutOfDateTS BIGINT UNSIGNED NULL DEFAULT NULL,
SubmittedTS BIGINT UNSIGNED NOT NULL, SubmittedTS BIGINT UNSIGNED NOT NULL,
ModifiedTS BIGINT UNSIGNED NOT NULL, ModifiedTS BIGINT UNSIGNED NOT NULL,
SubmitterUID INTEGER UNSIGNED NOT NULL DEFAULT 0, -- who submitted it? SubmitterUID INTEGER UNSIGNED NULL DEFAULT NULL, -- who submitted it?
MaintainerUID INTEGER UNSIGNED NOT NULL DEFAULT 0, -- User MaintainerUID INTEGER UNSIGNED NULL DEFAULT NULL, -- User
PRIMARY KEY (ID), PRIMARY KEY (ID),
UNIQUE (Name), UNIQUE (Name),
INDEX (CategoryID), INDEX (CategoryID),

7
support/schema/gendummydata.py
View file

@ -228,8 +228,13 @@ for p in seen_pkgs.keys():
uuid = genUID() # the submitter/user uuid = genUID() # the submitter/user
s = "INSERT INTO Packages (ID, Name, Version, CategoryID, SubmittedTS, SubmitterUID, MaintainerUID) VALUES (%d, '%s', '%s', %d, %d, %d, %d);\n" % (seen_pkgs[p], p, genVersion(), if muid == 0:
s = "INSERT INTO Packages (ID, Name, Version, CategoryID, SubmittedTS, SubmitterUID, MaintainerUID) VALUES (%d, '%s', '%s', %d, %d, %d, NULL);\n" % (seen_pkgs[p], p, genVersion(),
genCategory(), NOW, uuid)
else:
s = "INSERT INTO Packages (ID, Name, Version, CategoryID, SubmittedTS, SubmitterUID, MaintainerUID) VALUES (%d, '%s', '%s', %d, %d, %d, %d);\n" % (seen_pkgs[p], p, genVersion(),
genCategory(), NOW, uuid, muid) genCategory(), NOW, uuid, muid)
out.write(s) out.write(s)
if count % 100 == 0: if count % 100 == 0:
if DBUG: print ".", if DBUG: print ".",

2
web/README
View file

@ -152,7 +152,7 @@ Scripts:
can also set the account type to Dev. TUs and Devs are able to can also set the account type to Dev. TUs and Devs are able to
delete accounts. If an account is deleted, all "Unsupported" delete accounts. If an account is deleted, all "Unsupported"
packages are orphaned (the MaintainerUID field in the Packages packages are orphaned (the MaintainerUID field in the Packages
table is set to Null). table is set to NULL).
- html/packages.php - html/packages.php
PHP script to search the package database. It should support PHP script to search the package database. It should support

2
web/html/pkgsubmit.php
View file

@ -344,7 +344,7 @@ if ($_COOKIE["AURSID"]):
} }
} }
if (!$pdata["MaintainerUID"]) pkg_notify(account_from_sid($_COOKIE["AURSID"]), array($pdata["ID"])); if ($pdata["MaintainerUID"] === NULL) pkg_notify(account_from_sid($_COOKIE["AURSID"]), array($pdata["ID"]));
header('Location: packages.php?ID=' . $pdata['ID']); header('Location: packages.php?ID=' . $pdata['ID']);

2
web/lib/aur.inc
View file

@ -339,7 +339,7 @@ function can_submit_pkg($name="", $sid="") {
if ($row[1] == "1") { return 1; } if ($row[1] == "1") { return 1; }
$my_uid = uid_from_sid($sid); $my_uid = uid_from_sid($sid);
if (!$row[0] || $row[0] == $my_uid) { if ($row[0] === NULL || $row[0] == $my_uid) {
return 1; return 1;
} }

6
web/lib/pkgfuncs.inc
View file

@ -487,7 +487,7 @@ function pkg_search_page($SID="") {
} }
if ($_GET["do_Orphans"]) { if ($_GET["do_Orphans"]) {
$q.= "AND MaintainerUID = 0 "; $q.= "AND MaintainerUID IS NULL ";
} }
if (isset($_GET['outdated'])) { if (isset($_GET['outdated'])) {
@ -813,7 +813,7 @@ function pkg_adopt ($atype, $ids, $action = True) {
if ($action) { if ($action) {
$user = uid_from_sid($_COOKIE["AURSID"]); $user = uid_from_sid($_COOKIE["AURSID"]);
} else { } else {
$user = 0; $user = 'NULL';
} }
$q.= "SET $field = $user "; $q.= "SET $field = $user ";
@ -821,7 +821,7 @@ function pkg_adopt ($atype, $ids, $action = True) {
if ($action && $atype == "User") { if ($action && $atype == "User") {
# Regular users may only adopt orphan packages from unsupported # Regular users may only adopt orphan packages from unsupported
$q.= "AND $field = 0 "; $q.= "AND $field IS NULL ";
} else if ($atype == "User") { } else if ($atype == "User") {
$q.= "AND $field = " . uid_from_sid($_COOKIE["AURSID"]); $q.= "AND $field = " . uid_from_sid($_COOKIE["AURSID"]);
} }

2
web/template/actions_form.php
View file

@ -35,7 +35,7 @@ if ($row["OutOfDateTS"] === NULL) {
echo " value='".__("UnFlag Out-of-date")."'>\n"; echo " value='".__("UnFlag Out-of-date")."'>\n";
} }
if ($row["MaintainerUID"] == 0) { if ($row["MaintainerUID"] === NULL) {
echo "<input type='submit' class='button' name='do_Adopt'"; echo "<input type='submit' class='button' name='do_Adopt'";
echo " value='".__("Adopt Packages")."'>\n"; echo " value='".__("Adopt Packages")."'>\n";
} else if ($uid == $row["MaintainerUID"] || } else if ($uid == $row["MaintainerUID"] ||