From f0c11cac4a2eb4b7c7ca929b860c067c7fd3839d Mon Sep 17 00:00:00 2001 From: Max Weller Date: Wed, 2 May 2012 16:59:58 +0200 Subject: [PATCH 1/8] Moved Meta Viewport from global head.tpl to diabook's header I mistakenly added this tag to the global header, but it causes problems for other themes, as they have other optimal widths. I also added a style to diabook which makes the jGrowl messages appear below the header bar, so you can still click the menu items without having to close messages first. --- view/head.tpl | 1 - view/theme/diabook/style.css | 1 + view/theme/diabook/theme.php | 8 ++++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/view/head.tpl b/view/head.tpl index 7b15412427..7638e56ca6 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -6,7 +6,6 @@ - page['htmlhead'] .= ''; +} else { + $a->page['htmlhead'] .= ''; +} + + $color = false; $site_color = get_config("diabook", "color" ); if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");} From 3be9cddfd75c006a1d93bb100942579749806d72 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 2 May 2012 15:26:57 -0700 Subject: [PATCH 2/8] rev update --- boot.php | 2 +- util/messages.po | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index f357487b99..ca954a90c6 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1329' ); +define ( 'FRIENDICA_VERSION', '2.3.1330' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); diff --git a/util/messages.po b/util/messages.po index f5612882c1..3314eb58d5 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1329\n" +"Project-Id-Version: 2.3.1330\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-01 10:00-0700\n" +"POT-Creation-Date: 2012-05-02 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3584,7 +3584,7 @@ msgstr "" msgid "Access to this profile has been restricted." msgstr "" -#: ../../mod/profile.php:147 +#: ../../mod/profile.php:151 msgid "Tips for New Members" msgstr "" @@ -3783,7 +3783,7 @@ msgstr "" #: ../../mod/profiles.php:331 #, php-format -msgid "%1$s changed %2$s to %3$s" +msgid "%1$s changed %2$s to \"%3$s\"" msgstr "" #: ../../mod/profiles.php:332 @@ -6431,6 +6431,13 @@ msgstr "" msgid "Categories" msgstr "" +#: ../../include/contact_widgets.php:183 +#, php-format +msgid "%d friend in common" +msgid_plural "%d friends in common" +msgstr[0] "" +msgstr[1] "" + #: ../../include/auth.php:29 msgid "Logged out." msgstr "" From 8e1437ca8bebcc3ef684192833c7a9ee10755608 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 2 May 2012 16:15:59 -0700 Subject: [PATCH 3/8] fixing common friends --- include/socgraph.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index 35d754cadc..a67b3d9e34 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), @@ -192,8 +193,8 @@ function common_friends($uid,$cid,$limit=9999,$shuffle = false) { $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 ) - sql_extra 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), @@ -211,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) ); @@ -232,7 +233,7 @@ function common_friends_zcid($uid,$zcid,$limit = 9999,$shuffle) { $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 ) + 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), From 3ecde2d72f27c248eb13d53d3f601934f6baaf16 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 2 May 2012 16:27:19 -0700 Subject: [PATCH 4/8] use mysql replace on cache items --- include/cache.php | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/include/cache.php b/include/cache.php index 3c8a3f7138..360c4acbdb 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'", From 5d957c3803936b8be54b5e197246d670fdcfa223 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Wed, 2 May 2012 21:12:57 -0600 Subject: [PATCH 5/8] Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others. --- mod/events.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/mod/events.php b/mod/events.php index e66a2dc442..1f11e75039 100644 --- a/mod/events.php +++ b/mod/events.php @@ -28,6 +28,9 @@ function events_post(&$a) { $adjust = intval($_POST['adjust']); $nofinish = intval($_POST['nofinish']); + // The default setting for the `private` field in event_store() is false, so mirror that + $private_event = false; + $start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute); if($nofinish) @@ -70,8 +73,23 @@ function events_post(&$a) { $str_contact_allow = perms2str($_POST['contact_allow']); $str_group_deny = perms2str($_POST['group_deny']); $str_contact_deny = perms2str($_POST['contact_deny']); + + // Undo the pseudo-contact of self, since there are real contacts now + if( strpos($str_contact_allow, '<' . local_user() . '>') !== false ) + { + $str_contact_allow = str_replace('<' . local_user() . '>', '', $str_contact_allow); + } + // Make sure to set the `private` field as true. This is necessary to + // have the posts show up correctly in Diaspora if an event is created + // as visible only to self at first, but then edited to display to others. + if( strlen($str_group_allow) or strlen($str_contact_allow) or strlen($str_group_deny) or strlen($str_contact_deny) ) + { + $private_event = true; + } } else { + // Note: do not set `private` field for self-only events. It will + // keep even you from seeing them! $str_contact_allow = '<' . local_user() . '>'; $str_group_allow = $str_contact_deny = $str_group_deny = ''; } @@ -91,6 +109,7 @@ function events_post(&$a) { $datarray['allow_gid'] = $str_group_allow; $datarray['deny_cid'] = $str_contact_deny; $datarray['deny_gid'] = $str_group_deny; + $datarray['private'] = $private_event; $datarray['id'] = $event_id; $datarray['created'] = $created; $datarray['edited'] = $edited; From e7580b71e1825dc6e049d7c1f945ab701bf8f6cd Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 2 May 2012 21:00:39 -0700 Subject: [PATCH 6/8] use cid rather than uid in perms --- mod/events.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/mod/events.php b/mod/events.php index 1f11e75039..069046ff9d 100644 --- a/mod/events.php +++ b/mod/events.php @@ -68,6 +68,15 @@ function events_post(&$a) { $share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0); + $c = q("select id from contact where uid = %d and self = 1 limit 1", + intval(local_user()) + ); + if(count($c)) + $self = $c[0]['id']; + else + $self = 0; + + if($share) { $str_group_allow = perms2str($_POST['group_allow']); $str_contact_allow = perms2str($_POST['contact_allow']); @@ -75,9 +84,9 @@ function events_post(&$a) { $str_contact_deny = perms2str($_POST['contact_deny']); // Undo the pseudo-contact of self, since there are real contacts now - if( strpos($str_contact_allow, '<' . local_user() . '>') !== false ) + if( strpos($str_contact_allow, '<' . $self . '>') !== false ) { - $str_contact_allow = str_replace('<' . local_user() . '>', '', $str_contact_allow); + $str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow); } // Make sure to set the `private` field as true. This is necessary to // have the posts show up correctly in Diaspora if an event is created @@ -90,7 +99,7 @@ function events_post(&$a) { else { // Note: do not set `private` field for self-only events. It will // keep even you from seeing them! - $str_contact_allow = '<' . local_user() . '>'; + $str_contact_allow = '<' . $self . '>'; $str_group_allow = $str_contact_deny = $str_group_deny = ''; } From 3521e22333d9050d3feb35b4f9b147d444505904 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 3 May 2012 06:05:55 +0200 Subject: [PATCH 7/8] diabook-theme: made boxes at right_aside sortable --- view/theme/diabook/bottom.tpl | 26 ++++++++++--- view/theme/diabook/communityhome.tpl | 8 +++- .../diabook-aerith/style-network-wide.css | 4 +- .../diabook/diabook-aerith/style-network.css | 4 +- .../diabook-aerith/style-profile-wide.css | 4 +- .../diabook/diabook-aerith/style-profile.css | 4 +- .../diabook-blue/style-network-wide.css | 4 +- .../diabook/diabook-blue/style-network.css | 4 +- .../diabook-blue/style-profile-wide.css | 4 +- .../diabook/diabook-blue/style-profile.css | 4 +- .../diabook-green/style-network-wide.css | 4 +- .../diabook/diabook-green/style-network.css | 4 +- .../diabook-green/style-profile-wide.css | 4 +- .../diabook/diabook-green/style-profile.css | 4 +- .../diabook-pink/style-network-wide.css | 4 +- .../diabook/diabook-pink/style-network.css | 4 +- .../diabook-pink/style-profile-wide.css | 4 +- .../diabook/diabook-pink/style-profile.css | 4 +- .../diabook-red/style-network-wide.css | 4 +- .../diabook/diabook-red/style-network.css | 4 +- .../diabook-red/style-profile-wide.css | 4 +- .../diabook/diabook-red/style-profile.css | 4 +- .../diabook/js/jquery-ui-1.8.20.custom.min.js | 37 +++++++++++++++++++ view/theme/diabook/style-network-wide.css | 4 +- view/theme/diabook/style-network.css | 4 +- view/theme/diabook/style-profile-wide.css | 4 +- view/theme/diabook/style-profile.css | 4 +- view/theme/diabook/style-wide.css | 1 + view/theme/diabook/theme.php | 11 +++++- 29 files changed, 122 insertions(+), 57 deletions(-) create mode 100644 view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl index 8eb71b7dd1..2bb651796a 100644 --- a/view/theme/diabook/bottom.tpl +++ b/view/theme/diabook/bottom.tpl @@ -1,11 +1,6 @@ ', $imageresizeJS); + //load jquery.ui.js + $jqueryuiJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js"; + $a->page['htmlhead'] .= sprintf('', $jqueryuiJS); + //load jquery.twitter.search.js if($_COOKIE['close_twitter'] != "1") { $twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js"; @@ -133,6 +137,9 @@ if ($color=="dark") $color_path = "/diabook-dark/"; var footer_top = $(document).height() - 30; $("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;"); }); + + + '; //check if twitterbox is active and print @@ -467,7 +474,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; //Community_Pages at right_aside if($_COOKIE['close_pages'] != "1") { if(local_user()) { - $page = '
+ $page = '

'.t("Community Pages").'

    '; @@ -493,7 +500,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $page .= '
  • ' . $contact['url'] . ' '. $contact["name"]."
    • "; } - $page .= '
'; + $page .= ''; //if (sizeof($contacts) > 0) $aside['$page'] = $page; }} From ff2ddc319d4307e56a1bf48f51f8f948fe0736ca Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 3 May 2012 06:25:23 +0200 Subject: [PATCH 8/8] diabook-theme: small fix --- view/theme/diabook/theme.php | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 1d4fd5e288..eaf17bea17 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -193,6 +193,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $.cookie("close_lastusers","2", { expires: 365, path: "/" }); $.cookie("close_lastphotos","2", { expires: 365, path: "/" }); $.cookie("close_lastlikes","2", { expires: 365, path: "/" }); + $.cookie("Boxorder",null, { expires: 365, path: "/" }); alert("Right-hand column was restored. Please refresh your browser"); } ';}