diff --git a/app/calls/app_config.php b/app/calls/app_config.php
index b645037791..9c55a8011b 100644
--- a/app/calls/app_config.php
+++ b/app/calls/app_config.php
@@ -32,7 +32,7 @@
$apps[$x]['menu'][0]['uuid'] = '';
$apps[$x]['menu'][0]['parent_uuid'] = '';
$apps[$x]['menu'][0]['category'] = 'internal';
- $apps[$x]['menu'][0]['path'] = '/app/calls/v_calls.php';
+ $apps[$x]['menu'][0]['path'] = '/app/calls/calls.php';
$apps[$x]['menu'][0]['groups'][] = 'user';
$apps[$x]['menu'][0]['groups'][] = 'admin';
$apps[$x]['menu'][0]['groups'][] = 'superadmin';
diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php
index e61c5980d4..fe1ef00424 100644
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@@ -308,7 +308,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//redirect the user
require_once "includes/header.php";
- echo "\n";
+ echo "\n";
echo "
\n";
echo "".$text['confirm-update']."
\n";
echo "
\n";
@@ -390,7 +390,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo " ".$text['title']."\n";
echo "\n";
echo "\n";
- echo " \n";
+ echo " \n";
echo " | \n";
echo "\n";
echo "\n";
diff --git a/app/calls/calls.php b/app/calls/calls.php
index c39f8d55fe..274d30f996 100644
--- a/app/calls/calls.php
+++ b/app/calls/calls.php
@@ -155,15 +155,15 @@ else {
echo " | ".$row['extension']." | \n";
echo " \n";
if (permission_exists('call_forward')) {
- echo " ".$text['label-call-forward']." \n";
+ echo " ".$text['label-call-forward']." \n";
echo " \n";
}
if (permission_exists('follow_me')) {
- echo " ".$text['label-follow-me']." \n";
+ echo " ".$text['label-follow-me']." \n";
echo " \n";
}
if (permission_exists('do_not_disturb')) {
- echo " ".$text['label-dnd']." \n";
+ echo " ".$text['label-dnd']." \n";
}
echo " | \n";
echo " ".$row['description']." | \n";
diff --git a/app/calls/set_call_forward_all.php b/app/calls/set_call_forward_all.php
new file mode 100644
index 0000000000..5952647602
--- /dev/null
+++ b/app/calls/set_call_forward_all.php
@@ -0,0 +1,137 @@
+
+ Portions created by the Initial Developer are Copyright (C) 2008-2012
+ the Initial Developer. All Rights Reserved.
+
+ Contributor(s):
+ Mark J Crane
+*/
+require_once "root.php";
+require_once "includes/require.php";
+require_once "includes/checkauth.php";
+if (permission_exists('call_forward')) {
+ //access granted
+}
+else {
+ echo "access denied";
+ exit;
+}
+
+//define the destination_select function
+ function destination_select($select_name, $select_value, $select_default) {
+ if (strlen($select_value) == 0) { $select_value = $select_default; }
+ echo " \n";
+ }
+
+//get the extension_uuid
+ $extension_uuid = check_str($_REQUEST["id"]);
+
+//get the extension number
+ $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 (count($_SESSION['user']['extension']) > 0) {
+ $sql .= "and (";
+ $x = 0;
+ foreach($_SESSION['user']['extension'] as $row) {
+ if ($x > 0) { $sql .= "or "; }
+ $sql .= "extension = '".$row['user']."' ";
+ $x++;
+ }
+ $sql .= ")";
+ }
+ else {
+ //hide any results when a user has not been assigned an extension
+ $sql .= "and extension = 'disabled' ";
+ }
+ }
+ $sql .= "and enabled = 'true' ";
+ $prep_statement = $db->prepare(check_sql($sql));
+ $prep_statement->execute();
+ $result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+ if (count($result)== 0) {
+ echo "access denied";
+ exit;
+ }
+ else {
+ foreach ($result as &$row) {
+ $extension = $row["extension"];
+ $effective_caller_id_name = $row["effective_caller_id_name"];
+ $effective_caller_id_number = $row["effective_caller_id_number"];
+ $outbound_caller_id_name = $row["outbound_caller_id_name"];
+ $outbound_caller_id_number = $row["outbound_caller_id_number"];
+ $do_not_disturb = $row["do_not_disturb"];
+ $call_forward_all = $row["call_forward_all"];
+ $dial_string = $row["dial_string"];
+ $call_forward_busy = $row["call_forward_busy"];
+ $description = $row["description"];
+ }
+ if (strlen($do_not_disturb) == 0) {
+ $do_not_disturb = "false";
+ }
+ }
+ unset ($prep_statement);
+
+//get http post variables and set them to php variables
+ if (count($_POST)>0) {
+ $call_forward_all_enabled = check_str($_POST["call_forward_all_enabled"]);
+ $call_forward_all = check_str($_POST["call_forward_all"]);
+ if (strlen($call_forward_all) > 0) {
+ $call_forward_all = preg_replace("~[^0-9]~", "",$call_forward_all);
+ }
+ }
+
+//include the classes
+ include "includes/classes/switch_call_forward.php";
+
+//call forward config
+ $call_forward = new call_forward;
+ $call_forward->domain_uuid = $_SESSION['domain_uuid'];
+ $call_forward->domain_name = $_SESSION['domain_name'];
+ $call_forward->extension = $extension;
+ $call_forward->number = $call_forward_all;
+ $call_forward->enabled = $call_forward_all_enabled;
+ $call_forward->set_all();
+ unset($call_forward);
+
+//redirect the user
+ require_once "includes/header.php";
+ echo "\n";
+ echo "\n";
+ echo "Update Complete
\n";
+ echo "
\n";
+ require_once "includes/footer.php";
+ return;
+
+?>
\ No newline at end of file
diff --git a/index2.php b/index2.php
index 829ba27b22..9bc425530e 100644
--- a/index2.php
+++ b/index2.php
@@ -82,7 +82,7 @@ echo "
";
if (file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/app/calls/v_calls.php")) {
if (permission_exists('follow_me') || permission_exists('call_forward') || permission_exists('do_not_disturb')) {
$is_included = "true";
- require_once "app/calls/v_calls.php";
+ require_once "app/calls/calls.php";
}
}