From f5aedce810fdbf04e83a2323bd6a2131c7a37705 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 20 Sep 2025 21:38:01 -0600 Subject: [PATCH] Update pin_numbers boolean toggle --- app/pin_numbers/app_config.php | 2 +- app/pin_numbers/pin_number_edit.php | 18 +++++++++++------- app/pin_numbers/pin_numbers.php | 9 +++++---- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/app/pin_numbers/app_config.php b/app/pin_numbers/app_config.php index 720597c067..643e55c429 100644 --- a/app/pin_numbers/app_config.php +++ b/app/pin_numbers/app_config.php @@ -80,7 +80,7 @@ $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the accountcode."; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "enabled"; - $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "boolean"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enable or Disable the PIN Number."; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "description"; diff --git a/app/pin_numbers/pin_number_edit.php b/app/pin_numbers/pin_number_edit.php index 7079546c90..4e11baf6fc 100644 --- a/app/pin_numbers/pin_number_edit.php +++ b/app/pin_numbers/pin_number_edit.php @@ -58,7 +58,7 @@ $description = $_POST["description"]; } -if (count($_POST)>0 && empty($_POST["persistformvar"])) { +if (!empty($_POST) && empty($_POST["persistformvar"])) { $msg = ''; if ($action == "update") { @@ -76,7 +76,6 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) { //check for all required data if (empty($pin_number)) { $msg .= $text['message-required']." ".$text['label-pin_number']."
\n"; } //if (empty($accountcode)) { $msg .= $text['message-required']." ".$text['label-accountcode']."
\n"; } - if (empty($enabled)) { $msg .= $text['message-required']." ".$text['label-enabled']."
\n"; } //if (empty($description)) { $msg .= $text['message-required']." ".$text['label-description']."
\n"; } if (!empty($msg) && empty($_POST["persistformvar"])) { require_once "resources/header.php"; @@ -116,7 +115,6 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) { $array['pin_numbers'][0]['enabled'] = $enabled; $array['pin_numbers'][0]['description'] = $description; //save data - $database = new database; $database->app_name = 'pin_numbers'; $database->app_uuid = '4b88ccfb-cb98-40e1-a5e5-33389e14a388'; $database->save($array); @@ -137,7 +135,6 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) { $sql .= "and pin_number_uuid = :pin_number_uuid "; $parameters['domain_uuid'] = $domain_uuid; $parameters['pin_number_uuid'] = $pin_number_uuid; - $database = new database; $row = $database->select($sql, $parameters, 'row'); if (is_array($row) && @sizeof($row) != 0) { $pin_number = $row["pin_number"]; @@ -198,10 +195,17 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) { echo " ".$text['label-enabled']."\n"; echo "\n"; echo "\n"; - echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; + if ($input_toggle_style_switch) { + echo " \n"; + echo " \n"; + } echo "
\n"; echo $text['description-enabled']."\n"; echo "\n"; diff --git a/app/pin_numbers/pin_numbers.php b/app/pin_numbers/pin_numbers.php index 863f5d693b..d17daa5bd6 100644 --- a/app/pin_numbers/pin_numbers.php +++ b/app/pin_numbers/pin_numbers.php @@ -86,7 +86,6 @@ $sql_search = "and ("; $sql_search .= "lower(pin_number) like :search "; $sql_search .= "or lower(accountcode) like :search "; - $sql_search .= "or lower(enabled) like :search "; $sql_search .= "or lower(description) like :search "; $sql_search .= ")"; $parameters['search'] = '%'.$search.'%'; @@ -97,7 +96,6 @@ $sql .= "where domain_uuid = :domain_uuid "; $sql .= $sql_search; $parameters['domain_uuid'] = $domain_uuid; - $database = new database; $num_rows = $database->select($sql, $parameters, 'column'); //prepare to page the results @@ -109,10 +107,13 @@ $offset = $rows_per_page * $page; //get the list - $sql = str_replace('count(*)', '*', $sql); + + $sql = "select domain_uuid, pin_number_uuid, pin_number, accountcode, description, cast(enabled as text) "; + $sql .= "from v_pin_numbers "; + $sql .= "where domain_uuid = :domain_uuid "; + $sql .= $sql_search; $sql .= order_by($order_by, $order, 'pin_number', 'asc'); $sql .= limit_offset($rows_per_page, $offset); - $database = new database; $pin_numbers = $database->select($sql, $parameters, 'all'); unset($sql, $parameters);