From cd1cc70044432b2b2ebb46f4d5d8b7a541ee9d34 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 5 Aug 2024 14:22:17 -0600 Subject: [PATCH] Remove redundant database objects This reduces database connections and improves performance. --- app/access_controls/app_defaults.php | 8 -------- app/call_block/app_defaults.php | 3 --- app/call_centers/app_defaults.php | 5 ----- app/call_flows/app_defaults.php | 1 - app/call_recordings/app_defaults.php | 2 -- app/conference_centers/app_defaults.php | 6 ------ app/conference_controls/app_defaults.php | 3 --- app/conference_profiles/app_defaults.php | 3 --- app/conferences/app_defaults.php | 2 -- app/destinations/app_defaults.php | 5 ----- app/devices/app_defaults.php | 14 -------------- app/dialplans/app_defaults.php | 9 --------- app/email_templates/app_defaults.php | 2 -- app/extensions/app_defaults.php | 6 ------ app/fax/app_defaults.php | 2 -- app/ivr_menus/app_defaults.php | 4 ---- app/modules/app_defaults.php | 2 -- app/music_on_hold/app_defaults.php | 2 -- app/phrases/app_defaults.php | 5 ----- app/provision/app_defaults.php | 1 - app/recordings/app_defaults.php | 4 ---- app/ring_groups/app_defaults.php | 3 --- app/sip_profiles/app_defaults.php | 6 ------ app/sofia_global_settings/app_defaults.php | 2 -- app/tones/app_defaults.php | 2 -- app/vars/app_defaults.php | 8 -------- app/yealink/app_defaults.php | 4 ---- core/authentication/app_defaults.php | 2 -- core/dashboard/app_defaults.php | 3 --- core/databases/app_defaults.php | 2 -- core/default_settings/app_defaults.php | 8 -------- core/domain_settings/app_defaults.php | 4 ---- core/domains/app_defaults.php | 1 - core/groups/app_defaults.php | 9 --------- core/notifications/app_defaults.php | 2 -- core/permissions/app_defaults.php | 2 -- core/software/app_defaults.php | 2 -- core/upgrade/app_defaults.php | 4 ---- core/user_settings/app_defaults.php | 3 --- core/users/app_defaults.php | 13 ------------- 40 files changed, 169 deletions(-) diff --git a/app/access_controls/app_defaults.php b/app/access_controls/app_defaults.php index 7cf90760f0..43ad0a448a 100644 --- a/app/access_controls/app_defaults.php +++ b/app/access_controls/app_defaults.php @@ -29,7 +29,6 @@ //add the access control list to the database $sql = "select count(*) from v_access_controls "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { @@ -78,7 +77,6 @@ $p = new permissions; $p->add('access_control_add', 'temp'); - $database = new database; $database->app_name = 'access_controls'; $database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd'; $database->save($array, false); @@ -111,7 +109,6 @@ $p = new permissions; $p->add('access_control_node_add', 'temp'); - $database = new database; $database->app_name = 'access_controls'; $database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd'; $database->save($array, false); @@ -133,13 +130,11 @@ //rename domains access control to providers $sql = "select count(*) from v_access_controls "; $sql .= "where access_control_name = 'domains' "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows > 0) { //update the access control name $sql = "update v_access_controls set access_control_name = 'providers' "; $sql .= "where access_control_name = 'domains' "; - $database = new database; $database->execute($sql, null); unset($sql); @@ -147,7 +142,6 @@ $sql = "update v_sip_profile_settings set sip_profile_setting_value = 'providers' "; $sql .= "where (sip_profile_setting_name = 'apply-inbound-acl' or sip_profile_setting_name = 'apply-register-acl') "; $sql .= "and sip_profile_setting_value = 'domains'; "; - $database = new database; $database->execute($sql, null); unset($sql); @@ -165,7 +159,6 @@ //rescan each sip profile $sql = "select sip_profile_name from v_sip_profiles "; $sql .= "where sip_profile_enabled = 'true'; "; - $database = new database; $sip_profiles = $database->select($sql, null, 'all'); if (is_array($sip_profiles)) { foreach ($sip_profiles as $row) { @@ -184,7 +177,6 @@ $sql .= "where access_control_uuid not in ( "; $sql .= " select access_control_uuid from v_access_controls "; $sql .= ")"; - $database = new database; $database->execute($sql, null); unset($sql); diff --git a/app/call_block/app_defaults.php b/app/call_block/app_defaults.php index df2d735093..d1ca2c7cec 100644 --- a/app/call_block/app_defaults.php +++ b/app/call_block/app_defaults.php @@ -27,7 +27,6 @@ if ($domains_processed == 1) { //create a view for call block - $database = new database; $database->execute("DROP VIEW view_call_block;", null); $sql = "CREATE VIEW view_call_block AS ( \n"; $sql .= " select c.domain_uuid, call_block_uuid, c.call_block_direction, c.extension_uuid, c.call_block_name, c.call_block_country_code, \n"; @@ -37,13 +36,11 @@ if ($domains_processed == 1) { $sql .= " left join v_extensions as e \n"; $sql .= " on c.extension_uuid = e.extension_uuid \n"; $sql .= "); \n"; - $database = new database; $database->execute($sql, null); unset($sql); //set call blocks to inbound if no direction defined $sql = "update v_call_block set call_block_direction = 'inbound' where call_block_direction is null "; - $database = new database; $database->execute($sql, null); unset($sql); diff --git a/app/call_centers/app_defaults.php b/app/call_centers/app_defaults.php index e6aa5c3aa8..74d82b1fa3 100644 --- a/app/call_centers/app_defaults.php +++ b/app/call_centers/app_defaults.php @@ -33,7 +33,6 @@ if ($domains_processed == 1) { $sql .= " WHERE d.domain_uuid = c.domain_uuid "; $sql .= ") "; $sql .= "WHERE queue_context is null; "; - $database = new database; $database->execute($sql); unset($sql); @@ -44,7 +43,6 @@ if ($domains_processed == 1) { $sql .= "from v_call_center_tiers as t, v_domains as d "; $sql .= "where t.domain_uuid = d.domain_uuid "; $sql .= "and (t.call_center_queue_uuid is null or t.call_center_agent_uuid is null) "; - $database = new database; $tiers = $database->select($sql, null, 'all'); if (!empty($tiers)) { foreach ($tiers as $index => &$row) { @@ -63,7 +61,6 @@ if ($domains_processed == 1) { $p = new permissions; $p->add('call_center_tier_edit', 'temp'); - $database = new database; $database->app_name = 'call_centers'; $database->app_uuid = '95788e50-9500-079e-2807-fd530b0ea370'; $database->save($array, false); @@ -83,7 +80,6 @@ if ($domains_processed == 1) { $sql .= "from v_call_center_queues as q, v_dialplans as dp, v_domains as d "; $sql .= "where q.domain_uuid = d.domain_uuid "; $sql .= "and (q.dialplan_uuid = dp.dialplan_uuid or q.dialplan_uuid is null) "; - $database = new database; $call_center_queues = $database->select($sql, null, 'all'); $id = 0; if (!empty($call_center_queues)) { @@ -177,7 +173,6 @@ if ($domains_processed == 1) { $p->add("dialplan_edit", "temp"); //save to the data - $database = new database; $database->app_name = 'call_centers'; $database->app_uuid = '95788e50-9500-079e-2807-fd530b0ea370'; $database->save($array, false); diff --git a/app/call_flows/app_defaults.php b/app/call_flows/app_defaults.php index 3e55ff648d..86d7938dd9 100644 --- a/app/call_flows/app_defaults.php +++ b/app/call_flows/app_defaults.php @@ -28,7 +28,6 @@ if ($domains_processed == 1) { //update the dialplan order - $database = new database; $sql = "update v_call_flows set call_flow_enabled = 'true' where call_flow_enabled is null;\n"; $database->execute($sql); unset($sql); diff --git a/app/call_recordings/app_defaults.php b/app/call_recordings/app_defaults.php index 094b6a53cb..2a8f3e7e44 100644 --- a/app/call_recordings/app_defaults.php +++ b/app/call_recordings/app_defaults.php @@ -27,7 +27,6 @@ if ($domains_processed == 1) { //create the user view combines username, organization, contact first and last name - $database = new database; $database->execute("DROP VIEW view_call_recordings;", null); $sql = "CREATE VIEW view_call_recordings AS ( \n"; $sql .= " select domain_uuid, xml_cdr_uuid as call_recording_uuid, \n"; @@ -40,7 +39,6 @@ if ($domains_processed == 1) { $sql .= " and record_path is not null \n"; $sql .= " order by start_stamp desc \n"; $sql .= "); \n"; - $database = new database; $database->execute($sql, null); unset($sql); diff --git a/app/conference_centers/app_defaults.php b/app/conference_centers/app_defaults.php index 08cf5d5e94..2da20cf057 100644 --- a/app/conference_centers/app_defaults.php +++ b/app/conference_centers/app_defaults.php @@ -30,12 +30,10 @@ if ($domains_processed == 1) { //get the conference room count $sql = "select count(*) from v_conference_rooms; "; - $database = new database; $conference_room_count = $database->select($sql, null, 'column'); //get the count of moderator and participant pins that are null $sql = "select count(*) from v_conference_rooms where moderator_pin is null and participant_pin is null; "; - $database = new database; $pin_null_count = $database->select($sql, null, 'column'); //if missing move pin numbers from meetings table to the conference rooms table @@ -50,14 +48,12 @@ if ($domains_processed == 1) { $sql .= "WHERE r.meeting_uuid = m.meeting_uuid "; $sql .= " ) AS subquery "; $sql .= "WHERE v_conference_rooms.conference_room_uuid = subquery.conference_room_uuid; "; - $database = new database; $database->execute($sql); unset($sql); } //get the count of moderator and participant pins that are null $sql = "select count(*) from v_conference_room_users; "; - $database = new database; $conference_room_user_count = $database->select($sql, null, 'column'); //check if meeting_users table exists @@ -66,7 +62,6 @@ if ($domains_processed == 1) { //count the meeting users table if ($table_exists) { $sql = "select count(*) from v_meeting_users; "; - $database = new database; $meeting_user_count = $database->select($sql, null, 'column'); } @@ -78,7 +73,6 @@ if ($domains_processed == 1) { $sql .= "SELECT r.domain_uuid, m.meeting_user_uuid as conference_room_user_uuid, r.conference_room_uuid, m.user_uuid "; $sql .= "FROM v_conference_rooms as r, v_meeting_users as m "; $sql .= "WHERE r.meeting_uuid = m.meeting_uuid; "; - $database = new database; $database->execute($sql); unset($sql); } diff --git a/app/conference_controls/app_defaults.php b/app/conference_controls/app_defaults.php index 3fbe2544db..6c0f1c0a0d 100644 --- a/app/conference_controls/app_defaults.php +++ b/app/conference_controls/app_defaults.php @@ -28,7 +28,6 @@ //add the conference controls list to the database $sql = "select count(*) from v_conference_controls; "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { @@ -69,7 +68,6 @@ $p = new permissions; $p->add('conference_control_add', 'temp'); - $database = new database; $database->app_name = 'conference_controls'; $database->app_uuid = 'e1ad84a2-79e1-450c-a5b1-7507a043e048'; $database->save($array); @@ -101,7 +99,6 @@ $p = new permissions; $p->add('conference_control_detail_add', 'temp'); - $database = new database; $database->app_name = 'conference_controls'; $database->app_uuid = 'e1ad84a2-79e1-450c-a5b1-7507a043e048'; $database->save($array); diff --git a/app/conference_profiles/app_defaults.php b/app/conference_profiles/app_defaults.php index 33f2ae52ce..2ed206bdab 100644 --- a/app/conference_profiles/app_defaults.php +++ b/app/conference_profiles/app_defaults.php @@ -28,7 +28,6 @@ //add the music_on_hold list to the database $sql = "select count(*) from v_conference_profiles; "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { @@ -69,7 +68,6 @@ $p = new permissions; $p->add('conference_profile_add', 'temp'); - $database = new database; $database->app_name = 'conference_profiles'; $database->app_uuid = 'c33e2c2a-847f-44c1-8c0d-310df5d65ba9'; $database->save($array, false); @@ -96,7 +94,6 @@ $p = new permissions; $p->add('conference_profile_param_add', 'temp'); - $database = new database; $database->app_name = 'conference_profiles'; $database->app_uuid = 'c33e2c2a-847f-44c1-8c0d-310df5d65ba9'; $database->save($array, false); diff --git a/app/conferences/app_defaults.php b/app/conferences/app_defaults.php index de3f24d1e1..ebd1982792 100644 --- a/app/conferences/app_defaults.php +++ b/app/conferences/app_defaults.php @@ -6,7 +6,6 @@ if ($domains_processed == 1) { $sql = "update v_dialplan_details "; $sql .= "set dialplan_detail_data = replace(dialplan_detail_data, '-','@') "; $sql .= "where dialplan_detail_type = 'conference' and dialplan_detail_data like '%-%';"; - $database = new database; $database->execute($sql); unset($sql); @@ -17,7 +16,6 @@ if ($domains_processed == 1) { $sql .= " WHERE d.domain_uuid = c.domain_uuid "; $sql .= ") "; $sql .= "WHERE conference_context is null; "; - $database = new database; $database->execute($sql); unset($sql); diff --git a/app/destinations/app_defaults.php b/app/destinations/app_defaults.php index 3a39e1d0b7..7c12382a94 100644 --- a/app/destinations/app_defaults.php +++ b/app/destinations/app_defaults.php @@ -33,7 +33,6 @@ if ($domains_processed == 1) { $sql .= "and dialplan_detail_tag = 'action'\n"; $sql .= "and (dialplan_detail_type = 'transfer' or dialplan_detail_type = 'bridge')\n"; $sql .= "order by dialplan_detail_order;\n"; - $database = new database; $extensions = $database->select($sql, null, 'all'); unset($sql); @@ -45,7 +44,6 @@ if ($domains_processed == 1) { $parameters['destination_app'] = $row['destination_app']; $parameters['destination_data'] = $row['destination_data']; $parameters['dialplan_uuid'] = $row['dialplan_uuid']; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } @@ -55,7 +53,6 @@ if ($domains_processed == 1) { //use destinations actions to $sql = "select * from v_destinations "; $sql .= "where destination_actions is null "; - $database = new database; $destinations = $database->select($sql, null, 'all'); if (is_array($destinations)) { //pre-set the numbers @@ -90,7 +87,6 @@ if ($domains_processed == 1) { $p->add('destination_edit', 'temp'); //create the database object and save the data - $database = new database; $database->app_name = 'destinations'; $database->app_uuid = '5ec89622-b19c-3559-64f0-afde802ab139'; $database->save($array, false); @@ -117,7 +113,6 @@ if ($domains_processed == 1) { $p->add('destination_edit', 'temp'); //create the database object and save the data - $database = new database; $database->app_name = 'destinations'; $database->app_uuid = '5ec89622-b19c-3559-64f0-afde802ab139'; $database->save($array, false); diff --git a/app/devices/app_defaults.php b/app/devices/app_defaults.php index 8c34f99747..00f24b50d9 100644 --- a/app/devices/app_defaults.php +++ b/app/devices/app_defaults.php @@ -28,14 +28,12 @@ if ($domains_processed == 1) { //set all lines to enabled (true) where null or empty string $sql = "select device_line_uuid from v_device_lines "; $sql .= "where enabled is null or enabled = '' "; - $database = new database; $device_lines = $database->select($sql, null, 'all'); if (!empty($device_lines)) { $sql = "update v_device_lines set "; $sql .= "enabled = 'true' "; $sql .= "where enabled is null "; $sql .= "or enabled = '' "; - $database = new database; $database->execute($sql); unset($sql); } @@ -44,7 +42,6 @@ if ($domains_processed == 1) { //set label to user_id if the label is null $sql = "select count(*) from v_device_lines "; $sql .= "where label is null "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { $sql = "update v_device_lines "; @@ -58,7 +55,6 @@ if ($domains_processed == 1) { $sql .= "where d.device_uuid = k.device_uuid "; $sql .= "and k.device_uuid is not null "; $sql .= "and k.device_key_vendor is null "; - $database = new database; $device_keys = $database->select($sql, null, 'all'); if (!empty($device_keys)) { foreach ($device_keys as $index => &$row) { @@ -69,7 +65,6 @@ if ($domains_processed == 1) { $p = new permissions; $p->add('device_key_edit', 'temp'); - $database = new database; $database->app_name = 'devices'; $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->save($array); @@ -83,13 +78,11 @@ if ($domains_processed == 1) { //set the device profile keys $sql = "select count(*) from v_device_profile_keys "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { //get the device profile keys from device_keys table $sql = "select * from v_device_keys "; $sql .= "where device_profile_uuid is not null "; - $database = new database; $device_profile_keys = $database->select($sql, null, 'all'); //loop through the device_keys to build the data array @@ -116,7 +109,6 @@ if ($domains_processed == 1) { $p = new permissions; $p->add('device_profile_key_add', 'temp'); - $database = new database; $database->app_name = 'devices'; $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->save($array); @@ -130,13 +122,11 @@ if ($domains_processed == 1) { //set the device profile settings $sql = "select count(*) from v_device_profile_settings "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { //get the device profile keys from device_keys table $sql = "select * from v_device_settings "; $sql .= "where device_profile_uuid is not null "; - $database = new database; $device_profile_keys = $database->select($sql, null, 'all'); //loop through the device_keys to build the data array @@ -157,7 +147,6 @@ if ($domains_processed == 1) { $p = new permissions; $p->add('device_profile_setting_add', 'temp'); - $database = new database; $database->app_name = 'devices'; $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->save($array); @@ -171,7 +160,6 @@ if ($domains_processed == 1) { //add device vendor functions to the database $sql = "select count(*) from v_device_vendors; "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { @@ -180,7 +168,6 @@ if ($domains_processed == 1) { //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'); foreach ($groups as $row) { if ($row['domain_uuid'] == '') { @@ -243,7 +230,6 @@ if ($domains_processed == 1) { $p->add('device_vendor_function_add', 'temp'); $p->add('device_vendor_function_group_add', 'temp'); - $database = new database; $database->app_name = 'devices'; $database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e'; $database->save($array); diff --git a/app/dialplans/app_defaults.php b/app/dialplans/app_defaults.php index abdb7907f5..6e81a9678c 100644 --- a/app/dialplans/app_defaults.php +++ b/app/dialplans/app_defaults.php @@ -38,7 +38,6 @@ //get the list of domains $sql = "select * from v_domains "; - $database = new database; $domains = $database->select($sql, null, 'all'); unset($sql); @@ -47,7 +46,6 @@ $dialplan->import($domains); //update the dialplan order - $database = new database; $sql = "update v_dialplans set dialplan_order = '870' where dialplan_order = '980' and dialplan_name = 'cidlookup';\n"; $database->execute($sql); $sql = "update v_dialplans set dialplan_order = '880' where dialplan_order = '990' and dialplan_name = 'call_screen';\n"; @@ -57,7 +55,6 @@ unset($sql); //set empty strings to null - $database = new database; $sql = "update v_device_lines set outbound_proxy_primary = null where outbound_proxy_primary = '';\n"; $database->execute($sql); $sql = "update v_device_lines set outbound_proxy_secondary = null where outbound_proxy_secondary = '';\n"; @@ -65,7 +62,6 @@ unset($sql); //change recording_slots to recording_id - $database = new database; $sql = "update v_dialplan_details set dialplan_detail_data = 'recording_id=true' "; $sql .= "where dialplan_uuid in (select dialplan_uuid from v_dialplans where app_uuid = '430737df-5385-42d1-b933-22600d3fb79e') "; $sql .= "and dialplan_detail_data = 'recording_slots=true'; \n"; @@ -82,7 +78,6 @@ //add xml for each dialplan where the dialplan xml is empty $sql = "select domain_name "; $sql .= "from v_domains \n"; - $database = new database; $results = $database->select($sql, null, 'all'); if (is_array($results) && @sizeof($results) != 0) { foreach ($results as $row) { @@ -102,7 +97,6 @@ $array = $dialplans->xml(); //delete the follow me bridge dialplan - $database = new database; $sql = "delete from v_dialplan_details where dialplan_uuid = '8ed73d1f-698f-466c-8a7a-1cf4cd229f7f' "; $database->execute($sql); $sql = "delete from v_dialplans where dialplan_uuid = '8ed73d1f-698f-466c-8a7a-1cf4cd229f7f' "; @@ -128,7 +122,6 @@ $sql = "select count(*) from v_dialplans "; $sql .= "where dialplan_name = 'domain-variables' "; $sql .= "and dialplan_xml like '%origination_callee_id_name%' "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows > 0) { $sql = "update v_dialplan_details set dialplan_detail_data = 'origination_callee_id_name=\${caller_destination}', update_date = now() \n"; @@ -153,7 +146,6 @@ if (is_readable($setting->get('switch','dialplan'))) { $sql = "select count(*) from v_dialplans "; $sql .= "where dialplan_uuid = 'ea5339de-1982-46ca-9695-c35176165314' "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { $array['dialplans'][0]['dialplan_uuid'] = 'ea5339de-1982-46ca-9695-c35176165314'; @@ -182,7 +174,6 @@ $p->add('dialplan_add', 'temp'); $p->add('dialplan_detail_add', 'temp'); - $database = new database; $database->app_name = 'dialplans'; $database->app_uuid = '742714e5-8cdf-32fd-462c-cbe7e3d655db'; $database->save($array, false); diff --git a/app/email_templates/app_defaults.php b/app/email_templates/app_defaults.php index a61357f605..31bced4be8 100644 --- a/app/email_templates/app_defaults.php +++ b/app/email_templates/app_defaults.php @@ -560,7 +560,6 @@ $parameters['email_template_uuid_'.$index] = $uuid; } $sql .= implode(' or ', $sql_where); - $database = new database; $email_templates = $database->select($sql, $parameters, 'all'); unset($sql, $sql_where, $parameters); @@ -585,7 +584,6 @@ $p->add("email_template_edit", 'temp'); //save the data - $database = new database; $database->app_name = 'email_templates'; $database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd'; $database->save($array, false); diff --git a/app/extensions/app_defaults.php b/app/extensions/app_defaults.php index 1c65c04d5c..b22e77551f 100644 --- a/app/extensions/app_defaults.php +++ b/app/extensions/app_defaults.php @@ -38,7 +38,6 @@ $sql = "select * from v_extensions "; $sql .= "where directory_first_name <> '' "; $sql .= "and directory_last_name is null "; - $database = new database; $extensions = $database->select($sql, null, 'all'); unset($sql); if (is_array($extensions) && @sizeof($extensions) != 0) { @@ -54,7 +53,6 @@ $p = new permissions; $p->add('extension_edit', 'temp'); - $database = new database; $database->app_name = 'extensions'; $database->app_uuid = 'e68d9689-2769-e013-28fa-6214bf47fca3'; $database->save($array, false); @@ -74,7 +72,6 @@ $p = new permissions; $p->add('default_setting_edit', 'temp'); - $database = new database; $database->execute($sql); unset($sql); @@ -87,7 +84,6 @@ $sql .= " select string_agg(convert_to(coalesce(r[2], length(length(r[1])::text) || length(r[1])::text || r[1]), 'UTF8'),'\\x00')\n"; $sql .= " from regexp_matches(\$1, '0*([0-9]+)|([^0-9]+)', 'g') r;\n"; $sql .= "\$f\$;"; - $database = new database; $database->execute($sql); unset($sql); } @@ -100,13 +96,11 @@ //update the extension_type when the value is null $sql = "select count(*) from v_extensions "; $sql .= "where extension_type is null; "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows > 0) { $sql = "update v_extensions "; $sql .= "set extension_type = 'default' "; $sql .= "where extension_type is null;"; - $database = new database; $database->execute($sql, null); } diff --git a/app/fax/app_defaults.php b/app/fax/app_defaults.php index 006faa24af..5b2607d4e2 100644 --- a/app/fax/app_defaults.php +++ b/app/fax/app_defaults.php @@ -180,7 +180,6 @@ $parameters['email_template_uuid_'.$index] = $uuid; } $sql .= implode(' or ', $sql_where); - $database = new database; $email_templates = $database->select($sql, $parameters, 'all'); unset($sql, $sql_where, $parameters); @@ -205,7 +204,6 @@ $p->add("email_template_edit", 'temp'); //save the data - $database = new database; $database->app_name = 'email_templates'; $database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd'; $database->save($array); diff --git a/app/ivr_menus/app_defaults.php b/app/ivr_menus/app_defaults.php index 2f8edab382..c79980b75d 100644 --- a/app/ivr_menus/app_defaults.php +++ b/app/ivr_menus/app_defaults.php @@ -29,7 +29,6 @@ if ($domains_processed == 1) { //select ivr menus with an empty context $sql = "select * from v_ivr_menus where ivr_menu_context is null "; - $database = new database; $ivr_menus = $database->select($sql, null, 'all'); unset($sql); @@ -58,7 +57,6 @@ if ($domains_processed == 1) { $p = new permissions; $p->add('ivr_menu_edit', 'temp'); - $database = new database; $database->app_name = 'ivr_menus'; $database->app_uuid = 'a5788e9b-58bc-bd1b-df59-fff5d51253ab'; $database->save($array, false); @@ -81,7 +79,6 @@ if ($domains_processed == 1) { $sql .= "ivr_menu_voice = SUBSTRING_INDEX(SUBSTRING_INDEX(ivr_menu_language, '/', 3), '/', -1) "; } $sql .= "where ivr_menu_language like '%/%/%'; "; - $database = new database; $ivr_menus = $database->select($sql, null, 'all'); unset($sql); @@ -89,7 +86,6 @@ if ($domains_processed == 1) { $sql = "update v_ivr_menu_options "; $sql .= "set ivr_menu_option_enabled = true "; $sql .= "where ivr_menu_option_enabled is null; "; - $database = new database; $database->execute($sql, null); unset($sql); diff --git a/app/modules/app_defaults.php b/app/modules/app_defaults.php index 5527d284f7..1fc9cf37e9 100644 --- a/app/modules/app_defaults.php +++ b/app/modules/app_defaults.php @@ -38,7 +38,6 @@ //add the access control list to the database $sql = "select * from v_modules "; $sql .= "where module_order is null "; - $database = new database; $modules = $database->select($sql, null, 'all'); if (is_array($modules) && @sizeof($modules) != 0) { foreach ($modules as $index => &$row) { @@ -49,7 +48,6 @@ $array['modules'][$index]['module_order'] = $mod['module_order']; } if (is_array($array) && @sizeof($array) != 0) { - $database = new database; $database->app_name = 'modules'; $database->app_uuid = '5eb9cba1-8cb6-5d21-e36a-775475f16b5e'; $database->save($array, false); diff --git a/app/music_on_hold/app_defaults.php b/app/music_on_hold/app_defaults.php index 4b68bfc653..c3c34f624a 100644 --- a/app/music_on_hold/app_defaults.php +++ b/app/music_on_hold/app_defaults.php @@ -45,7 +45,6 @@ if ($domains_processed == 1) { //add the music_on_hold list to the database if (!empty($setting->get('switch','conf'))) { $sql = "select count(music_on_hold_uuid) from v_music_on_hold; "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); unset($sql); @@ -97,7 +96,6 @@ if ($domains_processed == 1) { $p = new permissions; $p->add('music_on_hold_add', 'temp'); - $database = new database; $database->app_name = 'app_name'; $database->app_uuid = 'app_uuid'; $database->save($array, false); diff --git a/app/phrases/app_defaults.php b/app/phrases/app_defaults.php index 10e4281890..8b22d40fb8 100644 --- a/app/phrases/app_defaults.php +++ b/app/phrases/app_defaults.php @@ -68,7 +68,6 @@ if ($domains_processed == 1) { if (!empty($setting->get('recordings','storage_type')) && $setting->get('recordings','storage_type') == 'base64') { $sql = "select phrase_detail_uuid, phrase_detail_data "; $sql .= "from v_phrase_details where phrase_detail_function = 'play-file' "; - $database = new database; $result = $database->select($sql, null, 'all'); if (is_array($result) && @sizeof($result) != 0) { foreach ($result as $index => &$row) { @@ -87,7 +86,6 @@ if ($domains_processed == 1) { $p = new permissions; $p->add('phrase_detail_edit', 'temp'); - $database = new database; $database->app_name = 'phrases'; $database->app_uuid = '5c6f597c-9b78-11e4-89d3-123b93f75cba'; $database->save($array, false); @@ -105,7 +103,6 @@ if ($domains_processed == 1) { $sql .= "from v_phrase_details where "; $sql .= "phrase_detail_function = 'execute' "; $sql .= "and phrase_detail_data like 'lua(streamfile.lua %)' "; - $database = new database; $result = $database->select($sql, null, 'all'); if (is_array($result) && @sizeof($result) != 0) { foreach ($result as $index => &$row) { @@ -125,7 +122,6 @@ if ($domains_processed == 1) { $p = new permissions; $p->add('phrase_detail_edit', 'temp'); - $database = new database; $database->app_name = 'phrases'; $database->app_uuid = '5c6f597c-9b78-11e4-89d3-123b93f75cba'; $database->save($array, false); @@ -146,7 +142,6 @@ if ($domains_processed == 1) { if ($esl->is_connected()) { //get phrase languages $sql = "select distinct phrase_language from v_phrases order by phrase_language asc "; - $database = new database; $result = $database->select($sql, null, 'all'); //delete memcache var if (!empty($result)) { diff --git a/app/provision/app_defaults.php b/app/provision/app_defaults.php index 9887e6ed45..aba93b68a4 100644 --- a/app/provision/app_defaults.php +++ b/app/provision/app_defaults.php @@ -31,7 +31,6 @@ if ($domains_processed == 1) { $sql = "select device_uuid, device_address "; $sql .= "from v_devices "; $sql .= "where (device_address like '%-%' or device_address like '%:%') "; - $database = database::new(); $result = $database->select($sql, null, 'all'); if (!empty($result)) { foreach ($result as $row) { diff --git a/app/recordings/app_defaults.php b/app/recordings/app_defaults.php index ee891fd742..fadca47bb8 100644 --- a/app/recordings/app_defaults.php +++ b/app/recordings/app_defaults.php @@ -41,7 +41,6 @@ $sql .= "from v_recordings "; $sql .= "where recording_base64 is null "; $sql .= "or recording_base64 = '' "; - $database = new database; $result = $database->select($sql, null, 'all'); if (is_array($result) && @sizeof($result) != 0) { foreach ($result as &$row) { @@ -64,7 +63,6 @@ $p = new permissions; $p->add('recording_edit', 'temp'); //update recording record with base64 - $database = new database; $database->app_name = 'recordings'; $database->app_uuid = '83913217-c7a2-9e90-925d-a866eb40b60e'; $database->save($array, false); @@ -84,7 +82,6 @@ $sql = "select recording_uuid, domain_uuid, recording_filename, recording_base64 "; $sql .= "from v_recordings "; $sql .= "where recording_base64 is not null "; - $database = new database; $result = $database->select($sql, null, 'all'); if (!empty($result)) { foreach ($result as &$row) { @@ -116,7 +113,6 @@ $p->add('recording_edit', 'temp'); //update recording record - $database = new database; $database->app_name = 'recordings'; $database->app_uuid = '83913217-c7a2-9e90-925d-a866eb40b60e'; $database->save($array, false); diff --git a/app/ring_groups/app_defaults.php b/app/ring_groups/app_defaults.php index 052547f4cb..ac375ad34c 100644 --- a/app/ring_groups/app_defaults.php +++ b/app/ring_groups/app_defaults.php @@ -30,7 +30,6 @@ if ($domains_processed == 1) { //select ring groups with an empty context $sql = "select * from v_ring_groups "; $sql .= "where ring_group_context is null "; - $database = new database; $ring_groups = $database->select($sql, null, 'all'); if (is_array($ring_groups) && @sizeof($ring_groups) != 0) { //get the domain list @@ -53,7 +52,6 @@ if ($domains_processed == 1) { $p = new permissions; $p->add('ring_group_edit', 'temp'); //execute update - $database = new database; $database->app_name = 'ring_groups'; $database->app_uuid = '1d61fb65-1eec-bc73-a6ee-a6203b4fe6f2'; $database->save($array, false); @@ -67,7 +65,6 @@ if ($domains_processed == 1) { $sql = "update v_ring_group_destinations "; $sql .= "set destination_enabled = true "; $sql .= "where destination_enabled is null; "; - $database = new database; $database->execute($sql, null); unset($sql); diff --git a/app/sip_profiles/app_defaults.php b/app/sip_profiles/app_defaults.php index 8c7579eb55..fcc8b81856 100644 --- a/app/sip_profiles/app_defaults.php +++ b/app/sip_profiles/app_defaults.php @@ -29,7 +29,6 @@ //add the sip profiles to the database $sql = "select count(*) from v_sip_profiles "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); unset($sql); @@ -127,7 +126,6 @@ $p->add('sip_profile_setting_add', 'temp'); //execute insert - $database = new database; $database->app_name = 'sip_profiles'; $database->app_uuid = '159a8da8-0e8c-a26b-6d5b-19c532b6d470'; $database->save($array, false); @@ -147,7 +145,6 @@ //upgrade - add missing sip profiles domain settings $sql = "select count(*) from v_sip_profile_domains "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); unset($sql); @@ -181,7 +178,6 @@ $sql = "select sip_profile_uuid from v_sip_profiles "; $sql .= "where sip_profile_name = :sip_profile_name "; $parameters['sip_profile_name'] = $sip_profile_name; - $database = new database; $sip_profile_uuid = $database->select($sql, $parameters, 'column'); unset($sql, $parameters); @@ -206,7 +202,6 @@ $p->add('sip_profile_domain_add', 'temp'); //execute insert - $database = new database; $database->app_name = 'sip_profiles'; $database->app_uuid = '159a8da8-0e8c-a26b-6d5b-19c532b6d470'; $database->save($array, false); @@ -227,7 +222,6 @@ $sql .= "sip_profile_enabled = 'true' "; $sql .= "where sip_profile_enabled is null "; $sql .= "or sip_profile_enabled = '' "; - $database = new database; $database->execute($sql); unset($sql); diff --git a/app/sofia_global_settings/app_defaults.php b/app/sofia_global_settings/app_defaults.php index 766ab9a8c9..f9842a83b3 100644 --- a/app/sofia_global_settings/app_defaults.php +++ b/app/sofia_global_settings/app_defaults.php @@ -4,7 +4,6 @@ if ($domains_processed == 1) { //get all of the sofia global default settings $sql = "select * from v_sofia_global_settings \n"; - $database = new database; $sofia_global_settings = $database->select($sql, null, 'all'); //build array @@ -74,7 +73,6 @@ if ($domains_processed == 1) { $p->add('sofia_global_setting_add', 'temp'); //execute insert - $database = new database; $database->app_name = 'sofia_global_settings'; $database->app_uuid = '240c25a3-a2cf-44ea-a300-0626eca5b945'; $database->save($array, false); diff --git a/app/tones/app_defaults.php b/app/tones/app_defaults.php index 1a1f72aa2c..c69e544609 100644 --- a/app/tones/app_defaults.php +++ b/app/tones/app_defaults.php @@ -30,7 +30,6 @@ if ($domains_processed == 1) { $sql = "select * from v_vars "; $sql .= "where var_category = 'Tones' "; $sql .= "and var_name like '%-ring%'; "; - $database = new database; $ringtones = $database->select($sql, null, 'all'); unset($sql); @@ -39,7 +38,6 @@ if ($domains_processed == 1) { $sql .= "var_category = 'Ringtones' "; $sql .= "where var_category = 'Tones' "; $sql .= "and var_name like '%-ring%'; "; - $database = new database; $database->execute($sql); unset($sql); } diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php index 35c3ebd253..d7ef6da8db 100644 --- a/app/vars/app_defaults.php +++ b/app/vars/app_defaults.php @@ -29,7 +29,6 @@ if ($domains_processed == 1) { //base64 decode the description - added for backwards comptability with old versions of FusionPBX $sql = "select * from v_vars \n"; $sql .= "where var_description like '%=';\n"; - $database = new database; $vars = $database->select($sql, null, 'all'); if (!empty($vars)) { foreach($vars as $row) { @@ -46,7 +45,6 @@ if ($domains_processed == 1) { //add the variables to the database $sql = "select count(*) from v_vars "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); unset($sql); @@ -103,7 +101,6 @@ if ($domains_processed == 1) { //execute insert if (!empty($array)) { - $database = new database; $database->app_name = 'vars'; $database->app_uuid = '54e08402-c1b8-0a9d-a30a-f569fc174dd8'; $database->save($array, false); @@ -127,7 +124,6 @@ if ($domains_processed == 1) { $sql .= "and default_setting_category = 'domain' "; $sql .= "and default_setting_subcategory = 'country' "; $sql .= "and default_setting_enabled = 'true';"; - $database = new database; $country_iso = $database->select($sql, null, 'column'); unset($sql); @@ -142,7 +138,6 @@ if ($domains_processed == 1) { $sql = "select count(*) from v_vars "; $sql .= "where var_name = 'default_country' "; $sql .= "and var_category = 'Defaults' "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); unset($sql); @@ -162,7 +157,6 @@ if ($domains_processed == 1) { $sql = "select count(*) from v_vars "; $sql .= "where var_name = 'default_countrycode' "; $sql .= "and var_category = 'Defaults' "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); unset($sql); @@ -182,7 +176,6 @@ if ($domains_processed == 1) { $sql = "select count(*) from v_vars "; $sql .= "where var_name = 'default_exitcode' "; $sql .= "and var_category = 'Defaults' "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); unset($sql); @@ -205,7 +198,6 @@ if ($domains_processed == 1) { $p->add("var_add", "temp"); //execute inserts - $database = new database; $database->app_name = 'vars'; $database->app_uuid = '54e08402-c1b8-0a9d-a30a-f569fc174dd8'; $database->save($array, false); diff --git a/app/yealink/app_defaults.php b/app/yealink/app_defaults.php index f28fc39f2d..c2545bc94b 100644 --- a/app/yealink/app_defaults.php +++ b/app/yealink/app_defaults.php @@ -31,7 +31,6 @@ $sql = "select default_setting_uuid, default_setting_value from v_default_settings "; $sql .= "where default_setting_subcategory = 'yealink_trust_certificates' "; $sql .= "and (default_setting_value = 'true' or default_setting_value = 'false');"; - $database = new database; $row = $database->select($sql, null, 'row'); if (is_array($row)) { if ($row['default_setting_value'] == 'false') { @@ -44,7 +43,6 @@ $sql .= "set default_setting_value = ".$row['default_setting_value'].", "; $sql .= "default_setting_description = 'Only Accept Trusted Certificates 0-Disabled (default), 1-Enabled.' "; $sql .= "where default_setting_uuid = '".$row['default_setting_uuid']."'; "; - $database = new database; $database->execute($sql, null); unset($sql); } @@ -53,12 +51,10 @@ if ($db_type == 'pgsql') { $sql = "select pg_typeof(default_setting_enabled) "; $sql .= "from v_default_settings limit 1;"; - $database = new database; $enabled_type = $database->select($sql, null, 'column'); if ($enabled_type == 'text') { $sql = "update v_default_settings set default_setting_enabled = 'true', default_setting_value = '13' "; $sql .= "where default_setting_uuid = 'a018c028-0f99-4ef8-869d-f5322636ae36' and default_setting_enabled = '13'; "; - $database = new database; $database->execute($sql, null); unset($sql); } diff --git a/core/authentication/app_defaults.php b/core/authentication/app_defaults.php index f3a1bd9471..d0d2c6f9f0 100644 --- a/core/authentication/app_defaults.php +++ b/core/authentication/app_defaults.php @@ -75,7 +75,6 @@ $parameters['email_template_uuid_'.$index] = $uuid; } $sql .= implode(' or ', $sql_where); - $database = new database; $email_templates = $database->select($sql, $parameters, 'all'); unset($sql, $sql_where, $parameters); @@ -100,7 +99,6 @@ $p->add("email_template_edit", 'temp'); //save the data - $database = new database; $database->app_name = 'email_templates'; $database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd'; $database->save($array); diff --git a/core/dashboard/app_defaults.php b/core/dashboard/app_defaults.php index 0edfd98650..a1f349717c 100644 --- a/core/dashboard/app_defaults.php +++ b/core/dashboard/app_defaults.php @@ -14,7 +14,6 @@ if ($domains_processed == 1) { //get the groups $sql = "select * from v_groups "; $sql .= "where domain_uuid is null "; - $database = new database; $groups = $database->select($sql, null, 'all'); //get the dashboard @@ -26,7 +25,6 @@ if ($domains_processed == 1) { $sql .= "cast(dashboard_enabled as text), "; $sql .= "dashboard_description "; $sql .= "from v_dashboard "; - $database = new database; $dashboard_widgets = $database->select($sql, null, 'all'); unset($sql, $parameters); @@ -110,7 +108,6 @@ if ($domains_processed == 1) { //save the data if (!empty($array)) { - $database = new database; $database->app_name = 'dashboard'; $database->app_uuid = '55533bef-4f04-434a-92af-999c1e9927f7'; $database->save($array, false); diff --git a/core/databases/app_defaults.php b/core/databases/app_defaults.php index 7a1e31a866..27168356d9 100644 --- a/core/databases/app_defaults.php +++ b/core/databases/app_defaults.php @@ -30,7 +30,6 @@ if (!empty($domains_processed) && $domains_processed == 1) { //set the database driver $sql = "select * from v_databases "; $sql .= "where database_driver is null "; - $database = new database; $result = $database->select($sql, null, 'all'); foreach ($result as &$row) { $database_uuid = $row["database_uuid"]; @@ -47,7 +46,6 @@ if (!empty($domains_processed) && $domains_processed == 1) { $sql .= "where database_uuid = :database_uuid "; $parameters['database_driver'] = $database_driver; $parameters['database_uuid'] = $database_uuid; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } diff --git a/core/default_settings/app_defaults.php b/core/default_settings/app_defaults.php index 18fd06002d..05159c9042 100644 --- a/core/default_settings/app_defaults.php +++ b/core/default_settings/app_defaults.php @@ -31,7 +31,6 @@ $sql = "update v_default_settings "; $sql .= "set default_setting_name = 'text' "; $sql .= "where default_setting_name = 'var' "; - $database = new database; $database->execute($sql, null); unset($sql); @@ -39,13 +38,11 @@ $sql = "delete from v_default_settings "; $sql .= "where (default_setting_category is null and default_setting_subcategory is null) "; $sql .= "or (default_setting_category = '' and default_setting_subcategory = '') "; - $database = new database; $database->execute($sql, null); unset($sql); //populate the languages table, if necessary $sql = "select count(*) from v_languages"; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { $sql = "insert into v_languages (language_uuid, language, code) values "; @@ -205,14 +202,12 @@ $sql .= "('".uuid()."', 'Welsh', 'cy'), "; $sql .= "('".uuid()."', 'Xhosa', 'xh'), "; $sql .= "('".uuid()."', 'Yiddish', 'yi') "; - $database = new database; $database->execute($sql, null); unset($sql, $parameters); } //populate the countries table, if necessary $sql = "select count(*) from v_countries"; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { $sql = "insert into v_countries (country_uuid, country, iso_a2, iso_a3, num, country_code) values "; @@ -482,7 +477,6 @@ $sql .= "and default_setting_category = 'domain' "; $parameters['language_code'] = $language_code; $parameters['legacy_code'] = $legacy_code; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } @@ -498,7 +492,6 @@ $sql .= "and default_setting_category = 'domain' "; $sql .= "and default_setting_subcategory = 'time_zone' "; $sql .= "and default_setting_name = 'name' "; - $database = new database; $database->execute($sql); unset($sql); @@ -509,7 +502,6 @@ $sql .= "where default_setting_category = 'login' "; $sql .= "and default_setting_subcategory = 'destination' "; $sql .= "and default_setting_name = 'url' "; - $database = new database; $database->execute($sql); unset($sql); diff --git a/core/domain_settings/app_defaults.php b/core/domain_settings/app_defaults.php index 46dd3f1740..37077252d0 100644 --- a/core/domain_settings/app_defaults.php +++ b/core/domain_settings/app_defaults.php @@ -31,7 +31,6 @@ $sql = "update v_domain_settings "; $sql .= "set domain_setting_name = 'text' "; $sql .= "where domain_setting_name = 'var' "; - $database = new database; $database->execute($sql, null); unset($sql, $parameters); @@ -49,7 +48,6 @@ $sql .= "and domain_setting_category = 'domain'"; $parameters['language_code'] = $language_code; $parameters['legacy_code'] = $legacy_code; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } @@ -59,7 +57,6 @@ $sql .= "set domain_setting_value = '#fafafa' "; $sql .= "where domain_setting_subcategory = 'message_default_color' "; $sql .= "and domain_setting_value = '#ccffcc' "; - $database = new database; $database->execute($sql, null); unset($sql, $parameters); @@ -67,7 +64,6 @@ $sql .= "set domain_setting_value = '#666' "; $sql .= "where domain_setting_subcategory = 'message_default_background_color' "; $sql .= "and domain_setting_value = '#004200' "; - $database = new database; $database->execute($sql, null); unset($sql, $parameters); diff --git a/core/domains/app_defaults.php b/core/domains/app_defaults.php index abd55ff6c0..556ebf1319 100644 --- a/core/domains/app_defaults.php +++ b/core/domains/app_defaults.php @@ -30,7 +30,6 @@ //set domains with enabled status of empty or null to true $sql = "update v_domains set domain_enabled = 'true' "; $sql .= "where domain_enabled = '' or domain_enabled is null "; - $database = new database; $database->execute($sql, null); unset($sql); diff --git a/core/groups/app_defaults.php b/core/groups/app_defaults.php index aa4b737e7a..27206703e1 100644 --- a/core/groups/app_defaults.php +++ b/core/groups/app_defaults.php @@ -33,7 +33,6 @@ if ($domains_processed == 1) { //find rows that have a null group_uuid and set the correct group_uuid $sql = "select * from v_user_groups "; $sql .= "where group_uuid is null; "; - $database = new database; $result = $database->select($sql, null, 'all'); if (is_array($result)) { foreach($result as $row) { @@ -42,7 +41,6 @@ if ($domains_processed == 1) { $sql = "select group_uuid from v_groups "; $sql .= "where group_name = :group_name "; $parameters['group_name'] = $row['group_name']; - $database = new database; $group_uuid = $database->select($sql, $parameters, 'column'); unset($sql, $parameters); @@ -52,7 +50,6 @@ if ($domains_processed == 1) { $sql .= "where user_group_uuid = :user_group_uuid; "; $parameters['group_uuid'] = $group_uuid; $parameters['user_group_uuid'] = $row['user_group_uuid']; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } @@ -63,7 +60,6 @@ if ($domains_processed == 1) { //set the default group levels $sql = "select * from v_groups "; $sql .= "where group_level is null; "; - $database = new database; $result = $database->select($sql, null, 'all'); if (is_array($result) && count($result) > 0) { $x = 0; @@ -90,7 +86,6 @@ if ($domains_processed == 1) { } $x++; } - $database = new database; $database->app_name = 'groups'; $database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84'; $database->save($array, false); @@ -105,12 +100,10 @@ if ($domains_processed == 1) { $sql .= ") "; $sql .= "WHERE group_uuid is null; "; $parameters = null; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); //drop the view_groups - $database = new database; $database->execute("DROP VIEW view_groups;", null); //add or update the view @@ -122,12 +115,10 @@ if ($domains_processed == 1) { $sql .= " group_level, group_protected, group_description "; $sql .= " from v_groups as g "; $sql .= ");"; - $database = new database; $database->execute($sql, null); unset($sql); //group permissions - $database = new database; $database->execute("update v_group_permissions set permission_protected = 'false' where permission_protected is null;", null); $database->execute("update v_group_permissions set permission_assigned = 'true' where permission_assigned is null;", null); diff --git a/core/notifications/app_defaults.php b/core/notifications/app_defaults.php index d9acb834d4..e379565697 100644 --- a/core/notifications/app_defaults.php +++ b/core/notifications/app_defaults.php @@ -30,7 +30,6 @@ if ($domains_processed == 1) { //update the notifications table //if (is_array($_SESSION['switch']['scripts'])) { // $sql = "select count(*) from v_notifications "; - // $database = new database; // $num_rows = $database->select($sql, null, 'column'); // if ($num_rows == 0) { // //build insert array @@ -40,7 +39,6 @@ if ($domains_processed == 1) { // $p = new permissions; // $p->add('notification_add', 'temp'); // //execute insert - // $database = new database; // $database->app_name = 'notifications'; // $database->app_uuid = 'e746fbcb-f67f-4e0e-ab64-c414c01fac11'; // $database->save($array, false); diff --git a/core/permissions/app_defaults.php b/core/permissions/app_defaults.php index 9445a66589..00a5f464f7 100644 --- a/core/permissions/app_defaults.php +++ b/core/permissions/app_defaults.php @@ -4,7 +4,6 @@ if ($domains_processed == 1) { //add the permissions $sql = "select * from v_permissions \n"; - $database = new database; $database_permissions = $database->select($sql, null, 'all'); //get the $apps array from the installed apps from the core and mod directories @@ -50,7 +49,6 @@ if ($domains_processed == 1) { $p->add('permission_add', 'temp'); //execute insert - $database = new database; $database->app_name = 'permissions'; $database->app_uuid = 'ce1498a0-46e2-487d-85de-4eec7122a984'; $database->save($array, false); diff --git a/core/software/app_defaults.php b/core/software/app_defaults.php index 6742ea399b..15cb2bf3e5 100644 --- a/core/software/app_defaults.php +++ b/core/software/app_defaults.php @@ -31,7 +31,6 @@ if ($domains_processed == 1) { //update the software table $sql = "select software_version from v_software "; - $database = new database; $software_version = $database->select($sql, null, 'column'); if (empty($software_version)) { $array['software'][0]['software_uuid'] = '7de057e7-333b-4ebf-9466-315ae7d44efd'; @@ -52,7 +51,6 @@ if ($domains_processed == 1) { $p->add("software_edit", 'temp'); //save the data - $database = new database; $database->app_name = 'software'; $database->app_uuid = 'b88c795f-7dea-4fc8-9ab7-edd555242cff'; $database->save($array, false); diff --git a/core/upgrade/app_defaults.php b/core/upgrade/app_defaults.php index 0acf6f3220..87bf494f7a 100644 --- a/core/upgrade/app_defaults.php +++ b/core/upgrade/app_defaults.php @@ -36,7 +36,6 @@ if ($domains_processed == 1) { $sql .= "where default_setting_category = 'login' "; $sql .= "and default_setting_subcategory = 'message' "; $sql .= "and default_setting_name = 'text' "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { @@ -62,7 +61,6 @@ if ($domains_processed == 1) { $sql .= "'' "; $sql .= ")"; $parameters['default_setting_value'] = $text['login-message_text']; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); @@ -75,7 +73,6 @@ if ($domains_processed == 1) { $sql .= "where default_setting_category = 'login' "; $sql .= "and default_setting_subcategory = 'message' "; $sql .= "and default_setting_name = 'text' "; - $database = new database; $result = $database->select($sql, null, 'all'); if (is_array($result) && count($result) > 0) { foreach($result as $row) { @@ -93,7 +90,6 @@ if ($domains_processed == 1) { $sql .= "where default_setting_uuid = :default_setting_uuid "; $parameters['default_setting_value'] = $text['login-message_text']; $parameters['default_setting_uuid'] = $current_default_setting_uuid; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } diff --git a/core/user_settings/app_defaults.php b/core/user_settings/app_defaults.php index d79b28549b..71241025c7 100644 --- a/core/user_settings/app_defaults.php +++ b/core/user_settings/app_defaults.php @@ -39,7 +39,6 @@ $sql .= "and user_setting_category = 'domain'"; $parameters['language_code'] = $language_code; $parameters['legacy_code'] = $legacy_code; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } @@ -48,7 +47,6 @@ $sql .= "set user_setting_value = '#fafafa' "; $sql .= "where user_setting_subcategory = 'message_default_color' "; $sql .= "and user_setting_value = '#ccffcc' "; - $database = new database; $database->execute($sql, null); unset($sql); @@ -56,7 +54,6 @@ $sql .= "set user_setting_value = '#666' "; $sql .= "where user_setting_subcategory = 'message_default_background_color' "; $sql .= "and user_setting_value = '#004200' "; - $database = new database; $database->execute($sql, null); unset($sql); } diff --git a/core/users/app_defaults.php b/core/users/app_defaults.php index 7013447170..ead91efc3d 100644 --- a/core/users/app_defaults.php +++ b/core/users/app_defaults.php @@ -31,7 +31,6 @@ if ($domains_processed == 1) { $group->defaults(); //create the user view combines username, organization, contact first and last name - $database = new database; $database->execute("DROP VIEW view_users;", null); $sql = "CREATE VIEW view_users AS ( \n"; @@ -80,14 +79,12 @@ if ($domains_processed == 1) { $sql .= " where 1 = 1 \n"; $sql .= " order by u.username asc \n"; $sql .= "); \n"; - $database = new database; $database->execute($sql, null); unset($sql); //find rows that have a null group_uuid and set the correct group_uuid $sql = "select * from v_user_groups "; $sql .= "where group_uuid is null; "; - $database = new database; $result = $database->select($sql, null, 'all'); if (is_array($result)) { foreach($result as $row) { @@ -96,7 +93,6 @@ if ($domains_processed == 1) { $sql = "select group_uuid from v_groups "; $sql .= "where group_name = :group_name "; $parameters['group_name'] = $row['group_name']; - $database = new database; $group_uuid = $database->execute($sql, $parameters, 'column'); unset($sql, $parameters); //set the user_group_uuid @@ -105,7 +101,6 @@ if ($domains_processed == 1) { $sql .= "where user_group_uuid = :user_group_uuid; "; $parameters['group_uuid'] = $group_uuid; $parameters['user_group_uuid'] = $row['user_group_uuid']; - $database = new database; $database->execute($sql, $parameters); unset($sql, $parameters); } @@ -116,7 +111,6 @@ if ($domains_processed == 1) { //update users email if they are all null $sql = "select count(*) from v_users "; $sql .= "where user_email is not null; "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { $sql = "with users AS ( "; @@ -130,14 +124,12 @@ if ($domains_processed == 1) { $sql .= "set user_email = users.email_address "; $sql .= "from users "; $sql .= "where v_users.user_uuid = users.user_uuid;"; - $database = new database; $database->execute($sql, null); } //find rows that have a null group_uuid and set the correct group_uuid $sql = "select count(*) from v_default_settings "; $sql .= "where default_setting_category = 'user'; "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows > 0) { //build the array @@ -171,7 +163,6 @@ if ($domains_processed == 1) { $p->add("default_setting_edit", 'temp'); //save to the data - $database = new database; $database->app_name = 'default_setting'; $database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09'; $database->save($array, false); @@ -187,7 +178,6 @@ if ($domains_processed == 1) { //add the email templates to the database $sql = "select count(*) as num_rows from v_email_templates "; $sql .= "where email_template_uuid = '05b529c4-fba7-4071-bab3-143b076392e7' "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows == 0) { //build the array @@ -223,7 +213,6 @@ if ($domains_processed == 1) { $p->add("email_template_edit", 'temp'); //save to the data - $database = new database; $database->app_name = 'email_templates'; $database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd'; $database->save($array, false); @@ -238,13 +227,11 @@ if ($domains_processed == 1) { //update the user_type when the value is null $sql = "select count(*) from v_users "; $sql .= "where user_type is null; "; - $database = new database; $num_rows = $database->select($sql, null, 'column'); if ($num_rows > 0) { $sql = "update v_users "; $sql .= "set user_type = 'default' "; $sql .= "where user_type is null;"; - $database = new database; $database->execute($sql, null); }