diegods/homelabdspbx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove database app_name and app_uuid (#7562)

Browse Source 
- Remove database app_name, app_uuid
  - This is handled automatically by the database class
- Remove redundant database::new()
This commit is contained in:
FusionPBX
2025-10-09 17:54:05 -06:00
committed by GitHub
parent d59eab1f94
commit 76e2e7d3b7
109 changed files with 27 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/authentication/app_defaults.php
-2
View File
@@ -99,8 +99,6 @@
$p->add("email_template_edit", 'temp');
//save the data
$database->app_name = 'email_templates';
$database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd';
$database->save($array);
//$message = $database->message;
core/contacts/contact_edit.php
+1 -7
View File
@@ -572,16 +572,10 @@
$p->add('contact_user_add', 'temp');
$p->add('contact_group_add', 'temp');
//view_array($array);
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
$message = $database->message;
//$message = $database->message;
unset($array);
//view_array($message);
$p->delete('contact_add', 'temp');
$p->delete('contact_phone_add', 'temp');
$p->delete('contact_address_add', 'temp');
core/contacts/contact_import.php
-4
View File
@@ -382,8 +382,6 @@
//process a chunk of the array
if ($row_id === 1000) {
//save to the data
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
//clear the array
@@ -405,8 +403,6 @@
//save to the data
if (!empty($array)) {
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
}
core/dashboard/app_defaults.php
-5
View File
@@ -188,8 +188,6 @@ if ($domains_processed == 1) {
//exit;
//save the data
if (!empty($array)) {
$database->app_name = 'dashboard';
$database->app_uuid = '55533bef-4f04-434a-92af-999c1e9927f7';
$database->save($array, false);
}
unset($array);
@@ -288,11 +286,8 @@ if ($domains_processed == 1) {
//save the data
if (!empty($array)) {
$database->app_name = 'dashboard';
$database->app_uuid = '55533bef-4f04-434a-92af-999c1e9927f7';
$database->save($array, false);
//$result = $database->message;
//view_array($result);
}
//delete the temporary permissions
core/dashboard/dashboard_edit.php
-2
View File
@@ -116,8 +116,6 @@
$array['dashboards'][0]['dashboard_description'] = $dashboard_description;
//save the data
$database->app_name = 'dashboard';
$database->app_uuid = '55533bef-4f04-434a-92af-999c1e9927f7';
$result = $database->save($array);
//redirect the user
core/dashboard/dashboard_widget_edit.php
-4
View File
@@ -169,8 +169,6 @@
//delete the group from the widget
$array['dashboard_widget_groups'][0]['dashboard_widget_group_uuid'] = $widget_group_uuid;
$database->app_name = 'dashboard';
$database->app_uuid = '55533bef-4f04-434a-92af-999c1e9927f7';
$database->delete($array);
unset($array);
@@ -329,8 +327,6 @@
}
//save the data
$database->app_name = 'dashboard';
$database->app_uuid = '55533bef-4f04-434a-92af-999c1e9927f7';
$result = $database->save($array);
//redirect the user
core/dashboard/index.php
-2
View File
@@ -186,8 +186,6 @@
//save the data
if (is_array($array)) {
$database->app_name = 'dashboard';
$database->app_uuid = '55533bef-4f04-434a-92af-999c1e9927f7';
$database->save($array);
}
core/databases/database_edit.php
+1 -4
View File
@@ -144,8 +144,6 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
//add new uuid
$array['databases'][0]['database_uuid'] = uuid();
$database->app_name = 'databases';
$database->app_uuid = '8d229b6d-1383-fcec-74c6-4ce1682479e2';
$database->save($array);
unset($array);
@@ -162,8 +160,7 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
//add uuid to update
$array['databases'][0]['database_uuid'] = $database_uuid;
$database->app_name = 'databases';
$database->app_uuid = '8d229b6d-1383-fcec-74c6-4ce1682479e2';
//save to the database
$database->save($array);
unset($array);
core/databases/databases.php
-3
View File
@@ -38,9 +38,6 @@
exit;
}
//connect to database
$database = database::new();
//add multi-lingual support
$language = new text;
$text = $language->get();
core/default_settings/default_setting_edit.php
-4
View File
@@ -178,8 +178,6 @@
$p->add('dialplan_detail_add', 'temp');
}
if (is_array($array) && sizeof($array) != 0) {
$database->app_name = 'default_settings';
$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
$database->save($array);
unset($array);
@@ -216,8 +214,6 @@
$array['default_settings'][$x]['default_setting_description'] = $default_setting_description;
//save to the data
$database->app_name = 'default_settings';
$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
$database->save($array);
$message = $database->message;
core/default_settings/default_setting_toggle.php
+2 -3
View File
@@ -60,10 +60,9 @@
//set new status
$array['default_settings'][0]['default_setting_uuid'] = $default_setting_uuid;
$array['default_settings'][0]['default_setting_enabled'] = $new_status;
$database->app_name = 'default_settings';
$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
$database->save($array);
$message = $database->message;
//$message = $database->message;
unset($array);
//increment toggle total
core/default_settings/default_settings.php
-1
View File
@@ -142,7 +142,6 @@
$sql .= "lower(default_setting_category) = :default_setting_category ";
$parameters['default_setting_category'] = strtolower($default_setting_category);
}
$database = database::new();
$num_rows = $database->select($sql, $parameters ?? null, 'column');
//get the list
core/domain_settings/domain_setting_edit.php
-6
View File
@@ -176,8 +176,6 @@
}
if (!empty($array)) {
$database->app_name = 'domain_settings';
$database->app_uuid = 'b31e723a-bf70-670c-a49b-470d2a232f71';
$database->save($array);
unset($array);
@@ -223,8 +221,6 @@
$array['domain_settings'][0]['domain_setting_order'] = $domain_setting_order;
$array['domain_settings'][0]['domain_setting_enabled'] = $domain_setting_enabled;
$array['domain_settings'][0]['domain_setting_description'] = $domain_setting_description;
$database->app_name = 'domain_settings';
$database->app_uuid = 'b31e723a-bf70-670c-a49b-470d2a232f71';
$database->save($array);
unset($array);
}
@@ -296,8 +292,6 @@
//execute
if (!empty($array)) {
$database->app_name = 'domain_settings';
$database->app_uuid = 'b31e723a-bf70-670c-a49b-470d2a232f71';
$database->save($array);
unset($array);
core/domains/domain_edit.php
-6
View File
@@ -143,8 +143,6 @@
$domain_array = $array;
//add the new domain
$database->app_name = 'domains';
$database->app_uuid = '8b91605b-f6d2-42e6-a56d-5d1ded01bb44';
$database->save($array);
//add dialplans to the domain
@@ -200,8 +198,6 @@
$array['domains'][0]['domain_name'] = $domain_name;
$array['domains'][0]['domain_enabled'] = $domain_enabled;
$array['domains'][0]['domain_description'] = $domain_description;
$database->app_name = 'domains';
$database->app_uuid = '8b91605b-f6d2-42e6-a56d-5d1ded01bb44';
$database->save($array);
//add dialplans to the domain
@@ -484,8 +480,6 @@
$sql .= "var_value = :var_value ";
$sql .= "where var_name = 'domain' ";
$parameters['var_value'] = $domain_name;
$database->app_name = 'domains';
$database->app_uuid = '8b91605b-f6d2-42e6-a56d-5d1ded01bb44';
$database->execute($sql, $parameters);
unset($sql, $parameters);
}
core/email_templates/app_defaults.php
-2
View File
@@ -602,8 +602,6 @@
$p->add("email_template_edit", 'temp');
//save the data
$database->app_name = 'email_templates';
$database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd';
$database->save($array, false);
//$message = $database->message;
core/email_templates/email_template_edit.php
+1 -3
View File
@@ -126,13 +126,11 @@
$array['email_templates'][0]['template_description'] = $template_description;
//save to the data
$database->app_name = 'email_templates';
$database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd';
if (!empty($email_template_uuid)) {
$database->uuid($email_template_uuid);
}
$database->save($array);
$message = $database->message;
//$message = $database->message;
//redirect the user
if (isset($action)) {
core/groups/app_defaults.php
-2
View File
@@ -86,8 +86,6 @@ if ($domains_processed == 1) {
}
$x++;
}
$database->app_name = 'groups';
$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
$database->save($array, false);
unset($array);
}
core/groups/group_edit.php
-7
View File
@@ -37,9 +37,6 @@
exit;
}
//connect to database
$database = database::new();
//add multi-lingual support
$language = new text;
$text = $language->get();
@@ -138,8 +135,6 @@
$array['groups'][0]['group_description'] = $group_description;
//save the data
$database->app_name = 'Group Manager';
$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
$database->save($array);
//update group name in group permissions if group name changed
@@ -151,8 +146,6 @@
$parameters['group_name'] = $group_name;
$parameters['group_name_previous'] = $group_name_previous;
$parameters['group_uuid'] = $group_uuid;
$database->app_name = 'Group Manager';
$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
$database->execute($sql, $parameters);
unset($sql, $parameters);
}
core/groups/group_member_add.php
-2
View File
@@ -68,8 +68,6 @@
$p = permissions::new();
$p->add('user_group_add', 'temp');
$database->app_name = 'groups';
$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
$database->save($array);
unset($array);
core/groups/group_permissions.php
-4
View File
@@ -238,8 +238,6 @@
//save the save array
if (!empty($array['save']) && is_array($array['save']) && @sizeof($array['save']) != 0) {
$database->app_name = 'groups';
$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
$database->save($array['save']);
$message = $database->message;
}
@@ -247,8 +245,6 @@
//delete the delete array
if (!empty($array['delete']) && is_array($array['delete']) && @sizeof($array['delete']) != 0) {
if (permission_exists('group_permission_delete')) {
$database->app_name = 'groups';
$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
$database->delete($array['delete']);
}
}
core/groups/permissions_copy.php
-4
View File
@@ -73,8 +73,6 @@
}
$array['groups'][0]['group_name'] = $new_group_name;
$array['groups'][0]['group_description'] = $new_group_desc;
$database->app_name = 'groups';
$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
$database->save($array);
unset($array);
@@ -114,8 +112,6 @@
$p->add('group_permission_add', 'temp');
//execute insert
$database->app_name = 'groups';
$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
$database->save($array);
unset($array);
core/menu/menu_edit.php
-4
View File
@@ -98,8 +98,6 @@
$array['menus'][0]['menu_name'] = $menu_name;
$array['menus'][0]['menu_language'] = $menu_language;
$array['menus'][0]['menu_description'] = $menu_description;
$database->app_name = 'menu';
$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
$database->save($array);
unset($array);
@@ -115,8 +113,6 @@
$array['menus'][0]['menu_name'] = $menu_name;
$array['menus'][0]['menu_language'] = $menu_language;
$array['menus'][0]['menu_description'] = $menu_description;
$database->app_name = 'menu';
$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
$database->save($array);
unset($array);
core/menu/menu_item_edit.php
-10
View File
@@ -83,8 +83,6 @@
//delete the group from the menu item
$array['menu_item_groups'][0]['menu_item_group_uuid'] = $menu_item_group_uuid;
$database->app_name = 'menu';
$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
$database->delete($array);
unset($array);
@@ -196,8 +194,6 @@
}
$array['menu_items'][0]['menu_item_add_user'] = $_SESSION["username"];
$array['menu_items'][0]['menu_item_add_date'] = 'now()';
$database->app_name = 'menu';
$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
$database->save($array);
unset($array);
}
@@ -222,8 +218,6 @@
}
$array['menu_items'][0]['menu_item_add_user'] = $_SESSION["username"];
$array['menu_items'][0]['menu_item_add_date'] = 'now()';
$database->app_name = 'menu';
$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
$database->save($array);
unset($array);
}
@@ -250,8 +244,6 @@
$array['menu_item_groups'][0]['menu_item_uuid'] = $menu_item_uuid;
$array['menu_item_groups'][0]['group_name'] = $group_name;
$array['menu_item_groups'][0]['group_uuid'] = $group_uuid;
$database->app_name = 'menu';
$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
$database->save($array);
unset($array);
}
@@ -271,8 +263,6 @@
$array['menu_languages'][0]['menu_item_uuid'] = $menu_item_uuid;
$array['menu_languages'][0]['menu_language'] = $menu_language;
$array['menu_languages'][0]['menu_item_title'] = $menu_item_title;
$database->app_name = 'menu';
$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
$database->save($array);
unset($array);
}
core/menu/menu_item_list.php
-4
View File
@@ -216,8 +216,6 @@
$array['menu_items'][0]['menu_uuid'] = $menu_uuid;
$array['menu_items'][0]['menu_item_title'] = $row2['menu_item_title'];
$array['menu_items'][0]['menu_item_order'] = $tmp_menu_item_order;
$database->app_name = 'menu';
$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
$database->save($array);
unset($array);
}
@@ -427,8 +425,6 @@
$array['menu_items'][0]['menu_uuid'] = $menu_uuid;
$array['menu_items'][0]['menu_item_title'] = $row['menu_item_title'];
$array['menu_items'][0]['menu_item_order'] = $tmp_menu_item_order;
//$database->app_name = 'menu';
//$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
//$database->save($array);
unset($array);
}
core/menu/menu_item_move_down.php
-4
View File
@@ -67,8 +67,6 @@ if (count($_GET)>0) {
$sql .= "and menu_item_order = :menu_item_order ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['menu_item_order'] = $menu_item_order + 1;
$database->app_name = 'menu';
$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
$database->execute($sql, $parameters);
unset($sql, $parameters);
@@ -79,8 +77,6 @@ if (count($_GET)>0) {
$sql .= "and menu_item_id = :menu_item_id ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['menu_item_id'] = $menu_item_id;
$database->app_name = 'menu';
$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
$database->execute($sql, $parameters);
unset($sql, $parameters);
core/menu/menu_item_move_up.php
-4
View File
@@ -58,8 +58,6 @@ if (count($_GET)>0) {
$sql .= "and menu_order = :menu_order ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['menu_order'] = $menu_order - 1;
$database->app_name = 'menu';
$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
$database->execute($sql, $parameters);
unset($sql, $parameters);
@@ -70,8 +68,6 @@ if (count($_GET)>0) {
$sql .= "and menu_item_id = :menu_item_id ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['menu_item_id'] = $menu_item_id;
$database->app_name = 'menu';
$database->app_uuid = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
$database->execute($sql, $parameters);
unset($sql, $parameters);
core/notifications/app_defaults.php
-2
View File
@@ -39,8 +39,6 @@ if ($domains_processed == 1) {
// $p = permissions::new();
// $p->add('notification_add', 'temp');
// //execute insert
// $database->app_name = 'notifications';
// $database->app_uuid = 'e746fbcb-f67f-4e0e-ab64-c414c01fac11';
// $database->save($array, false);
// unset($array);
// //revoke temporary permissions
core/permissions/app_defaults.php
-2
View File
@@ -49,8 +49,6 @@ if ($domains_processed == 1) {
$p->add('permission_add', 'temp');
//execute insert
$database->app_name = 'permissions';
$database->app_uuid = 'ce1498a0-46e2-487d-85de-4eec7122a984';
$database->save($array, false);
unset($array);
core/software/app_defaults.php
-2
View File
@@ -51,8 +51,6 @@ if ($domains_processed == 1) {
$p->add("software_edit", 'temp');
//save the data
$database->app_name = 'software';
$database->app_uuid = 'b88c795f-7dea-4fc8-9ab7-edd555242cff';
$database->save($array, false);
unset($array);
core/upgrade/index.php
-3
View File
@@ -47,9 +47,6 @@
$language = new text;
$text = $language->get();
//connect to the database
$database = database::new();
//set a default message_timeout
$message_timeout = 4*1000;
core/user_logs/user_logs.php
-4
View File
@@ -81,10 +81,6 @@
}
}
//prepare the database object
$database->app_name = 'user_logs';
$database->app_uuid = '582a13cf-7d75-4ea3-b2d9-60914352d76e';
//send the array to the database class
if (!empty($action) && $action == 'delete' && permission_exists('user_log_delete')) {
$database->delete($array);
core/user_settings/user_setting_edit.php
-8
View File
@@ -173,8 +173,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
$array['dialplan_details'][0]['dialplan_detail_group'] = 0;
}
if (is_array($array) && sizeof($array) != 0) {
$database->app_name = 'user_settings';
$database->app_uuid = '3a3337f7-78d1-23e3-0cfd-f14499b8ed97';
$database->save($array);
unset($array);
@@ -205,8 +203,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
$array['user_settings'][0]['user_setting_enabled'] = $user_setting_enabled;
$array['user_settings'][0]['user_setting_description'] = $user_setting_description;
$database->app_name = 'user_settings';
$database->app_uuid = '3a3337f7-78d1-23e3-0cfd-f14499b8ed97';
$database->save($array);
unset($array);
}
@@ -266,8 +262,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
$p = permissions::new();
$p->add('dialplan_detail_add', 'temp');
$database->app_name = 'user_settings';
$database->app_uuid = '3a3337f7-78d1-23e3-0cfd-f14499b8ed97';
$database->save($array);
unset($array);
@@ -284,8 +278,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
$p = permissions::new();
$p->add('dialplan_detail_edit', 'temp');
$database->app_name = 'user_settings';
$database->app_uuid = '3a3337f7-78d1-23e3-0cfd-f14499b8ed97';
$database->save($array);
unset($array);
core/user_settings/user_settings.php
-2
View File
@@ -99,8 +99,6 @@
//update setting
$array['user_settings'][0]['user_setting_uuid'] = $user_setting_uuids[0];
$array['user_settings'][0]['user_setting_enabled'] = $enabled;
$database->app_name = 'user_settings';
$database->app_uuid = '3a3337f7-78d1-23e3-0cfd-f14499b8ed97';
$database->save($array);
unset($array);
core/users/app_defaults.php
-4
View File
@@ -155,8 +155,6 @@ if ($domains_processed == 1) {
$p->add("default_setting_edit", 'temp');
//save to the data
$database->app_name = 'default_setting';
$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
$database->save($array, false);
unset($array);
@@ -205,8 +203,6 @@ if ($domains_processed == 1) {
$p->add("email_template_edit", 'temp');
//save to the data
$database->app_name = 'email_templates';
$database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd';
$database->save($array, false);
unset($array);
core/users/user_imports.php
-4
View File
@@ -347,8 +347,6 @@
if ($row_id === 1000) {
//save to the data
$database->app_name = 'users';
$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
$database->save($array);
//$message = $database->message;
@@ -373,8 +371,6 @@
//save to the data
if (!empty($array)) {
$database->app_name = 'users';
$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
$database->save($array);
//$message = $database->message;
unset($array);