nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix so fusionpbx doesn't fail on servers with php versions later than 5. (e.g. php7).

Browse Source 
Also a few warning causes fixed.
Also, one step along the way to allow freeswitch to be u freeswitch g freeswitch and fusionpbx to run www-data:www-data.
This commit is contained in:
Harry G. Coin
2016-04-25 20:52:21 -05:00
parent 1f9ad42543
commit 077059eeb1
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/switch.php
View File

@@ -30,7 +30,7 @@ require_once "resources/require.php";
//get the event socket information
if (file_exists($_SERVER["PROJECT_ROOT"]."/app/settings/app_config.php")) {
if (strlen($_SESSION['event_socket_ip_address']) == 0) {
if ((! isset($_SESSION['event_socket_ip_address'])) or strlen($_SESSION['event_socket_ip_address']) == 0) {
$sql = "select * from v_settings ";
$prep_statement = $db->prepare(check_sql($sql));
if ($prep_statement) {
@@ -56,7 +56,7 @@ function load_extensions() {
$db = $database->db;
if (file_exists($_SERVER["PROJECT_ROOT"]."/app/extensions/app_config.php")) {
if ($db && strlen($_SESSION["domain_uuid"]) > 0 && strlen($_SESSION["user_uuid"]) > 0 && count($_SESSION['user']['extension']) == 0) {
if (isset($_SESSION["user"]) && isset($_SESSION["user_uuid"]) && $db && strlen($_SESSION["domain_uuid"]) > 0 && strlen($_SESSION["user_uuid"]) > 0 && count($_SESSION['user']['extension']) == 0) {
//get the user extension list
unset($_SESSION['user']['extension']);
$sql = "select ";
@@ -1356,7 +1356,7 @@ if (!function_exists('switch_conf_xml')) {
$v_mail_bat = path_join($secure_path, 'mailto.bat');
$v_mail_cmd = '@' .
'"' . str_replace('/', '\\', path_join($bindir, 'php.exe')) . '" ' .
'"' . str_replace('/', '\\', path_join($bindir, 'php5.exe')) . '" ' .
'"' . str_replace('/', '\\', path_join($secure_path, 'v_mailto.php')) . '" ';
$fout = fopen($v_mail_bat, "w+");