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

Cleanup the indentation ... tabs and whitespace after the last pull request.

This commit is contained in:
markjcrane 2016-04-28 16:56:44 -06:00
parent 15a1ecbcea
commit c3b12c217d
73 changed files with 242 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/upgrade/upgrade.php
View File

@ -25,17 +25,14 @@
*/
//check the permission
if(defined('STDIN')) {
// $document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
// preg_match("/^(.*)\/core\/.*$/", $document_root, $matches);
// $document_root = $matches[1];
// set_include_path($document_root);
$format = 'text'; //html, text
include "root.php";
$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
preg_match("/^(.*)\/core\/.*$/", $document_root, $matches);
$document_root = $matches[1];
set_include_path($document_root);
require_once "resources/require.php";
// $_SERVER["DOCUMENT_ROOT"] = $document_root;
$_SERVER["DOCUMENT_ROOT"] = $document_root;
$format = 'text'; //html, text
}
else {
include "root.php";

4
resources/check_auth.php
View File

@ -127,10 +127,10 @@ require_once "resources/require.php";
//ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, 7);
$bind_dn = $_SESSION["ldap"]["user_attribute"]["text"]."=".$username.",".$_SESSION["ldap"]["user_dn"]["text"];
$bind_pw = $_REQUEST["password"];
//Note: As of 4/16, the call below will fail randomly. Php debug reports ldap_bind
//Note: As of 4/16, the call below will fail randomly. PHP debug reports ldap_bind
//called below with all arguments '*uninitialized*'. However, the debugger
//single-stepping just before the failing call correctly displays all the values.
$bind = ldap_bind($connect, $bind_dn, $bind_pw );
$bind = ldap_bind($connect, $bind_dn, $bind_pw);
if ($bind) {
$_SESSION['username'] = $username;
}

5
resources/classes/switch_settings.php
View File

@ -67,14 +67,15 @@ if (!class_exists('switch_settings')) {
}
}
{ //connect to event socket
//connect to event socket
$esl = new event_socket;
$esl->connect($this->event_socket_ip_address, $this->event_socket_port, $this->event_socket_password);
//run the api command
$result = $esl->request('api global_getvar');
} //close event socket
//close event socket
fclose($fp);
//set the result as a named array
$vars = array();