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

Merge pull request #1557 from hcoin/fix-warnings

Browse Source 
Mariadb 10.1, Freeswitch 1.6, Ubuntu Xenial LTS, Ldaps, warnings enabled, cli install/upgrade
This commit is contained in:
FusionPBX
2016-04-28 14:43:06 -06:00
parent 3b1a6aa34a cb98d74ccd
commit d57a44ae23
216 changed files with 41215 additions and 40927 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/app_defaults.php
+1380 -1380
View File
File diff suppressed because it is too large Load Diff
themes/default/root.php
+4 -1
View File
@@ -25,6 +25,7 @@
*/
// make sure the PATH_SEPARATOR is defined
umask(2);
if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";");
@@ -33,10 +34,12 @@
}
}
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
if(PHP_SAPI == 'cli'){
chdir(pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME));
chdir(pathinfo(realpath($_SERVER["PHP_SELF"]), PATHINFO_DIRNAME));
$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
if (file_exists('/project_root.php')) {
themes/default/template.php
+3 -3
View File
@@ -57,7 +57,7 @@
$background_images_enabled = false;
if ($default_login) {
//try using login background images/colors
if ($_SESSION['theme']['login_background_image_enabled']['boolean'] == 'true' && is_array($_SESSION['theme']['login_background_image'])) {
if (isset($_SESSION['theme']) && $_SESSION['theme']['login_background_image_enabled']['boolean'] == 'true' && is_array($_SESSION['theme']['login_background_image'])) {
$background_images_enabled = true;
$background_images = $_SESSION['theme']['login_background_image'];
}
@@ -79,7 +79,7 @@
}
else {
//use standard background images/colors
if ($_SESSION['theme']['background_image_enabled']['boolean'] == 'true' && is_array($_SESSION['theme']['background_image'])) {
if (isset($_SESSION['theme']) && isset($_SESSION['theme']['background_image_enabled']) && $_SESSION['theme']['background_image_enabled']['boolean'] == 'true' && is_array($_SESSION['theme']['background_image'])) {
$background_images_enabled = true;
$background_images = $_SESSION['theme']['background_image'];
}
@@ -96,7 +96,7 @@
if (count($background_images) > 0) {
if (strlen($_SESSION['background_image']) == 0) {
if ((!isset($_SESSION['background_image'])) or strlen($_SESSION['background_image']) == 0) {
$_SESSION['background_image'] = $background_images[array_rand($background_images)];
$background_image = $_SESSION['background_image'];
}