v0.7.6 - Working on guiCore, adding core functionality.

-Adding & refining functions in guiCore.php.
-I want to have widgets, apps, and files on the homepage similar to HRCloud2, but with seamless iframes that scroll to the side similar to Netflix.
  -Maybe smaller than netflix. 
  -Maybe put two side by side?
  -User can re-arrange widgets and apps and anything else.
  -Make a cache file to store the order in which items are displayed. 
  -Update this cache file when the user changes their display options.
  -Iframes sidescroll, only one object tall.
  -Iframes should be outputted via PHP functions and contained in widgets.
  -Authentication levels for widgets are coded into the widget themselves.
  -That way widgets can be made for unauthenticated users for things that don't need auth. Like converting one-time files or outputting server analytics or marketing.
-Refactored getFiles() in guiCore.php pretty heavily.
-Add Applications and Widgets folders to verifyInstallation() in core.php.
-Need to add code in core.php to create a cache file to store the order that guiElements are displayed in.
  -This code should probably go in the same area as notifications file generation. 
  -Maybe tuck it inside the generateUserCache() function?
-Cleanup lingering files from last nights big GUI / HTML file move.

Author: zelon88

compatibilityCore.php

@@ -23,7 +23,7 @@
 
 // / ----------------------------------------------------------------------------------
 // / Specify the engine version.
-$EngineVersion = 'v0.7.5';
+$EngineVersion = 'v0.7.6';
 // / ----------------------------------------------------------------------------------
 
 // / ----------------------------------------------------------------------------------

core.php

@@ -8,7 +8,7 @@
 https://www.gnu.org/licenses/gpl-3.0.html
 
 Author: Justin Grimes
-Date: 3/10/2021
+Date: 3/12/2021
 <3 Open-Source
 
 This is the primary Core file for the Diablo Web Application Engine.
