From c754e43e2d8d42223d579a14b8b7a0b4777929a1 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Sat, 20 Oct 2012 00:39:21 +0000 Subject: [PATCH] Add a field to the database to store the required pin length. --- app/conference_centers/app_config.php | 76 ++++++++++--------- .../conference_center_edit.php | 17 +++++ 2 files changed, 57 insertions(+), 36 deletions(-) diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php index 033caec871..f3c6987f2e 100644 --- a/app/conference_centers/app_config.php +++ b/app/conference_centers/app_config.php @@ -118,26 +118,30 @@ $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid'; $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = ''; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; $apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign'; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_dialplans'; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'dialplan_uuid'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_center_name'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the conference center name.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the conference center name.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_center_extension'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the conference center extension number.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the conference center extension number.'; + $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_center_pin_length'; + $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the pin length.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_center_description'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the center description.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the center description.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_center_enabled'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enable or disable the conference center.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enable or disable the conference center.'; $y = 1; //table array index $z = 0; //field array index @@ -158,58 +162,58 @@ $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid'; $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Conference UUID'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Conference UUID'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'meeting_uuid'; $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid'; $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Meeting UUID'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Meeting UUID'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'profile'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Select the conference profile.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select the conference profile.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'record'; $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'recording'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Select whether to record the conference.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select whether to record the conference.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'max_members'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Limit number of people in the conference.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Limit number of people in the conference.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'wait_mod'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Wait for the moderator to join before starting the conference.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Wait for the moderator to join before starting the conference.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'announce'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Introduce participants as they enter the conference.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Introduce participants as they enter the conference.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'enter_sound'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'The sound played when someone enters the conference.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'The sound played when someone enters the conference.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'mute'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Mute participants on entering the conference.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Mute participants on entering the conference.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'created'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Date when the conference was created.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Date when the conference was created.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'created_by'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'The user that created the conference session.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'The user that created the conference session.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'enabled'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Select to enable or disable the session.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select to enable or disable the session.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'description'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Description.for the conference session.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Description.for the conference session.'; $z++; $y = 2; //table array index @@ -231,23 +235,23 @@ $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid'; $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'meeting_uuid'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'meeting_uuid'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'profile'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Select the conference profile.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select the conference profile.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'recording'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Conference Recording'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Conference Recording'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'start_epoch'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'start_epoch'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'start_epoch'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'end_epoch'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'end_epoch'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'end_epoch'; $z++; $y = 4; //table array index @@ -275,41 +279,41 @@ $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid'; $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'meeting_uuid'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'meeting_uuid'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'username'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Extension number.'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Extension number.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'caller_id_name'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'caller_id_name'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'caller_id_name'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'caller_id_number'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'caller_id_number'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'caller_id_number'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'uuid'; $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid'; $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Call UUID'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Call UUID'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'moderator'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Moderator'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Moderator'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'network_addr'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'network address'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'network address'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'start_epoch'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'start_epoch'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'start_epoch'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'end_epoch'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'end_epoch'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'end_epoch'; $z++; /* @@ -321,7 +325,7 @@ $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)'; $apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = ''; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid'; $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid'; @@ -330,7 +334,7 @@ $apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign'; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains'; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = ''; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_center_uuid'; $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid'; @@ -339,7 +343,7 @@ $apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign'; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_conference_centers'; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'conference_uuid'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = ''; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_uuid'; $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid'; @@ -348,7 +352,7 @@ $apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign'; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_users'; $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'user_uuid'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = ''; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; */ ?> \ No newline at end of file diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php index 508ee73311..4868bec18b 100644 --- a/app/conference_centers/conference_center_edit.php +++ b/app/conference_centers/conference_center_edit.php @@ -48,6 +48,7 @@ else { $dialplan_uuid = check_str($_POST["dialplan_uuid"]); $conference_center_name = check_str($_POST["conference_center_name"]); $conference_center_extension = check_str($_POST["conference_center_extension"]); + $conference_center_pin_length = check_str($_POST["conference_center_pin_length"]); $conference_center_description = check_str($_POST["conference_center_description"]); $conference_center_enabled = check_str($_POST["conference_center_enabled"]); @@ -117,6 +118,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //if (strlen($dialplan_uuid) == 0) { $msg .= "Please provide: Dialplan UUID
\n"; } if (strlen($conference_center_name) == 0) { $msg .= "Please provide: Name
\n"; } if (strlen($conference_center_extension) == 0) { $msg .= "Please provide: Extension
\n"; } + if (strlen($conference_center_pin_length) == 0) { $msg .= "Please provide: PIN Length
\n"; } //if (strlen($conference_center_order) == 0) { $msg .= "Please provide: Order
\n"; } //if (strlen($conference_center_description) == 0) { $msg .= "Please provide: Description
\n"; } if (strlen($conference_center_enabled) == 0) { $msg .= "Please provide: Enabled
\n"; } @@ -147,6 +149,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "dialplan_uuid, "; $sql .= "conference_center_name, "; $sql .= "conference_center_extension, "; + $sql .= "conference_center_pin_length, "; $sql .= "conference_center_description, "; $sql .= "conference_center_enabled "; $sql .= ")"; @@ -157,6 +160,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "'$dialplan_uuid', "; $sql .= "'$conference_center_name', "; $sql .= "'$conference_center_extension', "; + $sql .= "'$conference_center_pin_length', "; $sql .= "'$conference_center_description', "; $sql .= "'$conference_center_enabled' "; $sql .= ")"; @@ -209,6 +213,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql = "update v_conference_centers set "; $sql .= "conference_center_name = '$conference_center_name', "; $sql .= "conference_center_extension = '$conference_center_extension', "; + $sql .= "conference_center_pin_length = '$conference_center_pin_length', "; //$sql .= "conference_center_order = '$conference_center_order', "; $sql .= "conference_center_description = '$conference_center_description', "; $sql .= "conference_center_enabled = '$conference_center_enabled' "; @@ -284,6 +289,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $dialplan_uuid = $row["dialplan_uuid"]; $conference_center_name = $row["conference_center_name"]; $conference_center_extension = $row["conference_center_extension"]; + $conference_center_pin_length = $row["conference_center_pin_length"]; $conference_center_order = $row["conference_center_order"]; $conference_center_description = $row["conference_center_description"]; $conference_center_enabled = $row["conference_center_enabled"]; @@ -342,6 +348,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " Pin Length:\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo "Enter the required PIN length.\n"; + echo "\n"; + echo "\n"; + /* if (if_group("admin") || if_group("superadmin")) { if ($action == "update") {