Stable dashboard bugfixes to master (#225)

* case-insensitive ignoring of desktop.ini * base dashboard framework * Pull updates into dashboard working branch (#213) * dependency update * Include sources * Fix project render when no or bad carto_id obj * Sizes ... * Cleanup + debugging * later post update * Logging * Very bad goof * Update DB settings * Update dependencies * Tentative #212 * Tentative #212 * Temporary workaround for #212 * Temporary workaround for #212 * Debug #212 * Debug #212 * Debug #212 * Fix center calculation #212 * Fix #212 * Fix #211 * Start public #209 * Start public #209 * Render public #209 * Secure multibound data for private projects * Wrap cleaned corners in an array for compat * Tentative logged-in render for #209 * Fix broken tag * Tentative logged-in render for #209 * Tentative logged-in render for #209 * Fix #209 * Stage charts for dashboard * dashboard placeholders * Minor edits * Recompile after updates * Update bower * Chart creator * Recompile * Chart creator * Fix dist * Chart creator * Chart creator * Chart creator * some sketching for data charting api * Draft chart API response for infection binning * Fix error * Fix iteration * Sample API ping * Ignore server files * Fix passed parsed data * Fix passed parsed data * Multiply percent by 100 * colorize bars * colorize bars * Actually have some options * Wrap in a section * debug options * debug options * debug options * debug options * Fix tense * fix binning * Show a label * Use the right adjective * Debugging draft of location binning * API debugging * API debugging * Debugging draft of location binning * Debugging draft of location binning * Debugging draft of location binning * Debugging draft of location binning * Reconstruct data * Don't crap out on one bad blob of data * async timing * start at 0 * Bad Builders * Un-disable location * More api info * More api info * More api info * More raw info on country feedback * Delay for query limit * Delay for query limit * response change * response change * initialize empty points * initialize empty points * initialize empty points * wrong lookup type * arrayify * fix goofed wait * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * query limit test * Tentative #216 * Update dependencies * More updates * bump * Change the behaviour of search results * BiSciCol link moved: Fix #222 * Record migrator * Try country sample binning * Start synonymization for countries * Samples by country * More synonymies * Fix synonymies * Fix synonymies * Handle zero results * Update chart.js * Add dev public key * Minor coffee update * Allow stacking context * Synonymies * Dedups * more dedups * Enable debug context by default * Enable debug context by default * Enable debug context by default * Enable debug context by default * Store parsed data for later handling? ... * Fix issue with fakely not-empty last statement giving unauthorized query type error * Better FIMS bad response * Remove cancel upload once upload finished * Tag saves with modified time
AmphibiaWeb · Mar 29, 2017 · f49a715 · f49a715
1 parent 64ad019
commit f49a715
Show file tree

Hide file tree

Showing 1,122 changed files with 145,781 additions and 35,571 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ ehthumbs.db
 
 # Folder config file
 Desktop.ini
+desktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
@@ -91,4 +92,5 @@ users/profiles/*.GIF
 testQuery.sql
 *.bak
 aweb_list.txt
-npm-debug.log
+npm-debug.log
+amphibiandisease-*error_log
diff --git a/DB_CONFIG.php.gpg b/DB_CONFIG.php.gpg
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -37,7 +37,7 @@ module.exports = (grunt) ->
       npm:
         command: ["npm install", "npm update"].join("&&")
       movesrc:
-        command: ["mv js/c.src.coffee js/maps/c.src.coffee","mv js/admin.src.coffee js/maps/admin.src.coffee", "mv js/project.src.coffee js/maps/project.src.coffee","mv js/profile.src.coffee js/maps/profile.src.coffee","mv js/kml.src.coffee js/maps/kml.src.coffee","mv js/global-searach.src.coffee js/maps/global-search.src.coffee","mv js/global-search-worker.src.coffee js/maps/global-search-worker.src.coffee"].join("; ")
+        command: ["mv js/c.src.coffee js/maps/c.src.coffee","mv js/admin.src.coffee js/maps/admin.src.coffee", "mv js/project.src.coffee js/maps/project.src.coffee", "mv js/dashboard.src.coffee js/maps/dashboard.src.coffee","mv js/profile.src.coffee js/maps/profile.src.coffee","mv js/kml.src.coffee js/maps/kml.src.coffee","mv js/global-searach.src.coffee js/maps/global-search.src.coffee","mv js/global-search-worker.src.coffee js/maps/global-search-worker.src.coffee"].join("; ")
       updateglobals:
         command: ["npm install -g coffee-script npm-check-updates bower grunt-cli npm autoprefixer-core less"].join("&&")
       vulcanize:
@@ -100,8 +100,8 @@ module.exports = (grunt) ->
           sourceMapIncludeSources:true
           sourceMapIn:"js/maps/c.js.map"
         files:
-          "js/combined.min.js":["js/c.js","js/admin.js","js/project.js", "js/profile.js", "js/global-search.js","bower_components/purl/purl.js","bower_components/xmlToJSON/lib/xmlToJSON.js","bower_components/jquery-cookie/jquery.cookie.js"]
-          "js/app.min.js":["js/c.js","js/admin.js","js/project.js","js/global-search.js","js/global-search-worker.js"]
+          "js/combined.min.js":["js/c.js","js/admin.js","js/project.js", "js/dashboard.js", "js/profile.js", "js/global-search.js","bower_components/purl/purl.js","bower_components/xmlToJSON/lib/xmlToJSON.js","bower_components/jquery-cookie/jquery.cookie.js"]
+          "js/app.min.js":["js/c.js","js/admin.js","js/project.js", "js/dashboard.js", "js/global-search.js","js/global-search-worker.js"]
       dist:
         options:
           sourceMap:true
@@ -130,6 +130,7 @@ module.exports = (grunt) ->
           "js/c.min.js":["js/c.js"]
           "js/admin.min.js":["js/admin.js"]
           "js/project.min.js":["js/project.js"]
+          "js/dashboard.min.js":["js/dashboard.js"]
           "js/kml.min.js":["js/kml.js"]
           "js/profile.min.js":["js/profile.js"]
           "js/global-search.min.js":["js/global-search.js"]
@@ -193,13 +194,14 @@ module.exports = (grunt) ->
           "js/c.js":["coffee/core.coffee", "coffee/geo.coffee", "coffee/debug.coffee"]
           "js/admin.js":["coffee/admin.coffee", "coffee/admin-editor.coffee", "coffee/admin-viewer.coffee", "coffee/admin-validation.coffee", "coffee/admin-su.coffee"]
           "js/project.js":["coffee/project.coffee"]
+          "js/dashboard.js":["coffee/dashboard.coffee"]
           "js/profile.js":["coffee/profile.coffee"]
           "js/kml.js":["coffee/kml.coffee"]
           "js/global-search.js":["coffee/global-search.coffee"]
           "js/global-search-worker.js":["coffee/global-search-worker.coffee", "coffee/core-worker.coffee"]
     phpcsfixer:
       app:
-        dir: ["api.php", "meta.php", "admin-login.php", "admin-api.php", "project.php", "home.php", "helpers/excelHelper.php", "profile.php"]
+        dir: ["api.php", "meta.php", "admin-login.php", "admin-api.php", "project.php", "dashboard.php", "home.php", "helpers/excelHelper.php", "profile.php"]
       options:
         ignoreExitCode: true
         verbose: true
@@ -222,6 +224,7 @@ module.exports = (grunt) ->
         files: ["*.php", "helpers/*.php", "admin/*.php", "admin/handlers/*.php", "core/*/*.php", "core/*.php"]
         tasks: ["phplint"]
     phplint:
+      api: ["api.php"]
       root: ["*.php", "helpers/*.php", "core/*/*.php", "core/*.php"]
       admin: ["admin/*.php", "admin/handlers/*.php", "admin/core/*.php", "admin/core/*/*.php"]
     bootlint:

diff --git a/admin-api.php b/admin-api.php
@@ -1447,7 +1447,14 @@ function mintExpedition($projectLink, $projectTitle, $publicProject = false, $as
         $ctx = stream_context_create($params);
         $rawResponse = file_get_contents($fimsMintUrl, false, $ctx);
         if($rawResponse === false) {
-            throw(new Exception("Fatal FIMS communication error 006 (No Response) [".print_r(error_get_last(),true)."]"));
+            try {
+                $errorMessageRaw = print_r(error_get_last(),true);
+                $errorMessage = json_encode(error_get_last());
+                if(empty($errorMessage)) throw(new Exception("BadEncode"));
+            } catch(Exception $e) {
+                $errorMessage = $errorMessageRaw;
+            }
+            throw(new Exception("Fatal FIMS communication error 006 (No Response) [".$errorMessage."]"));
         }
         $resp = json_decode($rawResponse, true);
         # Get the ID in the result

diff --git a/admin/CONFIG.php.gpg b/admin/CONFIG.php.gpg
diff --git a/admin/oauth/credentials.json.gpg b/admin/oauth/credentials.json.gpg
diff --git a/admin/oauth/secrets.php.gpg b/admin/oauth/secrets.php.gpg