Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

#753 report 1043

Browse source
This commit is contained in:
tomas 2005-04-08 22:27:32 +00:00
parent e5d684309f
commit 9549a022f3
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
livesupport/modules/archiveServer/var/conf.php
View file

@ -22,8 +22,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Author : $Author: maroy $ Author : $Author: tomas $
Version : $Revision: 1.11 $ Version : $Revision: 1.12 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/var/conf.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/var/conf.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -120,17 +120,23 @@ $config = array(
// see if a ~/.livesupport/archiveServer.conf.php exists, and // see if a ~/.livesupport/archiveServer.conf.php exists, and
// overwrite the settings from there if any // overwrite the settings from there if any
$this_file = $_SERVER["SCRIPT_FILENAME"]; $this_file = null;
$fileowner_id = fileowner($this_file); if(isset($_SERVER["SCRIPT_FILENAME"])){
$fileowner_array = posix_getpwuid($fileowner_id); $this_file = $_SERVER["SCRIPT_FILENAME"];
$fileowner_homedir = $fileowner_array['dir']; }elseif(isset($argv[0])){
$home_conf = $fileowner_homedir . '/.livesupport/archiveServer.conf.php'; $this_file = $argv[0];
}
if (file_exists($home_conf)) { if(!is_null($this_file)){
$default_config = $config; $fileowner_id = fileowner($this_file);
include $home_conf; $fileowner_array = posix_getpwuid($fileowner_id);
$user_config = $config; $fileowner_homedir = $fileowner_array['dir'];
$config = $user_config + $default_config; $home_conf = $fileowner_homedir . '/.livesupport/archiveServer.conf.php';
if (file_exists($home_conf)) {
$default_config = $config;
include $home_conf;
$user_config = $config;
$config = $user_config + $default_config;
}
} }
?> ?>