[aur-dev][PATCH] Fix notifications emails going to the right people, part #2

[Eli Schwartz]

On 10/26/18 10:00 AM, Eli Schwartz wrote:
> Notifications are still going to the wrong people. We tried to fix this
> in commit b702e5c0e7f13103fc764b7e5613f78f3e7acd30, but only fixed it
> for the python callers. There's another caller in the php code, which
> needs to use the right order of arguments as well.
> 
> Fixes FS#60602

Obviously the version of the patch I actually merged to pu, references
the correct FS#60601 :)

Hotpatched in the live instance.

> Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
> ---
> 
> The division between the python and php code is, well, sort of awkward,
> who knew? And I guess the php callers would be the more common cause
> here, so...
> 
> Anyway, hopefully this actually fixes things for the common case.
> 
>  web/lib/pkgbasefuncs.inc.php | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
> index b39bca5..1df21a2 100644
> --- a/web/lib/pkgbasefuncs.inc.php
> +++ b/web/lib/pkgbasefuncs.inc.php
> @@ -733,7 +733,7 @@ function pkgbase_adopt ($base_ids, $action=true, $via) {
>  	}
>  
>  	foreach ($base_ids as $base_id) {
> -		notify(array($action ? 'adopt' : 'disown', $base_id, $uid));
> +		notify(array($action ? 'adopt' : 'disown', $uid, $base_id));
>  	}
>  
>  	if ($action) {
> @@ -1204,7 +1204,7 @@ function pkgbase_set_comaintainers($base_id, $users, $override=false) {
>  	foreach ($uids_new as $uid) {
>  		if (in_array($uid, $uids_add)) {
>  			$q = sprintf("INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (%d, %d, %d)", $base_id, $uid, $i);
> -			notify(array('comaintainer-add', $base_id, $uid));
> +			notify(array('comaintainer-add', $uid, $base_id));
>  		} else {
>  			$q = sprintf("UPDATE PackageComaintainers SET Priority = %d WHERE PackageBaseID = %d AND UsersID = %d", $i, $base_id, $uid);
>  		}
> @@ -1216,7 +1216,7 @@ function pkgbase_set_comaintainers($base_id, $users, $override=false) {
>  	foreach ($uids_rem as $uid) {
>  		$q = sprintf("DELETE FROM PackageComaintainers WHERE PackageBaseID = %d AND UsersID = %d", $base_id, $uid);
>  		$dbh->exec($q);
> -		notify(array('comaintainer-remove', $base_id, $uid));
> +		notify(array('comaintainer-remove', $uid, $base_id));
>  	}
>  
>  	return array(true, __("The package base co-maintainers have been updated."));
> 


-- 
Eli Schwartz
Bug Wrangler and Trusted User

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.archlinux.org/pipermail/aur-dev/attachments/20181026/1085279a/attachment.asc>