- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] UPGRADING: Add missing column to the instructions
by Lukas Fleischer 27 May '14

27 May '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/UPGRADING b/UPGRADING index d9860bb..71b3d1d 100644 --- a/UPGRADING +++ b/UPGRADING @@ -50,8 +50,9 @@ CREATE TABLE PackageBases ( 4. Migrate data from Packages to PackageBases: ---- -INSERT INTO PackageBases SELECT ID, Name, CategoryID, NumVotes, OutOfDateTS, - SubmittedTS, ModifiedTS, SubmitterUID, MaintainerUID FROM Packages; +INSERT INTO PackageBases + SELECT ID, Name, CategoryID, NumVotes, OutOfDateTS, SubmittedTS, + ModifiedTS, SubmitterUID, MaintainerUID, NULL FROM Packages; ---- 5. Delete unneeded foreign keys from Packages: -- 1.9.3

1 1

[aur-dev] [PATCH] acctfuncs.inc.php: Fix typo
by Lukas Fleischer 22 May '14

22 May '14

Replace a misplaced semicolon with the concatenation operator. This makes the AUR insert proper Reply-to and From headers again when sending password reset emails on registration. Fixes a regression introduced in 94a4f59 (Set Content-type header when sending UTF-8 mails, 2014-02-10). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/acctfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 5b907dc..962ebb4 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -655,7 +655,7 @@ function send_resetkey($email, $subject, $body) { "{$AUR_LOCATION}/" . get_uri('/passreset/') . "?". "resetkey={$resetkey}"; $headers = "MIME-Version: 1.0\r\n" . - "Content-type: text/plain; charset=UTF-8\r\n"; + "Content-type: text/plain; charset=UTF-8\r\n" . "Reply-to: noreply(a)aur.archlinux.org\r\n" . "From: notify(a)aur.achlinux.org\r\n" . "X-Mailer: PHP\r\n" . -- 1.9.3

1 0

[aur-dev] [PATCH] Add title attribute to links in updates table
by Lukas Fleischer 22 May '14

22 May '14

As of commit ea25f98 (Avoid overflow in updates table, 2014-05-22), long package names in the updates statistics are chopped off. Add a title attribute so that users at least get a tooltip with the full package name and version. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/stats/updates_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index 83e2103..a4b31c5 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -7,7 +7,7 @@ <?php foreach ($newest_packages->getIterator() as $row): ?> <tr> <td class="pkg-name"> - <a href="<?= get_pkg_uri($row["Name"]); ?>"><?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?></a> + <a href="<?= get_pkg_uri($row["Name"]); ?>" title="<?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?>"><?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?></a> </td> <td class="pkg-new"> <?php if ($row["ModifiedTS"] === $row["SubmittedTS"]): ?> -- 1.9.3

1 0

[aur-dev] [PATCH] Avoid overflow in updates table
by Lukas Fleischer 22 May '14

22 May '14

Fixes FS#40206. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/css/aur.css | 19 +++++++++++++++++++ web/template/stats/updates_table.php | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/web/html/css/aur.css b/web/html/css/aur.css index bed39e8..78fd4ce 100644 --- a/web/html/css/aur.css +++ b/web/html/css/aur.css @@ -42,3 +42,22 @@ list-style: none; padding: 0; } + +#pkg-updates table { + table-layout: fixed; + width:100%; +} + +#pkg-updates td.pkg-name { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +#pkg-updates td.pkg-new { + width: 16px; +} + +#pkg-updates td.pkg-date { + text-align:right; +} diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index 11f0a00..83e2103 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -14,7 +14,7 @@ <img src="images/new.png" alt="New!" /> <?php endif; ?> </td> - <td> + <td class="pkg-date"> <span><?= gmdate("Y-m-d H:i", intval($row["ModifiedTS"])); ?></span> </td> </tr> -- 1.9.3

1 0

[aur-dev] [PATCH 1/2] Be friendly to newly registered users
by Lukas Fleischer 22 May '14

22 May '14

Use "Welcome to the Arch User Repository" instead of "AUR Password Reset" as subject for the initial password reset email. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/passreset.php | 3 ++- web/lib/acctfuncs.inc.php | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/web/html/passreset.php b/web/html/passreset.php index 6fade6b..9541021 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -41,11 +41,12 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir if (empty($email)) { $error = __('Missing a required field.'); } else { + $subject = 'AUR Password Reset'; $body = __('A password reset request was submitted for the account '. 'associated with your e-mail address. If you wish to reset '. 'your password follow the link below, otherwise ignore '. 'this message and nothing will happen.'). - send_resetkey($email, $body); + send_resetkey($email, $subject, $body); header('Location: ' . get_uri('/passreset/') . '?step=confirm'); exit(); diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 312f11b..6ac34a0 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -221,6 +221,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="", "<strong>", htmlspecialchars($U,ENT_QUOTES), "</strong>"); print "<p>\n"; if ($send_resetkey) { + $subject = 'Welcome to the Arch User Repository'; $body = __('Welcome to %s! In order ' . 'to set an initial password ' . 'for your new account, ' . @@ -230,7 +231,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="", 'pasting it into your ' . 'browser.', $AUR_LOCATION); - send_resetkey($email, $body); + send_resetkey($email, $subject, $body); print __("A password reset key has been sent to your e-mail address."); } else { print __("Click on the Login link above to use your account."); @@ -632,11 +633,12 @@ function create_resetkey($resetkey, $uid) { * Send a reset key to a specific e-mail address * * @param string $email E-mail address of the user resetting their password + * @param string $subject Subject of the email * @param string $body Body of the email * * @return void */ -function send_resetkey($email, $body) { +function send_resetkey($email, $subject, $body) { global $AUR_LOCATION; $uid = uid_from_email($email); @@ -658,7 +660,7 @@ function send_resetkey($email, $body) { "From: aur-notify(a)archlinux.org\r\n" . "X-Mailer: PHP\r\n" . "X-MimeOLE: Produced By AUR"; - @mail($email, 'AUR Password Reset', $body, $headers); + @mail($email, $subject, $body, $headers); } } -- 1.9.3

1 1

[aur-dev] [PATCH] Add threading headers to notification mail
by Thomas Weißschuh 20 May '14

20 May '14

It is only basic, but works in this way for other platforms. Could be enhanced to include all previous comments in 'References:' This would require to have predictable 'Message-ID:' for notification mails. Could also be used for out of date notifications --- web/lib/pkgbasefuncs.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 4d05b94..f53ff61 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -138,6 +138,8 @@ function pkgbase_add_comment($base_id, $uid, $comment) { "Bcc: $bcc\r\n" . "Reply-to: nobody(a)archlinux.org\r\n" . "From: aur-notify(a)archlinux.org\r\n" . + "In-Reply-To: <" . $row['Name'] . "@aur.archlinux.org>\r\n" . + "References: <" . $row['Name'] . "@aur.archlinux.org>\r\n" . "X-Mailer: AUR"; @mail('undisclosed-recipients: ;', "AUR Comment for " . $row['Name'], $body, $headers); } -- 1.9.2

2 3

[aur-dev] multiinfo doesn't accept package ID
by 18 May '14

18 May '14

https://aur.archlinux.org/rpc.php?type=multiinfo&arg[]=afio works fine, but https://aur.archlinux.org/rpc.php?type=multiinfo&arg[]=3727 fails. So I guess only "info" requests accept package ID? Is this a bug or intended behaviour?

2 1

[aur-dev] [PATCH] Set language using a POST request
by Lukas Fleischer 13 May '14

13 May '14

Fixes FS#39027. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/translator.inc.php | 4 ++-- web/template/header.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php index 1070183..5117b99 100644 --- a/web/lib/translator.inc.php +++ b/web/lib/translator.inc.php @@ -79,10 +79,10 @@ function set_lang() { global $streamer, $l10n; $update_cookie = 0; - if (isset($_REQUEST['setlang'])) { + if (isset($_POST['setlang'])) { # visitor is requesting a language change # - $LANG = $_REQUEST['setlang']; + $LANG = $_POST['setlang']; $update_cookie = 1; } elseif (isset($_COOKIE['AURLANG'])) { diff --git a/web/template/header.php b/web/template/header.php index 9cefedc..df83995 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -32,7 +32,7 @@ <div id="content"> <div id="lang_sub"> - <form method="get" action="<?= htmlspecialchars($_SERVER["REQUEST_URI"], ENT_QUOTES) ?>"> + <form method="post" action="<?= htmlspecialchars($_SERVER["REQUEST_URI"], ENT_QUOTES) ?>"> <fieldset> <div> <select name="setlang" id="id_setlang"> -- 1.9.2

1 0

[aur-dev] [PATCH 1/4] Add a packager field to packages
by Lukas Fleischer 06 May '14

06 May '14

Store the last packager in addition to storing the submitter and the maintainer of a package. This allows for checking who last updated a package, even if the package has been disowned. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 5 ++++- schema/aur-schema.sql | 5 ++++- web/lib/pkgbasefuncs.inc.php | 15 +++++++++------ web/lib/pkgfuncs.inc.php | 2 +- web/template/pkg_details.php | 19 +++++++++++++++++++ web/template/pkgbase_details.php | 19 +++++++++++++++++++ 6 files changed, 56 insertions(+), 9 deletions(-) diff --git a/UPGRADING b/UPGRADING index 357cd6c..d9860bb 100644 --- a/UPGRADING +++ b/UPGRADING @@ -31,16 +31,19 @@ CREATE TABLE PackageBases ( ModifiedTS BIGINT UNSIGNED NOT NULL, SubmitterUID INTEGER UNSIGNED NULL DEFAULT NULL, MaintainerUID INTEGER UNSIGNED NULL DEFAULT NULL, + PackagerUID INTEGER UNSIGNED NULL DEFAULT NULL, PRIMARY KEY (ID), UNIQUE (Name), INDEX (CategoryID), INDEX (NumVotes), INDEX (SubmitterUID), INDEX (MaintainerUID), + INDEX (PackagerUID), FOREIGN KEY (CategoryID) REFERENCES PackageCategories(ID) ON DELETE NO ACTION, -- deleting a user will cause packages to be orphaned, not deleted FOREIGN KEY (SubmitterUID) REFERENCES Users(ID) ON DELETE SET NULL, - FOREIGN KEY (MaintainerUID) REFERENCES Users(ID) ON DELETE SET NULL + FOREIGN KEY (MaintainerUID) REFERENCES Users(ID) ON DELETE SET NULL, + FOREIGN KEY (PackagerUID) REFERENCES Users(ID) ON DELETE SET NULL ) ENGINE = InnoDB; ---- diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 8533548..adacdf0 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -104,16 +104,19 @@ CREATE TABLE PackageBases ( ModifiedTS BIGINT UNSIGNED NOT NULL, SubmitterUID INTEGER UNSIGNED NULL DEFAULT NULL, -- who submitted it? MaintainerUID INTEGER UNSIGNED NULL DEFAULT NULL, -- User + PackagerUID INTEGER UNSIGNED NULL DEFAULT NULL, -- Last packager PRIMARY KEY (ID), UNIQUE (Name), INDEX (CategoryID), INDEX (NumVotes), INDEX (SubmitterUID), INDEX (MaintainerUID), + INDEX (PackagerUID), FOREIGN KEY (CategoryID) REFERENCES PackageCategories(ID) ON DELETE NO ACTION, -- deleting a user will cause packages to be orphaned, not deleted FOREIGN KEY (SubmitterUID) REFERENCES Users(ID) ON DELETE SET NULL, - FOREIGN KEY (MaintainerUID) REFERENCES Users(ID) ON DELETE SET NULL + FOREIGN KEY (MaintainerUID) REFERENCES Users(ID) ON DELETE SET NULL, + FOREIGN KEY (PackagerUID) REFERENCES Users(ID) ON DELETE SET NULL ) ENGINE = InnoDB; diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 4eaa640..4d05b94 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -182,7 +182,8 @@ function pkgbase_get_details($base_id) { $q.= "PackageBases.CategoryID, PackageBases.NumVotes, "; $q.= "PackageBases.OutOfDateTS, PackageBases.SubmittedTS, "; $q.= "PackageBases.ModifiedTS, PackageBases.SubmitterUID, "; - $q.= "PackageBases.MaintainerUID, PackageCategories.Category "; + $q.= "PackageBases.MaintainerUID, PackageBases.PackagerUID, "; + $q.= "PackageCategories.Category "; $q.= "FROM PackageBases, PackageCategories "; $q.= "WHERE PackageBases.CategoryID = PackageCategories.ID "; $q.= "AND PackageBases.ID = " . intval($base_id); @@ -917,9 +918,10 @@ function pkgbase_change_category($base_id, $atype) { function pkgbase_create($name, $category_id, $uid) { $dbh = DB::connect(); $q = sprintf("INSERT INTO PackageBases (Name, CategoryID, " . - "SubmittedTS, ModifiedTS, SubmitterUID, MaintainerUID) " . - "VALUES (%s, %d, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), %d, %d)", - $dbh->quote($name), $category_id, $uid, $uid); + "SubmittedTS, ModifiedTS, SubmitterUID, MaintainerUID, " . + "PackagerUID) VALUES (%s, %d, UNIX_TIMESTAMP(), " . + "UNIX_TIMESTAMP(), %d, %d, %d)", + $dbh->quote($name), $category_id, $uid, $uid, $uid); $dbh->exec($q); return $dbh->lastInsertId(); } @@ -937,8 +939,9 @@ function pkgbase_update($base_id, $name, $uid) { $dbh = DB::connect(); $q = sprintf("UPDATE PackageBases SET " . "Name = %s, ModifiedTS = UNIX_TIMESTAMP(), " . - "MaintainerUID = %d, OutOfDateTS = NULL WHERE ID = %d", - $dbh->quote($name), $uid, $base_id); + "MaintainerUID = %d, PackagerUID = %d, OutOfDateTS = NULL " . + "WHERE ID = %d", + $dbh->quote($name), $uid, $uid, $base_id); $dbh->exec($q); } diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index a6fa32e..c35147f 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -400,7 +400,7 @@ function pkg_get_details($id=0) { $q.= "PackageBases.NumVotes, PackageBases.OutOfDateTS, "; $q.= "PackageBases.SubmittedTS, PackageBases.ModifiedTS, "; $q.= "PackageBases.SubmitterUID, PackageBases.MaintainerUID, "; - $q.= "PackageCategories.Category "; + $q.= "PackageBases.PackagerUID, PackageCategories.Category "; $q.= "FROM Packages, PackageBases, PackageCategories "; $q.= "WHERE PackageBases.ID = Packages.PackageBaseID "; $q.= "AND PackageBases.CategoryID = PackageCategories.ID "; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 791c9ee..12aa692 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -9,6 +9,7 @@ $catarr = pkgbase_categories(); $submitter = username_from_id($row["SubmitterUID"]); $maintainer = username_from_id($row["MaintainerUID"]); +$packager = username_from_id($row["PackagerUID"]); $votes = $row['NumVotes']; @@ -289,6 +290,24 @@ if ($row["MaintainerUID"]): <?php endif; ?> </tr> <tr> + <th><?= __('Last Packager') .': ' ?></th> +<?php +if ($row["PackagerUID"]): + if ($SID): + if (!$USE_VIRTUAL_URLS): +?> + <td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&ID=<?= htmlspecialchars($row['PackagerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= htmlspecialchars($packager) ?>"><?= htmlspecialchars($packager) ?></a></td> + <?php else: ?> + <td><a href="<?= get_uri('/account/') . htmlspecialchars($packager, ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($packager)) ?>"><?= htmlspecialchars($packager) ?></a></td> + <?php endif; ?> + <?php else: ?> + <td><?= htmlspecialchars($packager) ?></td> + <?php endif; ?> +<?php else: ?> + <td><?= __('None') ?></td> +<?php endif; ?> + </tr> + <tr> <th><?= __('Votes') . ': ' ?></th> <?php if ($atype == "Developer" || $atype == "Trusted User"): ?> <?php if ($USE_VIRTUAL_URLS): ?> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index fd7bdad..eab3a53 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -8,6 +8,7 @@ $catarr = pkgbase_categories(); $submitter = username_from_id($row["SubmitterUID"]); $maintainer = username_from_id($row["MaintainerUID"]); +$packager = username_from_id($row["PackagerUID"]); $votes = $row['NumVotes']; @@ -172,6 +173,24 @@ if ($row["MaintainerUID"]): <?php endif; ?> </tr> <tr> + <th><?= __('Last Packager') .': ' ?></th> +<?php +if ($row["PackagerUID"]): + if ($SID): + if (!$USE_VIRTUAL_URLS): +?> + <td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&ID=<?= htmlspecialchars($row['PackagerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= htmlspecialchars($packager) ?>"><?= htmlspecialchars($packager) ?></a></td> + <?php else: ?> + <td><a href="<?= get_uri('/account/') . htmlspecialchars($packager, ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($packager)) ?>"><?= htmlspecialchars($packager) ?></a></td> + <?php endif; ?> + <?php else: ?> + <td><?= htmlspecialchars($packager) ?></td> + <?php endif; ?> +<?php else: ?> + <td><?= __('None') ?></td> +<?php endif; ?> + </tr> + <tr> <th><?= __('Votes') . ': ' ?></th> <?php if ($atype == "Developer" || $atype == "Trusted User"): ?> <?php if ($USE_VIRTUAL_URLS): ?> -- 1.9.2

1 3

[aur-dev] [PATCH 1/2] Fix vote/notify link on the package details page
by Lukas Fleischer 03 May '14

03 May '14

Call pkgbase_user_voted() and pkgbase_user_notify() using the package base ID instead of using the package ID. Fixes FS#40165. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgfuncs.inc.php | 11 ++++++----- web/template/pkg_details.php | 5 +++-- web/template/pkgbase_details.php | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index f800e34..a6fa32e 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -395,11 +395,12 @@ function pkg_name_is_blacklisted($name) { function pkg_get_details($id=0) { $dbh = DB::connect(); - $q = "SELECT Packages.*, PackageBases.Name AS BaseName, "; - $q.= "PackageBases.CategoryID, PackageBases.NumVotes, "; - $q.= "PackageBases.OutOfDateTS, PackageBases.SubmittedTS, "; - $q.= "PackageBases.ModifiedTS, PackageBases.SubmitterUID, "; - $q.= "PackageBases.MaintainerUID, PackageCategories.Category "; + $q = "SELECT Packages.*, PackageBases.ID AS BaseID, "; + $q.= "PackageBases.Name AS BaseName, PackageBases.CategoryID, "; + $q.= "PackageBases.NumVotes, PackageBases.OutOfDateTS, "; + $q.= "PackageBases.SubmittedTS, PackageBases.ModifiedTS, "; + $q.= "PackageBases.SubmitterUID, PackageBases.MaintainerUID, "; + $q.= "PackageCategories.Category "; $q.= "FROM Packages, PackageBases, PackageCategories "; $q.= "WHERE PackageBases.ID = Packages.PackageBaseID "; $q.= "AND PackageBases.CategoryID = PackageCategories.ID "; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 7836596..791c9ee 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -3,6 +3,7 @@ $atype = account_from_sid($SID); $uid = uid_from_sid($SID); $pkgid = intval($row['ID']); +$base_id = intval($row['BaseID']); $catarr = pkgbase_categories(); @@ -73,7 +74,7 @@ $sources = pkg_sources($row["ID"]); </form> </li> <?php endif; ?> - <?php if (pkgbase_user_voted($uid, $row['ID'])): ?> + <?php if (pkgbase_user_voted($uid, $base_id)): ?> <li> <form action="<?= get_pkgbase_uri($row['BaseName']) . 'unvote/'; ?>" method="post"> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> @@ -88,7 +89,7 @@ $sources = pkg_sources($row["ID"]); </form> </li> <?php endif; ?> - <?php if (pkgbase_user_notify($uid, $row['ID'])): ?> + <?php if (pkgbase_user_notify($uid, $base_id)): ?> <li> <form action="<?= get_pkgbase_uri($row['BaseName']) . 'unnotify/'; ?>" method="post"> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index 83b474c..fd7bdad 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -49,7 +49,7 @@ $pkgs = pkgbase_get_pkgnames($base_id); </form> </li> <?php endif; ?> - <?php if (pkgbase_user_voted($uid, $row['ID'])): ?> + <?php if (pkgbase_user_voted($uid, $base_id)): ?> <li> <form action="<?= get_pkgbase_uri($row['Name']) . 'unvote/'; ?>" method="post"> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> @@ -64,7 +64,7 @@ $pkgs = pkgbase_get_pkgnames($base_id); </form> </li> <?php endif; ?> - <?php if (pkgbase_user_notify($uid, $row['ID'])): ?> + <?php if (pkgbase_user_notify($uid, $base_id)): ?> <li> <form action="<?= get_pkgbase_uri($row['Name']) . 'unnotify/'; ?>" method="post"> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> -- 1.9.2

1 2