jostreff/nsedit
1
0
Fork 0
mirror of https://github.com/tuxis-ie/nsedit.git synced 2025-04-20 20:13:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issues as db can't be closed now.

Browse source
This commit is contained in:
Richard Underwood 2017-01-04 12:07:53 +00:00
parent e9b6a49e5a
commit f978e784d5
3 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/database.inc.php
View file

@ -51,8 +51,7 @@ function get_db() {
global $authdb, $db; global $authdb, $db;
if (!isset($db)) { if (!isset($db)) {
$db = new SQLite3($authdb, SQLITE3_OPEN_READWRITE); open_db();
$db->exec('PRAGMA foreign_keys = 1');
} }
return $db; return $db;

6
includes/groups.inc.php
View file

@ -17,7 +17,6 @@ function get_group_info($name) {
$q->bindValue(1, $name); $q->bindValue(1, $name);
$result = $q->execute(); $result = $q->execute();
$groupinfo = $result->fetchArray(SQLITE3_ASSOC); $groupinfo = $result->fetchArray(SQLITE3_ASSOC);
$db->close();
return $groupinfo; return $groupinfo;
} }
@ -28,7 +27,6 @@ function get_group_name($id) {
$q->bindValue(1, $id, SQLITE3_INTEGER); $q->bindValue(1, $id, SQLITE3_INTEGER);
$r = $q->execute(); $r = $q->execute();
$ret = $r->fetchArray(SQLITE3_NUM); $ret = $r->fetchArray(SQLITE3_NUM);
$db->close();
return $ret[0]; return $ret[0];
} }
@ -43,7 +41,6 @@ function add_group($name, $desc) {
$q->bindValue(1, $name, SQLITE3_TEXT); $q->bindValue(1, $name, SQLITE3_TEXT);
$q->bindValue(2, $desc, SQLITE3_TEXT); $q->bindValue(2, $desc, SQLITE3_TEXT);
$ret = $q->execute(); $ret = $q->execute();
$db->close();
writelog("Added group $name ($desc)."); writelog("Added group $name ($desc).");
return $ret; return $ret;
@ -65,7 +62,6 @@ function update_group($id, $name, $desc) {
$q->bindValue(3, $id, SQLITE3_INTEGER); $q->bindValue(3, $id, SQLITE3_INTEGER);
writelog("Updating group $oldname to: $name ($desc) "); writelog("Updating group $oldname to: $name ($desc) ");
$ret = $q->execute(); $ret = $q->execute();
$db->close();
return $ret; return $ret;
} }
@ -83,7 +79,6 @@ function delete_group($id) {
$q = $db->prepare('DELETE FROM groups WHERE id = ?'); $q = $db->prepare('DELETE FROM groups WHERE id = ?');
$q->bindValue(1, $id, SQLITE3_INTEGER); $q->bindValue(1, $id, SQLITE3_INTEGER);
$ret = $q->execute(); $ret = $q->execute();
$db->close();
writelog("Deleted group " . $groupinfo['name'] . "."); writelog("Deleted group " . $groupinfo['name'] . ".");
return $ret; return $ret;
@ -166,7 +161,6 @@ function remove_group_member($id) {
$q = $db->prepare('DELETE FROM groupmembers WHERE id=?'); $q = $db->prepare('DELETE FROM groupmembers WHERE id=?');
$q->bindValue(1, $id, SQLITE3_INTEGER); $q->bindValue(1, $id, SQLITE3_INTEGER);
$ret = $q->execute(); $ret = $q->execute();
$db->close();
if($ret) { if($ret) {
writelog("Removed user $user from group $group."); writelog("Removed user $user from group $group.");

1
includes/misc.inc.php
View file

@ -110,7 +110,6 @@ function get_usernames_filtered($term, $num = 10) {
while ($row = $r->fetchArray(SQLITE3_NUM)) { while ($row = $r->fetchArray(SQLITE3_NUM)) {
array_push($ret, $row[0]); array_push($ret, $row[0]);
} }
$db->close();
return $ret; return $ret;
} }