projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove fail() that is not used
[platal.git]
/
include
/
platal
/
globals.inc.php.in
diff --git
a/include/platal/globals.inc.php.in
b/include/platal/globals.inc.php.in
index
6948f4e
..
ff7b9c0
100644
(file)
--- a/
include/platal/globals.inc.php.in
+++ b/
include/platal/globals.inc.php.in
@@
-51,7
+51,7
@@
class PlatalGlobals extends DiogenesCoreGlobals
var $dbhost = 'localhost';
var $dbuser = 'x4dat';
var $dbpwd = 'x4dat';
var $dbhost = 'localhost';
var $dbuser = 'x4dat';
var $dbpwd = 'x4dat';
-
+
var $table_auth = 'auth_user_md5';
var $table_log_actions = 'logger.actions';
var $table_log_sessions = 'logger.sessions';
var $table_auth = 'auth_user_md5';
var $table_log_actions = 'logger.actions';
var $table_log_sessions = 'logger.sessions';
@@
-62,18
+62,21
@@
class PlatalGlobals extends DiogenesCoreGlobals
var $tlabel = array('native'=>'X.Org');
/** paths */
var $tlabel = array('native'=>'X.Org');
/** paths */
- var $baseurl = 'http://localhost/xorg';
- var $spoolroot = '/var/spool/xorg';
- var $root = null;
+ var $baseurl;
+ var $spoolroot;
function PlatalGlobals($sess)
{
function PlatalGlobals($sess)
{
- $this->session = $sess;
+ $this->session = $sess;
+
+ $base = empty($_SERVER['HTTPS']) ? 'http://' : 'https://';
+ $this->baseurl = trim($base.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']), '/');
+ $this->spoolroot = dirname(dirname(dirname(__FILE__)));
}
function read_config()
{
}
function read_config()
{
- $array = parse_ini_file($this->root.'/configs/platal.conf', true);
+ $array = parse_ini_file($this->
spool
root.'/configs/platal.conf', true);
if (!is_array($array)) {
return;
}
if (!is_array($array)) {
return;
}