From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephan Mending <list@md5collisions.eu>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] Changes to comply to coding style unnecessary whitespaces
 etc. (/\s\+$)
Date: Mon, 23 Mar 2020 22:27:46 +0100
Message-ID: <20200323212746.4424-2-list@md5collisions.eu>
In-Reply-To: <20200323212746.4424-1-list@md5collisions.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4890058975931961761=="
List-Id: <development.lists.ipfire.org>

--===============4890058975931961761==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

According to the described coding style the following changes were made.=20

---
 html/html/themes/darkdos/include/functions.pl | 35 +++++++++----------
 .../themes/ipfire-legacy/include/functions.pl | 22 ++++++------
 html/html/themes/ipfire/include/functions.pl  |  2 +-
 html/html/themes/maniac/include/functions.pl  | 32 ++++++++---------
 4 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/html/html/themes/darkdos/include/functions.pl b/html/html/themes=
/darkdos/include/functions.pl
index 9f3547237..6285ef8ba 100644
--- a/html/html/themes/darkdos/include/functions.pl
+++ b/html/html/themes/darkdos/include/functions.pl
@@ -48,7 +48,7 @@ EOF
 			</ul>
 		</div>
 EOF
-;   =20
+;
 }
=20
 sub getselected($) {
@@ -141,7 +141,7 @@ sub openpage {
=20
     $title =3D "-=3D IPFire - $title =3D-";
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
-        $title =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"=
;=20
+        $title =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title";
     }
=20
     print <<END
@@ -154,7 +154,7 @@ sub openpage {
     <link rel=3D"shortcut icon" href=3D"/favicon.ico" />
     <link rel=3D"stylesheet" type=3D"text/css" href=3D"/themes/darkdos/inclu=
de/style.css" />
     <script language=3D"javascript" type=3D"text/javascript">
-     =20
+
         function swapVisibility(id) {
             el =3D document.getElementById(id);
             if(el.style.display !=3D 'block') {
@@ -184,21 +184,21 @@ print <<END
 											t_current =3D new Date();
 											var t_diff =3D t_current - t_last;
 											t_last =3D t_current;
-			=09
+
 											rxb_current =3D \$("rxb",xml).text();
 											var rxb_diff =3D rxb_current - rxb_last;
 											rxb_last =3D rxb_current;
-			=09
+
 											var rx_kbs =3D rxb_diff/t_diff;
 											rx_kbs =3D Math.round(rx_kbs*10)/10;
-			=09
+
 											txb_current =3D \$("txb",xml).text();
 											var txb_diff =3D txb_current - txb_last;
 											txb_last =3D txb_current;
-			=09
+
 											var tx_kbs =3D txb_diff/t_diff;
 											tx_kbs =3D Math.round(tx_kbs*10)/10;
-			=09
+
 											\$("#rx_kbs").text(rx_kbs + ' kb/s');
 											\$("#tx_kbs").text(tx_kbs + ' kb/s');
 											}
@@ -227,7 +227,7 @@ print <<END
 END
 ;
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
-        print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span=
></h1><br />";=20
+        print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span=
></h1><br />";
     } else {
 				print "<h1><span><a href=3D'https://www.ipfire.org' style=3D'text-decora=
tion: none;'>-=3D IPFire =3D-</a></span></h1><br />";
 		}
@@ -239,7 +239,7 @@ END
 ;
 	&showmenu();
=20
-print <<END=09
+print <<END
 	</div>
 </div>
=20
@@ -264,7 +264,7 @@ sub openpagewithoutmenu {
=20
     $title =3D "-=3D IPFire - $title =3D-";
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
-        $title =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"=
;=20
+        $title =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title";
     }
=20
     print <<END
@@ -287,7 +287,7 @@ END
     <link rel=3D"shortcut icon" href=3D"/favicon.ico" />
     <link rel=3D"stylesheet" type=3D"text/css" href=3D"/include/style.css" />
     <script language=3D"javascript" type=3D"text/javascript">
-     =20
+
         function swapVisibility(id) {
             el =3D document.getElementById(id);
   	    if(el.style.display !=3D 'block') {
@@ -310,7 +310,7 @@ END
 		<div id=3D"logo">
 			<h1><span>-=3D IPFire =3D-</span></h1>
 			<h2>+ $h2 +</h2>
-		</div>=09
+		</div>
 	</div>
 </div>
=20
@@ -330,14 +330,11 @@ sub closepage () {
 	$uptime =3D~ s/month(s|)/$Lang::tr{'month'}/;
 	$uptime =3D~ s/day(s|)/$Lang::tr{'day'}/;
 	$uptime =3D~ s/user(s|)/$Lang::tr{'user'}/;
-	$uptime =3D~ s/load average/$Lang::tr{'uptime load average'}/;    =20
-			=09
+	$uptime =3D~ s/load average/$Lang::tr{'uptime load average'}/;
     print <<END
 			</div>
 		</div>
-
 		<div id=3D"secondaryContent_2columns">
-	=09
 			<div id=3D"columnC_2columns">
 END
 ;
@@ -347,13 +344,13 @@ END
 	print <<END
 				</div>
 			</div>
-			<br class=3D"clear" />=09
+			<br class=3D"clear" />
 			<div id=3D"footer" class=3D"fixed">
 				<b>Status:</b> $status <b>Uptime:</b> $uptime
 END
 ;
 if ($settings{'SPEED'} ne 'off') {
-print <<END                       =20
+print <<END
                         <br />
                                 <b>$Lang::tr{'bandwidth usage'}:</b>
 				$Lang::tr{'incoming'}: <span id=3D"rx_kbs"></span>&nbsp;$Lang::tr{'outgo=
ing'}: <span id=3D"tx_kbs"></span>
diff --git a/html/html/themes/ipfire-legacy/include/functions.pl b/html/html/=
themes/ipfire-legacy/include/functions.pl
index 3ce62ea41..cc8dfa318 100644
--- a/html/html/themes/ipfire-legacy/include/functions.pl
+++ b/html/html/themes/ipfire-legacy/include/functions.pl
@@ -48,7 +48,7 @@ EOF
                         </ul>
                 </div>
 EOF
-;   =20
+;
 }
=20
 sub getselected($) {
@@ -141,7 +141,7 @@ sub openpage {
=20
     $title =3D "IPFire - $title";
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
-        $title =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"=
;=20
+        $title =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title";
     }
=20
     print <<END
@@ -154,7 +154,7 @@ sub openpage {
     <link rel=3D"shortcut icon" href=3D"/favicon.ico" />
     <link rel=3D"stylesheet" type=3D"text/css" href=3D"/themes/ipfire-legacy=
/include/style.css" />
     <script language=3D"javascript" type=3D"text/javascript">
-     =20
+
         function swapVisibility(id) {
             el =3D document.getElementById(id);
             if(el.style.display !=3D 'block') {
@@ -227,7 +227,7 @@ print <<END
 END
 ;
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
-        print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span=
></h1><br />";=20
+        print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span=
></h1><br />";
     } else {
                                 print "<h1><span><a href=3D'https://www.ipfi=
re.org' style=3D'text-decoration: none;'>IPFire</a></span></h1><br />";
                 }
@@ -239,7 +239,7 @@ END
 ;
         &showmenu();
=20
-print <<END    =20
+print <<END
         </div>
 </div>
=20
@@ -264,7 +264,7 @@ sub openpagewithoutmenu {
=20
     $title =3D "IPFire - $title";
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
-        $title =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"=
;=20
+        $title =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title";
     }
=20
     print <<END
@@ -287,7 +287,7 @@ END
     <link rel=3D"shortcut icon" href=3D"/favicon.ico" />
     <link rel=3D"stylesheet" type=3D"text/css" href=3D"/include/style.css" />
     <script language=3D"javascript" type=3D"text/javascript">
-     =20
+
         function swapVisibility(id) {
             el =3D document.getElementById(id);
             if(el.style.display !=3D 'block') {
@@ -310,7 +310,7 @@ END
                 <div id=3D"logo">
                         <h1><span>IPFire</span></h1>
                         <h2>$h2</h2>
-                </div> =20
+                </div>
         </div>
 </div>
=20
@@ -337,7 +337,7 @@ sub closepage () {
                 </div>
=20
                 <div id=3D"secondaryContent_2columns">
-               =20
+
                         <div id=3D"columnC_2columns">
 END
 ;
@@ -347,7 +347,7 @@ END
         print <<END
                                 </div>
                         </div>
-                        <br class=3D"clear" />   =20
+                        <br class=3D"clear" />
                         <div id=3D"footer" class=3D"fixed">
                                 <b>Status:</b> $status <b>Uptime:</b> $uptime
 END
@@ -356,7 +356,7 @@ if ($settings{'SPEED'} ne 'off') {
 print <<END
                         <br />
                                 <b>$Lang::tr{'bandwidth usage'}:</b>
-                                $Lang::tr{'incoming'}: <span id=3D"rx_kbs"><=
/span>&nbsp;$Lang::tr{'outgoing'}: <span id=3D"tx_kbs"></span>               =
                                                            =20
+                                $Lang::tr{'incoming'}: <span id=3D"rx_kbs"><=
/span>&nbsp;$Lang::tr{'outgoing'}: <span id=3D"tx_kbs"></span>
 				<b>time:</b> $localtime_now
=20
 END
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/=
ipfire/include/functions.pl
index 9e3063476..108ce5f1a 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -40,7 +40,7 @@ use POSIX;
 # @param submenu entries
 sub showsubmenu() {
 	my $submenus =3D shift;
-=09
+
 	print "<ul>";
 	foreach my $item (sort keys %$submenus) {
 		$link =3D getlink($submenus->{$item});
diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/=
maniac/include/functions.pl
index c50357070..2fbc3f53a 100644
--- a/html/html/themes/maniac/include/functions.pl
+++ b/html/html/themes/maniac/include/functions.pl
@@ -48,7 +48,7 @@ EOF
 			</ul>
 		</div>
 EOF
-;   =20
+;
 }
=20
 sub getselected($) {
@@ -141,7 +141,7 @@ sub openpage {
=20
     $title =3D "-=3D IPFire - $title =3D-";
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
-        $title =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"=
;=20
+        $title =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title";
     }
=20
     print <<END
@@ -154,7 +154,7 @@ sub openpage {
     <link rel=3D"shortcut icon" href=3D"/favicon.ico" />
     <link rel=3D"stylesheet" type=3D"text/css" href=3D"/themes/maniac/includ=
e/style.css" />
     <script type=3D"text/javascript">
-     =20
+
         function swapVisibility(id) {
             el =3D document.getElementById(id);
             if(el.style.display !=3D 'block') {
@@ -184,21 +184,21 @@ print <<END
 											t_current =3D new Date();
 											var t_diff =3D t_current - t_last;
 											t_last =3D t_current;
-			=09
+
 											rxb_current =3D \$("rxb",xml).text();
 											var rxb_diff =3D rxb_current - rxb_last;
 											rxb_last =3D rxb_current;
-			=09
+
 											var rx_kbs =3D rxb_diff/t_diff;
 											rx_kbs =3D Math.round(rx_kbs*10)/10;
-			=09
+
 											txb_current =3D \$("txb",xml).text();
 											var txb_diff =3D txb_current - txb_last;
 											txb_last =3D txb_current;
-			=09
+
 											var tx_kbs =3D txb_diff/t_diff;
 											tx_kbs =3D Math.round(tx_kbs*10)/10;
-			=09
+
 											\$("#rx_kbs").text(rx_kbs + ' kb/s');
 											\$("#tx_kbs").text(tx_kbs + ' kb/s');
 											}
@@ -227,7 +227,7 @@ print <<END
 END
 ;
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
-        print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span=
></h1><br />";=20
+        print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span=
></h1><br />";
     } else {
 				print "<h1><span><a href=3D'https://www.ipfire.org' style=3D'text-decora=
tion: none;'>-=3D IPFire =3D-</a></span></h1><br />";
 		}
@@ -239,7 +239,7 @@ END
 ;
 	&showmenu();
=20
-print <<END=09
+print <<END
 	</div>
 </div>
=20
@@ -264,7 +264,7 @@ sub openpagewithoutmenu {
=20
     $title =3D "-=3D IPFire - $title =3D-";
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
-        $title =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"=
;=20
+        $title =3D  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title";
     }
=20
     print <<END
@@ -287,7 +287,7 @@ END
     <link rel=3D"shortcut icon" href=3D"/favicon.ico" />
     <link rel=3D"stylesheet" type=3D"text/css" href=3D"/include/style.css" />
     <script type=3D"text/javascript">
-     =20
+
         function swapVisibility(id) {
             el =3D document.getElementById(id);
   	    if(el.style.display !=3D 'block') {
@@ -310,7 +310,7 @@ END
 		<div id=3D"logo">
 			<h1><span>-=3D IPFire =3D-</span></h1>
 			<h2>+ $h2 +</h2>
-		</div>=09
+		</div>
 	</div>
 </div>
=20
@@ -337,7 +337,7 @@ sub closepage () {
                 </div>
=20
                 <div id=3D"secondaryContent_2columns">
-               =20
+
                         <div id=3D"columnC_2columns">
 END
 ;
@@ -347,7 +347,7 @@ END
         print <<END
                                 </div>
                         </div>
-                        <br class=3D"clear" />   =20
+                        <br class=3D"clear" />
                         <div id=3D"footer" class=3D"fixed">
                                 <b>Status:</b> $status <b>Uptime:</b> $uptime
 END
@@ -356,7 +356,7 @@ if ($settings{'SPEED'} ne 'off') {
 print <<END
                         <br />
                                 <b>$Lang::tr{'bandwidth usage'}:</b>
-                                $Lang::tr{'incoming'}: <span id=3D"rx_kbs"><=
/span>&nbsp;$Lang::tr{'outgoing'}: <span id=3D"tx_kbs"></span>               =
                                                            =20
+                                $Lang::tr{'incoming'}: <span id=3D"rx_kbs"><=
/span>&nbsp;$Lang::tr{'outgoing'}: <span id=3D"tx_kbs"></span>
                                 <b>time:</b> $localtime_now
=20
 END
--=20
2.20.1


--===============4890058975931961761==--