Merge remote-tracking branch 'origin/master'

Author: shibdib

app.php

@@ -45,7 +45,7 @@
     }
     if (!isset($_GET['code'])) {
         // If we don't have a code yet, we need to make the link
-        $scopes = 'guilds.join%20identify%20guilds';
+        $scopes = 'identify%20guilds';
         $discordLink = url($config['discord']['clientId'], $config['discord']['redirectUri'], $scopes);
         $app->render("discord.twig", array("botToken" => $config['discord']['botToken'], "discordLink" => $discordLink));
 

cron.php

@@ -31,6 +31,10 @@
 createAuthDb();
 
 $users = getUsers();
+$status = serverStatus();
+if (!$status || $status['players'] === null || (int)$status['players'] < 100) {
+    die();
+}
 $members = $restcord->guild->listGuildMembers(['guild.id' => $config['discord']['guildId'], 'limit' => 1000]);
 $roles = $restcord->guild->getGuildRoles(['guild.id' => $config['discord']['guildId']]);
 $currentGuild = $restcord->guild->getGuild(['guild.id' => (int)$config['discord']['guildId']]);
@@ -49,6 +53,10 @@
             break;
         }
     }
+    //Additional ESI Check
+    if (!(int)$characterData['corporation_id'] || (int)$characterData['corporation_id'] === null){
+        continue;
+    }
     if (!$exists) {
         $log->notice("$eveName has been removed from the database as they are no longer a member of the server.");
         deleteUser($id);

libraries/esi.php

@@ -46,5 +46,30 @@ function corporationDetails($corpID)
         return null;
     }
 
+    return $data;
+}
+
+function serverStatus()
+{
+    try {
+        // Initialize a new request for this URL
+        $ch = curl_init("https://esi.tech.ccp.is/latest/status/");
+        // Set the options for this request
+        curl_setopt_array($ch, array(
+            CURLOPT_FOLLOWLOCATION => true, // Yes, we want to follow a redirect
+            CURLOPT_RETURNTRANSFER => true, // Yes, we want that curl_exec returns the fetched data
+            CURLOPT_TIMEOUT => 8,
+            CURLOPT_SSL_VERIFYPEER => true, // Do not verify the SSL certificate
+        ));
+        // Fetch the data from the URL
+        $data = curl_exec($ch);
+        // Close the connection
+        curl_close($ch);
+        $data = json_decode($data, TRUE);
+
+    } catch (Exception $e) {
+        return null;
+    }
+
     return $data;
 }