nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant database instances (#7535)

Browse Source
This commit is contained in:
FusionPBX
2025-10-01 08:56:06 -06:00
committed by GitHub
parent 6fcd0e83c1
commit d1baf05891
204 changed files with 43 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/contacts/contact_address_edit.php
View File

@@ -134,9 +134,6 @@
$p = permissions::new();
$p->add('contact_edit', 'temp');
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
@@ -149,7 +146,6 @@
$sql .= "and contact_uuid = :contact_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid;
$database = new database;
$database->execute($sql, $parameters);
unset($sql, $parameters);
}
@@ -184,9 +180,6 @@
$array['contact_addresses'][0]['address_primary'] = $address_primary;
$array['contact_addresses'][0]['address_description'] = $address_description;
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
}
@@ -205,7 +198,6 @@
$sql .= "and contact_address_uuid = :contact_address_uuid ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_address_uuid'] = $contact_address_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (!empty($row)) {
$address_type = $row["address_type"];

1
core/contacts/contact_addresses.php
View File

@@ -52,7 +52,6 @@
$sql .= "order by address_primary desc, address_label asc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_addresses = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

1
core/contacts/contact_addresses_view.php
View File

@@ -44,7 +44,6 @@
$sql .= "order by address_primary desc, address_label asc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_addresses = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

1
core/contacts/contact_attachment.php
View File

@@ -45,7 +45,6 @@
$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
$parameters['contact_attachment_uuid'] = $contact_attachment_uuid;
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$database = new database;
$attachment = $database->select($sql, $parameters ?? null, 'row');
unset($sql, $parameters);

5
core/contacts/contact_attachment_edit.php
View File

@@ -84,7 +84,6 @@
$sql .= "and contact_uuid = :contact_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid;
$database = new database;
$database->execute($sql, $parameters ?? null);
unset($sql, $parameters);
@@ -157,9 +156,6 @@
}
//save data
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
@@ -176,7 +172,6 @@
$sql .= "and contact_attachment_uuid = :contact_attachment_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_attachment_uuid'] = $contact_attachment_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (!empty($row)) {
$attachment_primary = $row["attachment_primary"];

1
core/contacts/contact_attachments.php
View File

@@ -47,7 +47,6 @@
$sql .= "order by attachment_primary desc, attachment_filename asc ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_attachments = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

1
core/contacts/contact_attachments_view.php
View File

@@ -44,7 +44,6 @@
$sql .= "order by attachment_primary desc, attachment_filename asc ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_attachments = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

4
core/contacts/contact_edit.php
View File

@@ -34,9 +34,6 @@
exit;
}
//connect to the database
$database = new database;
//add multi-lingual support
$language = new text;
$text = $language->get();
@@ -382,7 +379,6 @@
}
$parameters['phone_speed_dial'] = $row["phone_speed_dial"];
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$database = new database;
if (!empty($database->execute($sql, $parameters, 'column'))) {
$phone_speed_dial_exists = true;
}

8
core/contacts/contact_email_edit.php
View File

@@ -115,9 +115,6 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
$p = permissions::new();
$p->add('contact_edit', 'temp');
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
@@ -130,7 +127,6 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
$sql .= "and contact_uuid = :contact_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid;
$database = new database;
$database->execute($sql, $parameters);
unset($sql, $parameters);
}
@@ -156,9 +152,6 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
$array['contact_emails'][0]['email_primary'] = $email_primary ? 1 : 0;
$array['contact_emails'][0]['email_description'] = $email_description;
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
}
@@ -177,7 +170,6 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
$sql .= "and contact_email_uuid = :contact_email_uuid ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_email_uuid'] = $contact_email_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');;
if (!empty($row)) {
$email_label = $row["email_label"];

1
core/contacts/contact_emails.php
View File

@@ -47,7 +47,6 @@
$sql .= "order by email_primary desc, email_label asc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_emails = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

1
core/contacts/contact_emails_view.php
View File

@@ -44,7 +44,6 @@
$sql .= "order by email_primary desc, email_label asc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_emails = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

1
core/contacts/contact_extensions.php
View File

@@ -50,7 +50,6 @@
$sql .= "order by e.extension asc ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_extensions = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

1
core/contacts/contact_extensions_view.php
View File

@@ -47,7 +47,6 @@
$sql .= "order by e.extension asc ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_extensions = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

3
core/contacts/contact_import.php
View File

@@ -37,9 +37,6 @@
exit;
}
//connect to the database
$database = new database;
//add multi-lingual support
$language = new text;
$text = $language->get();

