work on db update functions

.gitignore

@@ -50,6 +50,7 @@ Temporary Items
 php_errors.log
 # Backup Files
 .pydio_id
+.idea/*
 # =========================
 # Organizr files
 # =========================

api/functions.php

@@ -13,6 +13,8 @@ configLazy();
 if (isset($GLOBALS['dbLocation'])) {
     $GLOBALS['organizrLog'] = $GLOBALS['dbLocation'].'organizrLog.json';
     $GLOBALS['organizrLoginLog'] = $GLOBALS['dbLocation'].'organizrLoginLog.json';
+    //Upgrade Check
+    upgradeCheck();
 }
 // Validate Token if set and set guest if not - sets GLOBALS
 getOrganizrUserToken();

api/functions/upgrade-functions.php

@@ -4,25 +4,20 @@ function upgradeCheck()
 {
     $updateDB = false;
     $compare = new Composer\Semver\Comparator;
-    // Upgrade check start for vserion below
-    $versionCheck = '2.0.0-alpha-120';
     $config = loadConfig();
     $oldVer = $config['configVersion'];
-    echo 'Doing check if version '.$oldVer.' is less than '.$versionCheck.'<br />';
-    if (isset($config['dbLocation']) && (!isset($config['configVersion']) || $compare->lessThan($config['configVersion'], $versionCheck))) {
+    // Upgrade check start for version below
+    $versionCheck = '2.0.0-alpha-120';
+    if (isset($config['dbLocation']) && (!isset($config['configVersion']) || $compare->lessThan($oldVer, $versionCheck))) {
         $updateDB = true;
+        $oldVer = $versionCheck;
     }
+    // End Upgrade check start for version above
     if ($updateDB == true) {
-        return 'Upgraded Needed - Current Version '.$oldVer.' - New Version: '.$versionCheck;
-    // Upgrade database to latest version
-        //updateDB($GLOBALS['dbLocation'],$GLOBALS['dbName'],$oldVer);
-        // Update Version and Commit
-        //$config['configVersion'] = $versionCheck;
-        //copy('config/config.php', 'config/config['.date('Y-m-d_H-i-s').'][1.40].bak.php');
-        //$createConfigSuccess = createConfig($config);
-        //unset($config);
-    } else {
-        return 'No Upgraded Needed - Current Version Above: '.$versionCheck;
+        //return 'Upgraded Needed - Current Version '.$oldVer.' - New Version: '.$versionCheck;
+        // Upgrade database to latest version
+        updateDB($GLOBALS['dbLocation'],$GLOBALS['dbName'],$oldVer);
+        unset($config);
     }
     return true;
 }

index.php

@@ -137,8 +137,6 @@
 	<script src="js/jquery.serializeToJSON.js"></script>
 	<script src="js/lazyload.min2.js"></script>
 	<script src="js/clipboard.js"></script>
-<!--	<script src="js/jsColorPicker.min.js"></script>
-	<script src="js/jsColor.js"></script>-->
 	<script src="js/emulatetab.joelpurra.js"></script>
 	<script src="plugins/bower_components/ace/ace.js"></script>
 	<script src="plugins/bower_components/ace/mode-css.js"></script>