$scheme = $this->scheme;
- if ((x($this->config, 'system')) && (x($this->config['system'], 'ssl_policy'))) {
- if (intval($this->config['system']['ssl_policy']) === SSL_POLICY_FULL) {
- $scheme = 'https';
- }
+ if (Config::get('system', 'ssl_policy') === SSL_POLICY_FULL) {
+ $scheme = 'https';
+ }
- // Basically, we have $ssl = true on any links which can only be seen by a logged in user
- // (and also the login link). Anything seen by an outsider will have it turned off.
+ // Basically, we have $ssl = true on any links which can only be seen by a logged in user
+ // (and also the login link). Anything seen by an outsider will have it turned off.
- if ($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
- if ($ssl) {
- $scheme = 'https';
- } else {
- $scheme = 'http';
- }
+ if (Config::get('system', 'ssl_policy') == SSL_POLICY_SELFSIGN) {
+ if ($ssl) {
+ $scheme = 'https';
+ } else {
+ $scheme = 'http';
}
}
- if (get_config('config', 'hostname') != '') {
+ if (Config::get('config', 'hostname') != '') {
$this->hostname = get_config('config', 'hostname');
}
// If the last worker fork was less than 10 seconds before then don't fork another one.
// This should prevent the forking of masses of workers.
if (get_config("system", "worker")) {
- if ((time() - get_config("system", "proc_run_started")) < 10)
- return;
-
+ $cachekey = "app:proc_run:started";
+ $result = Cache::get($cachekey);
+ if (!is_null($result)) {
+ if ((time() - $result) < 10) {
+ return;
+ }
+ }
// Set the timestamp of the last proc_run
- set_config("system", "proc_run_started", time());
+ Cache::set($cachekey, time(), CACHE_MINUTE);
}
$args[0] = ((x($this->config,'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php');
$stored = intval($build);
$current = intval(DB_UPDATE_VERSION);
if($stored < $current) {
- load_config('database');
+ Config::load('database');
// We're reporting a different version than what is currently installed.
// Run any existing update scripts to bring the database up to current.