From patchwork Tue Oct 13 16:07:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3564 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gV91KwZz3x1S for ; Tue, 13 Oct 2020 16:09:37 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSz56BVz1TR; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSw1MGnz3060; Tue, 13 Oct 2020 16:08:32 +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 4C9gSt44Yrz305G for ; Tue, 13 Oct 2020 16:08:30 +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 4C9gSr23ZGz12S; Tue, 13 Oct 2020 16:08:28 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605308; 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=pTtvO8+RYHcqQJIaFLjYNcfRNt9ZVCAND+IPYpSietk=; b=Q+yvy5gMvtzWdNO4js/GZpHublJbZifSaJw/gP1rhl1VLUNTgRAesGaFsU/aM1/wqOPxk7 nSrkJFPfSwOz+RDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605308; 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=pTtvO8+RYHcqQJIaFLjYNcfRNt9ZVCAND+IPYpSietk=; b=jcOwP/RKW13eyR5VWuM/pVT8e5+FtyaIPH61ALSKK5/mCctIYg2bpO9ygh6VDKN5HXbqbi 3GFbqw4pSRAY3APEs+S0vWFMrqYqBsO86a9doPOn40mE/i5UgG/BFne0LnO4NzfrU7c6tJ YY83rzrno9ywKrkZWntu3ihh/SrXADHmSjKWeG+jlMZFzTBK1vd2tKKseazL9PXh2qbc3E TTpnI6RyHyex1amoYDitxLn+Xp0P2vXHQiLgncWqqfj2MHMyZErhHgloFbKfEqEN1yNCj/ GqNKA6oKJnUdtCUSs5b+w8M9jIlGbkSK1aKTPDU2GLwro1FzmPSQgmdBiOTXjA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 40/54] samba: Refactor status area Date: Tue, 13 Oct 2020 16:07:58 +0000 Message-Id: <20201013160812.27754-40-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-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" There is no need to double-wrap the status output in tables. Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index a64fc9177..66043f15b 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -37,9 +37,6 @@ my %mainsettings = (); my $message = ""; my $errormessage = ""; -my $Status = qx(/usr/local/bin/sambactrl smbstatus); -$Status = &Header::cleanhtml($Status); - my $userentry = ""; my @user = (); my @userline = (); @@ -746,16 +743,17 @@ if ($sambasettings{'ACTION'} eq 'smbsharechange') ############################################################################################################################ ############################################### Anzeige des Sambastatus #################################################### -&Header::openbox('100%', 'center', 'Status'); +&Header::openbox('100%', 'left', $Lang::tr{'status'}); -print < - - - -
$Lang::tr{'samba status'}
$Status
+my $status = qx(/usr/local/bin/sambactrl smbstatus); +$status = &Header::cleanhtml($status); + +print < + 
$status
+ END -; + &Header::closebox(); &Header::closebigbox();