From patchwork Wed Feb 12 20:16:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Schwartz X-Patchwork-Id: 1512 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 056FD170348E7 for ; Wed, 12 Feb 2020 20:17:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.3 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Wed, 12 Feb 2020 20:17:24 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id B5BC418E91EC32; Wed, 12 Feb 2020 20:17:06 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id A3E7E18E91EC15; Wed, 12 Feb 2020 20:17:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1581538624; bh=Fzx+wQ4XvDQe+C12qKQyvkqsdrrDg0imkmcDcKLdkCk=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=FQ07YabkCVs90N41dHJlNdqvPvZGnv6fLKvYbgbsm+kK8R3cjVrwCSSmm6r71NU/C H77ANYtqPD3Kth50ZDZU0SXA64j/36nsoTtRuoZGxjXGtYdv6Lj2aLvpILJ6VjnrUi 1wKcUIzgEtOWsLJ6aJK1xH1h0Tv1hUMKT5Ia4MYvM17M9raLcuvU5D2rGKXS8macz3 U/4CeUgLV16RdXQOPSlYI1uCkribdt4KoSHD2p/46CRY2cJOJUNuwhGdNnnfmx9Lfd am/1Ck36wdPIr5F1hAmb1op48NP+rJsYplHbcFHcneoSMKbTITKzw4NKyoH4a38f2n YO1Kug2U4wYsSfheCF3GWF9FbuOEcY9aEoyhtNk5xpRYcVx06IRSsVYavXSElRfWpI g4VufFQ4LSJmNRzNvxJsg1K7+OyHTeeILQi1VUHmu9EiAug+ncDaAtZEy9/lQMUrNS cjgfHSuPoyoDYk6nUxHCQJ5siU23A00ysgkzlTcY+q4Ay2VPBMzShrQmCYGixLCcPj NV/1w3wYb/IdFhjvOcwPoF+Dd9e7UShob+OVL22fyti/rJ1eXzLUeTdJwqPl+L2W3u cJTQK5jbDg+rv0O21LuLH8bIltlv6a952f+sVTg7Prz/F7GO8jYTKD+j6kfmGo5dvl P9+cZkZ+JMZdL2vljpigCUAo= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 9163229D09; Wed, 12 Feb 2020 20:17:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1581538624; bh=Fzx+wQ4XvDQe+C12qKQyvkqsdrrDg0imkmcDcKLdkCk=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=NZ+oo71Dp+56dPZRqSvX98c7g5wp0r4O1RmMXupNBY6XO0kRsDqaOgcWUV4aONSS2 7BX+Ss5Q//EQfVOiKxgWVGp31PmUpgKS2AKYwIvkZo1RS9716JP2ec4zC9JNwvrZEK XJDgwFNmKvU4o+X9rs3psXuznkM6xRAooP5Sii28gIkulBrVTe43WHnV8371VGlKjr t7m7tpSXvDwlwf5z0Vs9a+hFpyNAPOMZyq1UdaRDa3MZARHcke1PIKKcKX6lH9CJHc vka4McNScnNExqmQKnbXc7CVFI5q/CvxzA/GGWRcu1uOB7VIRUClYJJZMN1GIr+1pB f4u70cEXO0NbLPFclbqErHtSwuj7xllWCZQD0qWqFkfvUC7SQ9p2bx5x+TlY9W6beu /Zaq+35JW2fIYTyYvPiQDUjzsooZKsxDUuzW5OIKnRmMNsVXb3PiFIaZn/cI+N82dF 9exb4AUS4UC3e26168rPyRXPTjWQQoV/FV6LMYZaalVr+7gv0YpjAlZ8EgS8NIcL78 TVxrNYMWOwEwmXOB38rsi4vd+0G/THAKxXZsDP2KojVDJttFkv07gm5YvnAaZ7ySAC 9mtM6IC1JUhBDtU1KTr/Kz9807ANFsllyeKA6nyA2pjuy7Im9dMjXVFkKEgLE7FhmP qB0sFreeLufoNOHTyFCBhAqg= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id B2EC129D04 for ; Wed, 12 Feb 2020 20:17:01 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Wed, 12 Feb 2020 20:17:01 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 68B6818E91EC06; Wed, 12 Feb 2020 20:17:00 +0000 (UTC) Received: from didactylos.attlocal.net (unknown [IPv6:2600:1700:57f0:ca20:763a:c795:fcf6:91ea]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id ACAA918E91EC04; Wed, 12 Feb 2020 20:16:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1581538620; bh=Fzx+wQ4XvDQe+C12qKQyvkqsdrrDg0imkmcDcKLdkCk=; h=From:To:Subject:Date:In-Reply-To:References; b=RjNMCsMOYgtzneZla+7aqBSLOzGkj0phCC35PtTRUWKJYcK45urgQeBOgaIxAZE6n uYfiTvmlUs7/IFU8uivjOgFmm3E0UHi/B2b1s8xVlF6zgOjrbyA1lHVB9s1Qp4hz95 F/2LQorgLrDM3J4MmAvJspBTud9qxWSNQOv+8eOWUeE9ISz16TcRPOX/xZG2a/Gz14 qSrkohJmOrqMD/QQSUOtGBGf4ly8nHdt63LNKSuIpW9ufrrnxeChC0OwU4GkJqN4xs Fo2A9mmOcQLw1UR/zE9NjY+IlK7XvckmFv0cBV2BBvsG7gt1cojr8EdBmL7x8jW1mm SP5GDMPRXmrGUiQ1OcvDyhf4zPxJqYHkCJXqQuueeulI22LtYtgjBqm2rTcz89Px8C ZijhzmH1GYK0e26sl7ip499ZIIlu+dNd4GqL5X1kcW7iwozvh8U4Gw4QiEDvEsMQOG 4PXVzQ9XzypkAAQEONndiUMF7bDtwL4bg1nZODRve9NxskyLqhRFodQq8qPZ0e3aKZ KxEiDIyXjqGPIvAvV6Yi5snh+0SXjokG+HXxtuiqt/X5YcDxDlMh3mZ2bm1QDHPNd1 YD+r/q1Z6f+X+1nHp6ES9jHQECHKTfbAGRVhQd1+/tayAul2+F69cDnay/W5Ar7KH2 TTluI1Ty/TBfmB/qBb+qwqGo= From: Eli Schwartz To: aur-dev@archlinux.org Subject: [aur-dev][PATCH 2/2] fix more php 7.4 warnings Date: Wed, 12 Feb 2020 15:16:38 -0500 Message-Id: <20200212201638.3051647-3-eschwartz@archlinux.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200212201638.3051647-1-eschwartz@archlinux.org> References: <20200212201638.3051647-1-eschwartz@archlinux.org> MIME-Version: 1.0 X-BeenThere: aur-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: aur-dev-bounces@archlinux.org Sender: "aur-dev" The try_login() function documents it returns an array containing an 'error' key, and our only caller *only* consults the 'error' key. Then the function returns null instead of an array, if the login succeeded! I question why we bother returning the new SID if we never use it, surely we could either return the error or return default null. But, for now, I'm just going to fix it to return what it's actually supposed to, without changing the API. Signed-off-by: Eli Schwartz --- web/lib/acctfuncs.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 443fb4b1..d238c0e0 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -659,6 +659,7 @@ function try_login() { } header("Location: " . get_uri($referer)); $login_error = ""; + return array('SID' => $new_sid, 'error' => null); } /**