Merge of 8.5 to Extended (v8.5.0 XT)

All tested, known bugs fixed. This is now v8.5.0 XT.
Clean a lot of redundant lines of code from 8.5 branch, ensured best
practices.
If not needed may delete Modules: Node (deprecated), My Electric and
Schedule folders, they are modularized and will not be required if not
used.

Lib/enum.php

@@ -18,10 +18,10 @@ class DataType {
 
   class Engine {
     const MYSQL = 0;
-    const TIMESTORE = 1;
+    const TIMESTORE = 1;    // Depreciated
     const PHPTIMESERIES = 2;
-    const GRAPHITE = 3;
-    const PHPTIMESTORE = 4;
+    const GRAPHITE = 3;     // Not included in core
+    const PHPTIMESTORE = 4; // Depreciated
     const PHPFINA = 5;
     const PHPFIWA = 6;
   }

Modules/admin/admin_controller.php

@@ -19,8 +19,9 @@ function admin_controller()
     // Allow for special admin session if updatelogin property is set to true in settings.php
     // Its important to use this with care and set updatelogin to false or remove from settings
     // after the update is complete.
-    if ($updatelogin || $session['admin'])
+    if ($updatelogin || $session['admin']) {
         $sessionadmin = true;
+    }
 
     if ($sessionadmin)
     {
@@ -32,28 +33,15 @@ function admin_controller()
             if (!$applychanges) $applychanges = false;
             else $applychanges = true;
 
-            require "Modules/admin/update_class.php";
             require_once "Lib/dbschemasetup.php";
 
-            $update = new Update($mysqli);
-
             $updates = array();
             $updates[] = array(
                 'title'=>"Database schema",
                 'description'=>"",
                 'operations'=>db_schema_setup($mysqli,load_db_schema(),$applychanges)
             );
 
-            if (!$updates[0]['operations']) {
-
-            // In future versions we could check against db version number as to what updates should be applied
-            $updates[] = $update->u0001($applychanges);
-            //$updates[] = $update->u0002($applychanges);
-            $updates[] = $update->u0003($applychanges);
-            $updates[] = $update->u0004($applychanges);
-
-            }
-
             $result = view("Modules/admin/update_view.php", array('applychanges'=>$applychanges, 'updates'=>$updates));
         }