From fe4993a7bc08bc20b7d84c82597f852e6e7f7282 Mon Sep 17 00:00:00 2001
From: Jannik Schönartz
Date: Tue, 21 Feb 2017 08:32:26 -0800
Subject: Database: Changed login/passwd to credentials. install.php needs to
 be executed.

---
 modules-available/locationinfo/page.inc.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'modules-available/locationinfo/page.inc.php')

diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index 13ac09b1..7dae0762 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -61,14 +61,12 @@ class Page_LocationInfo extends Page
 	private function updateServer() {
 		$id = Request::post('id', 0, 'int');
 		if ($id == 0) {
-			Database::exec("INSERT INTO `setting_location_info` (servername, serverurl, servertype, login, passwd) VALUES (:name, :url, :type, :login, :passwd)",
-			 array('name' => Request::post('name', '', 'string'), 'url' => Request::post('url', '', 'string'), 'type' => Request::post('type', '', 'string'),
-		  'login' => Request::post('user', '', 'string'), 'passwd' => Request::post('password', '', 'string')));
+			Database::exec("INSERT INTO `setting_location_info` (servername, serverurl, servertype) VALUES (:name, :url, :type)",
+			 array('name' => Request::post('name', '', 'string'), 'url' => Request::post('url', '', 'string'), 'type' => Request::post('type', '', 'string')));
 		} else {
-			Database::exec("INSERT INTO `setting_location_info` (serverid, servername, servertype, serverurl, login, passwd) VALUES (:id, :name, :type, :url, :login, :passwd)
-			ON DUPLICATE KEY UPDATE servername=:name, serverurl=:url, servertype=:type, login=:login, passwd=:passwd",
-			 array('id' => $id, 'name' => Request::post('name', '', 'string'), 'url' => Request::post('url', '', 'string'), 'type' => Request::post('type', '', 'string'),
-		  'login' => Request::post('user', '', 'string'), 'passwd' => Request::post('password', '', 'string')));
+			Database::exec("INSERT INTO `setting_location_info` (serverid, servername, servertype, serverurl) VALUES (:id, :name, :type, :url)
+			ON DUPLICATE KEY UPDATE servername=:name, serverurl=:url, servertype=:type",
+			 array('id' => $id, 'name' => Request::post('name', '', 'string'), 'url' => Request::post('url', '', 'string'), 'type' => Request::post('type', '', 'string')));
 		}
 		Util::redirect('?do=locationinfo&action=infoscreen');
 	}
@@ -349,8 +347,8 @@ class Page_LocationInfo extends Page
 			}
 */
 			$server['url'] = $db['serverurl'];
-			$server['user'] = $db['login'];
-			$server['password'] = $db['passwd'];
+			$server['user'] = "TODO: Auth";
+			$server['password'] = "Needs a change to Auth";
 			$serverlist[] = $server;
 		}
 
-- 
cgit v1.2.3-55-g7522