Accounting for new Variables

Author: devinmatte

include/configuration-template.php

@@ -9,7 +9,7 @@
 ///////////////////////////////////////////////////////
 
 $get_data = function(&$var, $default=null) {
-    return isset($var) ? $var : $default;
+    return !empty($var) ? $var : $default;
 };
 
 $CHALLENGE_DB_HOST = getenv('CHALLENGE_DB_HOST');
@@ -19,11 +19,11 @@
 $CHALLENGE_GITHUB_ORG = getenv('CHALLENGE_GITHUB_ORG');
 $CHALLENGE_GITHUB_CLIENT = getenv('CHALLENGE_GITHUB_CLIENT');
 $CHALLENGE_GITHUB_SECRET = getenv('CHALLENGE_GITHUB_SECRET');
-$CHALLENGE_POOL = getenv('CHALLENGE_POOL');
-$CHALLENGE_DEBUG = getenv('CHALLENGE_DEBUG');
-$CHALLENGE_EVENT = getenv('CHALLENGE_EVENT');
-$CHALLENGE_CHALLENGES = getenv('CHALLENGE_CHALLENGES');
-$CHALLENGE_INFO = getenv('CHALLENGE_INFO');
+$CHALLENGE_POOL = (getenv('CHALLENGE_POOL') === 'true');
+$CHALLENGE_DEBUG = (getenv('CHALLENGE_DEBUG') === 'true');
+$CHALLENGE_EVENT = (getenv('CHALLENGE_EVENT') === 'true');
+$CHALLENGE_CHALLENGES = (getenv('CHALLENGE_CHALLENGES') === 'true');
+$CHALLENGE_INFO = (getenv('CHALLENGE_INFO') === 'true');
 $CHALLENGE_MAXCALLS = getenv('CHALLENGE_MAXCALLS');
 
 return (object)array(

main.php

@@ -154,7 +154,7 @@ public function commit(mysqli $conn, $configs, Alert $alert, $opts, $repo, $comm
                 $query = "SELECT * FROM Users WHERE id='" . $commit->author->id . "'";
                 $result = $conn->query($query);
 
-                if ($configs->options->pool == true && $result->num_rows <= 0 && ($repo->fork != true && $repo->fork != "true") && !array_key_exists($commit->author->login, $configs->blacklist)) {
+                if ($configs->options->pool == true && $result->num_rows <= 0 && ($repo->fork != true && $repo->fork != "true")) {
                     $this->addUser($conn, $configs, $alert, $opts, $commit->author->url, $commit->author->login);
                 }