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

Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

This commit is contained in:
markjcrane 2016-06-13 17:45:01 -06:00
parent 6a58bb97dd a36db08adf
commit 03c6c1c320
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/call_flows/app_languages.php
View File

@ -277,7 +277,7 @@ $text['description-alternate_destination']['fr-fr'] = "Choisir la destination al
$text['description-alternate_destination']['pt-br'] = "Selecione um destino alternativo";
$text['description-alternate_destination']['pl'] = "Wybierz alternatywną destynację";
$text['description-alternate_destination']['sv-se'] = "Välj den alternativa destinationen.";
$text['description-alternate_destination']['uk'] = Виберіть інше розташування.";
$text['description-alternate_destination']['uk'] = "Виберіть інше розташування.";
$text['description-alternate_destination']['de-at'] = "Wählen Sie ein alternatives Ziel.";
$text['description-sound']['en-us'] = "Select the sound to play when the status is set to the destinations.";

1
app/exec/exec.php
View File

@ -218,7 +218,6 @@
if (permission_exists('exec_switch') || permission_exists('exec_php') || permission_exists('exec_command') || permission_exists('exec_sql')) {
echo " <select name='handler' id='handler' class='formfld' style='width:100px;' onchange=\"handler=this.value;set_handler(this.value);\">\n";
echo " <option value=''></option>\n";
if (permission_exists('exec_switch')) { echo "<option value='switch' ".(($handler == 'switch') ? "selected='selected'" : null).">".$text['label-switch']."</option>\n"; }
if (permission_exists('exec_php')) { echo "<option value='php' ".(($handler == 'php') ? "selected='selected'" : null).">".$text['label-php']."</option>\n"; }
if (permission_exists('exec_command')) { echo "<option value='shell' ".(($handler == 'shell') ? "selected='selected'" : null).">".$text['label-shell']."</option>\n"; }

2
app/music_on_hold/music_on_hold.php
View File

@ -406,7 +406,7 @@ else {
$file_size = byte_convert($file_size);
//playback progress bar
echo "<tr id='recording_progress_bar_".$row_uuid."' style='display: none;'><td colspan='5'><span id='recording_progress_".$row_uuid."' style='background-color: #c43e42; height:1px; display: inline-block;'></span></td></tr>\n";
echo "<tr id='recording_progress_bar_".$row_uuid."' style='display: none;'><td colspan='5' class='".$row_style[$c]."' style='padding: 0px; border: none;'><span class='playback_progress_bar' id='recording_progress_".$row_uuid."'></span></td></tr>\n";
echo "<tr>\n";
echo " <td class='".$row_style[$c]."'>".$file."</td>\n";

4
app/voicemail_greetings/voicemail_greetings.php
View File

@ -383,9 +383,9 @@ require_once "resources/check_auth.php";
}
$tr_link = (permission_exists('voicemail_greeting_edit')) ? "href='voicemail_greeting_edit.php?id=".$row['voicemail_greeting_uuid']."&voicemail_id=".$voicemail_id."'" : null;
echo "<tr ".$tr_link.">\n";
echo " <td class='".$row_style[$c]." tr_link_void' width='30px;' valign='top'>";
echo " <td class='".$row_style[$c]." row_style_slim tr_link_void' width='30px;' valign='top'>";
$selected = ($row['greeting_id'] == $selected_greeting_id) ? true : false;
echo "<input type='radio' onclick=\"window.location='".PROJECT_PATH."/app/voicemail_greetings/voicemail_greetings.php?id=".$voicemail_id."&greeting_id=".$row['greeting_id']."&action=set&order_by=".$order_by."&order=".$order."';\" name='greeting_id' value='".$row['greeting_id']."' ".(($selected) ? "checked='checked'" : null).">\n";
echo "<input type='radio' onclick=\"window.location='".PROJECT_PATH."/app/voicemail_greetings/voicemail_greetings.php?id=".$voicemail_id."&greeting_id=".$row['greeting_id']."&action=set&order_by=".$order_by."&order=".$order."';\" name='greeting_id' value='".$row['greeting_id']."' ".(($selected) ? "checked='checked'" : null)." style='margin-top: 7px;'>\n";
echo " </td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['greeting_id']."</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['greeting_name']."</td>\n";