4
core/contacts/contact_import_google.php
View File

@@ -83,7 +83,6 @@ if ($_POST['a'] == 'import') {
$sql .= "and contact_setting_enabled = true ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_setting_value'] = $contact_id;
$database = new database;
$result = $database->select($sql, $parameters, 'row');
if (is_uuid($result['contact_uuid'])) {
$duplicate_exists = true;
@@ -241,9 +240,6 @@ if ($_POST['a'] == 'import') {
unset($contact_setting_columns, $contact_setting_array);
//insert records
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);

1
core/contacts/contact_json.php
View File

@@ -147,7 +147,6 @@
}
$sql .= "order by contact_organization asc ";
$sql .= "limit 300 ";
$database = new database;
$contact_array = $database->select($sql, $parameters ?? null, 'all');
unset($sql, $parameters);

7
core/contacts/contact_note_edit.php
View File

@@ -105,9 +105,6 @@
$p = permissions::new();
$p->add('contact_edit', 'temp');
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
@@ -136,9 +133,6 @@
$array['contact_notes'][0]['last_mod_date'] = 'now()';
$array['contact_notes'][0]['last_mod_user'] = $_SESSION['username'];
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
}
@@ -158,7 +152,6 @@
$sql .= "and contact_note_uuid = :contact_note_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_note_uuid'] = $contact_note_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (!empty($row)) {
$contact_note = $row["contact_note"];

1
core/contacts/contact_notes.php
View File

@@ -49,7 +49,6 @@
$sql .= "order by last_mod_date desc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_notes = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

1
core/contacts/contact_notes_view.php
View File

@@ -44,7 +44,6 @@
$sql .= "order by last_mod_date desc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_notes = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

9
core/contacts/contact_phone_edit.php
View File

@@ -135,9 +135,6 @@
$p = permissions::new();
$p->add('contact_edit', 'temp');
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
@@ -150,7 +147,6 @@
$sql .= "and contact_uuid = :contact_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid;
$database = new database;
$database->execute($sql, $parameters);
unset($sql, $parameters);
}
@@ -169,7 +165,6 @@
}
$parameters['phone_speed_dial'] = $phone_speed_dial;
$parameters['domain_uuid'] = $domain_uuid;
$database = new database;
if (!empty($database->execute($sql, $parameters, 'column'))) {
$phone_speed_dial_exists = true;
}
@@ -212,9 +207,6 @@
$array['contact_phones'][0]['phone_primary'] = $phone_primary ? 1 : 0;
$array['contact_phones'][0]['phone_description'] = $phone_description;
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
}
@@ -234,7 +226,6 @@
$sql .= "and contact_phone_uuid = :contact_phone_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_phone_uuid'] = $contact_phone_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (!empty($row)) {
$phone_label = $row["phone_label"];

1
core/contacts/contact_phones.php
View File

@@ -44,7 +44,6 @@
$sql .= "order by phone_primary desc, phone_label asc ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_phones = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

2
core/contacts/contact_phones_view.php
View File

