Merge pull request #1 from cmu-delphi/master

sync to delphi

Author: dfarrow0

.gitignore

@@ -1,12 +1,12 @@
 # Status
-[![Deploy Status](https://delphi.midas.cs.cmu.edu/~automation/public/github_deploy_repo/badge.php?repo=cmu-delphi/www-epicast)](#)
+
+[![Deploy Status](https://delphi.midas.cs.cmu.edu/~automation/public/github_deploy_repo/badge.php?repo=cmu-delphi/www-crowdcast)](#)
 
 # About
-The Epicast website for collecting flu forecasts.
+
+The Crowdcast website for collecting flu forecasts.
 
 The site is live at:
- - https://delphi.midas.cs.cmu.edu/epicast/
- - https://epicast.net/
- - https://epicast.org/
+- https://delphi.cmu.edu/crowdcast
 
 A live demo is available at http://demo.epicast.net/ (User ID is `00000000`)

README.md

@@ -3,13 +3,6 @@
   "version": 1,
   "actions": [
 
-    "// css is actually php",
-    {
-      "type": "move",
-      "src": "site/css/.htaccess",
-      "dst": "/var/www/html/crowdcast/css/.htaccess",
-      "add-header-comment": true
-    },
     "// .htaccess file",
     {
       "type": "move",
@@ -60,7 +53,20 @@
       "src": "site/images/flags/",
       "dst": "/var/www/html/crowdcast/images/flags/",
       "match": "^.*\\.png$"
+    },
+    "// tutorials",
+    {
+      "type": "move",
+      "src": "site/images/",
+      "dst": "/var/www/html/crowdcast/images/",
+      "match": "^.*\\.(gif|mp4)$"
+    },
+    "// benchmark data",
+    {
+      "type":"move",
+      "src":"site/data/",
+      "dst":"/var/www/html/crowdcast/data/",
+      "match":"^.*\\.csv$"
     }
-
   ]
 }

deploy.json

@@ -52,14 +52,14 @@ function sortInt(&$a, &$b) {
       }
    }
    //Round info
-   if(getEpiweekInfo($output) !== 1) {
+   if(getEpiweekInfo($dbh, $output) !== 1) {
       fail('Error loading round info');
    }
    if(isset($_REQUEST['x'])) {
       $output['epiweek']['round_epiweek'] = addEpiweeks($output['epiweek']['round_epiweek'], -1);
    }
    //Load the userbase
-   if(getUserbase($output, $sortField, $sortDir) !== 1) {
+   if(getUserbase($dbh, $output, $sortField, $sortDir) !== 1) {
       fail('Error loading userbase');
    }
    //Stats

site/admin.php

@@ -1,56 +1,56 @@
-<?php
-session_start();
-require_once('common/settings.php');
-require_once('common/utils.php');
-require_once('common/database.php');
-
-//Connect to the database
-$dbh = databaseConnect($dbHost, $dbPort, $dbUser, $dbPass, $dbName);
-
-//Create the output array
-$output = array('result' => 0);
-if(!$dbh) {
-   //Couldn't connect to the database
-   $output['result'] = -100;
-} else {
-   //Connected successfully
-   if($_REQUEST['action'] == 'forecast' || $_REQUEST['action'] == 'autosave') {
-      $output['action'] = $_REQUEST['action'];
-      $hash = mysql_real_escape_string($_REQUEST['hash']);
-      $temp = array();
-      if(getUserByHash($temp, $hash) == 1) {
-         $forecast = array();
-         foreach($_REQUEST['f'] as $f) {
-            array_push($forecast, floatval(mysql_real_escape_string($f)));
-         }
-         if(getEpiweekInfo($temp) == 1) {
-            if(count($forecast) >= 1 && count($forecast) <= 53) {
-               //Save the forecast
-               $regionID = intval(mysql_real_escape_string($_REQUEST['region_id']));
-               $commit = ($_REQUEST['action'] == 'forecast');
-               if(saveForecast($temp, $temp['user_id'], $regionID, $forecast, $commit) == 1) {
-                  //Success
-                  $output['result'] = 1;
-               } else {
-                  //Failed to save forecast
-                  $output['result'] = -5;
-               }
-            } else {
-               //Size of forecast array is wrong
-               $output['result'] = -4;
-            }
-         } else {
-            //Failed to get round info
-            $output['result'] = -3;
-         }
-      } else {
-         //Invalid user
-         $output['result'] = -2;
-      }
-   } else {
-      //Unknown action
-      $output['result'] = -1;
-   }
-}
-echo json_encode($output);
-?>
+<?php
+session_start();
+require_once('common/settings.php');
+require_once('common/utils.php');
+require_once('common/database.php');
+
+//Connect to the database
+$dbh = databaseConnect($dbHost, $dbPort, $dbUser, $dbPass, $dbName);
+
+//Create the output array
+$output = array('result' => 0);
+if(!$dbh) {
+   //Couldn't connect to the database
+   $output['result'] = -100;
+} else {
+   //Connected successfully
+   if($_REQUEST['action'] == 'forecast' || $_REQUEST['action'] == 'autosave') {
+      $output['action'] = $_REQUEST['action'];
+      $hash = mysqli_real_escape_string($dbh, $_REQUEST['hash']);
+      $temp = array();
+      if(getUserByHash($dbh, $temp, $hash) == 1) {
+         $forecast = array();
+         foreach($_REQUEST['f'] as $f) {
+            array_push($forecast, floatval(mysqli_real_escape_string($dbh, $f)));
+         }
+         if(getEpiweekInfo($dbh, $temp) == 1) {
+            if(count($forecast) >= 1 && count($forecast) <= 53) {
+               //Save the forecast
+               $regionID = intval(mysqli_real_escape_string($dbh, $_REQUEST['region_id']));
+               $commit = ($_REQUEST['action'] == 'forecast');
+               if(saveForecast($dbh, $temp, $temp['user_id'], $regionID, $forecast, $commit) == 1) {
+                  //Success
+                  $output['result'] = 1;
+               } else {
+                  //Failed to save forecast
+                  $output['result'] = -5;
+               }
+            } else {
+               //Size of forecast array is wrong
+               $output['result'] = -4;
+            }
+         } else {
+            //Failed to get round info
+            $output['result'] = -3;
+         }
+      } else {
+         //Invalid user
+         $output['result'] = -2;
+      }
+   } else {
+      //Unknown action
+      $output['result'] = -1;
+   }
+}
+echo json_encode($output);
+?>