From f3088300950f9088b7fe8500cff8ca70a3ed982c Mon Sep 17 00:00:00 2001
From: Geoffrey Frogeye <geoffrey@frogeye.fr>
Date: Sat, 10 Dec 2016 20:16:23 +0100
Subject: [PATCH] Some fixes

---
 index.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index 6e3b3b4..870258b 100644
--- a/index.php
+++ b/index.php
@@ -1,9 +1,8 @@
 <?php
 
 require __DIR__ . '/vendor/autoload.php';
-use OTPHP\TOTP;
 
-include_once('config.inc.php');
+require_once('config.inc.php');
 
 $route = explode('/', trim(substr(explode('?', $_SERVER['REDIRECT_URL'])[0], strrpos($_SERVER['SCRIPT_NAME'], '/')), '/'));
 $meth = $_SERVER['REQUEST_METHOD'];
@@ -190,12 +189,22 @@ function getKeys($network) {
     global $SSH_KEY_REGEX;
     global $DOMAIN;
     $machines = load('machine');
-    $networks = load('networks');
+    $networks = load('network');
     $t = '';
     foreach ($machines as $machineName => $machine) {
         if (
-               (isset($machine['network']) && isset($networks[$machine['network']]) && $networks[$machine['network']]['secure'] == 'true')
-            || ($network && in_array($machine['network'], $network['allowed']))
+            (
+                isset($machine['network'])
+                && isset($networks[$machine['network']])
+            ) && (
+                (
+                    $networks[$machine['network']]['secure'] == 'true'
+                ) || (
+                    $network
+                    && isset($network['allowed'])
+                    && in_array($machine['network'], $network['allowed'])
+                )
+            )
         ) {
             if (isset($machine['userkey']) && preg_match($SSH_KEY_REGEX, $machine['userkey'], $matches)) {
                 $t .= $matches[0].' '.$machineName.'@'.($machine['network'] ? $machine['network'].'.' : '').$DOMAIN."\n";