From f978e784d5d87390f7f766235bf198efea034f76 Mon Sep 17 00:00:00 2001
From: Richard Underwood <richard.underwood@digitaslbi.com>
Date: Wed, 4 Jan 2017 12:07:53 +0000
Subject: [PATCH] Fixed issues as db can't be closed now.

---
 includes/database.inc.php | 3 +--
 includes/groups.inc.php   | 6 ------
 includes/misc.inc.php     | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/includes/database.inc.php b/includes/database.inc.php
index a348c45..cfb9ff3 100644
--- a/includes/database.inc.php
+++ b/includes/database.inc.php
@@ -51,8 +51,7 @@ function get_db() {
     global $authdb, $db;
 
     if (!isset($db)) {
-        $db = new SQLite3($authdb, SQLITE3_OPEN_READWRITE);
-        $db->exec('PRAGMA foreign_keys = 1');
+        open_db();
     }
 
     return $db;
diff --git a/includes/groups.inc.php b/includes/groups.inc.php
index 597ab3f..a62a743 100644
--- a/includes/groups.inc.php
+++ b/includes/groups.inc.php
@@ -17,7 +17,6 @@ function get_group_info($name) {
     $q->bindValue(1, $name);
     $result = $q->execute();
     $groupinfo = $result->fetchArray(SQLITE3_ASSOC);
-    $db->close();
 
     return $groupinfo;
 }
@@ -28,7 +27,6 @@ function get_group_name($id) {
     $q->bindValue(1, $id, SQLITE3_INTEGER);
     $r = $q->execute();
     $ret = $r->fetchArray(SQLITE3_NUM);
-    $db->close();
 
     return $ret[0];
 }
@@ -43,7 +41,6 @@ function add_group($name, $desc) {
     $q->bindValue(1, $name, SQLITE3_TEXT);
     $q->bindValue(2, $desc, SQLITE3_TEXT);
     $ret = $q->execute();
-    $db->close();
 
     writelog("Added group $name ($desc).");
     return $ret;
@@ -65,7 +62,6 @@ function update_group($id, $name, $desc) {
     $q->bindValue(3, $id, SQLITE3_INTEGER);
     writelog("Updating group $oldname to: $name ($desc) ");
     $ret = $q->execute();
-    $db->close();
 
     return $ret;
 }
@@ -83,7 +79,6 @@ function delete_group($id) {
         $q = $db->prepare('DELETE FROM groups WHERE id = ?');
         $q->bindValue(1, $id, SQLITE3_INTEGER);
         $ret = $q->execute();
-        $db->close();
 
         writelog("Deleted group " . $groupinfo['name'] . ".");
         return $ret;
@@ -166,7 +161,6 @@ function remove_group_member($id) {
     $q = $db->prepare('DELETE FROM groupmembers WHERE id=?');
     $q->bindValue(1, $id, SQLITE3_INTEGER);
     $ret = $q->execute();
-    $db->close();
 
     if($ret) {
         writelog("Removed user $user from group $group.");
diff --git a/includes/misc.inc.php b/includes/misc.inc.php
index 30d0d24..2e9d374 100644
--- a/includes/misc.inc.php
+++ b/includes/misc.inc.php
@@ -110,7 +110,6 @@ function get_usernames_filtered($term, $num = 10) {
     while ($row = $r->fetchArray(SQLITE3_NUM)) {
         array_push($ret, $row[0]);
     }
-    $db->close();
 
     return $ret;
 }