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

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

Browse Source
This commit is contained in:
markjcrane
2015-09-26 09:00:11 -06:00
parent b27bcdd820 d4e8be5b75
commit 01d4219e1a
10 changed files with 85 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/fifo/app_menu.php
+4 -4
View File
@@ -3,9 +3,9 @@
$apps[$x]['menu'][0]['title']['en-us'] = "Queues";
$apps[$x]['menu'][0]['title']['es-cl'] = "Colas";
$apps[$x]['menu'][0]['title']['es-mx'] = "Colas";
$apps[$x]['menu'][0]['title']['de-de'] = "";
$apps[$x]['menu'][0]['title']['de-ch'] = "";
$apps[$x]['menu'][0]['title']['de-at'] = "";
$apps[$x]['menu'][0]['title']['de-de'] = "Warteschlangen";
$apps[$x]['menu'][0]['title']['de-ch'] = "Warteschlangen";
$apps[$x]['menu'][0]['title']['de-at'] = "Warteschlangen";
$apps[$x]['menu'][0]['title']['fr-fr'] = "Queues";
$apps[$x]['menu'][0]['title']['fr-ca'] = "";
$apps[$x]['menu'][0]['title']['fr-ch'] = "";
@@ -19,4 +19,4 @@ $apps[$x]['menu'][0]['path'] = "/app/dialplan/dialplans.php?app_uuid=16589224-c8
$apps[$x]['menu'][0]['groups'][] = "admin";
$apps[$x]['menu'][0]['groups'][] = "superadmin";
?>
?>
app/follow_me/app_menu.php
+4 -4
View File
@@ -2,9 +2,9 @@
$apps[$x]['menu'][0]['title']['en-us'] = "Follow Me";
$apps[$x]['menu'][0]['title']['es-mx'] = "Sígueme";
$apps[$x]['menu'][0]['title']['de-de'] = "";
$apps[$x]['menu'][0]['title']['de-ch'] = "";
$apps[$x]['menu'][0]['title']['de-at'] = "";
$apps[$x]['menu'][0]['title']['de-de'] = "Follow Me";
$apps[$x]['menu'][0]['title']['de-ch'] = "Follow Me";
$apps[$x]['menu'][0]['title']['de-at'] = "Follow Me";
$apps[$x]['menu'][0]['title']['fr-fr'] = "Follow Me";
$apps[$x]['menu'][0]['title']['fr-ca'] = "";
$apps[$x]['menu'][0]['title']['fr-ch'] = "";
@@ -18,4 +18,4 @@
$apps[$x]['menu'][0]['groups'][] = "admin";
$apps[$x]['menu'][0]['groups'][] = "superadmin";
?>
?>
app/provision/index.php
+2 -1
View File
@@ -77,6 +77,7 @@ openlog("fusion-provisioning", LOG_PID | LOG_PERROR, LOG_LOCAL0);
$domain_uuid = $row["domain_uuid"];
}
unset($result, $prep_statement);
$_SESSION['domain_uuid'] = $domain_uuid;
//get the domain name
$domain_name = $_SESSION['domains'][$domain_uuid]['domain_name'];
@@ -311,4 +312,4 @@ openlog("fusion-provisioning", LOG_PID | LOG_PERROR, LOG_LOCAL0);
return $needed_parts ? false : $data;
}
?>
?>
app/xml_cdr/xml_cdr.php
+6 -6
View File
@@ -471,21 +471,21 @@ else {
switch ($row['direction']) {
case "inbound" :
if ($row['billsec'] == 0)
echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_missed.png' style='border: none;' title='".$text['label-inbound']." ".$text['label-missed']."'>\n";
echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_missed.png' width='16' style='border: none;' title='".$text['label-inbound']." ".$text['label-missed']."'>\n";
else
echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_connected.png' style='border: none;' title='".$text['label-inbound']."'>\n";
echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_connected.png' width='16' style='border: none;' title='".$text['label-inbound']."'>\n";
break;
case "outbound" :
if ($row['billsec'] == 0)
echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_outbound_failed.png' style='border: none;' title='".$text['label-outbound']." ".$text['label-failed']."'>\n";
echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_outbound_failed.png' width='16' style='border: none;' title='".$text['label-outbound']." ".$text['label-failed']."'>\n";
else
echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_outbound_connected.png' style='border: none;' title='".$text['label-outbound']."'>\n";
echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_outbound_connected.png' width='16' style='border: none;' title='".$text['label-outbound']."'>\n";
break;
case "local" :
if ($row['billsec'] == 0)
echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_local_failed.png' style='border: none;' title='".$text['label-local']." ".$text['label-failed']."'>\n";
echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_local_failed.png' width='16' style='border: none;' title='".$text['label-local']." ".$text['label-failed']."'>\n";
else
echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_local_connected.png' style='border: none;' title='".$text['label-local']."'>\n";
echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_local_connected.png' width='16' style='border: none;' title='".$text['label-local']."'>\n";
break;
default:
echo "&nbsp;";