Changed to getenv, fixed error, and moved to new constructor

Also Removing Circleci

Author: devinmatte

.travis.yml

@@ -14,4 +14,4 @@ before_script:
   - cp include/configuration-template.php include/configuration.php
 
 script:
-  - phpunit test5.php
+  - phpunit test.php

README.md

@@ -1,8 +1,6 @@
 Git-Challenge
 =============
-Version 5.4-5.6: [![Build Status](https://travis-ci.org/devinmatte/Git-Challenge.svg?branch=master)](https://travis-ci.org/devinmatte/Git-Challenge)
-
-Version 7.0+: [![CircleCI](https://circleci.com/gh/devinmatte/Git-Challenge.svg?style=svg)](https://circleci.com/gh/devinmatte/Git-Challenge)
+[![Build Status](https://travis-ci.org/devinmatte/Git-Challenge.svg?branch=master)](https://travis-ci.org/devinmatte/Git-Challenge)
 
 Gamification of Git Contributions for the use of either education or competition.
 

circle.yml

@@ -12,23 +12,37 @@
     return isset($var) ? $var : $default;
 };
 
+$CHALLENGE_DB_HOST = getenv('CHALLENGE_DB_HOST');
+$CHALLENGE_DB_USER = getenv('CHALLENGE_DB_USER');
+$CHALLENGE_DB_PASS = getenv('CHALLENGE_DB_PASS');
+$CHALLENGE_DB = getenv('CHALLENGE_DB');
+$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_MAXCALLS = getenv('CHALLENGE_MAXCALLS');
+
 return (object)array(
-    'host' => $get_data($_ENV['CHALLENGE_DB_HOST'], '127.0.0.1'),
-    'username' => $get_data($_ENV['CHALLENGE_DB_USER'], 'root'),
-    'password' => $get_data($_ENV['CHALLENGE_DB_PASS'], ''),
-    'database' => $get_data($_ENV['CHALLENGE_DB'], 'gitchallenge'),
+    'host' => $get_data($CHALLENGE_DB_HOST, '127.0.0.1'),
+    'username' => $get_data($CHALLENGE_DB_USER, 'root'),
+    'password' => $get_data($CHALLENGE_DB_PASS, ''),
+    'database' => $get_data($CHALLENGE_DB, 'gitchallenge'),
     'git' => (object)array(
-        'org' => $get_data($_ENV['CHALLENGE_GITHUB_ORG'], 'github-tools'),
-        'client' => $get_data($_ENV['CHALLENGE_GITHUB_CLIENT'], ''),
-        'secret' => $get_data($_ENV['CHALLENGE_GITHUB_SECRET'], '')
+        'org' => $get_data($CHALLENGE_GITHUB_ORG, 'github-tools'),
+        'client' => $get_data($CHALLENGE_GITHUB_CLIENT, ''),
+        'secret' => $get_data($CHALLENGE_GITHUB_SECRET, '')
     ),
     'options' => (object)array(
-        'pool' => $get_data($_ENV['CHALLENGE_POOL'], true),
-        'debug' => $get_data($_ENV['CHALLENGE_DEBUG'], false),
-        'event' => $get_data($_ENV['CHALLENGE_EVENT'], false),
-        'challenges' => $get_data($_ENV['CHALLENGE_CHALLENGES'], false),
-        'info' => $get_data($_ENV['CHALLENGE_INFO'], true),
-        'maxcalls' => $get_data($_ENV['CHALLENGE_MAXCALLS'], 1000)
+        'pool' => $get_data($CHALLENGE_POOL, true),
+        'debug' => $get_data($CHALLENGE_DEBUG, false),
+        'event' => $get_data($CHALLENGE_EVENT, false),
+        'challenges' => $get_data($CHALLENGE_CHALLENGES, false),
+        'info' => $get_data($CHALLENGE_INFO, true),
+        'maxcalls' => $get_data($CHALLENGE_MAXCALLS, 1000)
     ),
     'points' => (object)array(
         'additions' => 1,
@@ -42,3 +56,4 @@
         'invalid-email-address' => 148100
     )
 );
+

include/configuration-template.php

@@ -441,3 +441,4 @@ class="label">GitHub</span></a>
 <?php
 mysqli_close($conn);
 ?>
+

index.php

@@ -4,7 +4,7 @@
 
 class main
 {
-    public function main(mysqli $conn, $configs, Alert $alert)
+    public function __construct(mysqli $conn, $configs, Alert $alert)
     {
         $GLOBALS['call_count'] = 0;
 
@@ -149,12 +149,12 @@ public function closedIssue(mysqli $conn, $configs, Alert $alert, $opts, $repo,
 
     public function commit(mysqli $conn, $configs, Alert $alert, $opts, $repo, $commit, $repo_empty)
     {
-        if ($GLOBALS['call_count'] < $configs->options->maxcalls && !$repo_empty && !array_key_exists("message", $commit) && !array_key_exists($commit->author->login, $configs->blacklist)) {
+        if ($GLOBALS['call_count'] < $configs->options->maxcalls && !$repo_empty && !array_key_exists("message", $commit)) {
             if (array_key_exists("author", $commit) && !empty($commit->author)) {
                 $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")) {
+                if ($configs->options->pool == true && $result->num_rows <= 0 && ($repo->fork != true && $repo->fork != "true") && !array_key_exists($commit->author->login, $configs->blacklist)) {
                     $this->addUser($conn, $configs, $alert, $opts, $commit->author->url, $commit->author->login);
                 }
 
@@ -287,4 +287,4 @@ public function repo(mysqli $conn, $configs, Alert $alert, $opts, $obj, $repo)
         }
     }
 
-}
+}

main.php

@@ -1,6 +1,6 @@
 <?php
 
-class test5
+class test
 {
 
 }