jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

load db configs (config,system) for all "executables"

Browse source
This commit is contained in:
Friendika 2011-06-30 01:15:18 -07:00
parent 3eb0b4be2a
commit 994011ddb6
7 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
boot.php
View file

@ -498,9 +498,6 @@ function install_plugin($plugin){
if(! function_exists('check_config')) { if(! function_exists('check_config')) {
function check_config(&$a) { function check_config(&$a) {
load_config('system');
$build = get_config('system','build'); $build = get_config('system','build');
if(! x($build)) if(! x($build))
$build = set_config('system','build',DB_UPDATE_VERSION); $build = set_config('system','build',DB_UPDATE_VERSION);
@ -1218,9 +1215,13 @@ function load_config($family) {
if(count($r)) { if(count($r)) {
foreach($r as $rr) { foreach($r as $rr) {
$k = $rr['k']; $k = $rr['k'];
if ($rr['cat'] === 'config') {
$a->config[$k] = $rr['v'];
} else {
$a->config[$family][$k] = $rr['v']; $a->config[$family][$k] = $rr['v'];
} }
} }
}
}} }}
// get a particular config variable given the family name // get a particular config variable given the family name

8
include/directory.php
View file

@ -4,17 +4,21 @@ require_once("boot.php");
function directory_run($argv, $argc){ function directory_run($argv, $argc){
global $a, $db; global $a, $db;
if(is_null($a)){ if(is_null($a)) {
$a = new App; $a = new App;
} }
if(is_null($db)){ if(is_null($db)) {
@include(".htconfig.php"); @include(".htconfig.php");
require_once("dba.php"); require_once("dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data); $db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
}; };
load_config('config');
load_config('system');
if($argc != 2) if($argc != 2)
return; return;

4
include/expire.php
View file

@ -22,6 +22,10 @@ function expire_run($argv, $argc){
require_once('include/items.php'); require_once('include/items.php');
require_once('include/Contact.php'); require_once('include/Contact.php');
load_config('config');
load_config('system');
$a->set_baseurl(get_config('system','url')); $a->set_baseurl(get_config('system','url'));

3
include/notifier.php
View file

@ -20,6 +20,9 @@ function notifier_run($argv, $argc){
require_once('include/items.php'); require_once('include/items.php');
require_once('include/bbcode.php'); require_once('include/bbcode.php');
load_config('config');
load_config('system');
load_hooks(); load_hooks();
if($argc < 3) if($argc < 3)

3
include/poller.php
View file

@ -24,6 +24,9 @@ function poller_run($argv, $argc){
require_once('include/Contact.php'); require_once('include/Contact.php');
require_once('include/email.php'); require_once('include/email.php');
load_config('config');
load_config('system');
$a->set_baseurl(get_config('system','url')); $a->set_baseurl(get_config('system','url'));
load_hooks(); load_hooks();

3
include/queue.php
View file

@ -22,6 +22,9 @@ function queue_run($argv, $argc){
require_once('include/items.php'); require_once('include/items.php');
require_once('include/bbcode.php'); require_once('include/bbcode.php');
load_config('config');
load_config('system');
$a->set_baseurl(get_config('system','url')); $a->set_baseurl(get_config('system','url'));
load_hooks(); load_hooks();

11
index.php
View file

@ -50,15 +50,8 @@ if(! $install) {
* Load configs from db. Overwrite configs from .htconfig.php * Load configs from db. Overwrite configs from .htconfig.php
*/ */
$r = q("SELECT * FROM `config` WHERE `cat` IN ('system', 'config')"); load_config('config');
foreach ($r as $c) { load_config('system');
if ($c['cat']=='config') {
$a->config[$c['k']] = $c['v'];
} else {
$a->config[$c['cat']][$c['k']] = $c['v'];
}
}
unset($r);
require_once("session.php"); require_once("session.php");
load_hooks(); load_hooks();