@@ -44,7 +44,6 @@
$sql .= "order by phone_primary desc, phone_label asc ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_phones = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);
@@ -67,7 +66,6 @@
$sql .= "and (dialplan_detail_enabled = true or dialplan_detail_enabled is null) ";
$sql .= "limit 1";
$parameters['domain_uuid'] = $domain_uuid;
$database = new database;
$speed_dial_condition = $database->select($sql, $parameters, 'column');
if (!empty($speed_dial_condition)) {
$speed_dial_prefix = str_replace('(.*)', '', trim($speed_dial_condition,'^\$')); // default: ^\*0(.*)$

8
core/contacts/contact_relation_edit.php
View File

@@ -113,9 +113,6 @@
$p = permissions::new();
$p->add('contact_edit', 'temp');
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
@@ -152,9 +149,6 @@
$array['contact_relations'][0]['relation_label'] = $relation_label;
$array['contact_relations'][0]['relation_contact_uuid'] = $relation_contact_uuid;
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
}
@@ -174,7 +168,6 @@
$sql .= "and contact_relation_uuid = :contact_relation_uuid ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_relation_uuid'] = $contact_relation_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) {
$relation_label = $row["relation_label"];
@@ -191,7 +184,6 @@
$sql .= "order by contact_organization desc, contact_name_given asc, contact_name_family asc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_uuid'] = $contact_relation_uuid;
$database = new database;
$contacts = $database->select($sql, $parameters, 'all');
if (!empty($contacts) && is_uuid($row['relation_contact_uuid'])) {
foreach($contacts as $field) {

1
core/contacts/contact_relations.php
View File

@@ -61,7 +61,6 @@
$sql .= "c.contact_name_family asc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_relations = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

1
core/contacts/contact_relations_view.php
View File

@@ -58,7 +58,6 @@
$sql .= "c.contact_name_family asc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_relations = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

7
core/contacts/contact_setting_edit.php
View File

@@ -132,9 +132,6 @@
$p = permissions::new();
$p->add('contact_edit', 'temp');
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
@@ -167,9 +164,6 @@
$array['contact_settings'][0]['contact_setting_enabled'] = $contact_setting_enabled;
$array['contact_settings'][0]['contact_setting_description'] = $contact_setting_description;
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
}
@@ -188,7 +182,6 @@
$sql .= "and contact_setting_uuid = :contact_setting_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_setting_uuid'] = $contact_setting_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (!empty($row)) {
$contact_setting_category = escape($row["contact_setting_category"]);

1
core/contacts/contact_settings.php
View File

@@ -51,7 +51,6 @@
$sql .= ", contact_setting_order asc ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_settings = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

7
core/contacts/contact_time_edit.php
View File

@@ -105,9 +105,6 @@
$p = permissions::new();
$p->add('contact_edit', 'temp');
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
@@ -134,9 +131,6 @@
$array['contact_times'][0]['time_stop'] = $time_stop;
$array['contact_times'][0]['time_description'] = $time_description;
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
}
@@ -161,7 +155,6 @@
$parameters['contact_uuid'] = $contact_uuid ?? '';
$parameters['user_uuid'] = $_SESSION["user"]["user_uuid"];
$parameters['contact_time_uuid'] = $contact_time_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
$time_start = $row["time_start"];
$time_stop = $row["time_stop"];

5
core/contacts/contact_timer.php
View File

@@ -61,9 +61,6 @@
}
if (!empty($array)) {
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
}
@@ -82,7 +79,6 @@
$sql .= "and contact_uuid = :contact_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (!empty($row)) {
$contact_organization = $row["contact_organization"];
@@ -108,7 +104,6 @@
$parameters['domain_uuid'] = $domain_uuid;
$parameters['user_uuid'] = $_SESSION['user']['user_uuid'];
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (!empty($row)) {
$contact_time_uuid = $row["contact_time_uuid"];

1
core/contacts/contact_timer_inc.php
View File

@@ -47,7 +47,6 @@
$parameters['contact_uuid'] = $contact_uuid;
$parameters['user_uuid'] = $_SESSION['user']['user_uuid'];
$parameters['contact_time_uuid'] = $contact_time_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (!empty($row)) {
$time_start = strtotime($row["time_start"]);

1
core/contacts/contact_times.php
View File

@@ -54,7 +54,6 @@
$sql .= "order by ct.time_start desc ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_times = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

1
core/contacts/contact_times_view.php
View File

@@ -46,7 +46,6 @@
$sql .= "order by ct.time_start desc ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid;
$database = new database;
$contact_times = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

8
core/contacts/contact_url_edit.php
View File

@@ -118,9 +118,6 @@
$p = permissions::new();
$p->add('contact_edit', 'temp');
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
@@ -133,7 +130,6 @@
$sql .= "and contact_uuid = :contact_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid;
$database = new database;
$database->execute($sql, $parameters ?? null);
unset($sql, $parameters);
}
@@ -159,9 +155,6 @@
$array['contact_urls'][0]['url_primary'] = $url_primary ? 1 : 0;
$array['contact_urls'][0]['url_description'] = $url_description;
$database = new database;
$database->app_name = 'contacts';
$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
$database->save($array);
unset($array);
}
@@ -180,7 +173,6 @@
$sql .= "and contact_url_uuid = :contact_url_uuid ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_url_uuid'] = $contact_url_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (!empty($row)) {
$url_label = $row["url_label"];

