Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Just minor spacing tweaks

This commit is contained in:
paul 2006-11-23 07:14:22 +00:00
parent 040683b700
commit 91130937c5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
campcaster/src/modules/storageServer/var/conf.php
View File

@ -132,22 +132,22 @@ set_include_path('.'.PATH_SEPARATOR.$config['pearPath'].PATH_SEPARATOR.$old_ip);
// see if a ~/.campcaster/storageServer.conf.php exists, and // see if a ~/.campcaster/storageServer.conf.php exists, and
// overwrite the settings from there if any // overwrite the settings from there if any
$this_file = null; $this_file = null;
if(isset($_SERVER["SCRIPT_FILENAME"])){ if (isset($_SERVER["SCRIPT_FILENAME"])) {
$this_file = $_SERVER["SCRIPT_FILENAME"]; $this_file = $_SERVER["SCRIPT_FILENAME"];
}elseif(isset($argv[0])){ } elseif(isset($argv[0])) {
$this_file = $argv[0]; $this_file = $argv[0];
} }
if(!is_null($this_file)){ if (!is_null($this_file)) {
$fileowner_id = fileowner($this_file); $fileowner_id = fileowner($this_file);
$fileowner_array = posix_getpwuid($fileowner_id); $fileowner_array = posix_getpwuid($fileowner_id);
$fileowner_homedir = $fileowner_array['dir']; $fileowner_homedir = $fileowner_array['dir'];
$fileowner_name = $fileowner_array['name']; $fileowner_name = $fileowner_array['name'];
$home_conf = $fileowner_homedir . '/.campcaster/storageServer.conf.php'; $home_conf = $fileowner_homedir . '/.campcaster/storageServer.conf.php';
if (file_exists($home_conf)) { if (file_exists($home_conf)) {
$default_config = $config; $default_config = $config;
$developer_name = $fileowner_name; $developer_name = $fileowner_name;
include $home_conf; include($home_conf);
$user_config = $config; $user_config = $config;
$config = $user_config + $default_config; $config = $user_config + $default_config;
} }