projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uniformizes pid and uid fields in database (Closes #1207).
[platal.git]
/
classes
/
platalglobals.php.in
diff --git
a/classes/platalglobals.php.in
b/classes/platalglobals.php.in
index
5d8493e
..
3f0085d
100644
(file)
--- a/
classes/platalglobals.php.in
+++ b/
classes/platalglobals.php.in
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-20
09
Polytechnique.org *
+ * Copyright (C) 2003-20
10
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-21,14
+21,17
@@
class PlatalGlobals extends PlGlobals
{
class PlatalGlobals extends PlGlobals
{
+ const DEBUG_NOCACHE = DEBUG_USERBASE;
+
/** The x.org version */
public $version = '@VERSION@';
/** db params */
/** The x.org version */
public $version = '@VERSION@';
/** db params */
- public $dbdb = 'x4dat';
+ public $dbdb = null;
+ public $dbprefix = '';
public $dbhost = 'localhost';
public $dbhost = 'localhost';
- public $dbuser =
'x4dat'
;
- public $dbpwd =
'x4dat'
;
+ public $dbuser =
null
;
+ public $dbpwd =
null
;
public $dbcharset = 'utf8';
/** default skin */
public $dbcharset = 'utf8';
/** default skin */
@@
-51,15
+54,17
@@
class PlatalGlobals extends PlGlobals
public function asso($key = null)
{
public function asso($key = null)
{
+ static $fetched = false;
static $aid = null;
static $aid = null;
- if (isset($GLOBALS['IS_XNET_SITE']) &&
is_null($aid)
) {
+ if (isset($GLOBALS['IS_XNET_SITE']) &&
!$fetched
) {
$gp = Get::v('n');
if ($p = strpos($gp, '/')) {
$gp = substr($gp, 0, $p);
}
$aid = Group::get($gp);
$gp = Get::v('n');
if ($p = strpos($gp, '/')) {
$gp = substr($gp, 0, $p);
}
$aid = Group::get($gp);
+ $fetched = true;
}
if (empty($key)) {
return $aid;
}
if (empty($key)) {
return $aid;
@@
-85,8
+90,12
@@
class PlatalGlobals extends PlGlobals
FROM requests");
$this->changeDynamicConfig(array('NbValid' => $res->fetchOneCell()));
}
FROM requests");
$this->changeDynamicConfig(array('NbValid' => $res->fetchOneCell()));
}
-}
+ public function cacheEnabled()
+ {
+ return ($this->debug & self::DEBUG_NOCACHE) == 0;
+ }
+}
/******************************************************************************
* Dynamic configuration update/edition stuff
/******************************************************************************
* Dynamic configuration update/edition stuff