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

Add a new permission number_alias. By default hide it to prevent confusing users.

Browse Source
This commit is contained in:
markjcrane
2016-05-11 13:36:31 -06:00
parent 72c366518f
commit b27b11fe40
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/extensions/app_config.php
+4
View File
@@ -71,6 +71,10 @@
$apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$apps[$x]['permissions'][$y]['groups'][] = "admin"; $apps[$x]['permissions'][$y]['groups'][] = "admin";
$y++; $y++;
$apps[$x]['permissions'][$y]['name'] = "number_alias";
//$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
//$apps[$x]['permissions'][$y]['groups'][] = "admin";
$y++;
$apps[$x]['permissions'][$y]['name'] = "extension_toll"; $apps[$x]['permissions'][$y]['name'] = "extension_toll";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$y++; $y++;
app/extensions/extension_edit.php
+28 -16
View File
@@ -417,7 +417,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "domain_uuid, "; $sql .= "domain_uuid, ";
$sql .= "extension_uuid, "; $sql .= "extension_uuid, ";
$sql .= "extension, "; $sql .= "extension, ";
$sql .= "number_alias, "; if (permission_exists('number_alias')) {
$sql .= "number_alias, ";
}
$sql .= "password, "; $sql .= "password, ";
if (if_group("superadmin") || (if_group("admin") && $billing_app_exists)) { if (if_group("superadmin") || (if_group("admin") && $billing_app_exists)) {
$sql .= "accountcode, "; $sql .= "accountcode, ";
@@ -477,7 +479,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'".$domain_uuid."', "; $sql .= "'".$domain_uuid."', ";
$sql .= "'$extension_uuid', "; $sql .= "'$extension_uuid', ";
$sql .= "'$extension', "; $sql .= "'$extension', ";
$sql .= "'$number_alias', "; if (permission_exists('number_alias')) {
$sql .= "'$number_alias', ";
}
$sql .= "'$password', "; $sql .= "'$password', ";
if (if_group("superadmin") || (if_group("admin") && $billing_app_exists)) { if (if_group("superadmin") || (if_group("admin") && $billing_app_exists)) {
$sql .= "'$accountcode', "; $sql .= "'$accountcode', ";
@@ -562,7 +566,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$ext->db = $db; $ext->db = $db;
$ext->domain_uuid = $domain_uuid; $ext->domain_uuid = $domain_uuid;
$ext->extension = $extension; $ext->extension = $extension;
$ext->number_alias = $number_alias; if (permission_exists('number_alias')) {
$ext->number_alias = $number_alias;
}
$ext->voicemail_password = $voicemail_password; $ext->voicemail_password = $voicemail_password;
$ext->voicemail_mail_to = $voicemail_mail_to; $ext->voicemail_mail_to = $voicemail_mail_to;
$ext->voicemail_file = $voicemail_file; $ext->voicemail_file = $voicemail_file;
@@ -623,7 +629,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "domain_uuid = '$domain_uuid', "; $sql .= "domain_uuid = '$domain_uuid', ";
} }
$sql .= "extension = '$extension', "; $sql .= "extension = '$extension', ";
$sql .= "number_alias = '$number_alias', "; if (permission_exists('number_alias')) {
$sql .= "number_alias = '$number_alias', ";
}
if (permission_exists('extension_password')) { if (permission_exists('extension_password')) {
$sql .= "password = '$password', "; $sql .= "password = '$password', ";
} }
@@ -711,7 +719,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$ext->db = $db; $ext->db = $db;
$ext->domain_uuid = $domain_uuid; $ext->domain_uuid = $domain_uuid;
$ext->extension = $extension; $ext->extension = $extension;
$ext->number_alias = $number_alias; if (permission_exists('number_alias')) {
$ext->number_alias = $number_alias;
}
$ext->voicemail_password = $voicemail_password; $ext->voicemail_password = $voicemail_password;
$ext->voicemail_mail_to = $voicemail_mail_to; $ext->voicemail_mail_to = $voicemail_mail_to;
$ext->voicemail_file = $voicemail_file; $ext->voicemail_file = $voicemail_file;
@@ -753,7 +763,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
//clear the cache //clear the cache
$cache = new cache; $cache = new cache;
$cache->delete("directory:".$extension."@".$user_context); $cache->delete("directory:".$extension."@".$user_context);
if (strlen($number_alias) > 0) { if (permission_exists('number_alias') && strlen($number_alias) > 0) {
$cache->delete("directory:".$number_alias."@".$user_context); $cache->delete("directory:".$number_alias."@".$user_context);
} }
} }
@@ -1036,16 +1046,18 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
echo "<tr>\n"; if (permission_exists('number_alias')) {
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo "<tr>\n";
echo " ".$text['label-number_alias']."\n"; echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo "</td>\n"; echo " ".$text['label-number_alias']."\n";
echo "<td class='vtable' align='left'>\n"; echo "</td>\n";
echo " <input class='formfld' type='number' name='number_alias' autocomplete='off' maxlength='255' min='0' step='1' value=\"$number_alias\">\n"; echo "<td class='vtable' align='left'>\n";
echo "<br />\n"; echo " <input class='formfld' type='number' name='number_alias' autocomplete='off' maxlength='255' min='0' step='1' value=\"$number_alias\">\n";
echo $text['description-number_alias']."\n"; echo "<br />\n";
echo "</td>\n"; echo $text['description-number_alias']."\n";
echo "</tr>\n"; echo "</td>\n";
echo "</tr>\n";
}
if (permission_exists('extension_password') && $action == "update") { if (permission_exists('extension_password') && $action == "update") {
echo "<tr>\n"; echo "<tr>\n";