From e0caeb4cc8b72f84b8ba512f4b259096157f4ca8 Mon Sep 17 00:00:00 2001
From: mattpass <matt@helical-levity.com>
Date: Sat, 20 Jun 2020 07:39:24 +0100
Subject: [PATCH] ExtreProcesses, System and URL now indicated as classes

---
 classes/FTP.php             |  6 ++---
 classes/File.php            | 14 +++++------
 classes/_ExtraProcesses.php |  6 ++---
 index.php                   |  4 ++--
 lib/bug-files-check.php     |  4 ++--
 lib/file-control.php        | 46 ++++++++++++++++++-------------------
 lib/settings-common.php     | 12 +++++-----
 lib/settings.php            | 12 +++++-----
 8 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/classes/FTP.php b/classes/FTP.php
index c94dd1e..e6a7fec 100644
--- a/classes/FTP.php
+++ b/classes/FTP.php
@@ -6,11 +6,11 @@ use ICEcoder\System;
 
 class FTP
 {
-    private $system;
+    private $systemClass;
 
     public function __construct()
     {
-        $this->system = new System();
+        $this->systemClass = new System();
     }
 
     public function writeFile() {
@@ -30,7 +30,7 @@ class FTP
                 }
             }
             // Stitch changes onto it
-            $contents = $this->system->stitchChanges($fileLines, $_POST['changes']);
+            $contents = $this->systemClass->stitchChanges($fileLines, $_POST['changes']);
 
             // get old file contents and count stats on usage \n and \r there
             // in this case we can keep line endings, which file had before, without
