From e8e6ed51425110ecf3d389ecaf1185793cc20b56 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Wed, 26 Jun 2019 08:49:04 -0500
Subject: [PATCH] Fix broken updates (#10380)

---
 daily.php               | 10 +++++-----
 dist-pollers.php        |  4 ++--
 html/graph-realtime.php |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/daily.php b/daily.php
index 6c4554cb37..e267f1d54d 100644
--- a/daily.php
+++ b/daily.php
@@ -25,13 +25,13 @@ if (isset($options['d'])) {
 }
 
 if ($options['f'] === 'update') {
-    if (!Config::get('base_url')) {
+    if (!Config::get('update')) {
         exit(0);
     }
 
-    if (Config::get('base_url') == 'master') {
+    if (Config::get('update_channel') == 'master') {
         exit(1);
-    } elseif (Config::get('base_url') == 'release') {
+    } elseif (Config::get('update_channel') == 'release') {
         exit(3);
     }
     exit(0);
@@ -243,10 +243,10 @@ if ($options['f'] === 'purgeusers') {
         }
 
         $purge = 0;
-        if (is_numeric(\LibreNMS\Config::get('radius.users_purge')) && Config::get('base_url') === 'radius') {
+        if (is_numeric(\LibreNMS\Config::get('radius.users_purge')) && Config::get('auth_mechanism') === 'radius') {
             $purge = \LibreNMS\Config::get('radius.users_purge');
         }
-        if (is_numeric(\LibreNMS\Config::get('active_directory.users_purge')) && Config::get('base_url') === 'active_directory') {
+        if (is_numeric(\LibreNMS\Config::get('active_directory.users_purge')) && Config::get('auth_mechanism') === 'active_directory') {
             $purge = \LibreNMS\Config::get('active_directory.users_purge');
         }
         if ($purge > 0) {
diff --git a/dist-pollers.php b/dist-pollers.php
index 299745d824..b109f6007c 100755
--- a/dist-pollers.php
+++ b/dist-pollers.php
@@ -47,8 +47,8 @@ if (isset($options['l'])) {
         echo 'Poller '.$options['u']." has been removed\n";
     }
 } elseif (isset($options['r'])) {
-    if (dbInsert(['poller_name' => Config::get('base_url'), 'last_polled' => '0000-00-00 00:00:00', 'devices' => 0, 'time_taken' => 0], 'pollers') >= 0) {
-        echo 'Poller ' . Config::get('base_url') . " has been registered\n";
+    if (dbInsert(['poller_name' => Config::get('distributed_poller_name'), 'last_polled' => '0000-00-00 00:00:00', 'devices' => 0, 'time_taken' => 0], 'pollers') >= 0) {
+        echo 'Poller ' . Config::get('distributed_poller_name') . " has been registered\n";
     }
 } else {
     echo "-l pollers | groups List registered pollers or poller groups\n";
diff --git a/html/graph-realtime.php b/html/graph-realtime.php
index 7985464d40..8f56f93d94 100644
--- a/html/graph-realtime.php
+++ b/html/graph-realtime.php
@@ -16,7 +16,7 @@
 $init_modules = array('web', 'auth');
 require realpath(__DIR__ . '/..') . '/includes/init.php';
 
-if (is_numeric($_GET['id']) && (Config::get('base_url') || port_permitted($_GET['id']))) {
+if (is_numeric($_GET['id']) && (Config::get('allow_unauth_graphs') || port_permitted($_GET['id']))) {
     $port   = cleanPort(get_port_by_id($_GET['id']));
     $device = device_by_id_cache($port['device_id']);
     $title  = generate_device_link($device);