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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
core/upgrade/root.php
View File

@@ -25,7 +25,7 @@
*/
// make sure the PATH_SEPARATOR is defined
umask(2);
umask(2);
if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";");
@@ -34,8 +34,8 @@
}
}
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
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'){

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";