Apparently we do need the StationPrefs group. Since the group name was
hard-coded in everywhere, I didnt detect that this value was used in the app. I changed the hard-coded values to use the value from the config file instead. Fixed the Transport.php::xmlrpcCall() function, an object was not being created before it was used. Fixed the archive server URLs in the default config files.
This commit is contained in:
parent
73d672b552
commit
e537255e27
13 changed files with 115 additions and 105 deletions
|
@ -132,16 +132,16 @@ class Prefs {
|
|||
/**
|
||||
* Read group preference record
|
||||
*
|
||||
* @param string $sessid
|
||||
* session id
|
||||
* @param string $group
|
||||
* group name
|
||||
* @param string $key
|
||||
* preference key
|
||||
* @param boolean $returnErrorIfKeyNotExists
|
||||
* If set to true and the key doesnt exist, return a PEAR error.
|
||||
* @return string
|
||||
* preference value
|
||||
*/
|
||||
function loadGroupPref($sessid, $group, $key)
|
||||
function loadGroupPref($group, $key, $returnErrorIfKeyNotExists = true)
|
||||
{
|
||||
// if sessid is would be used here fix Transport::cronCallMethod !
|
||||
$subjid = Subjects::GetSubjId($group);
|
||||
|
@ -157,8 +157,12 @@ class Prefs {
|
|||
return $val;
|
||||
}
|
||||
if ($val === FALSE) {
|
||||
return PEAR::raiseError(
|
||||
"Prefs::loadGroupPref: invalid preference key", GBERR_PREF);
|
||||
if ($returnErrorIfKeyNotExists) {
|
||||
return PEAR::raiseError(
|
||||
"Prefs::loadGroupPref: invalid preference key", GBERR_PREF);
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
return $val;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue