meteo/Sentri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed multiple database tables

Browse Source
This commit is contained in:
Marco
2026-05-15 23:00:08 +02:00
parent 925348e8fe
commit 5a27c678b1
40 changed files with 267 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

266
install.sql
View File

File diff suppressed because one or more lines are too long

16
pub/api/classes/API.php
View File

@@ -170,7 +170,7 @@ class API
}
$api_token_last_used_timestamp = time();
$stmt = $this->conn->prepare("UPDATE vc_api_tokens SET api_token_last_used_timestamp = ? WHERE api_token_uuid = ?");
$stmt = $this->conn->prepare("UPDATE system_api_tokens SET api_token_last_used_timestamp = ? WHERE api_token_uuid = ?");
$stmt->bind_param("is", $api_token_last_used_timestamp, $tokenId);
$stmt->execute();
}
@@ -402,11 +402,11 @@ class API
'RW' => 2, // Read Write
];
$query = "SELECT
vc_permissions.permission_name,
vc_user_group_permissions_portal.permission_value
FROM vc_user_group_permissions_portal
INNER JOIN vc_permissions ON vc_user_group_permissions_portal.permission_uuid =vc_permissions.permission_uuid
INNER JOIN vc_users ON vc_user_group_permissions_portal.user_group_uuid = vc_users.user_group_uuid
system_permissions.permission_name,
system_user_group_permissions.permission_value
FROM system_user_group_permissions
INNER JOIN system_permissions ON system_user_group_permissions.permission_uuid = system_permissions.permission_uuid
INNER JOIN system_users ON system_user_group_permissions.user_group_uuid = system_users.user_group_uuid
WHERE user_uuid = ? AND permission_name = ?";
@@ -536,7 +536,7 @@ class API
protected function validateToken(string $tokenId, string $tokenSecret)
{
$stmt = $this->conn->prepare("SELECT user_uuid, api_token FROM vc_api_tokens WHERE api_token_uuid = ? AND api_token_expiration_timestamp > UNIX_TIMESTAMP()");
$stmt = $this->conn->prepare("SELECT user_uuid, api_token FROM system_api_tokens WHERE api_token_uuid = ? AND api_token_expiration_timestamp > UNIX_TIMESTAMP()");
$stmt->bind_param("s", $tokenId);
$stmt->execute();
@@ -673,7 +673,7 @@ class API
public function isSuperuser()
{
$query = "SELECT * FROM vc_users WHERE vc_users.user_uuid = ?";
$query = "SELECT * FROM system_users WHERE system_users.user_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('s', $this->user_uuid);
$this->executeStatement($stmt);

12
pub/api/classes/API_apitoken.php
View File

@@ -10,7 +10,7 @@ class API_apitoken extends API
{
public function getTokens()
{
$query = "SELECT * FROM vc_api_tokens WHERE vc_api_tokens.user_uuid = ?";
$query = "SELECT * FROM system_api_tokens WHERE system_api_tokens.user_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('s', $this->data['user_uuid']);
$this->executeStatement($stmt);
@@ -33,7 +33,7 @@ class API_apitoken extends API
$api_token_hash = password_hash($api_token, PASSWORD_BCRYPT, ["cost" => 12]);
$api_token_expiration_timestamp = strtotime('+1 year');
$query = "INSERT INTO vc_api_tokens (api_token_uuid, user_uuid, api_token, api_token_expiration_timestamp, api_token_created_timestamp) VALUES (UUID(), ?, ?, ?, ?)";
$query = "INSERT INTO system_api_tokens (api_token_uuid, user_uuid, api_token, api_token_expiration_timestamp, api_token_created_timestamp) VALUES (UUID(), ?, ?, ?, ?)";
$stmt = $this->prepareStatement($query);
@@ -57,7 +57,7 @@ class API_apitoken extends API
public function getNewToken()
{
$query = "SELECT * FROM vc_api_tokens WHERE user_uuid = ? ORDER BY api_token_created_timestamp DESC LIMIT 1";
$query = "SELECT * FROM system_api_tokens WHERE user_uuid = ? ORDER BY api_token_created_timestamp DESC LIMIT 1";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('s', $this->data['user_uuid']);
$this->executeStatement($stmt);
@@ -67,7 +67,7 @@ class API_apitoken extends API
public function getToken()
{
$query = "SELECT vc_users.user_email, vc_users.user_uuid FROM vc_api_tokens INNER JOIN vc_users ON vc_api_tokens.user_uuid = vc_users.user_uuid WHERE api_token_uuid = ?";
$query = "SELECT system_users.user_email, system_users.user_uuid FROM system_api_tokens INNER JOIN system_users ON system_api_tokens.user_uuid = system_users.user_uuid WHERE api_token_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('s', $this->data['api_token_uuid']);
$this->executeStatement($stmt);
@@ -84,7 +84,7 @@ class API_apitoken extends API
public function deleteToken()
{
$query = "DELETE FROM vc_api_tokens WHERE api_token_uuid = ?";
$query = "DELETE FROM system_api_tokens WHERE api_token_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('s', $this->data['api_token_uuid']);
if ($this->executeStatement($stmt)) {
@@ -97,7 +97,7 @@ class API_apitoken extends API
$api_token_revoked = ($this->data['api_token_revoked']) ? 1 : 0;
$query = "UPDATE vc_api_tokens SET api_token_revoked = ? WHERE api_token_uuid = ?";
$query = "UPDATE system_api_tokens SET api_token_revoked = ? WHERE api_token_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('is', $api_token_revoked, $this->data['api_token_uuid']);

14
pub/api/classes/API_devices.php
View File

@@ -12,7 +12,7 @@ class API_devices extends API
public function getDevices($returnBoolean = false)
{
list($query, $types, $params) = $this->buildDynamicQuery('vc_devices');
list($query, $types, $params) = $this->buildDynamicQuery('autop_devices');
$items = $this->generalGetFunction($query, $types, $params, $returnBoolean, 'Device');
@@ -21,7 +21,7 @@ class API_devices extends API
private function getDeviceSlugify()
{
$query = "SELECT * FROM vc_devices WHERE device_slugify = ?";
$query = "SELECT * FROM autop_devices WHERE device_slugify = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("s", $this->data['device_slugify']);
$this->executeStatement($stmt);
@@ -47,12 +47,12 @@ class API_devices extends API
{
if (isset($this->data['device_image'])) {
$query = "INSERT INTO vc_devices (device_uuid, device_vendor_uuid, device_type, device_name, device_slugify, device_enabled, device_notes, device_eol, device_extensions, device_extra, device_create_timestamp, device_image, device_image_thumbnail)
$query = "INSERT INTO autop_devices (device_uuid, device_vendor_uuid, device_type, device_name, device_slugify, device_enabled, device_notes, device_eol, device_extensions, device_extra, device_create_timestamp, device_image, device_image_thumbnail)
VALUES (UUID(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("ssssisississ", $this->data['device_vendor_uuid'], $this->data['device_type'], $this->data['device_name'], $this->data['device_slugify'], $this->data['device_enabled'], $this->data['device_notes'], $this->data['device_eol'], $this->data['device_extensions'], $this->data['device_extra'], time(), $this->data['device_image'], $this->data['device_image_thumbnail']);
} else {
$query = "INSERT INTO vc_devices (device_uuid, device_vendor_uuid, device_type, device_name, device_slugify, device_enabled, device_notes, device_eol, device_extensions, device_extra, device_create_timestamp)
$query = "INSERT INTO autop_devices (device_uuid, device_vendor_uuid, device_type, device_name, device_slugify, device_enabled, device_notes, device_eol, device_extensions, device_extra, device_create_timestamp)
VALUES (UUID(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("ssssisissi", $this->data['device_vendor_uuid'], $this->data['device_type'], $this->data['device_name'], $this->data['device_slugify'], $this->data['device_enabled'], $this->data['device_notes'], $this->data['device_eol'], $this->data['device_extensions'], $this->data['device_extra'], time());
@@ -94,11 +94,11 @@ class API_devices extends API
public function updateDevice()
{
if (isset($this->data['device_image'])) {
$query = "UPDATE vc_devices SET device_modified_timestamp = ?, device_vendor_uuid = ?, device_name = ?, device_enabled = ?, device_notes = ?, device_eol = ?, device_extensions = ?, device_extra = ?, device_image = ?, device_image_thumbnail = ? WHERE device_uuid = ?";
$query = "UPDATE autop_devices SET device_modified_timestamp = ?, device_vendor_uuid = ?, device_name = ?, device_enabled = ?, device_notes = ?, device_eol = ?, device_extensions = ?, device_extra = ?, device_image = ?, device_image_thumbnail = ? WHERE device_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("issisisssss", time(), $this->data['device_vendor_uuid'], $this->data['device_name'], $this->data['device_enabled'], $this->data['device_notes'], $this->data['device_eol'], $this->data['device_extensions'], $this->data['device_extra'], $this->data['device_image'], $this->data['device_image_thumbnail'], $this->data['device_uuid']);
} else {
$query = "UPDATE vc_devices SET device_modified_timestamp = ?, device_vendor_uuid = ?, device_name = ?, device_enabled = ?, device_notes = ?, device_eol = ?, device_extensions = ?, device_extra = ? WHERE device_uuid = ?";
$query = "UPDATE autop_devices SET device_modified_timestamp = ?, device_vendor_uuid = ?, device_name = ?, device_enabled = ?, device_notes = ?, device_eol = ?, device_extensions = ?, device_extra = ? WHERE device_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("issisisss", time(), $this->data['device_vendor_uuid'], $this->data['device_name'], $this->data['device_enabled'], $this->data['device_notes'], $this->data['device_eol'], $this->data['device_extensions'], $this->data['device_extra'], $this->data['device_uuid']);
}
@@ -115,7 +115,7 @@ class API_devices extends API
$device = $this->getDevices()[0];
# remove from database
$query = "DELETE FROM vc_devices WHERE device_uuid = ?";
$query = "DELETE FROM autop_devices WHERE device_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("s", $device['device_uuid']);

4
pub/api/classes/API_mailsettings.php
View File

@@ -11,12 +11,12 @@ class API_mailsettings extends API
public function updateMailSettings($updatePassword)
{
if ($updatePassword) {
$query = "UPDATE vc_portal_settings SET mail_from_name = ?, mail_from_address = ?, mail_smtp_host = ?, mail_smtp_secure = ?, mail_smtp_port = ?, mail_smtp_auth = ?, mail_smtp_user = ?, mail_smtp_pass = ? WHERE portal_uuid = ?";
$query = "UPDATE system_settings SET mail_from_name = ?, mail_from_address = ?, mail_smtp_host = ?, mail_smtp_secure = ?, mail_smtp_port = ?, mail_smtp_auth = ?, mail_smtp_user = ?, mail_smtp_pass = ? WHERE portal_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('ssssiisss', $this->data['mail_from_name'], $this->data['mail_from_address'], $this->data['mail_smtp_host'], $this->data['mail_smtp_secure'], $this->data['mail_smtp_port'], $this->data['mail_smtp_auth'], $this->data['mail_smtp_user'], $this->data['mail_smtp_pass'], $this->data['portal_uuid']);
} else {
$query = "UPDATE vc_portal_settings SET mail_from_name = ?, mail_from_address = ?, mail_smtp_host = ?, mail_smtp_secure = ?, mail_smtp_port = ?, mail_smtp_auth = ?, mail_smtp_user = ? WHERE portal_uuid = ?";
$query = "UPDATE system_settings SET mail_from_name = ?, mail_from_address = ?, mail_smtp_host = ?, mail_smtp_secure = ?, mail_smtp_port = ?, mail_smtp_auth = ?, mail_smtp_user = ? WHERE portal_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('ssssiiss', $this->data['mail_from_name'], $this->data['mail_from_address'], $this->data['mail_smtp_host'], $this->data['mail_smtp_secure'], $this->data['mail_smtp_port'], $this->data['mail_smtp_auth'], $this->data['mail_smtp_user'], $this->data['portal_uuid']);

4
pub/api/classes/API_mfa.php
View File

@@ -15,7 +15,7 @@ class API_mfa extends API
$this->checkPermissions('admin-access-admins-mfa', 'RW');
}
$query = "UPDATE vc_users SET user_two_factor_enabled = 0, user_two_factor_secret = NULL WHERE user_uuid = ?";
$query = "UPDATE system_users SET user_two_factor_enabled = 0, user_two_factor_secret = NULL WHERE user_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("s", $this->data['user_uuid']);
$this->executeStatement($stmt);
@@ -30,7 +30,7 @@ class API_mfa extends API
$this->apiOutput(401, ['error' => 'you are not allowed to enable mfa for others']);
}
$query = "UPDATE vc_users SET user_two_factor_enabled = 1, user_two_factor_secret = ? WHERE user_uuid = ?";
$query = "UPDATE system_users SET user_two_factor_enabled = 1, user_two_factor_secret = ? WHERE user_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("ss", $this->data['user_two_factor_secret'], $this->data['user_uuid']);
$this->executeStatement($stmt);

24
pub/api/classes/API_permissions.php
View File

@@ -10,7 +10,7 @@ class API_permissions extends API
{
public function getPermission($returnBoolean = false)
{
list($query, $types, $params) = $this->buildDynamicQuery('vc_permissions');
list($query, $types, $params) = $this->buildDynamicQuery('system_permissions');
$items = $this->generalGetFunction($query, $types, $params, $returnBoolean, 'Permission');
@@ -19,7 +19,7 @@ class API_permissions extends API
public function deletePermission()
{
$query = "DELETE FROM vc_permissions WHERE permission_uuid = ?";
$query = "DELETE FROM system_permissions WHERE permission_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('s', $this->data['permission_uuid']);
if ($this->executeStatement($stmt)) {
@@ -35,7 +35,7 @@ class API_permissions extends API
$this->apiOutput(409, ['error' => 'Permission slugify already exists'], 'item_already_exists!');
}
$query = "INSERT INTO vc_permissions (permission_uuid, permission_name, permission_slugify, permission_description, permission_create_timestamp, module_uuid) VALUES (UUID(), ?, ?, ?, ?, ?)";
$query = "INSERT INTO system_permissions (permission_uuid, permission_name, permission_slugify, permission_description, permission_create_timestamp, module_uuid) VALUES (UUID(), ?, ?, ?, ?, ?)";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('sssis', $this->data['permission_name'], $this->data['permission_slugify'], $this->data['permission_description'], time(), $this->data['module_uuid']);
$this->executeStatement($stmt);
@@ -50,7 +50,7 @@ class API_permissions extends API
# Get all the groups so we can create the permissions for the group
$user_groups = array();
$sql = "SELECT * FROM vc_user_groups";
$sql = "SELECT * FROM system_user_groups";
$stmt = $this->conn->query($sql);
while ($user_group = $stmt->fetch_assoc()) {
array_push($user_groups, $user_group);
@@ -58,7 +58,7 @@ class API_permissions extends API
# Update all the groups with the newly added permission
foreach ($user_groups as $user_group) {
$query = "INSERT INTO vc_user_group_permissions_portal (permission_uuid, user_group_uuid, permission_value) VALUES (?, ?, ?)";
$query = "INSERT INTO system_user_group_permissions (permission_uuid, user_group_uuid, permission_value) VALUES (?, ?, ?)";
$permission_value = 'NA';
if ($user_group['user_group_name'] == 'superuser') {
$permission_value = 'RW';
@@ -74,7 +74,7 @@ class API_permissions extends API
public function getPermissionSlugify()
{
$query = "SELECT * FROM vc_permissions WHERE permission_slugify = ?";
$query = "SELECT * FROM system_permissions WHERE permission_slugify = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("s", $this->data['permission_slugify']);
$this->executeStatement($stmt);
@@ -83,7 +83,7 @@ class API_permissions extends API
public function updatePermission()
{
$query = "UPDATE vc_permissions SET permission_name = ?, permission_description = ?, permission_modified_timestamp = ?, module_uuid = ? WHERE permission_uuid = ?";
$query = "UPDATE system_permissions SET permission_name = ?, permission_description = ?, permission_modified_timestamp = ?, module_uuid = ? WHERE permission_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('ssiss', $this->data['permission_name'], $this->data['permission_description'], time(), $this->data['module_uuid'], $this->data['permission_uuid']);
if ($this->executeStatement($stmt)) {
@@ -93,7 +93,7 @@ class API_permissions extends API
public function updateAccessRights()
{
$query = "UPDATE vc_user_group_permissions_portal SET permission_value = ? WHERE permission_uuid = ? AND user_group_uuid = ?";
$query = "UPDATE system_user_group_permissions SET permission_value = ? WHERE permission_uuid = ? AND user_group_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('sss', $this->data['permission_value'], $this->data['permission_uuid'], $this->data['user_group_uuid']);
if ($this->executeStatement($stmt)) {
@@ -103,10 +103,10 @@ class API_permissions extends API
public function getPermissionRights()
{
$query = "SELECT * FROM vc_permissions
INNER JOIN vc_user_group_permissions_portal ON vc_permissions.permission_uuid = vc_user_group_permissions_portal.permission_uuid
INNER JOIN vc_user_groups ON vc_user_group_permissions_portal.user_group_uuid = vc_user_groups.user_group_uuid
WHERE vc_permissions.permission_uuid = ? ORDER BY vc_user_groups.user_group_weight ASC";
$query = "SELECT * FROM system_permissions
INNER JOIN system_user_group_permissions ON system_permissions.permission_uuid = system_user_group_permissions.permission_uuid
INNER JOIN system_user_groups ON system_user_group_permissions.user_group_uuid = system_user_groups.user_group_uuid
WHERE system_permissions.permission_uuid = ? ORDER BY system_user_groups.user_group_weight ASC";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('s', $this->data['permission_uuid']);
$this->executeStatement($stmt);

12
pub/api/classes/API_platforms.php
View File

@@ -10,7 +10,7 @@ class API_platforms extends API
{
public function getPlatforms($returnBoolean = false)
{
list($query, $types, $params) = $this->buildDynamicQuery('vc_platforms');
list($query, $types, $params) = $this->buildDynamicQuery('autop_platforms');
$items = $this->generalGetFunction($query, $types, $params, $returnBoolean, 'Platform');
@@ -21,11 +21,11 @@ class API_platforms extends API
public function createPlatforms()
{
if (isset($this->data['platform_image'])) {
$query = "INSERT INTO vc_platforms (platform_uuid, platform_name, platform_slugify, platform_description, platform_enabled, platform_image, platform_create_timestamp) VALUES (UUID(), ?, ?, ?, ?, ?, ?)";
$query = "INSERT INTO autop_platforms (platform_uuid, platform_name, platform_slugify, platform_description, platform_enabled, platform_image, platform_create_timestamp) VALUES (UUID(), ?, ?, ?, ?, ?, ?)";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('sssssi', $this->data['platform_name'], $this->data['platform_slugify'], $this->data['platform_description'], $this->data['platform_enabled'], $this->data['platform_image'], time());
} else {
$query = "INSERT INTO vc_platforms (platform_uuid, platform_name, platform_slugify, platform_description, platform_enabled, platform_create_timestamp) VALUES (UUID(), ?, ?, ?, ?, ?)";
$query = "INSERT INTO autop_platforms (platform_uuid, platform_name, platform_slugify, platform_description, platform_enabled, platform_create_timestamp) VALUES (UUID(), ?, ?, ?, ?, ?)";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('ssssi', $this->data['platform_name'], $this->data['platform_slugify'], $this->data['platform_description'], $this->data['platform_enabled'], time());
}
@@ -45,7 +45,7 @@ class API_platforms extends API
public function getPlatformSlugify()
{
$query = "SELECT * FROM vc_platforms WHERE platform_slugify = ?";
$query = "SELECT * FROM autop_platforms WHERE platform_slugify = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("s", $this->data['platform_slugify']);
$this->executeStatement($stmt);
@@ -55,11 +55,11 @@ class API_platforms extends API
public function editPlatforms()
{
if (isset($this->data['platform_image'])) {
$query = "UPDATE vc_platforms SET platform_name = ?, platform_description = ?, platform_enabled = ?, platform_image = ?, platform_modified_timestamp = ? WHERE platform_uuid = ?";
$query = "UPDATE autop_platforms SET platform_name = ?, platform_description = ?, platform_enabled = ?, platform_image = ?, platform_modified_timestamp = ? WHERE platform_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("ssisis", $this->data['platform_name'], $this->data['platform_description'], $this->data['platform_enabled'], $this->data['platform_image'], time(), $this->data['platform_uuid']);
} else {
$query = "UPDATE vc_platforms SET platform_name = ?, platform_description = ?, platform_enabled = ?, platform_modified_timestamp = ? WHERE platform_uuid = ?";
$query = "UPDATE autop_platforms SET platform_name = ?, platform_description = ?, platform_enabled = ?, platform_modified_timestamp = ? WHERE platform_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("ssiis", $this->data['platform_name'], $this->data['platform_description'], $this->data['platform_enabled'], time(), $this->data['platform_uuid']);
}

2
pub/api/classes/API_portalsettings.php
View File

@@ -10,7 +10,7 @@ class API_portalsettings extends API
{
public function updatePortalSettings()
{
$query = "UPDATE vc_portal_settings SET portal_name = ?, portal_provider_name = ?, admin_auth_methods = ? WHERE portal_uuid = ?";
$query = "UPDATE system_settings SET portal_name = ?, portal_provider_name = ?, admin_auth_methods = ? WHERE portal_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("ssss", $this->data['portal_name'], $this->data['portal_provider_name'], $this->data['admin_auth_methods'], $this->data['portal_uuid']);

2
pub/api/classes/API_resetpassword.php
View File

@@ -11,7 +11,7 @@ class API_resetpassword extends API
public function resetPassword()
{
$query = "UPDATE vc_users SET user_password = ?, user_password_reset_token = ?, user_password_reset_expires = ? WHERE user_uuid = ?";
$query = "UPDATE system_users SET user_password = ?, user_password_reset_token = ?, user_password_reset_expires = ? WHERE user_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("ssis",
$this->data['user_password'],

14
pub/api/classes/API_usergroups.php
View File

@@ -10,7 +10,7 @@ class API_usergroups extends API
{
public function getUsergroup($returnBoolean = false)
{
list($query, $types, $params) = $this->buildDynamicQuery('vc_user_groups');
list($query, $types, $params) = $this->buildDynamicQuery('system_user_groups');
$items = $this->generalGetFunction($query, $types, $params, $returnBoolean, 'User Group');
@@ -32,7 +32,7 @@ class API_usergroups extends API
$this->apiOutput(400, ['error' => 'You cannot make an group with an lower weight then yourself!']);
}
$query = "INSERT INTO vc_user_groups (user_group_uuid, user_group_name, user_group_slugify, user_group_weight, user_group_type, user_group_create_timestamp) VALUES (UUID(), ?, ?, ?, ?, ?)";
$query = "INSERT INTO system_user_groups (user_group_uuid, user_group_name, user_group_slugify, user_group_weight, user_group_type, user_group_create_timestamp) VALUES (UUID(), ?, ?, ?, ?, ?)";
$stmt = $this->prepareStatement($query);
$timestamp = time();
$stmt->bind_param("ssisi", $this->data['user_group_name'], $this->data['user_group_slugify'], $this->data['user_group_weight'], $this->data['user_group_type'], $timestamp);
@@ -42,7 +42,7 @@ class API_usergroups extends API
# Get all the permission from the database and create the permission for the user group.
$stmt = $this->conn->query("SELECT permission_uuid FROM vc_permissions");
$stmt = $this->conn->query("SELECT permission_uuid FROM system_permissions");
while ($row = $stmt->fetch_assoc()) {
$permission_uuids[] = $row['permission_uuid'];
}
@@ -57,7 +57,7 @@ class API_usergroups extends API
if (!empty($values)) {
$values_sql = implode(", ", $values);
$query = "INSERT INTO vc_user_group_permissions_portal (permission_uuid, user_group_uuid) VALUES $values_sql";
$query = "INSERT INTO system_user_group_permissions (permission_uuid, user_group_uuid) VALUES $values_sql";
$stmt = $this->prepareStatement($query);
$this->executeStatement($stmt);
@@ -83,7 +83,7 @@ class API_usergroups extends API
$this->apiOutput(400, ['error' => 'groups with an lower weight cannot be deleted.']);
}
$query = "DELETE FROM vc_user_groups WHERE user_group_uuid = ?";
$query = "DELETE FROM system_user_groups WHERE user_group_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('s', $this->data['user_group_uuid']);
$this->executeStatement($stmt);
@@ -94,7 +94,7 @@ class API_usergroups extends API
private function get_next_available_user_group_weight($weight)
{
# checks what the next avail weight is if the weight is taken by another item
$sql = "SELECT user_group_weight FROM vc_user_groups ORDER BY user_group_weight ASC";
$sql = "SELECT user_group_weight FROM system_user_groups ORDER BY user_group_weight ASC";
$result = $this->conn->query($sql);
// Store all existing weights in an array
@@ -130,7 +130,7 @@ class API_usergroups extends API
$this->apiOutput(400, ['error' => 'You cannot make an group with an lower weight then yourself!']);
}
$query = "UPDATE vc_user_groups SET user_group_name = ?, user_group_weight = ?, user_group_modified_timestamp = ? WHERE user_group_uuid = ?";
$query = "UPDATE system_user_groups SET user_group_name = ?, user_group_weight = ?, user_group_modified_timestamp = ? WHERE user_group_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("siis", $this->data['user_group_name'], $this->data['user_group_weight'], time(), $this->data['user_group_uuid']);
$this->executeStatement($stmt);

8
pub/api/classes/API_users.php
View File

@@ -13,7 +13,7 @@ class API_users extends API
{
public function getUser($returnBoolean = false)
{
list($query, $types, $params) = $this->buildDynamicQuery('vc_users');
list($query, $types, $params) = $this->buildDynamicQuery('system_users');
$items = $this->generalGetFunction($query, $types, $params, $returnBoolean, 'User');
@@ -34,7 +34,7 @@ class API_users extends API
$this->apiOutput(400, ['error' => 'You cannot make an user with an lower weight then yourself!']);
}
$query = "INSERT INTO vc_users (
$query = "INSERT INTO system_users (
user_uuid, user_group_uuid, user_email, user_first_name, user_last_name, user_full_name,
user_phone_number, user_password, user_password_reset_token, user_password_reset_expires,
user_two_factor_enabled, user_two_factor_secret, user_status,
@@ -110,7 +110,7 @@ The Sentri gnomes';
$this->apiOutput(400, ['error' => 'You cannot edit a user with an lower weight then yourself!']);
}
$query = "UPDATE vc_users SET user_group_uuid = ?, user_email = ?, user_first_name = ?, user_last_name = ?, user_full_name = ?, user_phone_number = ?, user_status = ?, user_pref_language = ?, user_modified_timestamp = ?, user_stompable = ? WHERE user_uuid = ?";
$query = "UPDATE system_users SET user_group_uuid = ?, user_email = ?, user_first_name = ?, user_last_name = ?, user_full_name = ?, user_phone_number = ?, user_status = ?, user_pref_language = ?, user_modified_timestamp = ?, user_stompable = ? WHERE user_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('ssssssssiis', $this->data['user_group_uuid'], $this->data['user_email'], $this->data['user_first_name'], $this->data['user_last_name'], $this->data['user_full_name'], $this->data['user_phone_number'], $this->data['user_status'], $this->data['user_pref_language'], time(), $this->data['user_stompable'], $this->data['user_uuid']);
@@ -140,7 +140,7 @@ The Sentri gnomes';
}
$query = "DELETE FROM vc_users WHERE user_uuid = ?";
$query = "DELETE FROM system_users WHERE user_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('s', $this->data['user_uuid']);

2
pub/api/classes/API_usersavatar.php
View File

@@ -27,7 +27,7 @@ class API_usersavatar extends API
public function updateUserImage()
{
$query = "UPDATE vc_users SET
$query = "UPDATE system_users SET
user_profile_picture = ?,
user_profile_picture_thumbnail = ?
WHERE user_uuid = ?";

12
pub/api/classes/API_vendors.php
View File

@@ -10,7 +10,7 @@ class API_vendors extends API
{
public function getVendors($returnBoolean = false)
{
list($query, $types, $params) = $this->buildDynamicQuery('vc_vendors');
list($query, $types, $params) = $this->buildDynamicQuery('autop_vendors');
$items = $this->generalGetFunction($query, $types, $params, $returnBoolean, 'Vendor');
@@ -20,11 +20,11 @@ class API_vendors extends API
public function createVendor()
{
if (isset($this->data['vendor_image'])) {
$query = "INSERT INTO vc_vendors (vendor_uuid, vendor_name, vendor_slugify, vendor_description, vendor_enabled, vendor_create_timestamp, vendor_image) VALUES (UUID(), ?, ?, ?, ?, ?, ?)";
$query = "INSERT INTO autop_vendors (vendor_uuid, vendor_name, vendor_slugify, vendor_description, vendor_enabled, vendor_create_timestamp, vendor_image) VALUES (UUID(), ?, ?, ?, ?, ?, ?)";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('ssssis', $this->data['vendor_name'], $this->data['vendor_slugify'], $this->data['vendor_description'], $this->data['vendor_enabled'], time(), $this->data['vendor_image']);
} else {
$query = "INSERT INTO vc_vendors (vendor_uuid, vendor_name, vendor_slugify, vendor_description, vendor_enabled, vendor_create_timestamp) VALUES (UUID(), ?, ?, ?, ?, ?)";
$query = "INSERT INTO autop_vendors (vendor_uuid, vendor_name, vendor_slugify, vendor_description, vendor_enabled, vendor_create_timestamp) VALUES (UUID(), ?, ?, ?, ?, ?)";
$stmt = $this->prepareStatement($query);
$stmt->bind_param('ssssi', $this->data['vendor_name'], $this->data['vendor_slugify'], $this->data['vendor_description'], $this->data['vendor_enabled'], time());
}
@@ -44,7 +44,7 @@ class API_vendors extends API
public function getVendorSlugify()
{
$query = "SELECT * FROM vc_vendors WHERE vendor_slugify = ?";
$query = "SELECT * FROM autop_vendors WHERE vendor_slugify = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("s", $this->data['vendor_slugify']);
$this->executeStatement($stmt);
@@ -54,11 +54,11 @@ class API_vendors extends API
public function editVendor()
{
if (isset($this->data['vendor_image'])) {
$query = "UPDATE vc_vendors SET vendor_name = ?, vendor_description = ?, vendor_enabled = ?, vendor_image = ?, vendor_modified_timestamp = ? WHERE vendor_uuid = ?";
$query = "UPDATE autop_vendors SET vendor_name = ?, vendor_description = ?, vendor_enabled = ?, vendor_image = ?, vendor_modified_timestamp = ? WHERE vendor_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("ssisis", $this->data['vendor_name'], $this->data['vendor_description'], $this->data['vendor_enabled'], $this->data['vendor_image'], time(), $this->data['vendor_uuid']);
} else {
$query = "UPDATE vc_vendors SET vendor_name = ?, vendor_description = ?, vendor_enabled = ?, vendor_modified_timestamp = ? WHERE vendor_uuid = ?";
$query = "UPDATE autop_vendors SET vendor_name = ?, vendor_description = ?, vendor_enabled = ?, vendor_modified_timestamp = ? WHERE vendor_uuid = ?";
$stmt = $this->prepareStatement($query);
$stmt->bind_param("ssiis", $this->data['vendor_name'], $this->data['vendor_description'], $this->data['vendor_enabled'], time(), $this->data['vendor_uuid']);
}

4
pub/bin/pages/autop/pageDevices_add.php
View File

@@ -78,7 +78,7 @@ $formBuilder->startForm();
<div class="select2-input">
<select id="device_vendor_uuid" name="device_vendor_uuid" class="form-control" required>
<?php
$data = $GLOBALS['conn']->query("SELECT vendor_uuid, vendor_name FROM vc_vendors WHERE vendor_enabled = 1");
$data = $GLOBALS['conn']->query("SELECT vendor_uuid, vendor_name FROM autop_vendors WHERE vendor_enabled = 1");
if ($data->num_rows == 0) { ?>
<option value=""><?php echo __('no_vendor_found') ?></option>
<?php } else {
@@ -162,7 +162,7 @@ $formBuilder->startForm();
<div class="select2-input">
<select id="device_extensions" name="device_extensions[]" class="form-control" multiple="multiple" data-multiple-select="true">
<?php
$data = $GLOBALS['conn']->query("SELECT device_uuid, device_name, device_vendor_uuid FROM vc_devices WHERE device_type = 'module'");
$data = $GLOBALS['conn']->query("SELECT device_uuid, device_name, device_vendor_uuid FROM autop_devices WHERE device_type = 'module'");
if ($data->num_rows == 0) { ?>
<option value=""><?php echo __('no_device_found') ?></option>
<?php } else {

8
pub/bin/pages/autop/pageDevices_edit.php
View File

@@ -51,7 +51,7 @@ $formBuilder->addExtraButtons(array(0 => array('buttonText' => __('view'), 'butt
# Retrieve Information for the page
$device_found = false;
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM vc_devices INNER JOIN vc_vendors ON vc_devices.device_vendor_uuid = vc_vendors.vendor_uuid WHERE device_uuid = ?");
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM autop_devices INNER JOIN autop_vendors ON autop_devices.device_vendor_uuid = autop_vendors.vendor_uuid WHERE device_uuid = ?");
$stmt->bind_param("s", $_GET['edit']);
$stmt->execute();
$device_data_result = $stmt->get_result();
@@ -91,7 +91,7 @@ if ($device_found) {
<div class="select2-input">
<select id="device_vendor_uuid" name="device_vendor_uuid" class="form-control" required>
<?php
$data = $GLOBALS['conn']->query("SELECT vendor_uuid, vendor_name FROM vc_vendors WHERE vendor_enabled = 1");
$data = $GLOBALS['conn']->query("SELECT vendor_uuid, vendor_name FROM autop_vendors WHERE vendor_enabled = 1");
if ($data->num_rows == 0) { ?>
<option value=""><?php echo __('no_vendor_found') ?></option>
<?php } else {
@@ -178,9 +178,9 @@ if ($device_found) {
<select id="device_extensions" name="device_extensions[]" class="form-control" multiple="multiple" data-multiple-select="true">
<?php
if ($device_data['device_type'] == 'base') {
$data = $GLOBALS['conn']->query("SELECT device_uuid, device_name, device_vendor_uuid FROM vc_devices WHERE device_type = 'module' OR device_type = 'handset'");
$data = $GLOBALS['conn']->query("SELECT device_uuid, device_name, device_vendor_uuid FROM autop_devices WHERE device_type = 'module' OR device_type = 'handset'");
} else {
$data = $GLOBALS['conn']->query("SELECT device_uuid, device_name, device_vendor_uuid FROM vc_devices WHERE device_type = 'module'");
$data = $GLOBALS['conn']->query("SELECT device_uuid, device_name, device_vendor_uuid FROM autop_devices WHERE device_type = 'module'");
}
if ($data->num_rows == 0) { ?>

2
pub/bin/pages/autop/pageDevices_list.php
View File

@@ -45,7 +45,7 @@ if ($API->checkPermissions('admin-devices', 'RW', true)) {
</div>');
}
# Retrieve Information for the page
$data = $GLOBALS['conn']->query("SELECT * FROM vc_devices INNER JOIN vc_vendors ON vc_devices.device_vendor_uuid = vc_vendors.vendor_uuid");
$data = $GLOBALS['conn']->query("SELECT * FROM autop_devices INNER JOIN autop_vendors ON autop_devices.device_vendor_uuid = autop_vendors.vendor_uuid");
# Set breadcrumb data
array_push($GLOBALS['breadCrumbArray'], array('display' => __('devices'), 'href' => '/devices/'));

6
pub/bin/pages/autop/pageDevices_view.php
View File

@@ -123,7 +123,7 @@ if ($API->checkPermissions('admin-devices', 'RW', true)) {
}
# Retrieve Information for the page
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM vc_devices INNER JOIN vc_vendors ON vc_devices.device_vendor_uuid = vc_vendors.vendor_uuid WHERE device_uuid = ?");
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM autop_devices INNER JOIN autop_vendors ON autop_devices.device_vendor_uuid = autop_vendors.vendor_uuid WHERE device_uuid = ?");
$stmt->bind_param("s", $_GET['view']);
$stmt->execute();
$device_data_result = $stmt->get_result();
@@ -225,7 +225,7 @@ $pageNavbar->outPutNavbar();
if ($device_data['device_type'] == 'phone' || $device_data['device_type'] == 'base') {
$device_extensions = json_decode($device_data['device_extensions']);
} elseif ($device_data['device_type'] == 'module' || $device_data['device_type'] == 'handset') {
$query = "SELECT device_extensions, device_uuid FROM vc_devices WHERE device_extensions LIKE ?";
$query = "SELECT device_extensions, device_uuid FROM autop_devices WHERE device_extensions LIKE ?";
$stmt = $GLOBALS['conn']->prepare($query);
if ($stmt) {
$searchTerm = "%" . $device_data['device_uuid'] . "%"; // Add wildcards manually
@@ -243,7 +243,7 @@ $pageNavbar->outPutNavbar();
if (!empty($device_extensions)) {
$placeholders = implode(' OR device_uuid = ', array_fill(0, count($device_extensions), '?'));
$query = "SELECT * FROM vc_devices WHERE device_uuid = " . $placeholders;
$query = "SELECT * FROM autop_devices WHERE device_uuid = " . $placeholders;
$stmt = $GLOBALS['conn']->prepare($query);
if ($stmt) {
$types = str_repeat('s', count($device_extensions));

2
pub/bin/pages/autop/pagePlatforms_list.php
View File

@@ -28,7 +28,7 @@ $pageNavbar = new pageNavbar(false, '<i class="fas fa-layer-group"></i> Platform
$pageNavbar->AddHTMLButton('<a href="?add="><button class="btn btn-primary"><i class="fas fa-plus text-success"></i>' . __('add_platform') . '</button></a>');
# Retrieve Information for the page
$data = $GLOBALS['conn']->query("SELECT * FROM vc_platforms");
$data = $GLOBALS['conn']->query("SELECT * FROM autop_platforms");
# Set breadcrumb data

4
pub/bin/pages/office/pageStompjes.php
View File

@@ -37,7 +37,7 @@ $jsScriptLoadData['datepicker'] = true;
# Retrieve Information for the page
$stmt = $GLOBALS['conn']->query("SELECT user_uuid, user_full_name, user_first_name, user_profile_picture_thumbnail, user_stompable, user_email FROM vc_users WHERE user_stompable = '1'");
$stmt = $GLOBALS['conn']->query("SELECT user_uuid, user_full_name, user_first_name, user_profile_picture_thumbnail, user_stompable, user_email FROM system_users WHERE user_stompable = '1'");
$administrators = [];
while ($row = $stmt->fetch_assoc()) {
$administrators[$row['user_uuid']] = $row;
@@ -59,7 +59,7 @@ if (!isset($_GET['td'])) {
$stompjes = array();
$stmt = $GLOBALS['conn']->query("SELECT stomp_uuid, office_stompjes.user_uuid, user_full_name, user_first_name, stomp_timestamp FROM office_stompjes
INNER JOIN vc_users ON office_stompjes.user_uuid = vc_users.user_uuid
INNER JOIN system_users ON office_stompjes.user_uuid = system_users.user_uuid
WHERE stomp_timestamp BETWEEN '$SelectFromDate' AND '$SelectTillDate'
AND user_stompable = '1'
ORDER BY stomp_timestamp DESC");

4
pub/bin/pages/pageUserProfile_edit.php
View File

@@ -25,7 +25,7 @@ $pageNavbar = new pageNavbar(true);
$formBuilder = new formBuilder('Edit profile', '<i class="fas fa-plus"></i>', '/userprofile/');
# Retrieve Information for the page
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM vc_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC");
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC");
$user_groups = array();
$user_data = false;
while ($user_group = $user_groups_data->fetch_assoc()) {
@@ -34,7 +34,7 @@ while ($user_group = $user_groups_data->fetch_assoc()) {
}
$user_uuid = $_SESSION['user']['user_uuid'];
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM vc_users INNER JOIN vc_user_groups ON vc_users.user_group_uuid = vc_user_groups.user_group_uuid WHERE user_uuid = ?");
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM system_users INNER JOIN system_user_groups ON system_users.user_group_uuid = system_user_groups.user_group_uuid WHERE user_uuid = ?");
$stmt->bind_param("s", $user_uuid);
$stmt->execute();
$result = $stmt->get_result();

4
pub/bin/pages/pageUserProfile_view.php
View File

@@ -27,7 +27,7 @@ $jsScriptLoadData['updateToggle'] = true;
$pageNavbar = new pageNavbar(false, '<i class="fa-solid fa-address-card"></i> ' . $_SESSION['user']['user_full_name'] . ' ' . strtolower(__('user_profile')));
# Retrieve Information for the page
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM vc_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC");
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC");
$user_groups = array();
$admin_data = false;
while ($user_group = $user_groups_data->fetch_assoc()) {
@@ -36,7 +36,7 @@ while ($user_group = $user_groups_data->fetch_assoc()) {
}
$user_uuid = $_SESSION['user']['user_uuid'];
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM vc_users INNER JOIN vc_user_groups ON vc_users.user_group_uuid = vc_user_groups.user_group_uuid WHERE user_uuid = ?");
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM system_users INNER JOIN system_user_groups ON system_users.user_group_uuid = system_user_groups.user_group_uuid WHERE user_uuid = ?");
$stmt->bind_param("s", $user_uuid);
$stmt->execute();
$result = $stmt->get_result();

2
pub/bin/pages/portal-management/pageAccessControl_admin_add.php
View File

@@ -38,7 +38,7 @@ $pageNavbar->AddHTMLButton('<a href="?admin_add="><button class="btn btn-primary
$formBuilder = new formBuilder('add_admin', '<i class="fas fa-plus"></i>', '/accesscontrol/#user-groups');
# Retrieve Information for the page
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM vc_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC");
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC");
$user_groups = array();
while ($user_group = $user_groups_data->fetch_assoc()) {
array_push($user_groups, $user_group);

4
pub/bin/pages/portal-management/pageAccessControl_admin_edit.php
View File

@@ -34,7 +34,7 @@ $pageNavbar->AddHTMLButton('<a href="?admin_add="><button class="btn btn-primary
$formBuilder = new formBuilder('edit_admin', '<i class="fas fa-plus"></i>', '/accesscontrol/#user-groups');
# Retrieve Information for the page
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM vc_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC");
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC");
$user_groups = array();
$admin_data = false;
while ($user_group = $user_groups_data->fetch_assoc()) {
@@ -43,7 +43,7 @@ while ($user_group = $user_groups_data->fetch_assoc()) {
}
$user_uuid = $_GET['admin_edit'];
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM vc_users INNER JOIN vc_user_groups ON vc_users.user_group_uuid = vc_user_groups.user_group_uuid WHERE user_uuid = ?");
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM system_users INNER JOIN system_user_groups ON system_users.user_group_uuid = system_user_groups.user_group_uuid WHERE user_uuid = ?");
$stmt->bind_param("s", $user_uuid);
$stmt->execute();
$result = $stmt->get_result();

4
pub/bin/pages/portal-management/pageAccessControl_admin_view.php
View File

@@ -41,7 +41,7 @@ if ($API->checkPermissions('admin-access-admins', 'RW', true)) {
}
# Retrieve Information for the page
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM vc_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC");
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC");
$user_groups = array();
$admin_data = false;
while ($user_group = $user_groups_data->fetch_assoc()) {
@@ -50,7 +50,7 @@ while ($user_group = $user_groups_data->fetch_assoc()) {
}
$user_uuid = $_GET['admin_view'];
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM vc_users INNER JOIN vc_user_groups ON vc_users.user_group_uuid = vc_user_groups.user_group_uuid WHERE user_uuid = ?");
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM system_users INNER JOIN system_user_groups ON system_users.user_group_uuid = system_user_groups.user_group_uuid WHERE user_uuid = ?");
$stmt->bind_param("s", $user_uuid);
$stmt->execute();
$result = $stmt->get_result();

2
pub/bin/pages/portal-management/pageAccessControl_user_group_add.php
View File

@@ -33,7 +33,7 @@ $pageNavbar = new pageNavbar(true);
$formBuilder = new formBuilder('add_user_groups', '<i class="fas fa-plus"></i>', '/accesscontrol/#user-groups');
# Retrieve Information for the page
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM vc_user_groups ORDER BY user_group_weight ASC");
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups ORDER BY user_group_weight ASC");
$user_groups = array();
while ($user_group = $user_groups_data->fetch_assoc()) {
array_push($user_groups, $user_group);

4
pub/bin/pages/portal-management/pageAccessControl_user_group_view.php
View File

@@ -39,8 +39,8 @@ $requiredFields = ['user_group_uuid' => ['type' => 'uuid']];
$API_usergroups->validateData($requiredFields);
$user_group = $API_usergroups->getUsergroup()[0];
$query = "SELECT * FROM vc_user_group_permissions_portal
INNER JOIN vc_permissions ON vc_user_group_permissions_portal.permission_uuid = vc_permissions.permission_uuid
$query = "SELECT * FROM system_user_group_permissions
INNER JOIN system_permissions ON system_user_group_permissions.permission_uuid = system_permissions.permission_uuid
WHERE user_group_uuid = ?";
$stmt = $GLOBALS['pdo']->prepare($query);
$stmt->execute([$user_group_uuid]);

6
pub/bin/pages/portal-management/pageAccessControl_view.php
View File

@@ -25,7 +25,7 @@ $jsScriptLoadData['datatables'] = true;
# PageClasses Setup
# Retrieve Information for the page
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM vc_user_groups ORDER BY user_group_weight ASC");
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups ORDER BY user_group_weight ASC");
$user_groups = array();
while ($user_group = $user_groups_data->fetch_assoc()) {
array_push($user_groups, $user_group);
@@ -33,14 +33,14 @@ while ($user_group = $user_groups_data->fetch_assoc()) {
}
# get all the admins
$stmt = $GLOBALS['conn']->query("SELECT * FROM vc_users INNER JOIN vc_user_groups ON vc_users.user_group_uuid = vc_user_groups.user_group_uuid WHERE user_group_type = 'admin'");
$stmt = $GLOBALS['conn']->query("SELECT * FROM system_users INNER JOIN system_user_groups ON system_users.user_group_uuid = system_user_groups.user_group_uuid WHERE user_group_type = 'admin'");
$administrators = array();
while ($row = $stmt->fetch_assoc()) {
array_push($administrators, $row);
}
$stmt = $GLOBALS['conn']->query("SELECT * FROM vc_permissions INNER JOIN system_modules ON vc_permissions.module_uuid = system_modules.module_uuid WHERE system_modules.module_enabled = 1");
$stmt = $GLOBALS['conn']->query("SELECT * FROM system_permissions INNER JOIN system_modules ON system_permissions.module_uuid = system_modules.module_uuid WHERE system_modules.module_enabled = 1");
$permissions = array();
while ($row = $stmt->fetch_assoc()) {
array_push($permissions, $row);

2
pub/bin/pages/portal-management/pageSystemConfig.php
View File

@@ -25,7 +25,7 @@ $jsScriptLoadData['updateToggle'] = true;
# PageClasses Setup
# Retrieve Information for the page
$portal_settings = $GLOBALS['conn']->query("SELECT * FROM vc_portal_settings")->fetch_assoc();
$portal_settings = $GLOBALS['conn']->query("SELECT * FROM system_settings")->fetch_assoc();
$system_modules_data = $GLOBALS['conn']->query("SELECT * FROM system_modules");
$system_modules = array();

2
pub/bin/pages/servers/pageServerOverview_server_view.php
View File

@@ -51,7 +51,7 @@ if ($GLOBALS['modules_enabled']['customers']) {
}
# Retrieve Information for the page
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM vc_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC");
$user_groups_data = $GLOBALS['conn']->query("SELECT * FROM system_user_groups WHERE user_group_type = 'admin' ORDER BY user_group_weight DESC");
# memory

2
pub/bin/php/Classes/healthCheck.php
View File

@@ -27,7 +27,7 @@ class healthCheck
private function checkDeviceDataFolders()
{
try {
$sql = "SELECT device_slugify FROM vc_devices";
$sql = "SELECT device_slugify FROM autop_devices";
$stmt = $GLOBALS['conn']->prepare($sql);

2
pub/bin/php/Classes/mailBuilder.php
View File

@@ -26,7 +26,7 @@ class mailBuilder
mail_smtp_auth,
mail_smtp_user,
mail_smtp_pass
FROM vc_portal_settings LIMIT 1";
FROM system_settings LIMIT 1";
$stmt = $GLOBALS['conn']->prepare($sql);
$stmt->execute();
$result = $stmt->get_result();

2
pub/bin/php/Functions/globalFunctions.php
View File

@@ -81,7 +81,7 @@ function __(string $key, array $replacements = [])
function get_enabled_platforms($conn)
{
$platforms_enabled = [];
$query = "SELECT * FROM vc_platforms WHERE platform_enabled = 1";
$query = "SELECT * FROM autop_platforms WHERE platform_enabled = 1";
if ($stmt = $conn->prepare($query)) {
$stmt->execute();

2
pub/login/php/auth.php
View File

@@ -20,7 +20,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
die("Invalid email address.");
}
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM vc_users WHERE user_email = ? LIMIT 1");
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM system_users WHERE user_email = ? LIMIT 1");
$stmt->bind_param('s', $username);
$stmt->execute();
$result = $stmt->get_result();

32
pub/login/php/authFunctions.php
View File

@@ -48,29 +48,29 @@ function setSessionParams()
{
if (isset($_SESSION['user']['user_uuid'])) {
$user_uuid = $_SESSION['user']['user_uuid'];
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM vc_users INNER JOIN vc_user_groups ON vc_users.user_group_uuid = vc_user_groups.user_group_uuid WHERE user_uuid = ? LIMIT 1");
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM system_users INNER JOIN system_user_groups ON system_users.user_group_uuid = system_user_groups.user_group_uuid WHERE user_uuid = ? LIMIT 1");
$stmt->bind_param('s', $user_uuid);
$stmt->execute();
$result = $stmt->get_result();
$user = $result->fetch_assoc();
$_SESSION['user'] = ['user_uuid' => $user['user_uuid'],
'user_email' => $user['user_email'],
'user_first_name' => $user['user_first_name'],
'user_full_name' => $user['user_full_name'],
'user_group_uuid' => $user['user_group_uuid'],
'user_group_weight' => $user['user_group_weight'],
'user_group_type' => $user['user_group_type'],
'user_pref_language' => $user['user_pref_language'],
'user_two_factor_enabled' => $user['user_two_factor_enabled'],
'user_profile_picture' => $user['user_profile_picture'],
'user_profile_picture_thumbnail' => $user['user_profile_picture_thumbnail'],
'user_timezone' => getUserTimezone(),
'user_email' => $user['user_email'],
'user_first_name' => $user['user_first_name'],
'user_full_name' => $user['user_full_name'],
'user_group_uuid' => $user['user_group_uuid'],
'user_group_weight' => $user['user_group_weight'],
'user_group_type' => $user['user_group_type'],
'user_pref_language' => $user['user_pref_language'],
'user_two_factor_enabled' => $user['user_two_factor_enabled'],
'user_profile_picture' => $user['user_profile_picture'],
'user_profile_picture_thumbnail' => $user['user_profile_picture_thumbnail'],
'user_timezone' => getUserTimezone(),
];
$stmt = $GLOBALS['conn']->prepare("SELECT vc_user_group_permissions_portal.permission_value, vc_permissions.permission_name
FROM vc_user_group_permissions_portal
INNER JOIN vc_permissions ON vc_user_group_permissions_portal.permission_uuid = vc_permissions.permission_uuid
$stmt = $GLOBALS['conn']->prepare("SELECT system_user_group_permissions.permission_value, system_permissions.permission_name
FROM system_user_group_permissions
INNER JOIN system_permissions ON system_user_group_permissions.permission_uuid = system_permissions.permission_uuid
WHERE user_group_uuid = ?");
$stmt->bind_param('s', $user['user_group_uuid']);
$_SESSION['permission'] = array();
@@ -84,7 +84,7 @@ function setSessionParams()
function loginUser($user_uuid)
{
$update = $GLOBALS['conn']->prepare("UPDATE vc_users SET user_last_login_timestamp = ? WHERE user_uuid = ?");
$update = $GLOBALS['conn']->prepare("UPDATE system_users SET user_last_login_timestamp = ? WHERE user_uuid = ?");
$update->bind_param('is', time(), $user_uuid);
$update->execute();

4
pub/login/php/forgotPasswordRequest.php
View File

@@ -20,7 +20,7 @@ if ($loginAttempts > 5) {
$user_email = $_POST['user_email'];
$sql = "SELECT * FROM vc_users WHERE user_email = ?";
$sql = "SELECT * FROM system_users WHERE user_email = ?";
$stmt = $GLOBALS['conn']->prepare($sql);
$stmt->bind_param("s", $user_email);
if (!$stmt->execute()) {
@@ -45,7 +45,7 @@ $user_uuid = $user_data["user_uuid"];
$user_password_reset_token = bin2hex(random_bytes(32));
$user_password_reset_expires = time() + 86400;
$sql = "UPDATE vc_users SET user_password_reset_token = ?, user_password_reset_expires = ? WHERE user_uuid = ?";
$sql = "UPDATE system_users SET user_password_reset_token = ?, user_password_reset_expires = ? WHERE user_uuid = ?";
$stmt = $GLOBALS['conn']->prepare($sql);
$stmt->bind_param("sss",
$user_password_reset_token,

8
pub/login/php/setPassword.php
View File

@@ -16,22 +16,22 @@ if (isset($_POST['user_uuid'])) {
}
$user_uuid = $_SESSION['user']['user_uuid'];
$sql = "UPDATE vc_users SET user_password = ?,
$sql = "UPDATE system_users SET user_password = ?,
user_password_reset_token = NULL,
user_password_reset_expires = NULL
WHERE user_uuid = ?";
$userSql = "SELECT COUNT(*) FROM vc_users WHERE user_uuid = ?";
$userSql = "SELECT COUNT(*) FROM system_users WHERE user_uuid = ?";
$whereValue = $user_uuid;
} elseif (isset($_POST['user_password_reset_token'])) {
$user_password_reset_token = $_POST['user_password_reset_token'];
$sql = "UPDATE vc_users SET user_password = ?,
$sql = "UPDATE system_users SET user_password = ?,
user_password_reset_token = NULL,
user_password_reset_expires = NULL,
user_verified_email = 1,
user_status = 'active'
WHERE user_password_reset_token = ? AND user_status IN ('active', 'pending')";
$userSql = "SELECT COUNT(*) FROM vc_users WHERE user_password_reset_token = ?";
$userSql = "SELECT COUNT(*) FROM system_users WHERE user_password_reset_token = ?";
$whereValue = $user_password_reset_token;
}

4
pub/login/resetPassword.php
View File

@@ -11,13 +11,13 @@ include_once $_SERVER['DOCUMENT_ROOT'] . '/login/php/authFunctions.php';
$tokenfound = false;
if (isset($_GET['token'])) {
$token = htmlspecialchars($_GET['token'], ENT_QUOTES, 'UTF-8');
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM vc_users WHERE user_password_reset_token = ? AND user_password_reset_expires > UNIX_TIMESTAMP()");
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM system_users WHERE user_password_reset_token = ? AND user_password_reset_expires > UNIX_TIMESTAMP()");
$stmt->bind_param("s", $token);
$stmt->execute();
$result = $stmt->get_result();
} elseif (isset($_SESSION['user']['user_uuid'])) {
$user_uuid = $_SESSION['user']['user_uuid'];
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM vc_users WHERE user_uuid = ?");
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM system_users WHERE user_uuid = ?");
$stmt->bind_param("s", $user_uuid);
$stmt->execute();
$result = $stmt->get_result();

2
pub/login/verifyEmail.php
View File

@@ -8,7 +8,7 @@ if (!isset($_GET['token'])) {
include_once $_SERVER['DOCUMENT_ROOT'] . '/login/php/authFunctions.php';
$token = htmlspecialchars($_GET['token'], ENT_QUOTES, 'UTF-8');
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM vc_users WHERE user_password_reset_token = ? AND user_password_reset_expires > UNIX_TIMESTAMP()");
$stmt = $GLOBALS['conn']->prepare("SELECT * FROM system_users WHERE user_password_reset_token = ? AND user_password_reset_expires > UNIX_TIMESTAMP()");
$stmt->bind_param("s", $token);
$stmt->execute();
$result = $stmt->get_result();

11
sql-update-1.2.1.sql
View File

@@ -2,3 +2,14 @@ UPDATE `sentri`.`system_pages` SET `page_location`='/portal-management/sources/p
UPDATE `sentri`.`system_pages` SET `page_location`='/portal-management/pageSystemConfig.php' WHERE `page_uuid`='558df250-d6bd-4b81-b23d-99b472b2c72a';
UPDATE `sentri`.`system_pages` SET `page_location`='/portal-management/pageMonitoring.php' WHERE `page_uuid`='a9e542a7-be1e-4e93-a924-7f43ef974e16';
UPDATE `sentri`.`system_pages` SET `page_location`='/portal-management/pageAccessControl.php' WHERE `page_uuid`='c14362c2-7db2-4047-aed2-9569c0b4febf';
UPDATE `sentri`.`system_pages` SET `page_url`='/portal-management/sources/inserve' WHERE `page_uuid`='5b167631-ba04-4452-bb8f-3ae0be8bccb0';
RENAME TABLE `vc_api_tokens` TO `system_api_tokens`;
RENAME TABLE `vc_devices` TO `autop_devices`;
RENAME TABLE `vc_permissions` TO `system_permissions`;
RENAME TABLE `vc_platforms` TO `autop_platforms`;
RENAME TABLE `vc_portal_settings` TO `system_settings`;
RENAME TABLE `vc_user_group_permissions_portal` TO `system_user_group_permissions`;
RENAME TABLE `vc_user_groups` TO `system_user_groups`;
RENAME TABLE `vc_users` TO `system_users`;
RENAME TABLE `vc_vendors` TO `autop_vendors`;
DROP TABLE `vc_feedback`;