From a57af479b84202743b0007d83737aa4de1c1665a Mon Sep 17 00:00:00 2001
From: Richard Underwood <richard.underwood@digitaslbi.com>
Date: Fri, 6 Jan 2017 14:05:12 +0000
Subject: [PATCH] Moved a few functions to misc, moved where permissions is
 included as it's needed everywhere.

---
 includes/groups.inc.php      | 10 --------
 includes/misc.inc.php        | 46 ++++++++++++++++++++++++++++++++++++
 includes/permissions.inc.php | 34 --------------------------
 permissions.php              |  1 -
 4 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/includes/groups.inc.php b/includes/groups.inc.php
index 5c02e52..b2c2b8c 100644
--- a/includes/groups.inc.php
+++ b/includes/groups.inc.php
@@ -111,16 +111,6 @@ function get_group_members($id) {
     return $ret;
 }
 
-// move to misc?
-function get_user_id($user) {
-    $info=get_user_info($user);
-    if($info) {
-        return $info['id'];
-    } else {
-        return null;
-    }
-}
-
 function get_group_id($group) {
     $info=get_group_info($group);
     if($info) {
diff --git a/includes/misc.inc.php b/includes/misc.inc.php
index b8071fb..ca05131 100644
--- a/includes/misc.inc.php
+++ b/includes/misc.inc.php
@@ -475,7 +475,53 @@ if (!function_exists('hash_pbkdf2')) {
     }
 }
 
+// get user id from name
+function get_user_id($user) {
+    $info=get_user_info($user);
+    if($info) {
+        return $info['id'];
+    } else {
+        return null;
+    }
+}
+
+// get zone id from name
+function get_zone_id($zone) {
+    $db = get_db();
+
+    $q = $db->prepare('SELECT id FROM zones WHERE zone=?');
+    $q->bindValue(1, $zone, SQLITE3_TEXT);
+    $r = $q->execute();
+    $ret = $r->fetchArray(SQLITE3_NUM);
+
+    if($ret) {
+        return $ret[0];
+    } else {
+        return null;
+    }
+
+}
+
+// get user name from id
+function get_user_name($userid) {
+    $db = get_db();
+
+    $q = $db->prepare('SELECT emailAddress FROM users WHERE id = ?');
+    $q->bindValue(1, $userid, SQLITE3_INTEGER);
+    $r = $q->execute();
+    $ret = $r->fetchArray(SQLITE3_NUM);
+
+    if($ret) {
+        return $ret[0];
+    } else {
+        return null;
+    }
+}
+
+
 // Include functions for group management
 include_once('groups.inc.php');
+// Include functions for permissions management
+include_once('permissions.inc.php');
 
 ?>
diff --git a/includes/permissions.inc.php b/includes/permissions.inc.php
index a0a7726..19ff495 100644
--- a/includes/permissions.inc.php
+++ b/includes/permissions.inc.php
@@ -31,40 +31,6 @@ define('PERM_UPDATE',0x02);
 define('PERM_UPDATESPECIAL',0x04);
 define('PERM_ADMIN',0x08);
 
-
-// move to misc?
-function get_zone_id($zone) {
-    $db = get_db();
-
-    $q = $db->prepare('SELECT id FROM zones WHERE zone=?');
-    $q->bindValue(1, $zone, SQLITE3_TEXT);
-    $r = $q->execute();
-    $ret = $r->fetchArray(SQLITE3_NUM);
-
-    if($ret) {
-        return $ret[0];
-    } else {
-        return null;
-    }
-
-}
-
-// move to misc?
-function get_user_name($userid) {
-    $db = get_db();
-
-    $q = $db->prepare('SELECT emailAddress FROM users WHERE id = ?');
-    $q->bindValue(1, $userid, SQLITE3_INTEGER);
-    $r = $q->execute();
-    $ret = $r->fetchArray(SQLITE3_NUM);
-
-    if($ret) {
-        return $ret[0];
-    } else {
-        return null;
-    }
-}
-
 // Interface function - Return an array of permissions for the zone
 function get_zone_permissions($zone) {
     $db = get_db();
diff --git a/permissions.php b/permissions.php
index 32d55ae..fafaaea 100644
--- a/permissions.php
+++ b/permissions.php
@@ -3,7 +3,6 @@
 include_once('includes/config.inc.php');
 include_once('includes/session.inc.php');
 include_once('includes/misc.inc.php');
-include_once('includes/permissions.inc.php');
 
 if (!is_csrf_safe()) {
     header('Status: 403');