Create database object if not set. (#6492)
* Create database object if not set.
This commit is contained in:
@@ -34,6 +34,11 @@
|
||||
$language = new text;
|
||||
$text = $language->get($_SESSION['domain']['language']['code'], 'app/devices');
|
||||
|
||||
//connect to the database
|
||||
if (!isset($database)) {
|
||||
$database = new database;
|
||||
}
|
||||
|
||||
//get the vendor functions
|
||||
$sql = "select v.name as vendor_name, f.name, f.value ";
|
||||
$sql .= "from v_device_vendors as v, v_device_vendor_functions as f ";
|
||||
@@ -57,7 +62,6 @@
|
||||
$sql .= "and v.enabled = 'true' ";
|
||||
$sql .= "and f.enabled = 'true' ";
|
||||
$sql .= "order by v.name asc, f.name asc ";
|
||||
$database = new database;
|
||||
$vendor_functions = $database->select($sql, (is_array($parameters) ? $parameters : null), 'all');
|
||||
unset($sql, $sql_where_or, $parameters);
|
||||
|
||||
@@ -79,7 +83,6 @@
|
||||
$sql = "select device_uuid, device_profile_uuid from v_devices ";
|
||||
$sql .= "where device_user_uuid = :device_user_uuid ";
|
||||
$parameters['device_user_uuid'] = $_SESSION['user_uuid'];
|
||||
$database = new database;
|
||||
$row = $database->select($sql, $parameters, 'row');
|
||||
if (is_array($row) && @sizeof($row) != 0) {
|
||||
$device_uuid = $row['device_uuid'];
|
||||
@@ -92,7 +95,6 @@
|
||||
$sql = "select * from v_device_keys ";
|
||||
$sql .= "where device_profile_uuid = :device_profile_uuid ";
|
||||
$parameters['device_profile_uuid'] = $device_profile_uuid;
|
||||
$database = new database;
|
||||
$device_profile_keys = $database->select($sql, $parameters, 'all');
|
||||
unset($sql, $parameters);
|
||||
}
|
||||
@@ -102,7 +104,6 @@
|
||||
$sql = "select * from v_device_keys ";
|
||||
$sql .= "where device_uuid = :device_uuid ";
|
||||
$parameters['device_uuid'] = $device_uuid;
|
||||
$database = new database;
|
||||
$device_keys = $database->select($sql, $parameters, 'all');
|
||||
unset($sql, $parameters);
|
||||
}
|
||||
@@ -219,7 +220,6 @@
|
||||
$sql = "select device_uuid from v_devices ";
|
||||
$sql .= "where device_user_uuid = :device_user_uuid ";
|
||||
$parameters['device_user_uuid'] = $_SESSION['user_uuid'];
|
||||
$database = new database;
|
||||
$device_uuid = $database->select($sql, $parameters, 'column');
|
||||
unset($sql, $parameters);
|
||||
}
|
||||
@@ -268,7 +268,6 @@
|
||||
$p->add('device_key_edit', 'temp');
|
||||
|
||||
//save the changes
|
||||
$database = new database;
|
||||
$database->app_name = 'devices';
|
||||
$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
|
||||
$database->save($array);
|
||||
@@ -305,7 +304,6 @@
|
||||
$sql = "select device_uuid, device_profile_uuid from v_devices ";
|
||||
$sql .= "where device_user_uuid = :device_user_uuid ";
|
||||
$parameters['device_user_uuid'] = $_SESSION['user_uuid'];
|
||||
$database = new database;
|
||||
$row = $database->select($sql, $parameters, 'row');
|
||||
if (is_array($row) && @sizeof($row) != 0) {
|
||||
$device_uuid = $row['device_uuid'];
|
||||
@@ -318,7 +316,6 @@
|
||||
$sql = "select * from v_device_lines ";
|
||||
$sql .= "where device_uuid = :device_uuid ";
|
||||
$parameters['device_uuid'] = $device_uuid;
|
||||
$database = new database;
|
||||
$device_lines = $database->select($sql, $parameters, 'all');
|
||||
unset($sql, $parameters);
|
||||
}
|
||||
@@ -358,7 +355,6 @@
|
||||
if (is_uuid($device_profile_uuid)) {
|
||||
$parameters['device_profile_uuid'] = $device_profile_uuid;
|
||||
}
|
||||
$database = new database;
|
||||
$keys = $database->select($sql, $parameters, 'all');
|
||||
unset($sql, $parameters);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user