diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php index ac6f92a527..e049c83431 100644 --- a/app/access_controls/access_controls.php +++ b/app/access_controls/access_controls.php @@ -211,8 +211,12 @@ if (!empty($access_controls) && count($access_controls) > 0) { $x = 0; foreach ($access_controls as $row) { + $list_row_url = ''; if (permission_exists('access_control_edit')) { $list_row_url = "access_control_edit.php?id=".urlencode($row['access_control_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('access_control_add') || permission_exists('access_control_edit') || permission_exists('access_control_delete')) { @@ -254,3 +258,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php index 39946553f0..ce706932a3 100644 --- a/app/bridges/bridges.php +++ b/app/bridges/bridges.php @@ -234,8 +234,12 @@ if (!empty($bridges)) { $x = 0; foreach ($bridges as $row) { + $list_row_url = ''; if (permission_exists('bridge_edit')) { $list_row_url = "bridge_edit.php?id=".urlencode($row['bridge_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('bridge_add') || permission_exists('bridge_edit') || permission_exists('bridge_delete')) { diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php index 83484517eb..6ed672bc6d 100644 --- a/app/call_block/call_block.php +++ b/app/call_block/call_block.php @@ -309,8 +309,12 @@ if (!empty($result)) { $x = 0; foreach ($result as $row) { + $list_row_url = ''; if (permission_exists('call_block_edit')) { $list_row_url = "call_block_edit.php?id=".urlencode($row['call_block_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('call_block_add') || permission_exists('call_block_edit') || permission_exists('call_block_delete')) { @@ -405,3 +409,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php index 33ad94f238..6e6cd20c00 100644 --- a/app/call_broadcast/call_broadcast.php +++ b/app/call_broadcast/call_broadcast.php @@ -227,8 +227,12 @@ if (!empty($result)) { $x = 0; foreach($result as $row) { + $list_row_url = ''; if (permission_exists('call_broadcast_edit')) { $list_row_url = "call_broadcast_edit.php?id=".urlencode($row['call_broadcast_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('call_broadcast_add') || permission_exists('call_broadcast_delete')) { @@ -286,3 +290,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php index 3b10afdf77..427a8f1716 100644 --- a/app/call_center_active/call_center_queue.php +++ b/app/call_center_active/call_center_queue.php @@ -128,6 +128,9 @@ $x = 0; foreach($call_center_queues as $row) { $list_row_url = PROJECT_PATH."/app/call_center_active/call_center_active.php?queue_name=".escape($row['call_center_queue_uuid'])."&name=".urlencode(escape($row['queue_name'])); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } echo "\n"; echo " ".escape($row['queue_name'])."\n"; echo " ".escape($row['queue_extension'])."\n"; @@ -159,3 +162,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/call_centers/call_center_agents.php b/app/call_centers/call_center_agents.php index 07951e8535..9d76bf34bb 100644 --- a/app/call_centers/call_center_agents.php +++ b/app/call_centers/call_center_agents.php @@ -214,8 +214,12 @@ if (!empty($result)) { $x = 0; foreach($result as $row) { + $list_row_url = ''; if (permission_exists('call_center_agent_edit')) { $list_row_url = "call_center_agent_edit.php?id=".urlencode($row['call_center_agent_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('call_center_agent_delete')) { @@ -290,3 +294,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/call_centers/call_center_queues.php b/app/call_centers/call_center_queues.php index 76d4692f2b..52ef61e629 100644 --- a/app/call_centers/call_center_queues.php +++ b/app/call_centers/call_center_queues.php @@ -227,8 +227,12 @@ if (!empty($result)) { $x = 0; foreach($result as $row) { + $list_row_url = ''; if (permission_exists('call_center_queue_edit')) { $list_row_url = "call_center_queue_edit.php?id=".urlencode($row['call_center_queue_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('call_center_queue_add') || permission_exists('call_center_queue_delete')) { @@ -293,3 +297,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php index 90083781d4..2cbd2d6a53 100644 --- a/app/call_flows/call_flows.php +++ b/app/call_flows/call_flows.php @@ -243,8 +243,12 @@ if (!empty($call_flows)) { $x = 0; foreach ($call_flows as $row) { + $list_row_url = ''; if (permission_exists('call_flow_edit')) { $list_row_url = "call_flow_edit.php?id=".urlencode($row['call_flow_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('call_flow_add') || permission_exists('call_flow_edit') || permission_exists('call_flow_delete')) { @@ -311,3 +315,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/call_forward/call_forward.php b/app/call_forward/call_forward.php index cdb478d034..91e7d5f156 100644 --- a/app/call_forward/call_forward.php +++ b/app/call_forward/call_forward.php @@ -306,6 +306,9 @@ $x = 0; foreach ($extensions as $row) { $list_row_url = PROJECT_PATH . "/app/call_forward/call_forward_edit.php?id=" . $row['extension_uuid'] . "&return_url=" . urlencode($_SERVER['REQUEST_URI']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } echo "\n"; if (!$is_included && $extensions) { echo " \n"; @@ -424,3 +427,4 @@ require_once "resources/footer.php"; } ?> + diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index b0b1038154..e5a0ab5ed2 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -229,8 +229,12 @@ if (!empty($conference_centers)) { $x = 0; foreach ($conference_centers as $row) { + $list_row_url = ''; if (permission_exists('conference_center_edit')) { $list_row_url = "conference_center_edit.php?id=".$row['conference_center_uuid']; + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('conference_center_edit') || permission_exists('conference_center_delete')) { @@ -285,3 +289,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index 5ce0cd55de..53d30c44e9 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -319,8 +319,12 @@ $participant_pin = substr($participant_pin, 0, 3) ."-". substr($participant_pin, 3, 3) ."-". substr($participant_pin, -3)."\n"; } + $list_row_url = ''; if (permission_exists('conference_room_edit')) { $list_row_url = "conference_room_edit.php?id=".urlencode($row['conference_room_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('conference_room_add') || permission_exists('conference_room_edit') || permission_exists('conference_room_delete')) { @@ -508,3 +512,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php index 159cc29475..2a112abe24 100644 --- a/app/conferences/conferences.php +++ b/app/conferences/conferences.php @@ -231,8 +231,12 @@ if (!empty($conferences)) { $x = 0; foreach($conferences as $row) { + $list_row_url = ''; if (permission_exists('conference_edit')) { $list_row_url = "conference_edit.php?id=".urlencode($row['conference_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('conference_add') || permission_exists('conference_edit') || permission_exists('conference_delete')) { @@ -301,3 +305,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/database_transactions/database_transactions.php b/app/database_transactions/database_transactions.php index a04060d413..a17c6bfef6 100644 --- a/app/database_transactions/database_transactions.php +++ b/app/database_transactions/database_transactions.php @@ -195,8 +195,12 @@ $x = 0; foreach($transactions as $row) { if (empty($row['domain_name'])) { $row['domain_name'] = $text['label-global']; } + $list_row_url = ''; if (permission_exists('database_transaction_edit')) { $list_row_url = "database_transaction_edit.php?id=".urlencode($row['database_transaction_uuid']).(!empty($page) ? "&page=".urlencode($page) : null).(!empty($search) ? "&search=".urlencode($search) : null); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; echo " ".escape($row['domain_name'])." \n"; @@ -225,3 +229,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php index eabcd61c09..99a0e0b4e1 100644 --- a/app/destinations/destinations.php +++ b/app/destinations/destinations.php @@ -375,8 +375,12 @@ foreach ($destinations as $row) { //create the row link + $list_row_url = ''; if (permission_exists('destination_edit')) { $list_row_url = "destination_edit.php?id=".urlencode($row['destination_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } //show the data @@ -459,3 +463,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/devices/device_profiles.php b/app/devices/device_profiles.php index 8597a26352..d9cbfe0054 100644 --- a/app/devices/device_profiles.php +++ b/app/devices/device_profiles.php @@ -237,8 +237,12 @@ if (is_array($device_profiles) && @sizeof($device_profiles) != 0) { $x = 0; foreach($device_profiles as $row) { + $list_row_url = ''; if (permission_exists('device_profile_edit')) { $list_row_url = "device_profile_edit.php?id=".urlencode($row['device_profile_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('device_profile_add') || permission_exists('device_profile_edit') || permission_exists('device_profile_delete')) { @@ -298,3 +302,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/devices/device_vendor_functions.php b/app/devices/device_vendor_functions.php index 3b1e3b2b40..7a7dea5425 100644 --- a/app/devices/device_vendor_functions.php +++ b/app/devices/device_vendor_functions.php @@ -211,8 +211,12 @@ unset ($vendor_function_groups); //show the row of data + $list_row_url = ''; if (permission_exists('device_vendor_function_edit')) { $list_row_url = "device_vendor_function_edit.php?device_vendor_uuid=".urlencode($row['device_vendor_uuid'])."&id=".urlencode($row['device_vendor_function_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('device_vendor_function_add') || permission_exists('device_vendor_function_edit') || permission_exists('device_vendor_function_delete')) { @@ -289,3 +293,4 @@ echo "\n"; ?> + diff --git a/app/devices/device_vendors.php b/app/devices/device_vendors.php index 9d4a24e75d..9aed554771 100644 --- a/app/devices/device_vendors.php +++ b/app/devices/device_vendors.php @@ -178,8 +178,12 @@ if (is_array($result) && @sizeof($result) != 0) { $x = 0; foreach($result as $row) { + $list_row_url = ''; if (permission_exists('device_vendor_edit')) { $list_row_url = "device_vendor_edit.php?id=".urlencode($row['device_vendor_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('device_vendor_edit') || permission_exists('device_vendor_delete')) { @@ -222,3 +226,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/devices/devices.php b/app/devices/devices.php index ec56e1a667..7c251692a5 100644 --- a/app/devices/devices.php +++ b/app/devices/devices.php @@ -397,8 +397,12 @@ } } + $list_row_url = ''; if (permission_exists('device_edit')) { $list_row_url = "device_edit.php?id=".urlencode($row['device_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } $device_provisioned_method = ''; @@ -473,3 +477,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/dialplans/dialplans.php b/app/dialplans/dialplans.php index 296b764c34..81c7f11b16 100644 --- a/app/dialplans/dialplans.php +++ b/app/dialplans/dialplans.php @@ -551,9 +551,13 @@ $x = 0; foreach ($dialplans as $row) { + $list_row_url = ''; if ($row['app_uuid'] == "4b821450-926b-175a-af93-a03c441818b1") { if (permission_exists('time_condition_edit') || permission_exists('dialplan_edit')) { $list_row_url = PROJECT_PATH."/app/time_conditions/time_condition_edit.php?id=".urlencode($row['dialplan_uuid']).(is_uuid($app_uuid) ? "&app_uuid=".urlencode($app_uuid) : null); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } } else if ( @@ -563,6 +567,9 @@ permission_exists('dialplan_edit') ) { $list_row_url = "dialplan_edit.php?id=".urlencode($row['dialplan_uuid']).(is_uuid($app_uuid) ? "&app_uuid=".urlencode($app_uuid) : null); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } else { unset($list_row_url); @@ -648,3 +655,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/email_queue/email_queue.php b/app/email_queue/email_queue.php index faa6abc0c8..13e1d92e8e 100644 --- a/app/email_queue/email_queue.php +++ b/app/email_queue/email_queue.php @@ -337,8 +337,12 @@ if (is_array($email_queue) && @sizeof($email_queue) != 0) { $x = 0; foreach ($email_queue as $row) { + $list_row_url = ''; if (permission_exists('email_queue_edit')) { $list_row_url = "email_queue_edit.php?id=".urlencode($row['email_queue_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('email_queue_add') || permission_exists('email_queue_edit') || permission_exists('email_queue_delete')) { diff --git a/app/email_templates/email_templates.php b/app/email_templates/email_templates.php index ae1b22216a..36ae8687f0 100644 --- a/app/email_templates/email_templates.php +++ b/app/email_templates/email_templates.php @@ -257,8 +257,12 @@ if (!empty($result)) { $x = 0; foreach($result as $row) { + $list_row_url = ''; if (permission_exists('email_template_edit')) { $list_row_url = "email_template_edit.php?id=".urlencode($row['email_template_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('email_template_add') || permission_exists('email_template_edit') || permission_exists('email_template_delete')) { @@ -323,3 +327,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/event_guard/event_guard_logs.php b/app/event_guard/event_guard_logs.php index 7e40486006..38dce4027f 100644 --- a/app/event_guard/event_guard_logs.php +++ b/app/event_guard/event_guard_logs.php @@ -244,8 +244,12 @@ if (is_array($event_guard_logs) && @sizeof($event_guard_logs) != 0) { $x = 0; foreach ($event_guard_logs as $row) { + $list_row_url = ''; if (permission_exists('event_guard_log_edit')) { $list_row_url = "event_guard_log_edit.php?id=".urlencode($row['event_guard_log_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('event_guard_log_add') || permission_exists('event_guard_log_edit') || permission_exists('event_guard_log_delete')) { diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php index 12eb539b7d..fac86bdfb3 100644 --- a/app/extensions/extensions.php +++ b/app/extensions/extensions.php @@ -339,8 +339,12 @@ if (is_array($extensions) && @sizeof($extensions) != 0) { $x = 0; foreach($extensions as $row) { + $list_row_url = ''; if (permission_exists('extension_edit')) { $list_row_url = "extension_edit.php?id=".urlencode($row['extension_uuid']).(is_numeric($page) ? '&page='.urlencode($page) : null); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('extension_enabled') || permission_exists('extension_delete')) { @@ -447,3 +451,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/fax/fax.php b/app/fax/fax.php index f87e1e63df..125a7b1305 100644 --- a/app/fax/fax.php +++ b/app/fax/fax.php @@ -247,8 +247,12 @@ if (is_array($result) && @sizeof($result) != 0) { $x = 0; foreach ($result as $row) { + $list_row_url = ''; if (permission_exists('fax_extension_edit')) { $list_row_url = "fax_edit.php?id=".urlencode($row['fax_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('fax_extension_add') || permission_exists('fax_extension_delete')) { @@ -325,3 +329,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/fax_queue/fax_queue.php b/app/fax_queue/fax_queue.php index 1822255f86..5e51787f56 100644 --- a/app/fax_queue/fax_queue.php +++ b/app/fax_queue/fax_queue.php @@ -332,8 +332,12 @@ if (!empty($fax_queue)) { $x = 0; foreach ($fax_queue as $row) { + $list_row_url = ''; if ($permission['fax_queue_edit']) { $list_row_url = "fax_queue_edit.php?id=".urlencode($row['fax_queue_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if ($permission['fax_queue_add'] || $permission['fax_queue_edit'] || $permission['fax_queue_delete']) { diff --git a/app/fifo/fifo.php b/app/fifo/fifo.php index 898a333c82..54e50a05a0 100644 --- a/app/fifo/fifo.php +++ b/app/fifo/fifo.php @@ -264,6 +264,9 @@ foreach ($fifo as $row) { if (permission_exists('fifo_edit')) { $list_row_url = "fifo_edit.php?id=".urlencode($row['fifo_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('fifo_add') || permission_exists('fifo_edit') || permission_exists('fifo_delete')) { @@ -320,3 +323,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php index cd6299c25f..06f3a7bcc7 100644 --- a/app/gateways/gateways.php +++ b/app/gateways/gateways.php @@ -286,8 +286,12 @@ if (!empty($gateways)) { $x = 0; foreach($gateways as $row) { + $list_row_url = ''; if (permission_exists('gateway_edit')) { $list_row_url = "gateway_edit.php?id=".urlencode($row['gateway_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('gateway_add') || permission_exists('gateway_edit') || permission_exists('gateway_delete')) { @@ -391,3 +395,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/ivr_menus/ivr_menus.php b/app/ivr_menus/ivr_menus.php index 2c4968369d..287a2a66f5 100644 --- a/app/ivr_menus/ivr_menus.php +++ b/app/ivr_menus/ivr_menus.php @@ -236,8 +236,12 @@ if (!empty($ivr_menus)) { $x = 0; foreach($ivr_menus as $row) { + $list_row_url = ''; if (permission_exists('ivr_menu_edit')) { $list_row_url = "ivr_menu_edit.php?id=".urlencode($row['ivr_menu_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('ivr_menu_add') || permission_exists('ivr_menu_edit') || permission_exists('ivr_menu_delete')) { @@ -298,3 +302,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/modules/modules.php b/app/modules/modules.php index f2ec07b185..bb3a16a2dc 100644 --- a/app/modules/modules.php +++ b/app/modules/modules.php @@ -202,8 +202,12 @@ echo "\n"; write_header($row["module_category"]); } + $list_row_url = ''; if (permission_exists('module_edit')) { $list_row_url = "module_edit.php?id=".urlencode($row['module_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('module_edit') || permission_exists('module_delete')) { @@ -283,3 +287,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/number_translations/number_translations.php b/app/number_translations/number_translations.php index bc02e4fef8..3b58216bf3 100644 --- a/app/number_translations/number_translations.php +++ b/app/number_translations/number_translations.php @@ -225,8 +225,12 @@ if (!empty($number_translations)) { $x = 0; foreach ($number_translations as $row) { + $list_row_url = ''; if (permission_exists('number_translation_edit')) { $list_row_url = "number_translation_edit.php?id=".urlencode($row['number_translation_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('number_translation_add') || permission_exists('number_translation_edit') || permission_exists('number_translation_delete')) { @@ -276,3 +280,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/phrases/phrases.php b/app/phrases/phrases.php index e8b5bd16ab..0edd4f6559 100644 --- a/app/phrases/phrases.php +++ b/app/phrases/phrases.php @@ -211,8 +211,12 @@ if (is_array($phrases) && @sizeof($phrases) != 0) { $x = 0; foreach($phrases as $row) { + $list_row_url = ''; if (permission_exists('phrase_edit')) { $list_row_url = "phrase_edit.php?id=".urlencode($row['phrase_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('phrase_add') || permission_exists('phrase_edit') || permission_exists('phrase_delete')) { @@ -273,3 +277,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/pin_numbers/pin_numbers.php b/app/pin_numbers/pin_numbers.php index 1740c631a2..e7581cecf7 100644 --- a/app/pin_numbers/pin_numbers.php +++ b/app/pin_numbers/pin_numbers.php @@ -189,8 +189,12 @@ if (is_array($pin_numbers) && @sizeof($pin_numbers) != 0) { $x = 0; foreach ($pin_numbers as $row) { + $list_row_url = ''; if (permission_exists('pin_number_edit')) { $list_row_url = "pin_number_edit.php?id=".urlencode($row['pin_number_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('pin_number_add') || permission_exists('pin_number_edit') || permission_exists('pin_number_delete')) { @@ -241,3 +245,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index b429120270..0a8f68b13b 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -529,8 +529,12 @@ echo "\n"; echo "\n"; // dummy row to maintain alternating background color } + $list_row_url = ''; if (permission_exists('recording_edit')) { $list_row_url = "recording_edit.php?id=".urlencode($row['recording_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('recording_delete')) { @@ -710,3 +714,4 @@ } ?> + diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index 59473180d1..f995d7cdf0 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -257,8 +257,12 @@ if (is_array($ring_groups) && @sizeof($ring_groups) != 0) { $x = 0; foreach ($ring_groups as $row) { + $list_row_url = ''; if (permission_exists('ring_group_edit')) { $list_row_url = "ring_group_edit.php?id=".urlencode($row['ring_group_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('ring_group_add') || permission_exists('ring_group_edit') || permission_exists('ring_group_delete')) { @@ -315,3 +319,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php index a18b92c5e5..956d0727ea 100644 --- a/app/sip_profiles/sip_profiles.php +++ b/app/sip_profiles/sip_profiles.php @@ -188,8 +188,12 @@ if (!empty($sip_profiles) && @sizeof($sip_profiles) != 0) { $x = 0; foreach ($sip_profiles as $row) { + $list_row_url = ''; if (permission_exists('sip_profile_edit')) { $list_row_url = "sip_profile_edit.php?id=".urlencode($row['sip_profile_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('sip_profile_add') || permission_exists('sip_profile_edit') || permission_exists('sip_profile_delete')) { @@ -239,3 +243,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/sip_status/sip_status.php b/app/sip_status/sip_status.php index 364023a108..5dfb85360e 100644 --- a/app/sip_status/sip_status.php +++ b/app/sip_status/sip_status.php @@ -331,3 +331,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/sofia_global_settings/sofia_global_settings.php b/app/sofia_global_settings/sofia_global_settings.php index deb31716d5..12a40fb1ec 100644 --- a/app/sofia_global_settings/sofia_global_settings.php +++ b/app/sofia_global_settings/sofia_global_settings.php @@ -209,8 +209,12 @@ if (!empty($sofia_global_settings) && @sizeof($sofia_global_settings) != 0) { $x = 0; foreach ($sofia_global_settings as $row) { + $list_row_url = ''; if (permission_exists('sofia_global_setting_edit')) { $list_row_url = "sofia_global_setting_edit.php?id=".urlencode($row['sofia_global_setting_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('sofia_global_setting_add') || permission_exists('sofia_global_setting_edit') || permission_exists('sofia_global_setting_delete')) { @@ -261,3 +265,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/streams/streams.php b/app/streams/streams.php index 5b872b764a..c065cad90b 100644 --- a/app/streams/streams.php +++ b/app/streams/streams.php @@ -248,8 +248,12 @@ if (!empty($streams)) { $x = 0; foreach ($streams as $row) { + $list_row_url = ''; if (permission_exists('stream_edit')) { $list_row_url = "stream_edit.php?id=".urlencode($row['stream_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('stream_add') || permission_exists('stream_edit') || permission_exists('stream_delete')) { @@ -315,3 +319,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/time_conditions/time_conditions.php b/app/time_conditions/time_conditions.php index 63c826305e..6f5eede525 100644 --- a/app/time_conditions/time_conditions.php +++ b/app/time_conditions/time_conditions.php @@ -218,8 +218,12 @@ if (is_array($dialplans) && @sizeof($dialplans) != 0) { $x = 0; foreach ($dialplans as $row) { + $list_row_url = ''; if (permission_exists('time_condition_edit')) { $list_row_url = "time_condition_edit.php?id=".urlencode($row['dialplan_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('time_condition_add') || permission_exists('time_condition_edit') || permission_exists('time_condition_delete')) { @@ -282,3 +286,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/vars/vars.php b/app/vars/vars.php index d954ff394d..3e17ca5a23 100644 --- a/app/vars/vars.php +++ b/app/vars/vars.php @@ -224,8 +224,12 @@ echo "\n"; write_header($row["var_category"]); } + $list_row_url = ''; if (permission_exists('var_edit')) { $list_row_url = "var_edit.php?id=".urlencode($row['var_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('var_add') || permission_exists('var_edit') || permission_exists('var_delete')) { @@ -283,3 +287,4 @@ require_once "resources/footer.php"; ?> + diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php index 93a5674dac..49eec2c8bb 100644 --- a/app/voicemail_greetings/voicemail_greetings.php +++ b/app/voicemail_greetings/voicemail_greetings.php @@ -437,8 +437,12 @@ echo "\n"; echo "\n"; // dummy row to maintain alternating background color } + $list_row_url = ''; if (permission_exists('voicemail_greeting_edit')) { $list_row_url = "voicemail_greeting_edit.php?id=".urlencode($row['voicemail_greeting_uuid'])."&voicemail_id=".urlencode($voicemail_id); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('voicemail_greeting_delete')) { @@ -605,3 +609,4 @@ } ?> + diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php index 250e0b7160..ad6d6c1903 100644 --- a/app/voicemails/voicemails.php +++ b/app/voicemails/voicemails.php @@ -297,8 +297,12 @@ if (is_array($voicemails) && sizeof($voicemails) != 0) { $x = 0; foreach ($voicemails as $row) { + $list_row_url = ''; if (permission_exists('voicemail_edit')) { $list_row_url = "voicemail_edit.php?id=".urlencode($row['voicemail_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('voicemail_edit') || permission_exists('voicemail_delete')) { @@ -373,3 +377,4 @@ //include the footer require_once "resources/footer.php"; + diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index 2b59f228a3..68669d90a8 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -877,8 +877,12 @@ $content .= "\n"; $content .= "\n"; // dummy row to maintain alternating background color } + $list_row_url = ''; if ($permission['xml_cdr_details']) { $list_row_url = "xml_cdr_details.php?id=".urlencode($row['xml_cdr_uuid']).($_REQUEST['show'] ? "&show=all" : null); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } $content .= "\n"; if (!$archive_request && $permission['xml_cdr_delete']) { @@ -1059,3 +1063,4 @@ require_once "resources/footer.php"; ?> + diff --git a/core/contacts/contact_addresses.php b/core/contacts/contact_addresses.php index 7d17fd0180..8e375a3480 100644 --- a/core/contacts/contact_addresses.php +++ b/core/contacts/contact_addresses.php @@ -88,8 +88,12 @@ $x = 0; foreach ($contact_addresses as $row) { $map_query = $row['address_street']." ".$row['address_extended'].", ".$row['address_locality'].", ".$row['address_region'].", ".$row['address_region'].", ".$row['address_postal_code']; + $list_row_url = ''; if (permission_exists('contact_address_edit')) { $list_row_url = "contact_address_edit.php?contact_uuid=".urlencode($row['contact_uuid'])."&id=".urlencode($row['contact_address_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('contact_address_delete')) { @@ -123,3 +127,4 @@ } ?> + diff --git a/core/contacts/contact_attachments.php b/core/contacts/contact_attachments.php index 7986b3fbb7..8b2c913c78 100644 --- a/core/contacts/contact_attachments.php +++ b/core/contacts/contact_attachments.php @@ -107,8 +107,12 @@ foreach ($contact_attachments as $row) { $attachment_type = strtolower(pathinfo($row['attachment_filename'], PATHINFO_EXTENSION)); $attachment_type_label = $attachment_type == 'jpg' || $attachment_type == 'jpeg' || $attachment_type == 'gif' || $attachment_type == 'png' ? $text['label-image'] : $text['label-file']; + $list_row_url = ''; if (permission_exists('contact_attachment_edit')) { $list_row_url = "contact_attachment_edit.php?contact_uuid=".urlencode($row['contact_uuid'])."&id=".urlencode($row['contact_attachment_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('contact_attachment_delete')) { @@ -147,3 +151,4 @@ } ?> + diff --git a/core/contacts/contact_emails.php b/core/contacts/contact_emails.php index c89e9da80b..6afcb02539 100644 --- a/core/contacts/contact_emails.php +++ b/core/contacts/contact_emails.php @@ -79,8 +79,12 @@ if (!empty($contact_emails)) { $x = 0; foreach ($contact_emails as $row) { + $list_row_url = ''; if (permission_exists('contact_email_edit')) { $list_row_url = "contact_email_edit.php?contact_uuid=".urlencode($row['contact_uuid'])."&id=".urlencode($row['contact_email_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('contact_email_delete')) { @@ -110,3 +114,4 @@ } ?> + diff --git a/core/contacts/contact_extensions.php b/core/contacts/contact_extensions.php index 96678d5e8f..a848bd0976 100644 --- a/core/contacts/contact_extensions.php +++ b/core/contacts/contact_extensions.php @@ -77,8 +77,12 @@ if (!empty($contact_extensions)) { $x = 0; foreach ($contact_extensions as $row) { + $list_row_url = ''; if (permission_exists('extension_edit')) { $list_row_url = PROJECT_PATH.'/app/extensions/extension_edit.php?id='.urlencode($row['extension_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; echo " "; @@ -109,3 +113,4 @@ } ?> + diff --git a/core/contacts/contact_notes.php b/core/contacts/contact_notes.php index 07d45b94db..0e66f265ec 100644 --- a/core/contacts/contact_notes.php +++ b/core/contacts/contact_notes.php @@ -82,8 +82,12 @@ $contact_note = $row['contact_note']; $contact_note = escape($contact_note); $contact_note = str_replace("\n","
",$contact_note); + $list_row_url = ''; if (permission_exists('contact_note_add')) { $list_row_url = "contact_note_edit.php?contact_uuid=".escape($row['contact_uuid'])."&id=".escape($row['contact_note_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('contact_note_delete')) { @@ -112,3 +116,4 @@ } ?> + diff --git a/core/contacts/contact_phones.php b/core/contacts/contact_phones.php index b70759f153..51d18b2c14 100644 --- a/core/contacts/contact_phones.php +++ b/core/contacts/contact_phones.php @@ -93,8 +93,12 @@ if (!empty($contact_phones)) { $x = 0; foreach ($contact_phones as $row) { + $list_row_url = ''; if (permission_exists('contact_phone_edit')) { $list_row_url = "contact_phone_edit.php?contact_uuid=".urlencode($row['contact_uuid'])."&id=".urlencode($row['contact_phone_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('contact_phone_delete')) { @@ -144,3 +148,4 @@ } ?> + diff --git a/core/contacts/contact_relations.php b/core/contacts/contact_relations.php index 01e2c77779..36e006cf8b 100644 --- a/core/contacts/contact_relations.php +++ b/core/contacts/contact_relations.php @@ -93,8 +93,12 @@ if (!empty($contact_relations)) { $x = 0; foreach ($contact_relations as $row) { + $list_row_url = ''; if (permission_exists('contact_relation_edit')) { $list_row_url = "contact_relation_edit.php?contact_uuid=".urlencode($contact_uuid)."&id=".urlencode($row['contact_relation_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('contact_relation_delete')) { @@ -124,3 +128,4 @@ } ?> + diff --git a/core/contacts/contact_settings.php b/core/contacts/contact_settings.php index 0fa2d63a3b..6ded1b022a 100644 --- a/core/contacts/contact_settings.php +++ b/core/contacts/contact_settings.php @@ -86,8 +86,12 @@ if (!empty($contact_settings)) { $x = 0; foreach ($contact_settings as $row) { + $list_row_url = ''; if (permission_exists('contact_setting_edit')) { $list_row_url = "contact_setting_edit.php?contact_uuid=".urlencode($contact_uuid)."&id=".urlencode($row['contact_setting_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('contact_setting_delete')) { @@ -133,3 +137,4 @@ } ?> + diff --git a/core/contacts/contact_times.php b/core/contacts/contact_times.php index 1ab5fcf912..193fa0f911 100644 --- a/core/contacts/contact_times.php +++ b/core/contacts/contact_times.php @@ -97,8 +97,12 @@ } $tmp = explode(' ', $row['time_start']); $time_start = $tmp[0]; + $list_row_url = ''; if (permission_exists('contact_time_edit')) { $list_row_url = "contact_time_edit.php?contact_uuid=".urlencode($row['contact_uuid'])."&id=".urlencode($row['contact_time_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('contact_time_delete')) { @@ -129,3 +133,4 @@ } ?> + diff --git a/core/contacts/contact_urls.php b/core/contacts/contact_urls.php index d04d70cbb5..7de4cb087d 100644 --- a/core/contacts/contact_urls.php +++ b/core/contacts/contact_urls.php @@ -81,8 +81,12 @@ if (!empty($contact_urls)) { $x = 0; foreach ($contact_urls as $row) { + $list_row_url = ''; if (permission_exists('contact_url_edit')) { $list_row_url = "contact_url_edit.php?contact_uuid=".urlencode($row['contact_uuid'])."&id=".urlencode($row['contact_url_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('contact_url_delete')) { @@ -112,3 +116,4 @@ } ?> + diff --git a/core/contacts/contacts.php b/core/contacts/contacts.php index f35857b5bc..abdbdbfe2f 100644 --- a/core/contacts/contacts.php +++ b/core/contacts/contacts.php @@ -396,6 +396,9 @@ $x = 0; foreach($contacts as $row) { $list_row_url = "contact_view.php?id=".urlencode($row['contact_uuid'])."&query_string=".urlencode($_SERVER["QUERY_STRING"]); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } echo "\n"; if (permission_exists('contact_delete')) { echo " \n"; @@ -469,3 +472,5 @@ require_once "resources/footer.php"; ?> + + diff --git a/core/dashboard/dashboard.php b/core/dashboard/dashboard.php index 7d3076b9dd..841a95ce4f 100644 --- a/core/dashboard/dashboard.php +++ b/core/dashboard/dashboard.php @@ -202,8 +202,12 @@ if (!empty($dashboard)) { $x = 0; foreach ($dashboard as $row) { + $list_row_url = ''; if (permission_exists('dashboard_edit')) { $list_row_url = "dashboard_edit.php?id=".urlencode($row['dashboard_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('dashboard_add') || permission_exists('dashboard_edit') || permission_exists('dashboard_delete')) { @@ -256,3 +260,4 @@ require_once "resources/footer.php"; ?> + diff --git a/core/databases/databases.php b/core/databases/databases.php index 9e5280ebb6..a579b486ef 100644 --- a/core/databases/databases.php +++ b/core/databases/databases.php @@ -200,3 +200,4 @@ require_once "resources/footer.php"; ?> + diff --git a/core/users/users.php b/core/users/users.php index cffbe80a8e..304f6a3d32 100644 --- a/core/users/users.php +++ b/core/users/users.php @@ -276,8 +276,12 @@ if (is_array($users) && @sizeof($users) != 0) { $x = 0; foreach ($users as $row) { + $list_row_url = ''; if (permission_exists('user_edit')) { $list_row_url = "user_edit.php?id=".urlencode($row['user_uuid']); + if ($row['domain_uuid'] != $_SESSION['domain_uuid'] && permission_exists('domain_select')) { + $list_row_url .= '&domain_uuid='.urlencode($row['domain_uuid']).'&domain_change=true'; + } } echo "\n"; if (permission_exists('user_add') || permission_exists('user_edit') || permission_exists('user_delete')) { @@ -337,3 +341,4 @@ require_once "resources/footer.php"; ?> +