nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1146 from badcrc/master

Browse Source 
Random ring groups
This commit is contained in:
FusionPBX
2015-09-14 10:38:18 -06:00
parent 9e0c8cffd9 4bba1c1faf
commit 82542c6ea6
7 changed files with 189 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/calls/call_edit.php
View File

@@ -63,7 +63,7 @@ else {
$sql = "select * from v_extensions ";
$sql .= "where domain_uuid = '$domain_uuid' ";
$sql .= "and extension_uuid = '$extension_uuid' ";
if (!(if_group("admin") || if_group("superadmin"))) {
if (!(permission_exists('follow_me') || permission_exists('call_forward') || permission_exists('do_not_disturb'))) {
if (count($_SESSION['user']['extension']) > 0) {
$sql .= "and (";
$x = 0;

2
app/devices/app_languages.php
View File

@@ -1690,7 +1690,7 @@ $text['label-blf']['ar-eg'] = "";
$text['label-blf']['he'] = "";
$text['label-callers']['en-us'] = "Callers";
$text['label-callers']['es-cl'] = "Llaamadas";
$text['label-callers']['es-cl'] = "Llamadas";
$text['label-callers']['pt-pt'] = "";
$text['label-callers']['fr-fr'] = "";
$text['label-callers']['pt-br'] = "";

11
app/ring_groups/app_languages.php
View File

@@ -88,6 +88,17 @@ $text['option-rollover']['uk'] = "";
$text['option-rollover']['de-at'] = "Überrollen";
$text['option-rollover']['he'] = "";
$text['option-random']['en-us'] = "Random";
$text['option-random']['es-cl'] = "Aleatorio";
$text['option-random']['pt-pt'] = "";
$text['option-random']['fr-fr'] = "";
$text['option-random']['pt-br'] = "";
$text['option-random']['pl'] = "";
$text['option-random']['sv-se'] = "";
$text['option-random']['uk'] = "";
$text['option-random']['de-at'] = "";
$text['option-random']['he'] = "";
$text['option-ptring']['en-us'] = "pt-ring";
$text['option-ptring']['es-cl'] = "pt-ring";
$text['option-ptring']['fr-fr'] = "Portugal";

1
app/ring_groups/ring_group_edit.php
View File

@@ -499,6 +499,7 @@ else {
echo " <option value='sequence' ".(($ring_group_strategy == "sequence") ? "selected='selected'" : null).">".$text['option-sequence']."</option>\n";
echo " <option value='enterprise' ".(($ring_group_strategy == "enterprise") ? "selected='selected'" : null).">".$text['option-enterprise']."</option>\n";
echo " <option value='rollover' ".(($ring_group_strategy == "rollover") ? "selected='selected'" : null).">".$text['option-rollover']."</option>\n";
echo " <option value='random' ".(($ring_group_strategy == "random") ? "selected='selected'" : null).">".$text['option-random']."</option>\n";
echo " </select>\n";
echo "<br />\n";
echo $text['description-strategy']."\n";

2
app/voicemail_greetings/voicemail_greetings.php
View File

@@ -46,7 +46,7 @@ require_once "resources/check_auth.php";
}
//deny access if the user extension is not assigned
if (!(if_group("superadmin") || if_group("admin"))) {
if (!permission_exists('voicemail_greeting_view')) {
if (!is_extension_assigned($voicemail_id)) {
echo "access denied";
return;