From 665b2c8107e372fd2703f126b8c9db5c9719a36b Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Apr 2012 03:10:46 -0700 Subject: revert config changes, we're getting duplicate keys --- include/config.php | 298 ++++++++++++++++++++++++++--------------------------- 1 file changed, 147 insertions(+), 151 deletions(-) mode change 100644 => 100755 include/config.php diff --git a/include/config.php b/include/config.php old mode 100644 new mode 100755 index c999b76f2..4cff38090 --- a/include/config.php +++ b/include/config.php @@ -1,87 +1,80 @@ config[$k] = $rr['v']; - } else { - $a->config[$family][$k] = $rr['v']; - } +function load_config($family) { + global $a; + $r = q("SELECT * FROM `config` WHERE `cat` = '%s'", + dbesc($family) + ); + if(count($r)) { + foreach($r as $rr) { + $k = $rr['k']; + if ($rr['cat'] === 'config') { + $a->config[$k] = $rr['v']; + } else { + $a->config[$family][$k] = $rr['v']; } } } -} +}} -/** - * get a particular config variable given the family name - * and key. Returns false if not set. - * - * If a key is found in the DB but doesn't exist in - * local config cache, pull it into the cache so we don't have - *to hit the DB again for this item. - */ -if(! function_exists('get_config')) { - function get_config($family, $key) { +// get a particular config variable given the family name +// and key. Returns false if not set. +// $instore is only used by the set_config function +// to determine if the key already exists in the DB +// If a key is found in the DB but doesn't exist in +// local config cache, pull it into the cache so we don't have +// to hit the DB again for this item. - global $a; +if(! function_exists('get_config')) { +function get_config($family, $key, $instore = false) { + global $a; + if(! $instore) { if(isset($a->config[$family][$key])) { if($a->config[$family][$key] === '!!') { return false; } return $a->config[$family][$key]; } - $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($family), - dbesc($key) - ); - if(count($ret)) { - // manage array value - $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); - $a->config[$family][$key] = $val; - return $val; - } - else { - $a->config[$family][$key] = '!!'; - } - return false; } -} + $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", + dbesc($family), + dbesc($key) + ); + if(count($ret)) { + // manage array value + $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); + $a->config[$family][$key] = $val; + return $val; + } + else { + $a->config[$family][$key] = '!!'; + } + return false; +}} -/** - * Store a config value ($value) in the category ($family) - * under the key ($key) - * - * Return the value, or false if the database update failed - */ -if(! function_exists('set_config')) { +// Store a config value ($value) in the category ($family) +// under the key ($key) +// Return the value, or false if the database update failed +if(! function_exists('set_config')) { function set_config($family,$key,$value) { global $a; @@ -89,139 +82,142 @@ function set_config($family,$key,$value) { $dbvalue = (is_array($value)?serialize($value):$value); $dbvalue = (is_bool($value) ? intval($value) : $value); + if(get_config($family,$key,true) === false) { $a->config[$family][$key] = $value; - $ret = q("REPLACE INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", - dbesc($family), - dbesc($key), - dbesc($dbvalue) + $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", + dbesc($family), + dbesc($key), + dbesc($dbvalue) ); - if($ret) { + if($ret) return $value; - } return $ret; - } -} + + $ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", + dbesc($dbvalue), + dbesc($family), + dbesc($key) + ); + + $a->config[$family][$key] = $value; + + if($ret) + return $value; + return $ret; +}} if(! function_exists('load_pconfig')) { - function load_pconfig($uid,$family) { - global $a; - $r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d", - dbesc($family), - intval($uid) - ); - if(count($r)) { - foreach($r as $rr) { - $k = $rr['k']; - $a->config[$uid][$family][$k] = $rr['v']; - } +function load_pconfig($uid,$family) { + global $a; + $r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d", + dbesc($family), + intval($uid) + ); + if(count($r)) { + foreach($r as $rr) { + $k = $rr['k']; + $a->config[$uid][$family][$k] = $rr['v']; } } -} +}} -/** - * get a particular user-specific config variable given the family name, - * the user id and key. Returns false if not set. - * - * If a key is found in the DB but doesn't exist in - * local config cache, pull it into the cache so we don't have - * to hit the DB again for this item. - */ -if(! function_exists('get_pconfig')) { - function get_pconfig($uid,$family, $key) { - global $a; +if(! function_exists('get_pconfig')) { +function get_pconfig($uid,$family, $key, $instore = false) { + global $a; + if(! $instore) { if(isset($a->config[$uid][$family][$key])) { if($a->config[$uid][$family][$key] === '!!') { return false; } return $a->config[$uid][$family][$key]; } + } + $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", + intval($uid), + dbesc($family), + dbesc($key) + ); - $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - intval($uid), - dbesc($family), - dbesc($key) - ); - - if(count($ret)) { - $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); - $a->config[$uid][$family][$key] = $val; - return $val; - } - else { - $a->config[$uid][$family][$key] = '!!'; - } - return false; + if(count($ret)) { + $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); + $a->config[$uid][$family][$key] = $val; + return $val; + } + else { + $a->config[$uid][$family][$key] = '!!'; } -} + return false; +}} -/** - * Delete a value from config. This function - * deletes both: db value and cache entry. - */ if(! function_exists('del_config')) { - function del_config($family,$key) { - - global $a; - if(x($a->config[$family],$key)) - unset($a->config[$family][$key]); - $ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($family), - dbesc($key) - ); - return $ret; - } -} +function del_config($family,$key) { + global $a; + if(x($a->config[$family],$key)) + unset($a->config[$family][$key]); + $ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", + dbesc($family), + dbesc($key) + ); + return $ret; +}} -/** - * Store a user-specific config value ($value) for user $uid in the category ($family) - * under the key ($key). - * - * Return the value, or false if the database update failed - */ -if(! function_exists('set_pconfig')) { - function set_pconfig($uid,$family,$key,$value) { - global $a; - // manage array value - $dbvalue = (is_array($value)?serialize($value):$value); - $dbvalue = (is_bool($value)?serialize($value):$value); +// Same as above functions except these are for personal config storage and take an +// additional $uid argument. + +if(! function_exists('set_pconfig')) { +function set_pconfig($uid,$family,$key,$value) { + + global $a; + // manage array value + $dbvalue = (is_array($value)?serialize($value):$value); + if(get_pconfig($uid,$family,$key,true) === false) { $a->config[$uid][$family][$key] = $value; - $ret = q("REPLACE INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", - intval($uid), - dbesc($family), - dbesc($key), - dbesc($dbvalue) + $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", + intval($uid), + dbesc($family), + dbesc($key), + dbesc($dbvalue) ); - if($ret) { + if($ret) return $value; - } return $ret; - } -} + $ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", + dbesc($dbvalue), + intval($uid), + dbesc($family), + dbesc($key) + ); + + $a->config[$uid][$family][$key] = $value; + + if($ret) + return $value; + return $ret; +}} if(! function_exists('del_pconfig')) { - function del_pconfig($uid,$family,$key) { - - global $a; - if(x($a->config[$uid][$family],$key)) - unset($a->config[$uid][$family][$key]); - $ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - intval($uid), - dbesc($family), - dbesc($key) - ); - return $ret; - } -} +function del_pconfig($uid,$family,$key) { + + global $a; + if(x($a->config[$uid][$family],$key)) + unset($a->config[$uid][$family][$key]); + $ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", + intval($uid), + dbesc($family), + dbesc($key) + ); + return $ret; +}} -- cgit v1.2.3 From 0731c177eb4a58c6dd7bb50ee3915563c33531bc Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Apr 2012 03:25:01 -0700 Subject: fix bad sql update --- boot.php | 2 +- update.php | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index e1bcc078a..f4f44a644 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1303' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1135 ); +define ( 'DB_UPDATE_VERSION', 1136 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/update.php b/update.php index ae35d2d50..0c8486c31 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@