diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/cache.php | 42 | ||||
| -rw-r--r-- | include/contact_widgets.php | 20 | ||||
| -rw-r--r-- | include/socgraph.php | 29 |
3 files changed, 64 insertions, 27 deletions
diff --git a/include/cache.php b/include/cache.php index 3c8a3f713..360c4acbd 100644 --- a/include/cache.php +++ b/include/cache.php @@ -14,22 +14,40 @@ } public static function set($key,$value) { - $r = q("SELECT * FROM `cache` WHERE `k`='%s' limit 1", - dbesc($key) - ); - if(count($r)) { - q("UPDATE `cache` SET `v` = '%s', `updated = '%s' WHERE `k` = '%s' limit 1", - dbesc($value), - dbesc(datetime_convert()), - dbesc($key)); - } - else { - q("INSERT INTO `cache` (`k`,`v`,`updated`) VALUES ('%s','%s','%s')", + + q("REPLACE INTO `cache` (`k`,`v`,`updated`) VALUES ('%s','%s','%s')", dbesc($key), dbesc($value), dbesc(datetime_convert())); - } } + + +/* + * + * Leaving this legacy code temporaily to see how REPLACE fares + * as opposed to non-atomic checks when faced with fast moving key duplication. + * As a MySQL extension it isn't portable, but we're not yet very portable. + */ + +/* + * $r = q("SELECT * FROM `cache` WHERE `k`='%s' limit 1", + * dbesc($key) + * ); + * if(count($r)) { + * q("UPDATE `cache` SET `v` = '%s', `updated = '%s' WHERE `k` = '%s' limit 1", + * dbesc($value), + * dbesc(datetime_convert()), + * dbesc($key)); + * } + * else { + * q("INSERT INTO `cache` (`k`,`v`,`updated`) VALUES ('%s','%s','%s')", + * dbesc($key), + * dbesc($value), + * dbesc(datetime_convert())); + * } + * } + */ + public static function clear(){ q("DELETE FROM `cache` WHERE `updated` < '%s'", diff --git a/include/contact_widgets.php b/include/contact_widgets.php index cfe27c5c9..bf3a86958 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -146,11 +146,19 @@ function common_friends_visitor_widget($profile_uid) { $cid = local_user(); else { if(get_my_url()) { - $r = q("select id from gcontact where nurl = '%s' limit 1", - dbesc(normalise_link(get_my_url())) + $r = q("select id from contact where nurl = '%s' and uid = %d limit 1", + dbesc(normalise_link(get_my_url())), + intval($profile_uid) ); if(count($r)) - $zcid = $r[0]['id']; + $cid = $r[0]['id']; + else { + $r = q("select id from gcontact where nurl = '%s' limit 1", + dbesc(normalise_link(get_my_url())) + ); + if(count($r)) + $zcid = $r[0]['id']; + } } } @@ -162,14 +170,14 @@ function common_friends_visitor_widget($profile_uid) { if($cid) $t = count_common_friends($profile_uid,$cid); else - $t = count_common_friends($profile_uid,$cid); + $t = count_common_friends_zcid($profile_uid,$zcid); if(! $t) return; if($cid) - $r = common_friends($profile_uid,$cid,5); + $r = common_friends($profile_uid,$cid,5,true); else - $r = common_friends_zcid($profile_uid,$zcid); + $r = common_friends_zcid($profile_uid,$zcid,5,true); return replace_macros(get_markup_template('remote_friends_common.tpl'), array( '$desc' => sprintf( tt("%d friend in common", "%d friends in common", $t), $t), diff --git a/include/socgraph.php b/include/socgraph.php index a08d58074..a67b3d9e3 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -99,11 +99,12 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { $gcid = $x[0]['id']; if($x[0]['name'] != $name || $x[0]['photo'] != $profile_photo) { - q("update gcontact set `name` = '%s', `photo` = '%s', `connect` = '%s' + q("update gcontact set `name` = '%s', `photo` = '%s', `connect` = '%s', `url` = '%s' where `nurl` = '%s' limit 1", dbesc($name), dbesc($profile_photo), dbesc($connect_url), + dbesc($profile_url), dbesc(normalise_link($profile_url)) ); } @@ -168,7 +169,7 @@ function count_common_friends($uid,$cid) { $r = q("SELECT count(*) as `total` FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` where `glink`.`cid` = %d and `glink`.`uid` = %d - and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) ", + and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d ) ", intval($cid), intval($uid), intval($uid), @@ -182,13 +183,18 @@ function count_common_friends($uid,$cid) { } -function common_friends($uid,$cid,$limit=9999) { +function common_friends($uid,$cid,$limit=9999,$shuffle = false) { + + if($shuffle) + $sql_extra = " order by rand() "; + else + $sql_extra = " order by `gcontact`.`name` asc "; $r = q("SELECT `gcontact`.* FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` where `glink`.`cid` = %d and `glink`.`uid` = %d - and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) - order by `gcontact`.`name` asc limit 0, %d", + and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d ) + $sql_extra limit 0, %d", intval($cid), intval($uid), intval($uid), @@ -206,7 +212,7 @@ function count_common_friends_zcid($uid,$zcid) { $r = q("SELECT count(*) as `total` FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` where `glink`.`zcid` = %d - and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) ", + and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) ", intval($zcid), intval($uid) ); @@ -217,13 +223,18 @@ function count_common_friends_zcid($uid,$zcid) { } -function common_friends_zcid($uid,$zcid,$limit = 6) { +function common_friends_zcid($uid,$zcid,$limit = 9999,$shuffle) { + + if($shuffle) + $sql_extra = " order by rand() "; + else + $sql_extra = " order by `gcontact`.`name` asc "; $r = q("SELECT `gcontact`.* FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` where `glink`.`zcid` = %d - and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) - order by `gcontact`.`name` asc limit 0, %d", + and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) + $sql_extra limit 0, %d", intval($zcid), intval($uid), intval($limit) |