diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php index e191799657..033caec871 100644 --- a/app/conference_centers/app_config.php +++ b/app/conference_centers/app_config.php @@ -131,10 +131,6 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the conference center extension number.'; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_center_profile'; - $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; - $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Conference Profile is a collection of settings for the conference.'; - $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.'; @@ -170,6 +166,10 @@ $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)'; $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '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.'; + $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'; @@ -233,6 +233,10 @@ $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)'; $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '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.'; + $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'; diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php index 34620d3fc1..4ba4ff672e 100644 --- a/app/conference_centers/conference_center_edit.php +++ b/app/conference_centers/conference_center_edit.php @@ -48,7 +48,6 @@ 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_profile = check_str($_POST["conference_center_profile"]); $conference_center_description = check_str($_POST["conference_center_description"]); $conference_center_enabled = check_str($_POST["conference_center_enabled"]); @@ -118,7 +117,6 @@ 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_profile) == 0) { $msg .= "Please provide: Profile
\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"; } @@ -149,7 +147,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "dialplan_uuid, "; $sql .= "conference_center_name, "; $sql .= "conference_center_extension, "; - $sql .= "conference_center_profile, "; $sql .= "conference_center_description, "; $sql .= "conference_center_enabled "; $sql .= ")"; @@ -160,7 +157,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "'$dialplan_uuid', "; $sql .= "'$conference_center_name', "; $sql .= "'$conference_center_extension', "; - $sql .= "'$conference_center_profile', "; $sql .= "'$conference_center_description', "; $sql .= "'$conference_center_enabled' "; $sql .= ")"; @@ -213,7 +209,6 @@ 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_profile = '$conference_center_profile', "; $sql .= "conference_center_order = '$conference_center_order', "; $sql .= "conference_center_description = '$conference_center_description', "; $sql .= "conference_center_enabled = '$conference_center_enabled' "; @@ -289,7 +284,6 @@ 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_profile = $row["conference_center_profile"]; $conference_center_order = $row["conference_center_order"]; $conference_center_description = $row["conference_center_description"]; $conference_center_enabled = $row["conference_center_enabled"]; @@ -399,24 +393,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { } */ - echo "\n"; - echo "\n"; - echo " Profile:\n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "
\n"; - echo "Conference Profile is a collection of settings for the conference center.\n"; - echo "\n"; - echo "\n"; - echo "\n"; echo "\n"; echo " Enabled:\n"; diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index a7310ec098..1abca3cdc7 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -126,7 +126,6 @@ require_once "includes/paging.php"; echo "\n"; echo th_order_by('conference_center_name', 'Name', $order_by, $order); echo th_order_by('conference_center_extension', 'Extension', $order_by, $order); - echo th_order_by('conference_center_profile', 'Profile', $order_by, $order); //echo th_order_by('conference_center_order', 'Order', $order_by, $order); echo th_order_by('conference_center_enabled', 'Enabled', $order_by, $order); echo th_order_by('conference_center_description', 'Description', $order_by, $order); @@ -147,7 +146,6 @@ require_once "includes/paging.php"; echo "\n"; echo " ".$conference_center_name." \n"; echo " ".$row['conference_center_extension']." \n"; - echo " ".$row['conference_center_profile']." \n"; //echo " ".$row['conference_center_order']." \n"; echo " ".$row['conference_center_enabled']." \n"; echo " ".$row['conference_center_description']." \n"; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 3b11e9dfa8..23aa00cb47 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -48,6 +48,7 @@ else { $conference_center_uuid = check_str($_POST["conference_center_uuid"]); $member_pin = check_str($_POST["member_pin"]); $member_type = check_str($_POST["member_type"]); + $profile = check_str($_POST["profile"]); $record = check_str($_POST["record"]); $user_uuid = check_str($_POST["user_uuid"]); $max_members = check_str($_POST["max_members"]); @@ -107,6 +108,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //if (strlen($conference_center_uuid) == 0) { $msg .= "Please provide: Conference UUID
\n"; } //if (strlen($max_members) == 0) { $msg .= "Please provide: Max Members
\n"; } //if (strlen($wait_mod) == 0) { $msg .= "Please provide: Wait for the Moderator
\n"; } + if (strlen($profile) == 0) { $msg .= "Please provide: Conference Profile
\n"; } if (strlen($announce) == 0) { $msg .= "Please provide: Announce
\n"; } //if (strlen($enter_sound) == 0) { $msg .= "Please provide: Enter Sound
\n"; } if (strlen($mute) == 0) { $msg .= "Please provide: Mute
\n"; } @@ -162,6 +164,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "conference_room_uuid, "; $sql .= "conference_center_uuid, "; $sql .= "meeting_uuid, "; + $sql .= "profile, "; $sql .= "record, "; $sql .= "max_members, "; $sql .= "wait_mod, "; @@ -179,6 +182,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "'$conference_room_uuid', "; $sql .= "'$conference_center_uuid', "; $sql .= "'$meeting_uuid', "; + $sql .= "'$profile', "; $sql .= "'$record', "; $sql .= "'$max_members', "; $sql .= "'$wait_mod', "; @@ -223,6 +227,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql = "update v_conference_rooms set "; $sql .= "conference_center_uuid = '$conference_center_uuid', "; //$sql .= "meeting_uuid = '$meeting_uuid', "; + $sql .= "profile = '$profile', "; $sql .= "record = '$record', "; $sql .= "max_members = '$max_members', "; $sql .= "wait_mod = '$wait_mod', "; @@ -308,6 +313,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { foreach ($result as &$row) { $conference_center_uuid = $row["conference_center_uuid"]; $meeting_uuid = $row["meeting_uuid"]; + $profile = $row["profile"]; $record = $row["record"]; $max_members = $row["max_members"]; $wait_mod = $row["wait_mod"]; @@ -492,6 +498,24 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " "; echo " "; + echo "\n"; + echo "\n"; + echo " Profile:\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo "Conference Profile is a collection of settings for the conference center.\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo " Record:\n"; diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index 354e8fea84..638223b014 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -98,6 +98,7 @@ require_once "includes/paging.php"; echo "\n"; //echo th_order_by('conference_center_uuid', 'Conference UUID', $order_by, $order); //echo th_order_by('meeting_uuid', 'Meeting UUID', $order_by, $order); + echo th_order_by('profile', 'Profile', $order_by, $order); echo th_order_by('record', 'Record', $order_by, $order); echo th_order_by('max_members', 'Max Members', $order_by, $order); echo th_order_by('wait_mod', 'Wait for Moderator', $order_by, $order); @@ -123,6 +124,7 @@ require_once "includes/paging.php"; echo "\n"; //echo " ".$row['conference_center_uuid']." \n"; //echo " ".$row['meeting_uuid']." \n"; + echo " ".$row['profile']." \n"; echo " ".$row['record']." \n"; echo " ".$row['max_members']." \n"; echo " ".$row['wait_mod']." \n";