From cb22029f7eace92ab8844da4863f05880c8c579d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= <pubgit@mikescher.com>
Date: Sun, 16 Oct 2022 15:50:38 +0200
Subject: [PATCH] Code cleanup

---
 .idea/inspectionProfiles/Project_Default.xml |  1 +
 .idea/php.xml                                |  2 +-
 www/commands/server_backupupload.php         |  8 ++++----
 www/commands/server_gitwebhook.php           |  8 ++++----
 www/data/javascript/admin.js                 |  6 +++---
 www/extern/egg/Logger.php                    |  4 ++--
 www/fragments/blogview_euler_list.php        | 16 ++++++++--------
 www/pages/api.php                            |  6 +++---
 8 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index f5f15f4..2f2d941 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -7,6 +7,7 @@
       </Languages>
     </inspection_tool>
     <inspection_tool class="HtmlUnknownTarget" enabled="true" level="INFORMATION" enabled_by_default="true" />
+    <inspection_tool class="PhpIllegalPsrClassPathInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpUnhandledExceptionInspection" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />
diff --git a/.idea/php.xml b/.idea/php.xml
index 30b4799..7e5d55a 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.2" />
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.1" />
 </project>
\ No newline at end of file
diff --git a/www/commands/server_backupupload.php b/www/commands/server_backupupload.php
index cf26e3e..1b7c2e9 100644
--- a/www/commands/server_backupupload.php
+++ b/www/commands/server_backupupload.php
@@ -25,10 +25,10 @@ $std = shell_exec("ncc_upload " . '"' . $tmppath . '" "' . $reltarget . '" 2>&1'
 
 fclose($fp);
 
-$content = "REQUEST: " . $uri            . "\r\n\r\n" .
-		   "IP:      " . get_client_ip() . "\r\n\r\n" .
-	       "TARGET:  " . $reltarget      . "\r\n\r\n" .
-	       "OUTPUT:  " . $std            . "\r\n\r\n";
+$content = "REQUEST: " . $uri            . "\n\n" .
+		   "IP:      " . get_client_ip() . "\n\n" .
+	       "TARGET:  " . $reltarget      . "\n\n" .
+	       "OUTPUT:  " . $std            . "\n\n";
 
 sendMail("Fileupload to '$folder' triggered", $content, 'virtualadmin@mikescher.de', 'webserver-info@mikescher.com');
 
diff --git a/www/commands/server_gitwebhook.php b/www/commands/server_gitwebhook.php
index ed3c428..621eb85 100644
--- a/www/commands/server_gitwebhook.php
+++ b/www/commands/server_gitwebhook.php
@@ -25,10 +25,10 @@ else
 
 $std = shell_exec($cmd);
 
-$content = "REQUEST: " . $uri . "\r\n\r\n" .
-		   "IP:      " . get_client_ip() . "\r\n\r\n" .
-	       "TARGET:  " . $hook . "\r\n\r\n" .
-	       "OUTPUT:  " . $std . "\r\n\r\n";
+$content = "REQUEST: " . $uri            . "\n\n" .
+		   "IP:      " . get_client_ip() . "\n\n" .
+	       "TARGET:  " . $hook           . "\n\n" .
+	       "OUTPUT:  " . $std            . "\n\n";
 
 sendMail("Webhook '$hook' triggered", $content, 'virtualadmin@mikescher.de', 'webserver-info@mikescher.com');
 
diff --git a/www/data/javascript/admin.js b/www/data/javascript/admin.js
index 4b6ebf7..3db11c9 100644
--- a/www/data/javascript/admin.js
+++ b/www/data/javascript/admin.js
@@ -5,7 +5,7 @@ function queryStatus(appendix, secret)
         success: function(result)
         {
             let ajaxOutput = $('#egg_ajaxOutput');
-            ajaxOutput.val(result + '\r\n' + appendix);
+            ajaxOutput.val(result + '\n' + appendix);
             ajaxOutput.scrollTop(ajaxOutput[0].scrollHeight);
         },
         async:   true
@@ -27,7 +27,7 @@ function startAjaxRefresh(secret)
         error: function( jqXHR, textStatus, errorThrown)
         {
             clearInterval(val);
-            queryStatus('AN ERROR OCCURED:' + '\r\n' + textStatus, secret);
+            queryStatus('AN ERROR OCCURED:' + '\n' + textStatus, secret);
         },
         async:   true
     });
