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

Fix the indentation and login redirect issue

This commit is contained in:
Mark Crane 2014-07-27 08:00:16 +00:00
parent 023176f775
commit 9140870915
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/dialplan/resources/switch/conf/dialplan/490_do-not-disturb.xml
View File

@ -1,6 +1,6 @@
<context name="{v_context}"> <context name="{v_context}">
<extension name="do-not-disturb" number="*78,*79" continue="false" app_uuid="df32d982-e39e-4ae5-a46d-aed1893873f2" enabled="true"> <extension name="do-not-disturb" number="*78,*79" continue="false" app_uuid="df32d982-e39e-4ae5-a46d-aed1893873f2" enabled="true">
<condition field="destination_number" expression="^\*78$" break="on-true"> <condition field="destination_number" expression="^\*78$|\*363$" break="on-true">
<action application="set" data="enabled=true"/> <action application="set" data="enabled=true"/>
<action application="lua" data="do_not_disturb.lua"/> <action application="lua" data="do_not_disturb.lua"/>
</condition> </condition>

39
index.php
View File

@ -46,28 +46,35 @@ include "root.php";
} }
// if not logged in, clear the session variables // if not logged in, clear the session variables
if (strlen($_SESSION["username"]) == 0) { if (strlen($_SESSION["username"]) == 0) {
session_unset(); session_unset();
session_destroy(); session_destroy();
} }
//adds multiple includes //adds multiple includes
require_once "resources/require.php"; require_once "resources/require.php";
// if logged in, redirect to login destination // if logged in, redirect to login destination
if (strlen($_SESSION["username"]) > 0) { if (strlen($_SESSION["username"]) > 0) {
header("Location: ".$_SESSION['login']['destination']['url']); if (strlen($_SESSION['login']['destination']['url']) > 0) {
} header("Location: ".$_SESSION['login']['destination']['url']);
else { }
//use custom index, if present, otherwise use custom login, if present, otherwise use default login else {
if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/index.php")) { require_once "resources/header.php";
require_once "themes/".$_SESSION['domain']['template']['name']."/index.php"; require_once "resources/header.php";
} }
else if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/login.php")) {
require_once "themes/".$_SESSION['domain']['template']['name']."/login.php";
} }
else { else {
require_once "resources/login.php"; //use custom index, if present, otherwise use custom login, if present, otherwise use default login
if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/index.php")) {
require_once "themes/".$_SESSION['domain']['template']['name']."/index.php";
}
else if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/login.php")) {
require_once "themes/".$_SESSION['domain']['template']['name']."/login.php";
}
else {
require_once "resources/login.php";
}
} }
}
?> ?>