nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the dev branch version to 3.7 and get rid of GLOB_BRACE which is not defined in Solaris

Browse Source
This commit is contained in:
Mark Crane
2014-08-19 09:16:01 +00:00
parent c7f56a53ab
commit e9993f4c3e
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/music_on_hold/resources/classes/switch_music_on_hold.php
View File

@@ -136,7 +136,17 @@ include "root.php";
//build the list of categories //build the list of categories
$music_on_hold_dir = $_SESSION['switch']['sounds']['dir'].'/music'; $music_on_hold_dir = $_SESSION['switch']['sounds']['dir'].'/music';
//default category //default category
$array = glob($music_on_hold_dir."/{8000,16000,32000,48000}", GLOB_ONLYDIR|GLOB_BRACE); if (defined("GLOB_BRACE")) {
$array = glob($music_on_hold_dir."/{8000,16000,32000,48000}", GLOB_ONLYDIR|GLOB_BRACE);
}
else {
$array_1 = glob($music_on_hold_dir."/8000".$class_name.".php", GLOB_ONLYDIR);
$array_2 = glob($music_on_hold_dir."/16000".$class_name.".php", GLOB_ONLYDIR);
$array_3 = glob($music_on_hold_dir."/32000".$class_name.".php", GLOB_ONLYDIR);
$array_4 = glob($music_on_hold_dir."/48000".$class_name.".php", GLOB_ONLYDIR);
$array = array_merge((array)$array_1,(array)$array_2,(array)$array_3,(array)$array_4);
unset($array_1,$array_2,$array_3,$array_4);
}
//other categories //other categories
if (count($_SESSION['domains']) > 1) { if (count($_SESSION['domains']) > 1) {
$array = array_merge($array, glob($music_on_hold_dir."/*/*/*", GLOB_ONLYDIR)); $array = array_merge($array, glob($music_on_hold_dir."/*/*/*", GLOB_ONLYDIR));

2
resources/functions.php
View File

@@ -26,7 +26,7 @@
if (!function_exists('software_version')) { if (!function_exists('software_version')) {
function software_version() { function software_version() {
return '3.6.0'; return '3.7.0';
} }
} }

12
resources/require.php
View File

@@ -48,13 +48,23 @@
} }
private function loader($class_name) { private function loader($class_name) {
//use glob to check "/resources/classes", "/{core,app}/*/resources/classes"; //use glob to check "/resources/classes", "/{core,app}/*/resources/classes";
$results = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "{/*/*,}/resources/classes/".$class_name.".php", GLOB_BRACE); if (defined("GLOB_BRACE")) {
$results = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "{/*/*,}/resources/classes/".$class_name.".php", GLOB_BRACE);
}
else {
$array_1 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/resources/classes/".$class_name.".php");
$array_2 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php");
$results = array_merge((array)$array_1,(array)$array_2);
unset($array_1, $array_2);
}
//include the class //include the class
foreach ($results as &$class_file) { foreach ($results as &$class_file) {
if (!class_exists($class_name)) { if (!class_exists($class_name)) {
include $class_file; include $class_file;
} }
} }
unset($results);
} }
} }
$autoload = new auto_loader(); $autoload = new auto_loader();