dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update groupedit.php

This commit is contained in:
FusionPBX 2019-07-24 23:09:10 -06:00 committed by GitHub
parent df98bcd099
commit 5942cfd4db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/groups/groupedit.php
View File

@ -17,7 +17,7 @@
The Initial Developer of the Original Code is The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com> Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2014 Portions created by the Initial Developer are Copyright (C) 2008-2019
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@ -50,11 +50,12 @@
$group_name_previous = $_POST['group_name_previous']; $group_name_previous = $_POST['group_name_previous'];
$domain_uuid = $_POST["domain_uuid"]; $domain_uuid = $_POST["domain_uuid"];
$domain_uuid_previous = $_POST["domain_uuid_previous"]; $domain_uuid_previous = $_POST["domain_uuid_previous"];
$group_order = $_POST["group_order"];
$group_description = $_POST["group_description"]; $group_description = $_POST["group_description"];
//check for global/domain duplicates //check for global/domain duplicates
$sql = "select count(*) from v_groups where "; $sql = "select count(*) from v_groups ";
$sql .= "group_name = :group_name "; $sql .= "where group_name = :group_name ";
$sql .= "and group_uuid <> :group_uuid "; $sql .= "and group_uuid <> :group_uuid ";
if (is_uuid($domain_uuid)) { if (is_uuid($domain_uuid)) {
$sql .= "and domain_uuid = :domain_uuid "; $sql .= "and domain_uuid = :domain_uuid ";
@ -75,6 +76,7 @@
$array['groups'][0]['group_uuid'] = $group_uuid; $array['groups'][0]['group_uuid'] = $group_uuid;
$array['groups'][0]['domain_uuid'] = is_uuid($domain_uuid) ? $domain_uuid : null; $array['groups'][0]['domain_uuid'] = is_uuid($domain_uuid) ? $domain_uuid : null;
$array['groups'][0]['group_name'] = $group_name; $array['groups'][0]['group_name'] = $group_name;
$array['groups'][0]['group_order'] = $group_order;
$array['groups'][0]['group_description'] = $group_description; $array['groups'][0]['group_description'] = $group_description;
$database = new database; $database = new database;
$database->app_name = 'groups'; $database->app_name = 'groups';
@ -129,7 +131,6 @@
unset($sql, $parameters); unset($sql, $parameters);
} }
} }
//group changed from one domain to another //group changed from one domain to another
else if (is_uuid($domain_uuid_previous) && is_uuid($domain_uuid) && $domain_uuid_previous != $domain_uuid) { else if (is_uuid($domain_uuid_previous) && is_uuid($domain_uuid) && $domain_uuid_previous != $domain_uuid) {
//remove any users assigned to the group from the old domain //remove any users assigned to the group from the old domain
@ -274,6 +275,7 @@
if (is_array($row) && sizeof($row) != 0) { if (is_array($row) && sizeof($row) != 0) {
$group_name = $row['group_name']; $group_name = $row['group_name'];
$domain_uuid = $row['domain_uuid']; $domain_uuid = $row['domain_uuid'];
$group_order = $row['group_order'];
$group_description = $row['group_description']; $group_description = $row['group_description'];
} }
unset($sql, $parameters, $row); unset($sql, $parameters, $row);
@ -351,6 +353,31 @@
echo "<input type='hidden' name='domain_uuid' value='".escape($domain_uuid)."'>"; echo "<input type='hidden' name='domain_uuid' value='".escape($domain_uuid)."'>";
} }
echo "<tr>\n";
echo "<td class='vncell' valign='top'>\n";
echo " ".$text['label-order']."\n";
echo "</td>\n";
echo "<td align='left' class='vtable' valign='top'>\n";
echo " <select name='group_order' class='formfld'>\n";
$i=0;
while($i<=999) {
$selected = ($i == $group_order) ? "selected" : null;
if (strlen($i) == 1) {
echo " <option value='00$i' ".$selected.">00$i</option>\n";
}
if (strlen($i) == 2) {
echo " <option value='0$i' ".$selected.">0$i</option>\n";
}
if (strlen($i) == 3) {
echo " <option value='$i' ".$selected.">$i</option>\n";
}
$i++;
}
echo " </select>\n";
echo " <br />\n";
echo "</td>\n";
echo "</tr>\n";
echo "<tr>\n"; echo "<tr>\n";
echo "<td class='vncell' valign='top'>\n"; echo "<td class='vncell' valign='top'>\n";
echo $text['label-group_description']."\n"; echo $text['label-group_description']."\n";