From 7411500497fb0222340e9055fa89843de4c5f8f2 Mon Sep 17 00:00:00 2001
From: Nigel Kukard <nkukard@lbsd.net>
Date: Thu, 7 May 2009 06:37:22 +0000
Subject: [PATCH] * Moved functions to include/ajax/functions/ and made DB
handle global
---
webgui/{ => include/ajax}/functions/AdminGroups.php | 3 +--
webgui/{ => include/ajax}/functions/AdminLocations.php | 3 +--
webgui/{ => include/ajax}/functions/AdminRealms.php | 3 +--
webgui/{ => include/ajax}/functions/AdminUsers.php | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
rename webgui/{ => include/ajax}/functions/AdminGroups.php (97%)
rename webgui/{ => include/ajax}/functions/AdminLocations.php (96%)
rename webgui/{ => include/ajax}/functions/AdminRealms.php (96%)
rename webgui/{ => include/ajax}/functions/AdminUsers.php (96%)
diff --git a/webgui/functions/AdminGroups.php b/webgui/include/ajax/functions/AdminGroups.php
similarity index 97%
rename from webgui/functions/AdminGroups.php
rename to webgui/include/ajax/functions/AdminGroups.php
index 9336b7d4..d3c5f5d4 100644
--- a/webgui/functions/AdminGroups.php
+++ b/webgui/include/ajax/functions/AdminGroups.php
@@ -5,8 +5,7 @@ include_once("include/db.php");
# Return list of users
function getAdminGroups($params) {
-
- $db = connect_db();
+ global $db;
$sql = "SELECT ID, Name, Priority, Disabled, Comment FROM groups";
$res = $db->query($sql);
diff --git a/webgui/functions/AdminLocations.php b/webgui/include/ajax/functions/AdminLocations.php
similarity index 96%
rename from webgui/functions/AdminLocations.php
rename to webgui/include/ajax/functions/AdminLocations.php
index 37cda530..83cd9177 100644
--- a/webgui/functions/AdminLocations.php
+++ b/webgui/include/ajax/functions/AdminLocations.php
@@ -5,8 +5,7 @@ include_once("include/db.php");
# Return list of users
function getAdminLocations($params) {
-
- $db = connect_db();
+ global $db;
$sql = "SELECT ID, Name FROM wisp_locations";
$res = $db->query($sql);
diff --git a/webgui/functions/AdminRealms.php b/webgui/include/ajax/functions/AdminRealms.php
similarity index 96%
rename from webgui/functions/AdminRealms.php
rename to webgui/include/ajax/functions/AdminRealms.php
index 1926f111..e25ff8df 100644
--- a/webgui/functions/AdminRealms.php
+++ b/webgui/include/ajax/functions/AdminRealms.php
@@ -5,8 +5,7 @@ include_once("include/db.php");
# Return list of users
function getAdminRealms($params) {
-
- $db = connect_db();
+ global $db;
$sql = "SELECT ID, Name, Disabled FROM realms";
$res = $db->query($sql);
diff --git a/webgui/functions/AdminUsers.php b/webgui/include/ajax/functions/AdminUsers.php
similarity index 96%
rename from webgui/functions/AdminUsers.php
rename to webgui/include/ajax/functions/AdminUsers.php
index 75a7852a..a5c64041 100644
--- a/webgui/functions/AdminUsers.php
+++ b/webgui/include/ajax/functions/AdminUsers.php
@@ -5,8 +5,7 @@ include_once("include/db.php");
# Return list of users
function getAdminUsers($params) {
-
- $db = connect_db();
+ global $db;
$sql = "SELECT ID, Username, Disabled FROM users";
$res = $db->query($sql);
--
GitLab