diff --git a/classes/File.php b/classes/File.php
index 235275e..09e0e3c 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -12,12 +12,12 @@ use lessc;
 class File
 {
     private $ftpClass;
-    private $system;
+    private $systemClass;
 
     public function __construct()
     {
         $this->ftpClass = new FTP();
-        $this->system = new System();
+        $this->systemClass = new System();
     }
 
     public function check() {
@@ -173,8 +173,8 @@ class File
                 $loadedFile = preg_replace('/\\n/', '&#13;', $loadedFile);
                 echo '</script><textarea name="loadedFile" id="loadedFile">' . $loadedFile . '</textarea><script>';
                 // Run our custom processes
-                $extraProcesses = new ExtraProcesses($fileLoc, $fileName);
-                $extraProcesses->onFileLoad();
+                $extraProcessesClass = new ExtraProcesses($fileLoc, $fileName);
+                $extraProcessesClass->onFileLoad();
             } else if (0 === strpos($finfo, "image")) {
                 echo 'fileType="image";fileName=\'' . $fileLoc . "/" . $fileName . '\';';
             } else {
@@ -355,7 +355,7 @@ class File
         if (isset($_POST['changes'])) {
             // Get existing file contents as lines and stitch changes onto it
             $fileLines = file($file);
-            $contents = $this->system->stitchChanges($fileLines, $_POST['changes']);
+            $contents = $this->systemClass->stitchChanges($fileLines, $_POST['changes']);
 
             // get old file contents, and count stats on usage \n and \r there
             // in this case we can keep line endings, which file had before, without
@@ -444,8 +444,8 @@ class File
                 $finalAction = "delete";
 
                 // Run any extra processes
-                $extraProcesses = new ExtraProcesses($fileLoc, $fileName);
-                $doNext = $extraProcesses->onFileDirDelete($doNext);
+                $extraProcessesClass = new ExtraProcesses($fileLoc, $fileName);
+                $doNext = $extraProcessesClass->onFileDirDelete($doNext);
             } else {
                 $doNext .= "ICEcoder.message('" . $t['Sorry, cannot delete'] . "\\\\n" . str_replace($docRoot, "", $fullPath) . "');";
                 $finalAction = "nothing";
diff --git a/classes/_ExtraProcesses.php b/classes/_ExtraProcesses.php
index 29a354e..5112dcb 100644
--- a/classes/_ExtraProcesses.php
+++ b/classes/_ExtraProcesses.php
@@ -9,7 +9,7 @@ class ExtraProcesses
     private $fileLoc;
     private $fileName;
     private $username;
-    private $system;
+    private $systemClass;
 
     /**
      * ExtraProcesses constructor.
@@ -21,7 +21,7 @@ class ExtraProcesses
         $this->fileLoc = $fileLoc;
         $this->fileName = $fileName;
         $this->username = $_SESSION['username'];
-        $this->system = new System;
+        $this->systemClass= new System;
     }
 
     /**
@@ -32,7 +32,7 @@ class ExtraProcesses
     {
         $username = "" !== $this->username ? $this->username : "default-user";
 
-        $this->system->writeLog(
+        $this->systemClass->writeLog(
             "{$username}.log",
             "{$action} >>> " . date("D dS M Y h:i:sa") . " : " . ($this->fileLoc) . "/" . ($this->fileName) . ("" !== $msg ? " : " . $msg : "") . "\n"
         );
diff --git a/index.php b/index.php
index 39f8199..0edc8a0 100644
--- a/index.php
+++ b/index.php
@@ -131,8 +131,8 @@ $t = $text['index'];
         if (true === $ICEcoder["tutorialOnLogin"]) {
             echo "ICEcoder.viewTutorial(false, 700);";
         }
-    $extraProcesses = new ExtraProcesses();
-    $onLoad = $extraProcesses->onLoad();
+    $extraProcessesClass = new ExtraProcesses();
+    $onLoad = $extraProcessesClass->onLoad();
 ?>ICEcoder.init()<?php echo $updateMsg.$onLoadExtras;?>;ICEcoder.content.style.visibility = 'visible';<?php echo $onLoad;?><?php if(true === isset($_GET["display"]) && "updated" === $_GET["display"]) {echo "ICEcoder.updated();";};?>" onresize="ICEcoder.setLayout()" onkeydown="return ICEcoder.interceptKeys('coder', event);" onkeyup="if('visible' === get('blackMask').style.visibility) {ICEcoder.handleModalKeyUp(event, 'modalGeneralCatch')}; ICEcoder.resetKeys(event);" onblur="ICEcoder.resetKeys(event);">
 
 <div id="blackMask" class="blackMask" onclick="if (!ICEcoder.overPopup) {ICEcoder.showHide('hide',this)}" oncontextmenu="return false">
diff --git a/lib/bug-files-check.php b/lib/bug-files-check.php
index 1ae63ec..2744121 100644
--- a/lib/bug-files-check.php
+++ b/lib/bug-files-check.php
@@ -112,8 +112,8 @@ $status = array(
 );
 
 // Include our process once our bug checking work is done
-$extraProcesses = new ExtraProcesses();
-$doNext = $extraProcesses->onBugCheckResult($result, $status);
+$extraProcessesClass = new ExtraProcesses();
+$doNext = $extraProcessesClass->onBugCheckResult($result, $status);
 
 // Finally, display our status in JSON format as the XHR response text
 echo json_encode($status);
diff --git a/lib/file-control.php b/lib/file-control.php
index a6b6c04..0883736 100644
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -11,7 +11,7 @@ use ICEcoder\URL;
 $backupClass = new Backup;
 $fileClass = new File;
 $ftpClass = new FTP;
-$system = new System;
+$systemClass = new System;
 
 $t = $text['file-control'];
 
@@ -160,8 +160,8 @@ if (!$error && "save" === $_GET['action']) {
                 $doNext .= $fileClass->compileLess();
 
                 // Run any extra processes
-                $extraProcesses = new ExtraProcesses($fileLoc, $fileName);
-                $doNext = $extraProcesses->onFileSave($doNext);
+                $extraProcessesClass = new ExtraProcesses($fileLoc, $fileName);
+                $doNext = $extraProcessesClass->onFileSave($doNext);
 
                 // ======================================================
                 // MDT'S DON'T MATCH, OFFER TO LOAD FILE & SHOW DIFF VIEW
@@ -204,8 +204,8 @@ if (!$error && "newFolder" === $_GET['action']) {
         }
         $finalAction = "newFolder";
         // Run any extra processes
-        $extraProcesses = new ExtraProcesses($fileLoc, $fileName);
-        $doNext = $extraProcesses->onDirNew($doNext);
+        $extraProcessesClass = new ExtraProcesses($fileLoc, $fileName);
+        $doNext = $extraProcessesClass->onDirNew($doNext);
     } else {
         $doNext .= "ICEcoder.message('" . $t['Sorry, cannot create...'] . "\\\\n" . $fileLoc . "');";
         $finalAction = "nothing";
@@ -246,8 +246,8 @@ if (!$error && "move" === $_GET['action']) {
             }
             $finalAction = "move";
             // Run any extra processes
-            $extraProcesses = new ExtraProcesses($fileLoc, $fileName);
-            $doNext = $extraProcesses->onFileDirMove($doNext);
+            $extraProcessesClass = new ExtraProcesses($fileLoc, $fileName);
+            $doNext = $extraProcessesClass->onFileDirMove($doNext);
         } else {
             $doNext .= "ICEcoder.message('" . $t['Sorry, cannot move'] . "\\\\n" . str_replace("|", "/", $_GET['oldFileName']) . "\\\\n\\\\n" . $t['Maybe public write...'] . "');";
             $finalAction = "nothing";
@@ -281,8 +281,8 @@ if (!$error && "rename" === $_GET['action']) {
 
         $finalAction = "rename";
         // Run any extra processes
-        $extraProcesses = new ExtraProcesses($fileLoc, $fileName);
-        $doNext = $extraProcesses->onFileDirRename($doNext);
+        $extraProcessesClass = new ExtraProcesses($fileLoc, $fileName);
+        $doNext = $extraProcessesClass->onFileDirRename($doNext);
     } else {
         $doNext .= "ICEcoder.message('".$t['Sorry, cannot rename'] . "\\\\n" . $_GET['oldFileName'] . "\\\\n\\\\n" . $t['Maybe public write...'] . "');";
         $finalAction = "nothing";
@@ -305,8 +305,8 @@ if (!isset($ftpSite) && !$error && "paste" === $_GET['action']) {
         $doNext .= 'ICEcoder.updateFileManagerList(\'add\', \'' . str_replace("|", "/", $_GET['location']) . '\', \'' . basename($dest) . '\', false, false, false, \'' . $fileOrFolder . '\');';
         $finalAction = "pasteFile";
         // Run any extra processes
-        $extraProcesses = new ExtraProcesses($fileLoc, $fileName);
-        $doNext = $extraProcesses->onFileDirPaste($doNext, $dest);
+        $extraProcessesClass = new ExtraProcesses($fileLoc, $fileName);
+        $doNext = $extraProcessesClass->onFileDirPaste($doNext, $dest);
     } else {
         $doNext .= "ICEcoder.message('" . $t['Sorry, cannot copy'] . " \\\\n" . str_replace($docRoot, "", $source) . "\\\\n " . $t['into'] . " \\\\n" . str_replace($docRoot, "", $dest) . "');";
         $finalAction = "nothing";
@@ -326,8 +326,8 @@ if (!isset($ftpSite) && !$error && "upload" === $_GET['action']) {
             $finalAction = $fileClass->upload($uploads);
         }
         // Run any extra processes
-        $extraProcesses = new ExtraProcesses($fileLoc, $fileName);
-        $doNext = $extraProcesses->onFileUpload($doNext, $uploads);
+        $extraProcessesClass = new ExtraProcesses($fileLoc, $fileName);
+        $doNext = $extraProcessesClass->onFileUpload($doNext, $uploads);
     } else {
         $doNext .= "parent.parent.ICEcoder.message('" . $t['Sorry, cannot upload...'] . "');";
         $finalAction = "nothing";
@@ -359,8 +359,8 @@ if (!$error && "delete" === $_GET['action']) {
                 $doNext .= 'ICEcoder.selectedFiles = []; ICEcoder.updateFileManagerList(\'delete\', \'' . $fileLoc . '\', \'' . $fileName . '\');';
                 $finalAction = "delete";
                 // Run any extra processes
-                $extraProcesses = new ExtraProcesses($fileLoc, $fileName);
-                $doNext = $extraProcesses->onFileDirDelete($doNext);
+                $extraProcessesClass = new ExtraProcesses($fileLoc, $fileName);
+                $doNext = $extraProcessesClass->onFileDirDelete($doNext);
             } else {
                 $doNext .= "ICEcoder.message('" . $t['Sorry, cannot delete'] . "\\\\n" . $fileLoc . "/" . $fileName . "');";
                 $finalAction = "nothing";
@@ -391,8 +391,8 @@ if (!isset($ftpSite) && !$error && "replaceText" === $_GET['action']) {
         $finalAction = "replaceText";
 
         // Run any extra processes
-        $extraProcesses = new ExtraProcesses($fileLoc, $fileName);
-        $doNext = $extraProcesses->onFileReplaceText($doNext, $_GET['fileRef']);
+        $extraProcessesClass = new ExtraProcesses($fileLoc, $fileName);
+        $doNext = $extraProcessesClass->onFileReplaceText($doNext, $_GET['fileRef']);
 
     } else {
         $doNext .= "ICEcoder.message('" . $t['Sorry, cannot replace...'] . "\\\\n" . $file . "');";
@@ -411,13 +411,13 @@ if (!isset($ftpSite) && !$error && "getRemoteFile" === $_GET['action']) {
 
     if ($remoteFile = toUTF8noBOM(getData($file, 'curl'), true)) {
         // Get URL contents
-        $url = new URL($remoteFile);
-        $doNext .= $url->load($ICEcoder["lineEnding"], $lineNumber);
+        $urlClass = new URL($remoteFile);
+        $doNext .= $urlClass->load($ICEcoder["lineEnding"], $lineNumber);
         $finalAction = "getRemoteFile";
 
         // Run any extra processes
-        $extraProcesses = new ExtraProcesses($fileLoc);
-        $doNext = $extraProcesses->onGetRemoteFile($doNext);
+        $extraProcessesClass = new ExtraProcesses($fileLoc);
+        $doNext = $extraProcessesClass->onGetRemoteFile($doNext);
 
     } else {
         $finalAction = "nothing";
@@ -448,8 +448,8 @@ if (!$error && "perms" === $_GET['action']) {
         }
         $finalAction = "perms";
         // Run any custom processes
-        $extraProcesses = new ExtraProcesses($fileLoc, $fileName);
-        $doNext = $extraProcesses->onFileDirPerms($doNext, $_GET['perms']);
+        $extraProcessesClass = new ExtraProcesses($fileLoc, $fileName);
+        $doNext = $extraProcessesClass->onFileDirPerms($doNext, $_GET['perms']);
     } else {
         $finalAction = "nothing";
         $doNext .= "ICEcoder.message('" . $t['Sorry, cannot change...'] . " \\n" . $file . "');";
diff --git a/lib/settings-common.php b/lib/settings-common.php
index 617a380..e4fb529 100644
--- a/lib/settings-common.php
+++ b/lib/settings-common.php
@@ -5,10 +5,10 @@ require_once dirname(__FILE__) . "/../classes/System.php";
 use ICEcoder\ExtraProcesses;
 use ICEcoder\System;
 
-$system = new System;
-$system->setErrorHandling();
-$system->setTimeZone();
-$context = $system->setStreamContext();
+$systemClass = new System;
+$systemClass->setErrorHandling();
+$systemClass->setTimeZone();
+$context = $systemClass->setStreamContext();
 
 // Start a session if we haven't already
 if(false === isset($_SESSION)) {
@@ -146,8 +146,8 @@ function requireReIndexNextTime() {
 
 // Logout if that's the action we're taking
 if (true === isset($_GET['logout'])) {
-    $extraProcesses = new ExtraProcesses();
-    $extraProcesses->onUserLogout($_SESSION['username']);
+    $extraProcessesClass = new ExtraProcesses();
+    $extraProcessesClass->onUserLogout($_SESSION['username']);
 	$_SESSION['loggedIn'] = false;
 	$_SESSION['username'] = "";
 	session_destroy();
diff --git a/lib/settings.php b/lib/settings.php
index dd3e40c..9aae41d 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -113,14 +113,14 @@ if (true === isset($_POST['submit']) && "login" === $setPWorLogin) {
             $_SESSION['username'] = $_POST['username'];
         }
         $_SESSION['loggedIn'] = true;
-        $extraProcesses = new ExtraProcesses();
-        $extraProcesses->onUserLogin($_SESSION['username'] ?? "");
+        $extraProcessesClass = new ExtraProcesses();
+        $extraProcessesClass->onUserLogin($_SESSION['username'] ?? "");
         header('Location: ../');
         echo "<script>window.location = '../';</script>";
         die('Logging you in...');
     } else {
-        $extraProcesses = new ExtraProcesses();
-        $extraProcesses->onUserLoginFail($_SESSION['username'] ?? "");
+        $extraProcessesClass = new ExtraProcesses();
+        $extraProcessesClass->onUserLoginFail($_SESSION['username'] ?? "");
     }
 };
 
@@ -200,8 +200,8 @@ if (false === isset($_POST['password']) && (!$_SESSION['loggedIn'] || "" === $IC
             $_SESSION['username'] = $_POST['username'];
         }
         $_SESSION['loggedIn'] = true;
-        $extraProcesses = new ExtraProcesses();
-        $extraProcesses->onUserNew($_SESSION['username'] ?? "");
+        $extraProcessesClass = new ExtraProcesses();
+        $extraProcessesClass->onUserNew($_SESSION['username'] ?? "");
         // Finally, load again as now this file has changed and auto login
         header('Location: ../');
         echo "<script>window.location = '../';</script>";