@@ -113,7 +113,7 @@ function verifyInstallation() {
   // / Set variables. 
   global $Date, $Time, $Salts, $RootPath;
   $dirCheck = $indexCheck = $dirExists = $indexExists = $logCheck = $cacheCheck = TRUE;
-  $requiredDirs = array('Logs', 'Data', 'Cache', 'Cache'.DIRECTORY_SEPARATOR.'Data');
+  $requiredDirs = array('Applications', 'Widgets', 'Logs', 'Data', 'Cache', 'Cache'.DIRECTORY_SEPARATOR.'Data');
   $InstallationIsVerified = FALSE;
   // / For servers with unprotected directory roots, we must verify (at minimum) that a local index file exists to catch unwanted traversal.
   if (!file_exists('index.html')) $indexCheck = FALSE;

guiCore.php

@@ -8,7 +8,7 @@
 https://www.gnu.org/licenses/gpl-3.0.html
 
 Author: Justin Grimes
-Date: 3/11/2021
+Date: 3/12/2021
 <3 Open-Source
 
 The GUI Core provides resources for the user interfaces & decides which interface to use.
@@ -61,15 +61,22 @@ function getCurrentURL() {
 // / Set $includeDangerousFiles to TRUE to have dangerous files appear in the array of results.
 // / Set $includeDangerousFiles to FALSE to have dangerous files removed from the array of results.
 // / The $DangerousFiles array defined in config.php contains the global list of dangerous file extensions.
-function getFiles($pathToFiles, $includeIndexFiles, $includeDangerousFiles) {
+// / Set $includeDirectories to TRUE to have directories appear in the array of results.
+// / Set $includeDirectories to FALSE to have directories removed from the array of results.
+function getFiles($pathToFiles, $includeIndexFiles, $includeDangerousFiles, $includeDirectories) {
   global $DangerousFiles;
-  $dirtyFileArr = $dirtyFileArr = FALSE;
+  $dirtyFileArr = $OperationSuccessful = FALSE;
+  $dirtyFileArr = array();
   $dirtyFileArr = scandir($Files);
   foreach ($dirtyFileArr as $dirtyFile) {
+    if ($dirtyFile === '.' or $dirtyFile === '..') continue;
     $dirtyExt = pathinfo($pathToFiles.DIRECTORY_SEPARATOR.$dirtyFile, PATHINFO_EXTENSION);
     if (!$includeDangerousFiles && in_array($dirtyExt, $DangerousFiles)) continue;
     if (!$includeIndexFiles && $dirtyFile == 'index.html') continue;
+    if (!$includeDirectories && is_dir($pathToFiles)) continue;
     array_push($Files, $dirtyFile); }
+  // / Check that the operation returned some files.
+  if (count($Files) > 0) $OperationSuccessful = TRUE;
   $dirtyFileArr = $dirtyFile = $dirtyExt = $pathToFiles = $includeDangerousFiles = $includeIndexFiles = NULL;
   unset($dirtyFileArr, $dirtyFile, $dirtyExt, $pathToFiles, $includeDangerousFiles, $includeIndexFiles);
   return ($Files); }
@@ -109,15 +116,83 @@ function setColorScheme() {
   if ($ColorScheme == '5') {
     echo ('<link rel="stylesheet" type="text/css" href="'.$CD.'Styles/iframeStyleBLACK.css">'); } }
 
-function getPageElement($htmlFile) {
+function outputPageElement($htmlFile) {
   global $DefaultTheme;
 
+  return ($HtmlElement);
+}
 
+// / A function to initialize installed widgets.
+// / Widgets are small macros for adding standalone functionality to the GUI. 
+function initializeWidgets() { 
+  global $WidgetsArrayCache;
+  $wac = $wid = $widget = $widgets = $WidgetsAreLoaded = $key = $keyCheck = $keyWac = $widgetArrayCountRaw = $widgetArrayCountRaw = $widgetArrayCheck = FALSE;
+  $widgetsArray = $newWidgetsArray = array();
+  // / Scan the Widgets directory and build an array of installed Widgets.
+  $widgetsArray = getFiles('Widgets', FALSE, TRUE);
+  // / Iterate through all installed widgets and
+  foreach ($widgetsArray as $widget) if (!is_dir($widget) && !($widget === '.' or $widget === '..' or $widget === 'index.html')) array_push($WidgetsArrayCache, $widget); 
+  $WidgetArrayCountRaw = count($WidgetsArrayCache);
+  $widgetArrayCountRaw = count($WidgetsArrayCache);
+  // / Validate the Widget cache is accurate.
+  // / The cahce is not for improving performance, but rather to store the order that the user has arranged their Widgets.
+  // / Detects when Widgets are added or removed and updates the cache accordingly.
+  foreach ($widgetsArray as $keyCheck => $widgetArrayCheck) {
+    // / Detect if a Widget needs to be removed from the Widget cache. 
+    if (!in_array($widgetArrayCheck, $widgetsArray)) { 
+      // / Remove the Widget from the cache array.
+      $WidgetsArrayCache[$keyCheck] = NULL;
+      unset ($WidgetsArrayCache[$keyCheck]); } }
+  // / Consolidate the WidgetsArrayCache but keep the order of array elements intact.
+  foreach ($WidgetsArrayCache as $keyWac => $wac) {
+    // / Add the current array index to a new array, but in the same order as the original array.
+    // / This way new array keys will be generated in-order, but the order of the array will be preserved.
+    // / This is required to keep the number of array keys down.
+    // / Otherwise our array keys would become orphaned and the our index would grow arbitrarily.
+    $newWidgetsArray = array_push($newWidgetsArray, $wac); 
+    // / Erase the current array index from the original WidgetsArrayCache array.
+    $WidgetsArrayCache[$keyWac] = NULL;
+    unset ($WidgetsArrayCache[$keyWac]); }
+  // / Redefine the WidgetsArrayCache with data from the newWidgetsArray.
+  $WidgetsArrayCache = $newWidgetsArray;
+  // / Clean up unneeded memory.
+  $wac = $wid = $widget = $widgets = $WidgetsAreLoaded = $key = $keyCheck = $keyWac = $widgetArrayCountRaw = $widgetArrayCountRaw = $widgetArrayCheck = $widgetsArray = $newWidgetsArray = NULL;
+  unset($wac, $wid, $widget, $widgets, $WidgetsAreLoaded, $key, $keyCheck, $keyWac, $widgetArrayCountRaw, $widgetArrayCountRaw, $widgetArrayCheck, $widgetsArray, $newWidgetsArray);
+  return (array($WidgetsArrayCache, $WidgetsAreLoaded)); } 
+
+function updateWidgetOrder() { 
+  
 
+  return ($WidgetOrder);
 }
 
+function outputWidgets($StyleToUse) { 
+  
+  return ($WidgetsElement);
+}
 
+function initializeApplications() { 
+  $app = $application = $applications = $ApplicationsAreLoaded = $key = FALSE;
+  $ApplicationsArray = $applicationArray = array();
+  $applicationsArray = scandir('Widgets');
+  foreach ($applicationsArray as $application) if (is_dir($application) && !($application === '.' or $application === '..')) array_push($ApplicationsArray, $application); 
+  foreach ($ApplicationsArray as $key => $application) { }
+  $applicationsArray = $applications = NULL;
+  unset($applicationsArray, $applications);
+  return (array($ApplicationArray, $applicationsAreLoaded)); }
+
+function updateApplicationOrder() { 
+  
+  return ($ApplicationOrder);
+}
 
+function outputApplications($StyleToUse) { 
+  
+  return ($ApplicationsElement);
+}
 
-
+function outputLogs($StyleToUse, $LogSource) { 
+  
+  return ($LogsElement);
+}
 // / -----------------------------------------------------------------------------------

versionInfo.php

@@ -16,5 +16,5 @@
 
 // / ----------------------------------------------------------------------------------
 // / Specify the engine version.
-$EngineVersionInfo = 'v0.7.5';
+$EngineVersionInfo = 'v0.7.6';
 // / ----------------------------------------------------------------------------------