Services: Captive Portal - minor improvments, make sure to initialize database if cp_clients table doesn't exist

This commit is contained in:
Ad Schellevis 2023-07-06 13:31:13 +02:00
parent 58387deddb
commit 8fbf2dd7f9
2 changed files with 2 additions and 2 deletions

View File

@ -55,7 +55,7 @@ class SessionController extends ApiControllerBase
"captiveportal list_clients",
array($cpZone->zoneid, 'json')
);
$allClients = json_decode($allClientsRaw, true);
$allClients = json_decode($allClientsRaw ?? '', true);
return $allClients;
} else {

View File

@ -70,7 +70,7 @@ class DB(object):
self._connection = sqlite3.connect(self.database_filename)
cur = self._connection.cursor()
cur.execute('SELECT count(*) FROM sqlite_master')
cur.execute("SELECT count(*) FROM sqlite_master where tbl_name = 'cp_clients'")
if cur.fetchall()[0][0] == 0:
# empty database, initialize database
init_script_filename = '%s/../sql/init.sql' % os.path.dirname(os.path.abspath(__file__))