From eb169d3b0b5d873d85791595a4e64df1ed337e1e Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Sat, 27 Jun 2015 17:48:39 +0200 Subject: Only print no changes message if queries failed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit changes the messages printed when changing the accound details so that it only prints that no changes were made if either the account change SQL query or the account_set_ssh_keys call failed. Reported-by: Alexis Chotard Signed-off-by: Johannes Löthberg Signed-off-by: Lukas Fleischer --- web/lib/acctfuncs.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web') diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 417ee6dd..861de0ac 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -348,9 +348,9 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$P="",$C="", $q.= " WHERE ID = ".intval($UID); $result = $dbh->exec($q); - account_set_ssh_keys($UID, $ssh_keys, $ssh_fingerprints); + $ssh_key_result = account_set_ssh_keys($UID, $ssh_keys, $ssh_fingerprints); - if (!$result) { + if ($result === false || $ssh_key_result === false) { print __("No changes were made to the account, %s%s%s.", "", htmlspecialchars($U,ENT_QUOTES), ""); } else { -- cgit v1.2.3-24-g4f1b