diff options
| -rw-r--r-- | include/cli_startup.php | 1 | ||||
| -rw-r--r-- | include/config.php | 116 | ||||
| -rw-r--r-- | mod/admin.php | 8 |
3 files changed, 73 insertions, 52 deletions
diff --git a/include/cli_startup.php b/include/cli_startup.php index 1d5861541..6bd4e7520 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -21,7 +21,6 @@ function cli_startup() { require_once('include/session.php'); - load_config('config'); load_config('system'); $a->set_baseurl(get_config('system','baseurl')); diff --git a/include/config.php b/include/config.php index 7d2dbdcc7..6a134deae 100644 --- a/include/config.php +++ b/include/config.php @@ -22,6 +22,7 @@ function load_config($family) { $a->config[$family] = array(); if(! array_key_exists('config_loaded',$a->config[$family])) { + $r = q("SELECT * FROM config WHERE cat = '%s'", dbesc($family)); if($r !== false) { if($r) { @@ -48,7 +49,7 @@ function get_config($family, $key) { global $a; - if(! array_key_exists($family,$a->config)) + if((! array_key_exists($family,$a->config)) || (! array_key_exists('config_loaded',$a->config[$family]))) load_config($family); if(array_key_exists('config_loaded',$a->config[$family])) { @@ -63,19 +64,29 @@ function get_config($family, $key) { return false; } +function get_config_from_storage($family,$key) { + $ret = q("select * from config where cat = '%s' and k = '%s' limit 1", + dbesc($family), + dbesc($key) + ); + return $ret; +} + + + // Store a config value ($value) in the category ($family) // under the key ($key) // Return the value, or false if the database update failed - function set_config($family,$key,$value) { global $a; // manage array value $dbvalue = ((is_array($value)) ? serialize($value) : $value); $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); - if(get_config($family,$key) === false) { + if(get_config($family,$key) === false || (! get_config_from_storage($family,$key))) { $a->config[$family][$key] = $value; + $ret = q("INSERT INTO config ( cat, k, v ) VALUES ( '%s', '%s', '%s' ) ", dbesc($family), dbesc($key), @@ -226,61 +237,64 @@ function del_pconfig($uid,$family,$key) { -function load_xconfig($xchan,$family) { +function load_xconfig($xchan,$family = '') { global $a; - $r = q("SELECT * FROM `xconfig` WHERE `cat` = '%s' AND `xchan` = '%s'", - dbesc($family), - dbesc($xchan) - ); - if(count($r)) { + + if(! $xchan) + return false; + + if(! array_key_exists($xchan,$a->config)) + $a->config[$xchan] = array(); + if(($family) && (! array_key_exists($family,$a->config[$xchan]))) + $a->config[$xchan][$family] = array(); + + if($family) { + $r = q("SELECT * FROM `xconfig` WHERE `cat` = '%s' AND `xchan` = '%s'", + dbesc($family), + dbesc($xchan) + ); + } + else { + $r = q("SELECT * FROM `xconfig` WHERE `xchan` = '%s'", + dbesc($xchan) + ); + } + + if($r) { foreach($r as $rr) { $k = $rr['k']; - $a->config[$xchan][$family][$k] = $rr['v']; + $c = $rr['cat']; + if(! array_key_exists($c,$a->config[$xchan])) { + $a->config[$xchan][$c] = array(); + $a->config[$xchan][$c]['config_loaded'] = true; + } + $a->config[$xchan][$c][$k] = $rr['v']; } - } else if ($family != 'config') { - // Negative caching - $a->config[$xchan][$family] = "!<unset>!"; - } + } + } -function get_xconfig($xchan,$family, $key, $instore = false) { +function get_xconfig($xchan,$family, $key) { global $a; - if(! $instore) { - // Looking if the whole family isn't set - if(isset($a->config[$xchan][$family])) { - if($a->config[$xchan][$family] === '!<unset>!') { - return false; - } - } + if(! $xchan) + return false; - if(isset($a->config[$xchan][$family][$key])) { - if($a->config[$xchan][$family][$key] === '!<unset>!') { - return false; - } - return $a->config[$xchan][$family][$key]; - } - } + if(! array_key_exists($xchan,$a->config)) + load_xconfig($xchan); - $ret = q("SELECT `v` FROM `xconfig` WHERE `xchan` = '%s' AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($xchan), - dbesc($family), - dbesc($key) + if((! array_key_exists($family,$a->config[$xchan])) || (! array_key_exists($key,$a->config[$xchan][$family]))) + return false; + + return ((preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$xchan][$family][$key])) + ? unserialize($a->config[$xchan][$family][$key]) + : $a->config[$xchan][$family][$key] ); - if(count($ret)) { - $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); - $a->config[$xchan][$family][$key] = $val; - return $val; - } - else { - $a->config[$xchan][$family][$key] = '!<unset>!'; - } - return false; } @@ -289,21 +303,28 @@ function set_xconfig($xchan,$family,$key,$value) { global $a; // manage array value - $dbvalue = (is_array($value)?serialize($value):$value); + $dbvalue = ((is_array($value)) ? serialize($value) : $value); + $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); + + if(get_xconfig($xchan,$family,$key) === false) { + if(! array_key_exists($xchan,$a->config)) + $a->config[$xchan] = array(); + if(! array_key_exists($family,$a->config[$xchan])) + $a->config[$xchan][$family] = array(); - if(get_xconfig($xchan,$family,$key,true) === false) { $a->config[$xchan][$family][$key] = $value; - $ret = q("INSERT INTO `xconfig` ( `xchan`, `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s', '%s' ) ", + $ret = q("INSERT INTO xconfig ( xchan, cat, k, v ) VALUES ( '%s', '%s', '%s', '%s' ) ", dbesc($xchan), dbesc($family), dbesc($key), dbesc($dbvalue) ); - if($ret) + if($ret) return $value; return $ret; } - $ret = q("UPDATE `xconfig` SET `v` = '%s' WHERE `xchan` = '%s' AND `cat` = '%s' AND `k` = '%s' LIMIT 1", + + $ret = q("UPDATE xconfig SET v = '%s' WHERE xchan = '%s' and cat = '%s' AND k = '%s' LIMIT 1", dbesc($dbvalue), dbesc($xchan), dbesc($family), @@ -315,6 +336,7 @@ function set_xconfig($xchan,$family,$key,$value) { if($ret) return $value; return $ret; + } diff --git a/mod/admin.php b/mod/admin.php index 670e89066..1fb729846 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -280,7 +280,7 @@ function admin_page_site_post(&$a){ set_config('system','delivery_interval',$delivery_interval); set_config('system','poll_interval',$poll_interval); set_config('system','maxloadavg',$maxloadavg); - set_config('config','sitename',$sitename); + set_config('system','sitename',$sitename); if ($banner=="") { del_config('system','banner'); @@ -402,7 +402,7 @@ function admin_page_site(&$a) { '$baseurl' => $a->get_baseurl(true), // name, label, value, help string, extra data... - '$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""), + '$sitename' => array('sitename', t("Site name"), htmlentities(get_config('system','sitename'), ENT_QUOTES), ""), '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices), @@ -410,8 +410,8 @@ function admin_page_site(&$a) { '$theme_accessibility' => array('theme-accessibility', t("Accessibility system theme"), get_config('system','accessibility-theme'), t("Accessibility theme"), $theme_choices_accessibility), '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), - '$register_policy' => array('register_policy', t("Register policy"), $a->config['system']['register_policy'], "", $register_choices), - '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), + '$register_policy' => array('register_policy', t("Register policy"), get_config('system','register_policy'), "", $register_choices), + '$register_text' => array('register_text', t("Register text"), htmlentities(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), |