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

Fix misuses of pkgbase_from_pkgid()

Browse source 
All pkgbase_*() functions should operate on package base IDs. Drop the
superfluous (and incorrect) parameter conversion from package IDs to
package base IDs.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-04-06 18:16:16 +02:00
parent 5b5a5f343e
commit 32b5d46643
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
web/lib/pkgbasefuncs.inc.php
View file

@ -350,7 +350,7 @@ function pkgbase_flag($atype, $base_ids) {
return array(false, __("You must be logged in before you can flag packages.")); return array(false, __("You must be logged in before you can flag packages."));
} }
$base_ids = pkgbase_from_pkgid($base_ids); $base_ids = sanitize_ids($base_ids);
if (empty($base_ids)) { if (empty($base_ids)) {
return array(false, __("You did not select any packages to flag.")); return array(false, __("You did not select any packages to flag."));
} }
@ -406,7 +406,7 @@ function pkgbase_unflag($atype, $base_ids) {
return array(false, __("You must be logged in before you can unflag packages.")); return array(false, __("You must be logged in before you can unflag packages."));
} }
$base_ids = pkgbase_from_pkgid($base_ids); $base_ids = sanitize_ids($base_ids);
if (empty($base_ids)) { if (empty($base_ids)) {
return array(false, __("You did not select any packages to unflag.")); return array(false, __("You did not select any packages to unflag."));
} }
@ -856,13 +856,14 @@ function pkgbase_delete_comment($atype) {
} }
/** /**
* Change package category * Change package base category
* *
* @param int Package base ID of the package base to modify
* @param string $atype Account type, output of account_from_sid * @param string $atype Account type, output of account_from_sid
* *
* @return array Tuple of success/failure indicator and error message * @return array Tuple of success/failure indicator and error message
*/ */
function pkgbase_change_category($pid, $atype) { function pkgbase_change_category($base_id, $atype) {
if (!$atype) { if (!$atype) {
return array(false, __("You must be logged in before you can edit package information.")); return array(false, __("You must be logged in before you can edit package information."));
} }
@ -879,7 +880,7 @@ function pkgbase_change_category($pid, $atype) {
return array(false, __("Invalid category ID.")); return array(false, __("Invalid category ID."));
} }
$base_id = pkgbase_from_pkgid($pid); $base_id = intval($base_id);
/* Verify package ownership. */ /* Verify package ownership. */
$q = "SELECT MaintainerUID FROM PackageBases WHERE ID = " . $base_id; $q = "SELECT MaintainerUID FROM PackageBases WHERE ID = " . $base_id;