1
core/contacts/contact_urls.php
View File

@@ -49,7 +49,6 @@
$sql .= "order by url_primary desc, url_label asc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_urls = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

1
core/contacts/contact_urls_view.php
View File

@@ -44,7 +44,6 @@
$sql .= "order by url_primary desc, url_label asc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['contact_uuid'] = $contact_uuid ?? '';
$database = new database;
$contact_urls = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);

3
core/contacts/contact_view.php
View File

@@ -37,9 +37,6 @@
exit;
}
//connect to the database
$database = new database;
//add multi-lingual support
$language = new text;
$text = $language->get();

4
core/contacts/contacts.php
View File

@@ -116,7 +116,6 @@
}
$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
$parameters['group_uuid'] = $_SESSION['group_uuid'] ?? '';
$database = new database;
$result = $database->select($sql, $parameters, 'all');
if (!empty($result)) {
foreach($result as $row) {
@@ -228,7 +227,6 @@
$parameters['user_uuid'] = $_SESSION['user_uuid'];
}
$sql .= $sql_search ?? '';
$database = new database;
$num_rows = $database->select($sql, $parameters ?? null, 'column');
//prepare to page the results
@@ -281,7 +279,6 @@
$parameters['user_uuid'] = $_SESSION['user_uuid'];
}
$sql .= $sql_search ?? '';
$database = new database;
if (!empty($order_by)) {
$sql .= order_by($order_by, $order);
$sql .= ", contact_organization asc ";
@@ -296,7 +293,6 @@
}
}
$sql .= limit_offset($rows_per_page, $offset);
$database = new database;
$contacts = $database->select($sql, $parameters ?? null, 'all');
unset($sql, $parameters);

5
core/contacts/contacts_vcard.php
View File

@@ -53,7 +53,6 @@ if (!empty($_GET)) {
$sql .= "and contact_uuid = :contact_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid;
$database = new database;
$row = $database->select($sql, $parameters, 'row');
if (!empty($row)) {
$contact_type = $row["contact_type"];
@@ -79,7 +78,6 @@ if (!empty($_GET)) {
$sql .= "order by email_primary desc ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid;
$database = new database;
$result = $database->select($sql, $parameters, 'all');
if (!empty($result)) {
$e = 1;
@@ -97,7 +95,6 @@ if (!empty($_GET)) {
$sql .= "and url_primary = true ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid;
$database = new database;
$url_address = $database->select($sql, $parameters, 'column');
$vcard->data['url'] = $url_address;
unset($sql, $parameters, $row);
@@ -121,7 +118,6 @@ if (!empty($_GET)) {
$sql .= "and contact_uuid = :contact_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid;
$database = new database;
$result = $database->select($sql, $parameters, 'all');
if (!empty($result)) {
foreach ($result as $row) {
@@ -150,7 +146,6 @@ if (!empty($_GET)) {
$sql .= "and contact_uuid = :contact_uuid ";
$parameters['domain_uuid'] = $domain_uuid;
$parameters['contact_uuid'] = $contact_uuid;
$database = new database;
$result = $database->select($sql, $parameters, 'all');
if (!empty($result)) {
foreach ($result as $row) {