From d1baf058916bec726e62ce4160ac09ab45b95515 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 1 Oct 2025 08:56:06 -0600 Subject: [PATCH] Remove redundant database instances (#7535) --- app/access_controls/access_control_export.php | 3 -- app/access_controls/access_control_import.php | 6 ---- app/access_controls/access_controls.php | 7 ----- app/basic_operator_panel/autocomplete.php | 5 ---- app/basic_operator_panel/index.php | 7 ----- app/bridges/bridge_edit.php | 7 ----- app/bridges/bridge_imports.php | 6 ---- app/bridges/bridges.php | 2 -- app/call_block/call_block.php | 2 -- app/call_block/call_block_edit.php | 3 -- app/call_broadcast/call_broadcast.php | 2 -- app/call_broadcast/call_broadcast_edit.php | 8 +---- app/call_broadcast/call_broadcast_send.php | 1 - .../call_center_active_inc.php | 3 -- app/call_center_active/call_center_exec.php | 1 - app/call_center_active/call_center_queue.php | 2 -- app/call_centers/call_center_agent_edit.php | 3 -- app/call_centers/call_center_agent_status.php | 9 +----- app/call_centers/call_center_agents.php | 3 -- app/call_centers/call_center_queues.php | 2 -- app/call_centers/cmd.php | 1 - .../dashboard/call_center_agents.php | 5 ---- .../resources/jobs/call_center_agents.php | 2 -- app/call_flows/call_flow_edit.php | 4 --- app/call_forward/call_forward.php | 4 --- .../resources/dashboard/call_forward.php | 7 ----- app/call_forward/resources/jobs/dnd.php | 1 - app/call_recordings/call_recordings.php | 3 -- app/call_recordings/waveform.php | 1 - app/calls_active/calls_active.php | 1 - app/click_to_call/click_to_call.php | 1 - .../conference_center_edit.php | 3 -- app/conference_centers/conference_centers.php | 3 -- .../conference_room_edit.php | 3 -- app/conference_centers/conference_rooms.php | 3 -- .../conference_session_details.php | 3 -- .../conference_sessions.php | 3 -- .../conference_control_detail_edit.php | 4 --- .../conference_controls.php | 2 -- .../conference_profile_edit.php | 4 --- .../conference_profiles.php | 2 -- app/conferences/conference_edit.php | 14 --------- app/conferences_active/conference_exec.php | 1 - .../conferences_active_inc.php | 2 -- .../database_transaction_edit.php | 6 +--- .../database_transactions.php | 3 -- app/destinations/destination_download.php | 1 - app/destinations/destination_imports.php | 15 +--------- app/devices/cmd.php | 1 - app/devices/device_copy.php | 10 +------ app/devices/device_imports.php | 5 ---- app/devices/device_profile_copy.php | 6 ---- app/devices/device_vendor_edit.php | 4 --- app/devices/device_vendor_function_edit.php | 3 -- app/devices/device_vendor_functions.php | 3 -- app/devices/device_vendor_restore.php | 8 ----- app/devices/device_vendors.php | 2 -- .../resources/dashboard/device_keys.php | 5 ---- app/dialplan_inbound/dialplan_inbound_add.php | 8 +---- .../dialplan_outbound_add.php | 6 ---- app/dialplans/dialplan_add.php | 3 -- app/dialplans/dialplan_xml.php | 5 ---- .../resources/dashboard/domain_limits.php | 5 ---- app/email_queue/email_queue.php | 7 ----- app/email_queue/email_queue_delete.php | 1 - app/email_queue/email_queue_edit.php | 13 ++------ app/email_queue/email_test.php | 1 - app/email_queue/resources/command/send.php | 2 -- .../resources/jobs/email_queue.php | 1 - app/emergency/emergency.php | 5 ---- app/event_guard/event_guard_log_edit.php | 13 ++------ app/event_guard/event_guard_logs.php | 2 -- .../extension_setting_edit.php | 14 ++------- app/extension_settings/extension_settings.php | 2 -- app/extensions/extension_copy.php | 3 -- app/extensions/extension_download.php | 3 -- app/extensions/extension_edit.php | 3 -- app/extensions/extension_imports.php | 3 -- app/extensions/extensions.php | 3 -- .../resources/dashboard/caller_id.php | 5 ---- app/fax/fax.php | 2 -- app/fax/fax_advanced.php | 6 +--- app/fax/fax_copy.php | 4 --- app/fax/fax_edit.php | 13 -------- app/fax/fax_files.php | 3 -- app/fax/fax_files_remote.php | 1 - app/fax/fax_log_view.php | 1 - app/fax/fax_logs.php | 2 -- app/fax/fax_outbox.php | 2 -- app/fax_queue/fax_queue_delete.php | 1 - app/fax_queue/fax_queue_edit.php | 13 ++------ app/fifo/fifo.php | 2 -- app/gateways/gateway_copy.php | 4 --- app/gateways/gateway_edit.php | 6 ---- .../resources/functions/ivr_menu_xml.php | 2 -- app/modules/module_edit.php | 4 --- app/music_on_hold/music_on_hold.php | 4 --- app/music_on_hold/music_on_hold_edit.php | 6 ---- app/music_on_hold/waveform.php | 1 - .../number_translation_edit.php | 14 ++------- .../number_translations.php | 7 ----- app/pin_numbers/pin_download.php | 1 - .../resources/functions/device_by.php | 2 -- .../dashboard/ring_group_forward.php | 5 ---- app/sip_profiles/sip_profile_copy.php | 7 ----- app/sip_profiles/sip_profile_edit.php | 8 ----- app/sip_profiles/sip_profiles.php | 2 -- app/sip_status/cmd.php | 1 - .../sofia_global_setting_edit.php | 13 ++------ .../sofia_global_settings.php | 2 -- app/streams/streams.php | 2 -- .../resources/dashboard/system_counts.php | 5 ---- .../resources/dashboard/system_status.php | 1 - .../functions/system_information.php | 1 - app/time_conditions/time_condition_edit.php | 12 -------- app/time_conditions/time_conditions.php | 2 -- app/vars/var_edit.php | 4 --- app/vars/vars.php | 2 -- .../voicemail_greeting_edit.php | 5 ---- app/voicemail_greetings/waveform.php | 2 -- app/voicemails/voicemail_export.php | 1 - app/voicemails/voicemail_imports.php | 6 ---- app/voicemails/voicemail_messages.php | 1 - app/voicemails/waveform.php | 3 -- app/xml_cdr/report.php | 1 - .../resources/dashboard/missed_calls.php | 1 - .../resources/dashboard/recent_calls.php | 1 - app/xml_cdr/waveform.php | 1 - app/xml_cdr/xml_cdr_inc.php | 1 - app/xml_cdr/xml_cdr_log.php | 1 - app/xml_cdr/xml_cdr_statistics_inc.php | 1 - core/contacts/contact_address_edit.php | 8 ----- core/contacts/contact_addresses.php | 1 - core/contacts/contact_addresses_view.php | 1 - core/contacts/contact_attachment.php | 1 - core/contacts/contact_attachment_edit.php | 5 ---- core/contacts/contact_attachments.php | 1 - core/contacts/contact_attachments_view.php | 1 - core/contacts/contact_edit.php | 4 --- core/contacts/contact_email_edit.php | 8 ----- core/contacts/contact_emails.php | 1 - core/contacts/contact_emails_view.php | 1 - core/contacts/contact_extensions.php | 1 - core/contacts/contact_extensions_view.php | 1 - core/contacts/contact_import.php | 3 -- core/contacts/contact_import_google.php | 4 --- core/contacts/contact_json.php | 1 - core/contacts/contact_note_edit.php | 7 ----- core/contacts/contact_notes.php | 1 - core/contacts/contact_notes_view.php | 1 - core/contacts/contact_phone_edit.php | 9 ------ core/contacts/contact_phones.php | 1 - core/contacts/contact_phones_view.php | 2 -- core/contacts/contact_relation_edit.php | 8 ----- core/contacts/contact_relations.php | 1 - core/contacts/contact_relations_view.php | 1 - core/contacts/contact_setting_edit.php | 7 ----- core/contacts/contact_settings.php | 1 - core/contacts/contact_time_edit.php | 7 ----- core/contacts/contact_timer.php | 5 ---- core/contacts/contact_timer_inc.php | 1 - core/contacts/contact_times.php | 1 - core/contacts/contact_times_view.php | 1 - core/contacts/contact_url_edit.php | 8 ----- core/contacts/contact_urls.php | 1 - core/contacts/contact_urls_view.php | 1 - core/contacts/contact_view.php | 3 -- core/contacts/contacts.php | 4 --- core/contacts/contacts_vcard.php | 5 ---- core/dashboard/dashboard.php | 2 -- core/dashboard/dashboard_edit.php | 3 -- core/dashboard/dashboard_widget_edit.php | 3 -- core/dashboard/dashboard_widget_list.php | 3 -- core/dashboard/index.php | 3 -- core/databases/database_edit.php | 6 +--- core/databases/databases.php | 6 ++-- .../default_settings/default_setting_edit.php | 3 -- .../default_setting_toggle.php | 3 -- core/domain_settings/domain_setting_edit.php | 3 -- core/domain_settings/domain_settings.php | 3 -- core/domains/domain_json.php | 3 -- core/domains/domains.php | 3 -- core/groups/group_member_add.php | 3 -- core/groups/group_members.php | 3 -- core/groups/group_permissions.php | 3 -- core/groups/groups.php | 3 -- core/groups/permissions_copy.php | 3 -- core/install/install.php | 14 ++------- core/menu/menu.php | 3 -- core/menu/menu_edit.php | 3 -- core/menu/menu_item_edit.php | 3 -- core/menu/menu_item_list.php | 4 --- core/menu/menu_item_move_down.php | 3 -- core/menu/menu_item_move_up.php | 3 -- core/notifications/notification_edit.php | 3 -- core/upgrade/upgrade_menu.php | 1 - core/user_logs/user_log_edit.php | 2 -- core/user_settings/user_setting_edit.php | 3 -- core/user_settings/user_settings.php | 3 -- core/users/user_imports.php | 3 -- core/users/user_json.php | 3 -- core/users/users.php | 3 -- resources/switch.php | 30 ++++++++----------- secure/v_mailto.php | 4 --- 204 files changed, 43 insertions(+), 754 deletions(-) diff --git a/app/access_controls/access_control_export.php b/app/access_controls/access_control_export.php index 7455cc5d67..e52e0bf52e 100644 --- a/app/access_controls/access_control_export.php +++ b/app/access_controls/access_control_export.php @@ -38,9 +38,6 @@ exit; } -//initialize the database object - $database = new database; - //add multi-lingual support $language = new text; $text = $language->get(); diff --git a/app/access_controls/access_control_import.php b/app/access_controls/access_control_import.php index 49d1f7ed7b..09b4f82026 100644 --- a/app/access_controls/access_control_import.php +++ b/app/access_controls/access_control_import.php @@ -314,9 +314,6 @@ //process a chunk of the array if ($row_id === 1000) { //save to the data - $database = new database; - $database->app_name = 'access_controls'; - $database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd'; $database->save($array); //clear the array @@ -337,9 +334,6 @@ //save to the data if (!empty($array)) { - $database = new database; - $database->app_name = 'access_controls'; - $database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd'; $database->save($array); unset($array); } diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php index faf6cab642..289abd7650 100644 --- a/app/access_controls/access_controls.php +++ b/app/access_controls/access_controls.php @@ -76,11 +76,6 @@ $x++; } - //prepare the database object - $database = new database; - $database->app_name = 'access_controls'; - $database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd'; - //send the array to the database class switch ($action) { case 'copy': @@ -125,7 +120,6 @@ $sql .= " or lower(access_control_description) like :search "; $sql .= ") "; } - $database = new database; $num_rows = $database->select($sql, $parameters ?? null, 'column'); //get the list @@ -143,7 +137,6 @@ $sql .= ") "; } $sql .= order_by($order_by, $order, 'access_control_name', 'asc'); - $database = new database; $access_controls = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters); diff --git a/app/basic_operator_panel/autocomplete.php b/app/basic_operator_panel/autocomplete.php index 4b30442929..c5f647c247 100644 --- a/app/basic_operator_panel/autocomplete.php +++ b/app/basic_operator_panel/autocomplete.php @@ -61,9 +61,6 @@ //add user's uuid to group uuid list to include private (non-shared) contacts $user_group_uuids[] = $_SESSION["user_uuid"]; -//create the database object - $database = new database; - //get extensions list $sql = "select \n"; $sql .= "e.extension, \n"; @@ -93,7 +90,6 @@ if (isset($_GET['debug'])) { echo $sql."

"; } $parameters['term'] = '%'.$term.'%'; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $result = $database->select($sql, $parameters, 'all'); unset ($parameters, $sql); @@ -159,7 +155,6 @@ if (isset($_GET['debug'])) { echo $sql."

"; } $parameters['term'] = '%'.$term.'%'; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $result = $database->select($sql, $parameters, 'all'); unset ($parameters, $sql); diff --git a/app/basic_operator_panel/index.php b/app/basic_operator_panel/index.php index 93ea0eb073..55d1ec6246 100644 --- a/app/basic_operator_panel/index.php +++ b/app/basic_operator_panel/index.php @@ -72,9 +72,6 @@ $array['users'][0]['user_uuid'] = $_SESSION['user']['user_uuid']; $array['users'][0]['domain_uuid'] = $_SESSION['user']['domain_uuid']; $array['users'][0]['user_status'] = $user_status; - $database = new database; - $database->app_name = 'operator_panel'; - $database->app_uuid = 'dd3d173a-5d51-4231-ab22-b18c5b712bb2'; $database->save($array); //remove the temporary permission @@ -91,7 +88,6 @@ $sql .= "and user_uuid = :user_uuid "; $parameters['domain_uuid'] = $_SESSION['user']['domain_uuid']; $parameters['user_uuid'] = $_SESSION['user']['user_uuid']; - $database = new database; $call_center_agent_uuid = $database->select($sql, $parameters, 'column'); unset($sql, $parameters); @@ -157,9 +153,6 @@ $p->add('extension_edit', 'temp'); //execute update - $database = new database; - $database->app_name = 'calls'; - $database->app_uuid = '19806921-e8ed-dcff-b325-dd3e5da4959d'; $database->save($array); unset($array); diff --git a/app/bridges/bridge_edit.php b/app/bridges/bridge_edit.php index 84951a3c9f..add4093d10 100644 --- a/app/bridges/bridge_edit.php +++ b/app/bridges/bridge_edit.php @@ -167,9 +167,6 @@ $array['bridges'][0]['bridge_description'] = $bridge_description; //save to the data - $database = new database; - $database->app_name = 'bridges'; - $database->app_uuid = 'a6a7c4c5-340a-43ce-bcbc-2ed9bab8659d'; $database->save($array); $message = $database->message; @@ -197,7 +194,6 @@ $sql = "select * from v_bridges "; $sql .= "where bridge_uuid = :bridge_uuid "; $parameters['bridge_uuid'] = $bridge_uuid; - $database = new database; $row = $database->select($sql, $parameters ?? null, 'row'); if (!empty($row)) { $bridge_name = $row["bridge_name"]; @@ -337,14 +333,12 @@ $sql .= "and domain_uuid = :domain_uuid "; } $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $gateways = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); //get the domains $sql = "select * from v_domains "; $sql .= "where domain_enabled = true "; - $database = new database; $domains = $database->select($sql, null, 'all'); unset($sql); @@ -353,7 +347,6 @@ $sql .= "from v_sip_profiles "; $sql .= "where sip_profile_enabled = true "; $sql .= "order by sip_profile_name asc "; - $database = new database; $sip_profiles = $database->select($sql, null, 'all'); unset($sql); diff --git a/app/bridges/bridge_imports.php b/app/bridges/bridge_imports.php index 7f25e88e39..6f8c8fe617 100644 --- a/app/bridges/bridge_imports.php +++ b/app/bridges/bridge_imports.php @@ -299,9 +299,6 @@ if ($row_id === 1000) { //save to the data - $database = new database; - $database->app_name = 'bridges'; - $database->app_uuid = 'b523c2d2-64cd-46f1-9520-ca4b4098e044'; $database->save($array); //clear the array @@ -319,9 +316,6 @@ //save to the data if (!empty($array) && is_array($array)) { - $database = new database; - $database->app_name = 'bridges'; - $database->app_uuid = 'b523c2d2-64cd-46f1-9520-ca4b4098e044'; $database->save($array); unset($array); } diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php index 08492e3005..2f8c703d6a 100644 --- a/app/bridges/bridges.php +++ b/app/bridges/bridges.php @@ -112,7 +112,6 @@ } $parameters['domain_uuid'] = $domain_uuid; } - $database = new database; $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare to page the results @@ -142,7 +141,6 @@ } $sql .= order_by($order_by, $order, 'bridge_name', 'asc'); $sql .= limit_offset($rows_per_page, $offset); - $database = new database; $bridges = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters); diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php index 4850455582..ec7c5dfcc8 100644 --- a/app/call_block/call_block.php +++ b/app/call_block/call_block.php @@ -136,7 +136,6 @@ $sql .= ") "; $parameters['search'] = '%'.$search.'%'; } - $database = new database; $num_rows = $database->select($sql, $parameters ?? null, 'column'); unset($parameters); @@ -204,7 +203,6 @@ } $sql .= order_by($order_by, $order, ['domain_uuid','call_block_country_code','call_block_number']); $sql .= limit_offset($rows_per_page, $offset); - $database = new database; $result = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters); diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php index fde803ace7..492f2f61f4 100644 --- a/app/call_block/call_block_edit.php +++ b/app/call_block/call_block_edit.php @@ -40,9 +40,6 @@ $language = new text; $text = $language->get(); -//initialize the database object - $database = new database; - //set the defaults $call_block_name = ''; $call_block_country_code = ''; diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php index 15b9c5cef1..71831f30e0 100644 --- a/app/call_broadcast/call_broadcast.php +++ b/app/call_broadcast/call_broadcast.php @@ -103,7 +103,6 @@ $sql .= ") "; $parameters['search'] = '%'.$search.'%'; } - $database = new database; $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare the paging @@ -145,7 +144,6 @@ } $sql .= order_by($order_by, $order, 'broadcast_name', 'asc'); $sql .= limit_offset($rows_per_page, $offset); - $database = new database; $result = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters); diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php index b7363be709..f928321907 100644 --- a/app/call_broadcast/call_broadcast_edit.php +++ b/app/call_broadcast/call_broadcast_edit.php @@ -126,7 +126,6 @@ $sql .= "and type_value = :type_value "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['type_value'] = $_POST['accountcode']; - $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); $broadcast_accountcode = $num_rows > 0 ? $_POST["broadcast_accountcode"] : $_SESSION['domain_name']; unset($sql, $parameters, $num_rows); @@ -266,10 +265,7 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) { } $array['call_broadcasts'][0]['broadcast_description'] = $broadcast_description; - //execute - $database = new database; - $database->app_name = 'call_broadcast'; - $database->app_uuid = 'efc11f6b-ed73-9955-4d4d-3a1bed75a056'; + //save changes to the database $database->save($array); unset($array); @@ -290,7 +286,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) { $sql .= "and call_broadcast_uuid = :call_broadcast_uuid "; $parameters['domain_uuid'] = $domain_uuid; $parameters['call_broadcast_uuid'] = $call_broadcast_uuid; - $database = new database; $row = $database->select($sql, $parameters, 'row'); if (!empty($row)) { $broadcast_name = $row["broadcast_name"]; @@ -428,7 +423,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) { //$sql .= "select * from v_recordings "; //$sql .= "where domain_uuid = :domain_uuid "; //$parameters['domain_uuid'] = $domain_uuid; - //$database = new database; //$rows = $database->select($sql, $parameters, 'all'); //if (!empty($rows)) { // foreach ($rows as $row) { diff --git a/app/call_broadcast/call_broadcast_send.php b/app/call_broadcast/call_broadcast_send.php index 9c037f19fe..97050fc9cf 100644 --- a/app/call_broadcast/call_broadcast_send.php +++ b/app/call_broadcast/call_broadcast_send.php @@ -77,7 +77,6 @@ $sql .= "and call_broadcast_uuid = :call_broadcast_uuid "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['call_broadcast_uuid'] = $call_broadcast_uuid; - $database = new database; $row = $database->select($sql, $parameters, 'row'); if (!empty($row)) { $broadcast_name = $row["broadcast_name"]; diff --git a/app/call_center_active/call_center_active_inc.php b/app/call_center_active/call_center_active_inc.php index 5091dac96d..7e3b05db0f 100644 --- a/app/call_center_active/call_center_active_inc.php +++ b/app/call_center_active/call_center_active_inc.php @@ -38,9 +38,6 @@ exit; } -//initialize the database object - $database = new database; - //add multi-lingual support $language = new text; $text = $language->get(); diff --git a/app/call_center_active/call_center_exec.php b/app/call_center_active/call_center_exec.php index 15903d3226..bd476d2c7c 100644 --- a/app/call_center_active/call_center_exec.php +++ b/app/call_center_active/call_center_exec.php @@ -125,7 +125,6 @@ $sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "and username = '".$username."' "; $parameters['user_status'] = trim($user_status, "'"); - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php index 1ea8d52fea..9d58ab5048 100644 --- a/app/call_center_active/call_center_queue.php +++ b/app/call_center_active/call_center_queue.php @@ -62,7 +62,6 @@ $sql .= "and ".$sql_search; } $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); //paging the records @@ -77,7 +76,6 @@ $sql = str_replace('count(*)', '*', $sql); $sql .= order_by($order_by, $order); $sql .= limit_offset($rows_per_page, $offset); - $database = new database; $call_center_queues = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); diff --git a/app/call_centers/call_center_agent_edit.php b/app/call_centers/call_center_agent_edit.php index 4c985e0a26..1662815096 100644 --- a/app/call_centers/call_center_agent_edit.php +++ b/app/call_centers/call_center_agent_edit.php @@ -42,9 +42,6 @@ $language = new text; $text = $language->get(); -//connect to the database - $database = new database; - //set the defaults $agent_id = ''; $agent_name = ''; diff --git a/app/call_centers/call_center_agent_status.php b/app/call_centers/call_center_agent_status.php index 94a3e3e0a1..61fcc19beb 100644 --- a/app/call_centers/call_center_agent_status.php +++ b/app/call_centers/call_center_agent_status.php @@ -46,7 +46,6 @@ $sql = "select * from v_call_center_tiers "; $sql .= "where domain_uuid = :domain_uuid "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $tiers = $database->select($sql, $parameters, 'all'); if (!empty($_SESSION['call_center']['queue_login']['text']) && $_SESSION['call_center']['queue_login']['text'] == 'dynamic') { $per_queue_login = true; @@ -64,7 +63,6 @@ $sql .= "where domain_uuid = :domain_uuid "; $sql .= "order by agent_name asc "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $agents = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); @@ -86,7 +84,6 @@ $sql .= "and q.domain_uuid = d.domain_uuid "; $sql .= "order by queue_name asc "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $call_center_queues = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); //view_array($call_center_queues, false); @@ -175,11 +172,8 @@ $p = permissions::new(); $p->add('user_edit', 'temp'); - $database = new database; - $database->app_name = 'call_centers'; - $database->app_uuid = '95788e50-9500-079e-2807-fd530b0ea370'; $database->save($array); - $response = $database->message; + //$response = $database->message; unset($array); $p->delete('user_edit', 'temp'); @@ -273,7 +267,6 @@ $sql .= "and call_center_agent_uuid = :call_center_agent_uuid "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['call_center_agent_uuid'] = $row['agent_uuid']; - $database = new database; $agent_name = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); diff --git a/app/call_centers/call_center_agents.php b/app/call_centers/call_center_agents.php index d030d7e1ee..3005a8f165 100644 --- a/app/call_centers/call_center_agents.php +++ b/app/call_centers/call_center_agents.php @@ -91,7 +91,6 @@ $sql .= ") "; $parameters['search'] = '%'.strtolower($search).'%'; } - $database = new database; $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare to page the results @@ -124,7 +123,6 @@ } $sql .= order_by($order_by, $order, 'agent_name', 'asc'); $sql .= limit_offset($rows_per_page, $offset); - $database = new database; $result = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters); @@ -256,7 +254,6 @@ $sql = "select gateway from v_gateways "; $sql .= "where gateway_uuid = :gateway_uuid "; $parameters['gateway_uuid'] = $bridge_statement[2]; - $database = new database; $result = $database->select($sql, $parameters ?? null, 'all'); if (count($result) > 0) { $gateway_name = $result[0]['gateway']; diff --git a/app/call_centers/call_center_queues.php b/app/call_centers/call_center_queues.php index 4ecc590e3d..f45ee1c477 100644 --- a/app/call_centers/call_center_queues.php +++ b/app/call_centers/call_center_queues.php @@ -101,7 +101,6 @@ if (!empty($sql_search)) { $sql .= "and ".$sql_search; } - $database = new database; $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare to page the results @@ -120,7 +119,6 @@ $sql = str_replace('count(*)', '*', $sql ?? ''); $sql .= order_by($order_by, $order, 'queue_name', 'asc', $sort); $sql .= limit_offset($rows_per_page, $offset); - $database = new database; $result = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters); diff --git a/app/call_centers/cmd.php b/app/call_centers/cmd.php index a1782ee9ff..573a3d543c 100644 --- a/app/call_centers/cmd.php +++ b/app/call_centers/cmd.php @@ -65,7 +65,6 @@ $sql .= "and call_center_queue_uuid = :call_center_queue_uuid "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['call_center_queue_uuid'] = $call_center_queue_uuid; - $database = new database; $queue_extension = $database->select($sql, $parameters, 'column'); unset($sql, $parameters); } diff --git a/app/call_centers/resources/dashboard/call_center_agents.php b/app/call_centers/resources/dashboard/call_center_agents.php index 2541e19ca2..7e97ca5681 100644 --- a/app/call_centers/resources/dashboard/call_center_agents.php +++ b/app/call_centers/resources/dashboard/call_center_agents.php @@ -45,11 +45,6 @@ $order_by = $_GET["order_by"] ?? null; $order = $_GET["order"] ?? null; -//connect to the database - if (!isset($database)) { - $database = new database; - } - //setup the event socket connection $esl = event_socket::create(); diff --git a/app/call_centers/resources/jobs/call_center_agents.php b/app/call_centers/resources/jobs/call_center_agents.php index ec83d3f9b4..6baa51da1a 100644 --- a/app/call_centers/resources/jobs/call_center_agents.php +++ b/app/call_centers/resources/jobs/call_center_agents.php @@ -43,8 +43,6 @@ $sql .= "from v_call_center_agents as a, v_domains as d \n"; $sql .= "where a.domain_uuid = d.domain_uuid \n"; $sql .= "order by agent_name asc \n"; - //echo $sql; - $database = new database; $agents = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php index c1c32b6b40..0123a17d51 100644 --- a/app/call_flows/call_flow_edit.php +++ b/app/call_flows/call_flow_edit.php @@ -242,9 +242,6 @@ $p->add("dialplan_edit", "temp"); //save to the data - $database = new database; - $database->app_name = 'call_flows'; - $database->app_uuid = 'b1b70f85-6b42-429b-8c5a-60c8b02b7d14'; if (!empty($call_flow_uuid)) { $database->uuid($call_flow_uuid); } @@ -317,7 +314,6 @@ $sql .= "and call_flow_uuid = :call_flow_uuid "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['call_flow_uuid'] = $call_flow_uuid; - $database = new database; $result = $database->select($sql, $parameters, 'all'); foreach ($result as $row) { //set the php variables diff --git a/app/call_forward/call_forward.php b/app/call_forward/call_forward.php index a0c63949c3..0941e45474 100644 --- a/app/call_forward/call_forward.php +++ b/app/call_forward/call_forward.php @@ -123,7 +123,6 @@ $sql .= "and extension = 'disabled' "; } } - $database = new database; $num_rows = $database->select($sql, $parameters ?? null, 'column'); unset($parameters); @@ -190,7 +189,6 @@ } $sql .= order_by($order_by, $order, 'extension', 'asc', $sort); $sql .= limit_offset($rows_per_page, $offset); - $database = new database; $extensions = $database->select($sql, $parameters ?? null, 'all'); unset($parameters); @@ -353,7 +351,6 @@ // $sql .= "and domain_uuid = :domain_uuid "; // $parameters['follow_me_uuid'] = $row['follow_me_uuid']; // $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - // $database = new database; // $follow_me_destination_count = $database->select($sql, $parameters, 'column'); // $button_label = $follow_me_destination_count ? $text['label-enabled'].' ('.$follow_me_destination_count.')' : $text['label-invalid']; // unset($sql, $parameters); @@ -376,7 +373,6 @@ $sql .= "and domain_uuid = :domain_uuid "; $parameters['follow_me_uuid'] = $row['follow_me_uuid']; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $follow_me_destination_count = $database->select($sql, $parameters ?? null, 'column'); unset($sql, $parameters); } diff --git a/app/call_forward/resources/dashboard/call_forward.php b/app/call_forward/resources/dashboard/call_forward.php index 6d88229ac2..2888b7e13e 100644 --- a/app/call_forward/resources/dashboard/call_forward.php +++ b/app/call_forward/resources/dashboard/call_forward.php @@ -13,11 +13,6 @@ exit; } -//connect to the database - if (!isset($database)) { - $database = new database; - } - //add multi-lingual support $language = new text; $text = $language->get($_SESSION['domain']['language']['code'], 'app/call_forward'); @@ -70,7 +65,6 @@ } } $sql .= order_by($order_by ?? null, $order ?? null, 'extension', 'asc'); - $database = new database; $extensions = $database->select($sql, $parameters, 'all'); unset($parameters); @@ -229,7 +223,6 @@ $sql .= "and domain_uuid = :domain_uuid "; $parameters['follow_me_uuid'] = $row['follow_me_uuid']; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $follow_me_destination_count = $database->select($sql, $parameters, 'column'); unset($sql, $parameters); } diff --git a/app/call_forward/resources/jobs/dnd.php b/app/call_forward/resources/jobs/dnd.php index f8cd0cc2db..7ffda04a01 100644 --- a/app/call_forward/resources/jobs/dnd.php +++ b/app/call_forward/resources/jobs/dnd.php @@ -51,7 +51,6 @@ $sql .= "where do_not_disturb = 'true' "; $sql .= "and e.domain_uuid = d.domain_uuid "; $sql .= "and enabled = 'true' "; - $database = new database; $results = $database->select($sql, $parameters, 'all'); unset($parameters); foreach ($results as $row) { diff --git a/app/call_recordings/call_recordings.php b/app/call_recordings/call_recordings.php index 31d0d1e1ce..2d518c931f 100644 --- a/app/call_recordings/call_recordings.php +++ b/app/call_recordings/call_recordings.php @@ -38,9 +38,6 @@ exit; } -//create the database connection - $database = new database; - //add multi-lingual support $language = new text; $text = $language->get(); diff --git a/app/call_recordings/waveform.php b/app/call_recordings/waveform.php index f7cba04c2b..0f9127f645 100644 --- a/app/call_recordings/waveform.php +++ b/app/call_recordings/waveform.php @@ -50,7 +50,6 @@ $sql .= "from view_call_recordings "; $sql .= "where call_recording_uuid = :call_recording_uuid "; $parameters['call_recording_uuid'] = $_GET['id']; - $database = new database; $row = $database->select($sql, $parameters, 'row'); if (is_array($row) && @sizeof($row) != 0) { $call_recording_name = $row['call_recording_name']; diff --git a/app/calls_active/calls_active.php b/app/calls_active/calls_active.php index 39a85d0915..f9bf5b7ec7 100644 --- a/app/calls_active/calls_active.php +++ b/app/calls_active/calls_active.php @@ -51,7 +51,6 @@ //load gateways into a session variable $sql = "select gateway_uuid, domain_uuid, gateway from v_gateways where enabled = 'true' "; - $database = new database; $gateways = $database->select($sql, $parameters ?? null, 'all'); foreach ($gateways as $row) { $_SESSION['gateways'][$row['gateway_uuid']] = $row['gateway']; diff --git a/app/click_to_call/click_to_call.php b/app/click_to_call/click_to_call.php index 644ad7e805..b130461633 100644 --- a/app/click_to_call/click_to_call.php +++ b/app/click_to_call/click_to_call.php @@ -175,7 +175,6 @@ $sql = "select outbound_caller_id_name, outbound_caller_id_number from v_extensions where domain_uuid = :domain_uuid and extension = :src "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['src'] = $src; - $database = new database; $result = $database->select($sql, $parameters, 'all'); foreach ($result as $row) { $dest_cid_name = $row["outbound_caller_id_name"]; diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php index 439e982353..06477d4ff7 100644 --- a/app/conference_centers/conference_center_edit.php +++ b/app/conference_centers/conference_center_edit.php @@ -37,9 +37,6 @@ exit; } -//connect to the database - $database = new database; - //add multi-lingual support $language = new text; $text = $language->get(); diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index 9e09ae690e..afa55814b8 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -38,9 +38,6 @@ exit; } -//connect to the database - $database = new database; - //add multi-lingual support $language = new text; $text = $language->get(); diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index dd34741dba..1972c520b1 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -38,9 +38,6 @@ exit; } -//connect to the database - $database = new database; - //add multi-lingual support $language = new text; $text = $language->get(); diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index d4946085cc..e2df6a8e87 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -38,9 +38,6 @@ exit; } -//connect to the database - $database = new database; - //add multi-lingual support $language = new text; $text = $language->get(); diff --git a/app/conference_centers/conference_session_details.php b/app/conference_centers/conference_session_details.php index e2785af7f9..941a5dd46e 100644 --- a/app/conference_centers/conference_session_details.php +++ b/app/conference_centers/conference_session_details.php @@ -37,9 +37,6 @@ exit; } -//connect to the database - $database = new database; - //add multi-lingual support $language = new text; $text = $language->get(); diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php index 584649dea5..345fc049a3 100644 --- a/app/conference_centers/conference_sessions.php +++ b/app/conference_centers/conference_sessions.php @@ -38,9 +38,6 @@ exit; } -//connect to the database - $database = new database; - //add multi-lingual support $language = new text; $text = $language->get(); diff --git a/app/conference_controls/conference_control_detail_edit.php b/app/conference_controls/conference_control_detail_edit.php index 0cd8f21353..be51a5dc79 100644 --- a/app/conference_controls/conference_control_detail_edit.php +++ b/app/conference_controls/conference_control_detail_edit.php @@ -123,9 +123,6 @@ } if (is_uuid($array['conference_control_details'][0]['conference_control_detail_uuid'])) { - $database = new database; - $database->app_name = 'conference_controls'; - $database->app_uuid = 'e1ad84a2-79e1-450c-a5b1-7507a043e048'; $database->save($array); unset($array); } @@ -144,7 +141,6 @@ //$sql .= "and domain_uuid = :domain_uuid "; $parameters['conference_control_detail_uuid'] = $conference_control_detail_uuid; //$parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $row = $database->select($sql, $parameters ?? null, 'row'); if (!empty($row)) { $control_digits = $row["control_digits"]; diff --git a/app/conference_controls/conference_controls.php b/app/conference_controls/conference_controls.php index c88adb2667..cfb29d8969 100644 --- a/app/conference_controls/conference_controls.php +++ b/app/conference_controls/conference_controls.php @@ -96,7 +96,6 @@ //get the count $sql = "select count(conference_control_uuid) from v_conference_controls "; $sql .= $sql_search ?? ''; - $database = new database; $num_rows = $database->select($sql, $parameters ?? null, 'column'); unset($sql); @@ -118,7 +117,6 @@ $sql .= $sql_search ?? ''; $sql .= order_by($order_by, $order, 'control_name', 'asc'); $sql .= limit_offset($rows_per_page, $offset); - $database = new database; $conference_controls = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters); diff --git a/app/conference_profiles/conference_profile_edit.php b/app/conference_profiles/conference_profile_edit.php index 2f7f90b33f..55ecddb611 100644 --- a/app/conference_profiles/conference_profile_edit.php +++ b/app/conference_profiles/conference_profile_edit.php @@ -113,9 +113,6 @@ } if (is_uuid($array['conference_profiles'][0]['conference_profile_uuid'])) { - $database = new database; - $database->app_name = 'conference_profiles'; - $database->app_uuid = 'c33e2c2a-847f-44c1-8c0d-310df5d65ba9'; $database->save($array); unset($array); } @@ -138,7 +135,6 @@ //$sql .= "and domain_uuid = :domain_uuid "; $parameters['conference_profile_uuid'] = $conference_profile_uuid; //$parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $row = $database->select($sql, $parameters, 'row'); if (!empty($row)) { $profile_name = $row["profile_name"]; diff --git a/app/conference_profiles/conference_profiles.php b/app/conference_profiles/conference_profiles.php index c9c9e811ef..bd7eb83509 100644 --- a/app/conference_profiles/conference_profiles.php +++ b/app/conference_profiles/conference_profiles.php @@ -100,7 +100,6 @@ if (isset($sql_search)) { $sql .= "where ".$sql_search; } - $database = new database; $num_rows = $database->select($sql, $parameters ?? null, 'column'); unset($sql); @@ -116,7 +115,6 @@ } $sql .= order_by($order_by, $order, 'profile_name', 'asc'); $sql .= limit_offset($rows_per_page ?? '', $offset ?? ''); - $database = new database; $conference_profiles = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters); diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index 4f4729551f..1b0f353c69 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -98,9 +98,6 @@ $array['conference_users'][0]['conference_uuid'] = $conference_uuid; $array['conference_users'][0]['user_uuid'] = $user_uuid; - $database = new database; - $database->app_name = 'conferences'; - $database->app_uuid = 'b81412e8-7253-91f4-e48e-42fc2c9a38d9'; $database->delete($array); $response = $database->message; unset($array); @@ -127,9 +124,6 @@ $p = permissions::new(); $p->add('conference_user_add', 'temp'); - $database = new database; - $database->app_name = 'conferences'; - $database->app_uuid = 'b81412e8-7253-91f4-e48e-42fc2c9a38d9'; $database->save($array); $response = $database->message; unset($array); @@ -243,9 +237,6 @@ $p->add('dialplan_add', 'temp'); $p->add('dialplan_edit', 'temp'); - $database = new database; - $database->app_name = 'conferences'; - $database->app_uuid = 'b81412e8-7253-91f4-e48e-42fc2c9a38d9'; $database->save($array); $response = $database->message; unset($array); @@ -259,7 +250,6 @@ //$sql .= "and domain_uuid = :domain_uuid "; //$parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['dialplan_uuid'] = $dialplan_uuid; - $database = new database; $database->execute($sql, $parameters ?? null); unset($sql, $parameters); @@ -306,7 +296,6 @@ $sql .= "and conference_uuid = :conference_uuid "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['conference_uuid'] = $conference_uuid; - $database = new database; $row = $database->select($sql, $parameters ?? null, 'row'); if (!empty($row)) { $dialplan_uuid = $row["dialplan_uuid"]; @@ -334,7 +323,6 @@ $sql .= "from v_conference_profiles "; $sql .= "where profile_enabled = 'true' "; $sql .= "and profile_name <> 'sla' "; - $database = new database; $conference_profiles = $database->select($sql, null, 'all'); unset($sql); @@ -346,7 +334,6 @@ $sql .= "and e.conference_uuid = :conference_uuid "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['conference_uuid'] = $conference_uuid ?? null; - $database = new database; $conference_users = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters); @@ -355,7 +342,6 @@ $sql .= "where domain_uuid = :domain_uuid "; $sql .= "and user_enabled = true "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $users = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters); diff --git a/app/conferences_active/conference_exec.php b/app/conferences_active/conference_exec.php index 449ee70371..5e694e1d0c 100644 --- a/app/conferences_active/conference_exec.php +++ b/app/conferences_active/conference_exec.php @@ -82,7 +82,6 @@ $sql .= "and conference_extension = :conference_extension "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['conference_extension'] = $name; - $database = new database; $name = $database->select($sql, $parameters, 'column'); unset ($parameters, $sql); } diff --git a/app/conferences_active/conferences_active_inc.php b/app/conferences_active/conferences_active_inc.php index ddf8bf9058..96cdd52100 100644 --- a/app/conferences_active/conferences_active_inc.php +++ b/app/conferences_active/conferences_active_inc.php @@ -100,7 +100,6 @@ $sql .= "left join v_conference_centers as cc on cr.conference_center_uuid = cc.conference_center_uuid "; $sql .= "where cr.conference_room_uuid = :conference_room_uuid "; $parameters['conference_room_uuid'] = $conference_uuid; - $database = new database; $conference = $database->select($sql, $parameters, 'row'); $conference_name = $conference['conference_room_name']; $conference_extension = $conference['conference_center_extension']; @@ -120,7 +119,6 @@ $sql .= "and conference_extension = :conference_extension "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['conference_extension'] = $name_array[0]; - $database = new database; $conference = $database->select($sql, $parameters, 'row'); $conference_name = $conference['conference_name']; $conference_extension = $conference['conference_extension']; diff --git a/app/database_transactions/database_transaction_edit.php b/app/database_transactions/database_transaction_edit.php index 560a559ef8..7b52094668 100644 --- a/app/database_transactions/database_transaction_edit.php +++ b/app/database_transactions/database_transaction_edit.php @@ -75,7 +75,6 @@ $sql .= "and t.database_transaction_uuid = :database_transaction_uuid "; $parameters['domain_uuid'] = $domain_uuid; $parameters['database_transaction_uuid'] = $database_transaction_uuid; - $database = new database; $row = $database->select($sql, $parameters, 'row'); if (!empty($row)) { @@ -101,11 +100,8 @@ $array = json_decode($transaction_old, true); //save to the data - $database = new database; - $database->app_name = $app_name; - $database->app_uuid = $app_uuid; $database->save($array); - $message = $database->message; + //$message = $database->message; //redirect the user $_SESSION["message"] = $text['message-update']; diff --git a/app/database_transactions/database_transactions.php b/app/database_transactions/database_transactions.php index b68b5e227a..59dd56043b 100644 --- a/app/database_transactions/database_transactions.php +++ b/app/database_transactions/database_transactions.php @@ -86,7 +86,6 @@ $parameters['search'] = '%'.$search.'%'; }; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); unset($parameters); @@ -126,7 +125,6 @@ $parameters['domain_uuid'] = $_SESSION['domain_uuid']; $sql .= order_by($order_by, $order, 't.transaction_date', 'desc'); $sql .= limit_offset($rows_per_page, $offset); - $database = new database; $transactions = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); @@ -135,7 +133,6 @@ $sql .= "where domain_uuid = :domain_uuid "; $sql .= "order by username "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $rows = $database->select($sql, $parameters, 'all'); if (!empty($rows)) { foreach ($rows as $row) { diff --git a/app/destinations/destination_download.php b/app/destinations/destination_download.php index 545f998d97..8bd5e8d8bc 100644 --- a/app/destinations/destination_download.php +++ b/app/destinations/destination_download.php @@ -128,7 +128,6 @@ $sql = "select ".implode(', ', $selected_columns)." from v_destinations "; $sql .= "where domain_uuid = :domain_uuid "; $parameters['domain_uuid'] = $domain_uuid; - $database = new database; $destinations = $database->select($sql, $parameters, 'all'); unset($sql, $parameters, $selected_columns); diff --git a/app/destinations/destination_imports.php b/app/destinations/destination_imports.php index 8b34d84099..1487f01975 100644 --- a/app/destinations/destination_imports.php +++ b/app/destinations/destination_imports.php @@ -489,9 +489,6 @@ if ($row_id === 1000) { //save to the data - $database = new database; - $database->app_name = 'destinations'; - $database->app_uuid = '5ec89622-b19c-3559-64f0-afde802ab139'; $database->save($array); //$message = $database->message; @@ -510,11 +507,8 @@ //save to the data if (!empty($array) && is_array($array)) { - $database = new database; - $database->app_name = 'destinations'; - $database->app_uuid = '5ec89622-b19c-3559-64f0-afde802ab139'; $database->save($array); - $message = $database->message; + //$message = $database->message; } } @@ -608,7 +602,6 @@ $sql .= "and destination_number = :destination_number; "; $parameters['domain_uuid'] = $domain_uuid; $parameters['destination_number'] = $destination_number; - $database = new database; $destinations = $database->select($sql, $parameters, 'all'); $row = $destinations[0]; unset($sql, $parameters); @@ -636,14 +629,12 @@ $sql = "delete from v_dialplan_details "; $sql .= "where dialplan_uuid = :dialplan_uuid "; $parameters['dialplan_uuid'] = $row['dialplan_uuid']; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); $sql = "delete from v_dialplans "; $sql .= "where dialplan_uuid = :dialplan_uuid "; $parameters['dialplan_uuid'] = $row['dialplan_uuid']; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } @@ -653,7 +644,6 @@ $sql = "delete from v_destinations "; $sql .= "where destination_uuid = :destination_uuid "; $parameters['destination_uuid'] = $row['destination_uuid']; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } @@ -679,14 +669,12 @@ $sql = "delete from v_dialplan_details "; $sql .= "where dialplan_uuid = :dialplan_uuid "; $parameters['dialplan_uuid'] = $row['dialplan_uuid']; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); $sql = "delete from v_dialplans "; $sql .= "where dialplan_uuid = :dialplan_uuid "; $parameters['dialplan_uuid'] = $row['dialplan_uuid']; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } @@ -696,7 +684,6 @@ $sql = "delete from v_destinations "; $sql .= "where destination_uuid = :destination_uuid "; $parameters['destination_uuid'] = $row['destination_uuid']; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } diff --git a/app/devices/cmd.php b/app/devices/cmd.php index e4467fb3f5..e3daf6d0e9 100644 --- a/app/devices/cmd.php +++ b/app/devices/cmd.php @@ -54,7 +54,6 @@ $sql .= "and extension = :extension "; $parameters['extension'] = $user; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; - $database = new database; $row = $database->select($sql, $parameters, 'row'); if (is_array($row)) { $domain_name = $row['domain_name']; diff --git a/app/devices/device_copy.php b/app/devices/device_copy.php index a467de98a1..08c4051e61 100644 --- a/app/devices/device_copy.php +++ b/app/devices/device_copy.php @@ -59,7 +59,6 @@ $sql = "select count(*) from v_devices "; $sql .= "where device_address = :device_address "; $parameters['device_address'] = $device_address; - $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); if ($num_rows == 0) { $save = true; @@ -75,7 +74,6 @@ $sql = "select * from v_devices "; $sql .= "where device_uuid = :device_uuid "; $parameters['device_uuid'] = $device_uuid; - $database = new database; $devices = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); @@ -84,7 +82,6 @@ $sql .= "where device_uuid = :device_uuid "; $sql .= "order by line_number asc "; $parameters['device_uuid'] = $device_uuid; - $database = new database; $device_lines = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); @@ -100,7 +97,6 @@ $sql .= "else 100 END, "; $sql .= "cast(device_key_id as int) asc "; $parameters['device_uuid'] = $device_uuid; - $database = new database; $device_keys = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); @@ -109,7 +105,6 @@ $sql .= "where device_uuid = :device_uuid "; $sql .= "order by device_setting_subcategory asc "; $parameters['device_uuid'] = $device_uuid; - $database = new database; $device_settings = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); @@ -169,11 +164,8 @@ //copy the device if ($save) { - $database = new database; - $database->app_name = 'devices'; - $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->save($array); - $response = $database->message; + //$response = $database->message; message::add($text['message-copy']); } diff --git a/app/devices/device_imports.php b/app/devices/device_imports.php index e8d6ba4193..78baaabd4c 100644 --- a/app/devices/device_imports.php +++ b/app/devices/device_imports.php @@ -253,11 +253,6 @@ //set the domain_uuid $domain_uuid = $_SESSION['domain_uuid']; - //open the database - $database = new database; - $database->app_name = 'devices'; - $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; - //get the users $sql = "select * from v_users where domain_uuid = :domain_uuid "; $parameters['domain_uuid'] = $domain_uuid; diff --git a/app/devices/device_profile_copy.php b/app/devices/device_profile_copy.php index 679338da6e..e5b50e3f49 100644 --- a/app/devices/device_profile_copy.php +++ b/app/devices/device_profile_copy.php @@ -50,7 +50,6 @@ $sql = "select * from v_device_profiles "; $sql .= "where device_profile_uuid = :device_profile_uuid "; $parameters['device_profile_uuid'] = $device_profile_uuid; - $database = new database; $device_profiles = $database->select($sql, $parameters); unset($sql, $parameters); @@ -66,7 +65,6 @@ $sql .= "else 100 end, "; $sql .= "profile_key_id asc "; $parameters['device_profile_uuid'] = $device_profile_uuid; - $database = new database; $device_profile_keys = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); @@ -75,7 +73,6 @@ $sql .= "where device_profile_uuid = :device_profile_uuid "; $sql .= "order by profile_setting_name asc "; $parameters['device_profile_uuid'] = $device_profile_uuid; - $database = new database; $device_profile_settings = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); @@ -117,9 +114,6 @@ } //copy the device - $database = new database; - $database->app_name = 'devices'; - $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->save($array); unset($array); diff --git a/app/devices/device_vendor_edit.php b/app/devices/device_vendor_edit.php index fac508cd84..10a9cccfef 100644 --- a/app/devices/device_vendor_edit.php +++ b/app/devices/device_vendor_edit.php @@ -107,9 +107,6 @@ $array['device_vendors'][0]['enabled'] = $enabled; $array['device_vendors'][0]['description'] = $description; - $database = new database; - $database->app_name = 'devices'; - $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->save($array); unset($array); @@ -130,7 +127,6 @@ $sql .= "from v_device_vendors "; $sql .= "where device_vendor_uuid = :device_vendor_uuid "; $parameters['device_vendor_uuid'] = $device_vendor_uuid; - $database = new database; $row = $database->select($sql, $parameters, 'row'); if (is_array($row) && @sizeof($row) != 0) { $name = $row["name"]; diff --git a/app/devices/device_vendor_function_edit.php b/app/devices/device_vendor_function_edit.php index d6a81c48f9..32d0fa3e63 100644 --- a/app/devices/device_vendor_function_edit.php +++ b/app/devices/device_vendor_function_edit.php @@ -87,9 +87,6 @@ //delete the device vendor function group $array['device_vendor_function_groups'][0]['device_vendor_function_group_uuid'] = $device_vendor_function_group_uuid; - $database = new database; - $database->app_name = 'devices'; - $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->delete($array); unset($array); diff --git a/app/devices/device_vendor_functions.php b/app/devices/device_vendor_functions.php index 80e08c5fc7..a9a7cbe099 100644 --- a/app/devices/device_vendor_functions.php +++ b/app/devices/device_vendor_functions.php @@ -92,7 +92,6 @@ $parameters['search'] = '%'.$search.'%'; } $parameters['device_vendor_uuid'] = $device_vendor_uuid; - $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); unset($sql, $parameters); @@ -131,7 +130,6 @@ $parameters['device_vendor_uuid'] = $device_vendor_uuid; $sql .= order_by($order_by, $order, 'type', 'asc'); $sql .= limit_offset($rows_per_page, $offset ?? null); - $database = new database; $vendor_functions = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); @@ -209,7 +207,6 @@ $sql .= "g.group_name asc "; $parameters['device_vendor_uuid'] = $device_vendor_uuid; $parameters['device_vendor_function_uuid'] = $row['device_vendor_function_uuid']; - $database = new database; $vendor_function_groups = $database->select($sql, $parameters, 'all'); unset($sql, $parameters); unset($group_list); diff --git a/app/devices/device_vendor_restore.php b/app/devices/device_vendor_restore.php index 2a40b1c475..f00a160c71 100644 --- a/app/devices/device_vendor_restore.php +++ b/app/devices/device_vendor_restore.php @@ -44,23 +44,19 @@ //flush everything $sql = "delete from v_device_vendors"; - $database = new database; $database->execute($sql); unset($sql); $sql = "delete from v_device_vendor_functions"; - $database = new database; $database->execute($sql); unset($sql); $sql = "delete from v_device_vendor_function_groups"; - $database = new database; $database->execute($sql); unset($sql); //add device vendor functions to the database $sql = "select count(*) from v_device_vendors; "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); unset($sql); @@ -72,7 +68,6 @@ //get the groups and create an array to use the name to get the uuid $sql = "select * from v_groups "; - $database = new database; $groups = $database->select($sql, null, 'all'); if (is_array($groups) && @sizeof($groups) != 0) { foreach ($groups as $row) { @@ -135,9 +130,6 @@ $p->add('device_vendor_function_group_add', 'temp'); //process array - $database = new database; - $database->app_name = 'devices'; - $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->save($array); unset($array); diff --git a/app/devices/device_vendors.php b/app/devices/device_vendors.php index 633ef35861..117ce46ddf 100644 --- a/app/devices/device_vendors.php +++ b/app/devices/device_vendors.php @@ -87,7 +87,6 @@ $sql .= ")"; $parameters['search'] = '%'.$search.'%'; } - $database = new database; $num_rows = $database->select($sql, $parameters ?? null, 'column'); //prepare to page the results @@ -116,7 +115,6 @@ } $sql .= order_by($order_by, $order, 'name', 'asc'); $sql .= limit_offset($rows_per_page, $offset); - $database = new database; $result = $database->select($sql, $parameters ?? null, 'all'); unset($sql, $parameters); diff --git a/app/devices/resources/dashboard/device_keys.php b/app/devices/resources/dashboard/device_keys.php index 58f0654a0d..d5e699e54a 100644 --- a/app/devices/resources/dashboard/device_keys.php +++ b/app/devices/resources/dashboard/device_keys.php @@ -30,11 +30,6 @@ $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.type, f.value "; $sql .= "from v_device_vendors as v, v_device_vendor_functions as f "; diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php index 2035c769df..3bcf1b3eec 100644 --- a/app/dialplan_inbound/dialplan_inbound_add.php +++ b/app/dialplan_inbound/dialplan_inbound_add.php @@ -99,7 +99,6 @@ $sql .= "and destination_uuid = :destination_uuid "; $parameters['domain_uuid'] = $domain_uuid; $parameters['destination_uuid'] = $destination_uuid; - $database = new database; $row = $database->select($sql, $parameters, 'row'); if (is_array($row) && @sizeof($row) != 0) { $destination_number = $row["destination_number"]; @@ -266,7 +265,6 @@ $sql .= "and fax_uuid = :fax_uuid "; $parameters['domain_uuid'] = $domain_uuid; $parameters['fax_uuid'] = $fax_uuid; - $database = new database; $row = $database->select($sql, $parameters, 'row'); if (is_array($row) && @sizeof($row) != 0) { $fax_extension = $row["fax_extension"]; @@ -407,11 +405,8 @@ } //save the data - $database = new database; - $database->app_name = 'inbound_routes'; - $database->app_uuid = $app_uuid; $database->save($array); - $message = $database->message; + //$message = $database->message; unset($array); //remove temp permission, if exists @@ -676,7 +671,6 @@ $sql .= "and destination_type = 'inbound' "; $sql .= "order by destination_number asc "; $parameters['domain_uuid'] = $domain_uuid; - $database = new database; $result = $database->select($sql, $parameters, 'all'); if (is_array($result) && @sizeof($result) != 0) { echo "