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 2015-10-24 16:39:37 -06:00
parent ed0e78ace2 2a0ef1b5af
commit c89075cc44
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/time_conditions/app_languages.php
View File

@ -583,6 +583,28 @@ $text['label-alternate-destination']['uk'] = "";
$text['label-alternate-destination']['de-at'] = "Alternatives Ziel";
$text['label-alternate-destination']['he'] = "";
$text['label-group']['en-us'] = "Group";
$text['label-group']['es-cl'] = "Grupo";
$text['label-group']['pt-pt'] = "";
$text['label-group']['fr-fr'] = "";
$text['label-group']['pt-br'] = "";
$text['label-group']['pl'] = "";
$text['label-group']['sv-se'] = "";
$text['label-group']['uk'] = "";
$text['label-group']['de-at'] = "";
$text['label-group']['he'] = "";
$text['label-destination']['en-us'] = "Destination";
$text['label-destination']['es-cl'] = "Destino";
$text['label-destination']['pt-pt'] = "Destino";
$text['label-destination']['fr-fr'] = "Destination";
$text['label-destination']['pt-br'] = "";
$text['label-destination']['pl'] = "Destynacja";
$text['label-destination']['sv-se'] = "Destination";
$text['label-destination']['uk'] = "";
$text['label-destination']['de-at'] = "Ziel";
$text['label-destination']['he'] = "";
$text['header-time_conditions']['en-us'] = "Time Conditions";
$text['header-time_conditions']['es-cl'] = "Condiciones de Tiempo";
$text['header-time_conditions']['pt-pt'] = "Condições Temporais";

20
app/time_conditions/time_condition_edit.php
View File

@ -248,7 +248,14 @@ require_once "resources/header.php";
$is_preset = (in_array($group_id, $_REQUEST['preset'])) ? true : false;
//set group and order number
$dialplan_detail_group = $group_id;
$dialplan_detail_group_user = check_str($_POST["group_$group_id"]);
if($dialplan_detail_group_user!='') {
$dialplan_detail_group = $dialplan_detail_group_user;
} else {
$dialplan_detail_group = $group_id;
}
$dialplan_detail_order = 0;
foreach ($conditions as $cond_num => $cond_var) {
@ -846,12 +853,23 @@ function add_custom_condition($destination, $group_id, $dialplan_action = '') {
echo " <tr>";
echo " <td colspan='4' style='white-space: nowrap;' id='group_".$group_id."'></td>";
echo " </tr>";
echo " </tr>";
echo " <td class='vtable' style='width: 108px;'>".$text['label-destination']."</td>\n";
echo " </tr>";
echo " <tr>";
echo " <td colspan='4' style='padding-top: 10px;'>";
//$destination = new destinations;
echo $destination->select('dialplan', 'dialplan_action['.$group_id.']', $dialplan_action);
echo " </td>";
echo " </tr>";
echo " <td class='vtable' style='width: 108px;'>".$text['label-group']."</td>\n";
echo " </tr>";
echo " </tr>";
echo " <td><input class='formfld' type='text' name='group_".$group_id."' id='group_".$group_id."' maxlength='255' value=\"".$group_id."\"></td>\n";
echo " </tr>";
echo " </table>";
echo " <br />";
echo " ".$text['description-settings'];