From patchwork Tue Feb 11 14:28:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2767 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48H4sR0BlZz3xY8 for ; Tue, 11 Feb 2020 14:29:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48H4sN5F87zxL; Tue, 11 Feb 2020 14:29:12 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48H4sN29Cdz2yxC; Tue, 11 Feb 2020 14:29:12 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48H4sL3gLdz2yNV for ; Tue, 11 Feb 2020 14:29:10 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48H4sL1pdYzBD; Tue, 11 Feb 2020 14:29:10 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581431350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+B1bz6lQbJTVtSoZ3TlcnqRFfQV7e6wiQO6M//d0CBo=; b=+mrGhb9HlWPPRHWq7cghjEsge55tQopWJF9esmqqKmuBmzqP486pT6ydkgmvbYmsH1pIZp 5Jr8JhM0I2ulTLCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581431350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+B1bz6lQbJTVtSoZ3TlcnqRFfQV7e6wiQO6M//d0CBo=; b=o8SClIuaHup+WXIRcH2iY/dNNE4x2P518mrXXFB0Ikq+2ooKpd95ndA7X8o1VxEtt3dENb TDYdpeswFd8jwrE1CpqtioSHyZpWOrCtmXACVWMZu2XBWEUakpCSNiy1KC5vdHQbPzl+25 lo4n+J5hRs84AZAAk4CN/PG8LCii4Pmv7WiyGWWxz1kKj/cnK4Jls7M3QDrqfp83ufmuge 0VJ/qifmDlGAXZqiIkWId/iZplhYgB3MCyPL/crRQtU7GG/182y6ynkTLCd6Y9veX/o9aH bNBDFy1ltjkU02h1/yLaL0egV+V9IJ39555E8pWm71CQYPA6PGRcQhwapdXFQw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/8] pakfire.cgi: Remove some old settings Date: Tue, 11 Feb 2020 14:28:47 +0000 Message-Id: <20200211142853.8561-3-michael.tremer@ipfire.org> In-Reply-To: <20200211142853.8561-1-michael.tremer@ipfire.org> References: <20200211142853.8561-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" These can no longer be modified in the GUI and are used nowhere. Signed-off-by: Michael Tremer --- html/cgi-bin/pakfire.cgi | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index e6f3cda94..7c560bfbf 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -42,8 +42,6 @@ $pakfiresettings{'VALID'} = ''; $pakfiresettings{'INSPAKS'} = ''; $pakfiresettings{'DELPAKS'} = ''; -$pakfiresettings{'AUTOUPDATE'} = 'off'; -$pakfiresettings{'UUID'} = 'on'; sub refreshpage{&Header::openbox( 'Waiting', 1, "" );print "

$Lang::tr{'pagerefresh'}
";&Header::closebox();} @@ -144,13 +142,6 @@ END system("$command"); system("/bin/sleep 1"); } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") { - - if ($pakfiresettings{'AUTOUPDATE'} eq 'on') { - system("/usr/local/bin/pakfire enable updates >/dev/null 2>&1"); - } else { - system("/usr/local/bin/pakfire disable updates >/dev/null 2>&1"); - } - &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings); } @@ -159,13 +150,6 @@ END my %selected=(); my %checked=(); -$checked{'AUTOUPDATE'}{'off'} = ''; -$checked{'AUTOUPDATE'}{'on'} = ''; -$checked{'AUTOUPDATE'}{$pakfiresettings{'AUTOUPDATE'}} = "checked='checked'"; -$checked{'UUID'}{'off'} = ''; -$checked{'UUID'}{'on'} = ''; -$checked{'UUID'}{$pakfiresettings{'UUID'}} = "checked='checked'"; - # DPC move error message to top so it is seen! if ($errormessage) { &Header::openbox('100%', 'left', $Lang::tr{'error messages'});