@@ -48,7 +48,7 @@ function startAjaxRedraw(secret)
         error: function( jqXHR, textStatus, errorThrown)
         {
             clearInterval(val);
-            queryStatus('AN ERROR OCCURED:' + '\r\n' + textStatus, secret);
+            queryStatus('AN ERROR OCCURED:' + '\n' + textStatus, secret);
         },
         async:   true
     });
diff --git a/www/extern/egg/Logger.php b/www/extern/egg/Logger.php
index 47f3127..18170b8 100644
--- a/www/extern/egg/Logger.php
+++ b/www/extern/egg/Logger.php
@@ -84,7 +84,7 @@ class SessionLogger implements ILogger
 	{
 		if (session_status() === PHP_SESSION_DISABLED) return;
 
-		$_SESSION[$this->sessionvar] .= $text . "\r\n";
+		$_SESSION[$this->sessionvar] .= $text . "\n";
 		session_commit();
 	}
 }
@@ -96,7 +96,7 @@ class OutputLogger implements ILogger
 		if ($text !== '') $text = '[' . date('H:i:s') . '] ' . $text;
 
 		print $text;
-		print "\r\n";
+		print "\n";
 	}
 
 }
\ No newline at end of file
diff --git a/www/fragments/blogview_euler_list.php b/www/fragments/blogview_euler_list.php
index c31978d..641e3ad 100644
--- a/www/fragments/blogview_euler_list.php
+++ b/www/fragments/blogview_euler_list.php
@@ -88,27 +88,27 @@ $problems = $SITE->modules->Euler()->listAll();
                 <?php
                 foreach ($problems as $problem)
                 {
-                    echo '<tr class="PEB_tablerowProblems">' . "\r\n";
+                    echo '<tr class="PEB_tablerowProblems">' . "\n";
 
                     echo '<td class="PEB_tablecellProblems PEB_TC_Number">';
                     echo '<a href="' . $problem['url'] . '">';
                     echo $problem['number'];
                     echo '</a>';
-                    echo '</td>' . "\r\n";
+                    echo '</td>' . "\n";
 
 					echo '<td class="PEB_tablecellProblems PEB_TC_Title">';
 					echo '<a href="' . $problem['url'] . '">';
 					echo htmlspecialchars($problem['title']);
 					echo '</a>';
-					echo '</td>' . "\r\n";
+					echo '</td>' . "\n";
 
 					echo '<td class="PEB_tablecellProblems PEB_TC_Rating">';
 					echo '<a href="' . $problem['url'] . '">';
 					echo '<div class="PEB_TC_Time PEB_TC_Timelevel_' . $problem['rating'] . '">';
-					echo formatMilliseconds($problem['time']) . "</div></td>\r\n";
+					echo formatMilliseconds($problem['time']) . "</div></td>\n";
 					echo '</div>';
 					echo '</a>';
-					echo '</td>' . "\r\n";
+					echo '</td>' . "\n";
 
 					echo '<td class="PEB_tablecellProblems PEB_TC_Size">';
 					echo '<a href="' . $problem['url'] . '">';
@@ -117,13 +117,13 @@ $problems = $SITE->modules->Euler()->listAll();
 					echo ($problem['is93'] ? 'Bef-93' : 'Bef-93+');
 					echo '</div>';
 					echo '</a>';
-					echo '</td>' . "\r\n";
+					echo '</td>' . "\n";
 
 					echo '<td class="PEB_tablecellProblems PEB_TC_Value">';
 					echo number_format($problem['value'], 0, null, ',');
-					echo '</td>' . "\r\n";
+					echo '</td>' . "\n";
 
-                    echo "</tr>\r\n";
+                    echo "</tr>\n";
                 }
                 ?>
                 </tbody>
diff --git a/www/pages/api.php b/www/pages/api.php
index 3a82ec3..cec5da1 100644
--- a/www/pages/api.php
+++ b/www/pages/api.php
@@ -102,9 +102,9 @@ try
 catch (exception $e)
 {
 	$content =
-		"REQUEST: " . var_export($_REQUEST) . "\r\n\r\n" .
-		"IP:      " . get_client_ip()       . "\r\n\r\n" .
-		"ERROR:   " . $e                    . "\r\n\r\n";
+		"REQUEST: " . var_export($_REQUEST) . "\n\n" .
+		"IP:      " . get_client_ip()       . "\n\n" .
+		"ERROR:   " . $e                    . "\n\n";
 
 	if ($SITE->isProd()) sendMail("Website API call failed", $content, 'virtualadmin@mikescher.de', 'webserver-info@mikescher.com');