From 6d3ba2825bf253f28204f07e265c37d873286592 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 1 May 2012 04:02:56 -0400 Subject: [PATCH 02/19] lighten bg and darken font on dispy light Signed-off-by: Simon L'nu --- view/theme/dispy/light/style.css | 8 ++++---- view/theme/dispy/light/style.less | 12 +++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 8fc48a80fd..19ae9b6e88 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -2,10 +2,10 @@ article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;} audio:not([controls]),[hidden]{display:none;} html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} -body{margin:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#222;background-color:#e8e8e8;} -button,input,select,textarea{font-family:sans-serif;color:#222;background-color:#e8e8e8;} -select{border:1px #555 dotted;padding:3px;margin:3px;color:#222;background:#e8e8e8;} -option{padding:3px;color:#222;background:#e8e8e8;}option[selected="selected"]{color:#111;background:#cca;} +body{margin:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#111;background-color:#eee;} +button,input,select,textarea{font-family:sans-serif;color:#222;background-color:#eee;} +select{border:1px #555 dotted;padding:3px;margin:3px;color:#222;background:#eee;} +option{padding:3px;color:#222;background:#eee;}option[selected="selected"]{color:#111;background:#cca;} ul,ol{padding:0;} :focus{outline:0;} [disabled="disabled"]{background:#ddd;color:#333;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 57b40351be..8968da42ee 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -13,6 +13,8 @@ /* from html5boilerplate */ /* these are to tell browsers they should be displayed a certain way */ +//@import "_base.less"; + article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; } @@ -44,25 +46,25 @@ body { font-size: 16px; line-height: 1.1em; font-family: sans-serif; - color: #222; - background-color: #e8e8e8; } + color: #111; + background-color: #eee; } button, input, select, textarea { font-family: sans-serif; color: #222; - background-color: #e8e8e8; } + background-color: #eee; } select { border: 1px #555 dotted; padding: 3px; margin: 3px; color: #222; - background: #e8e8e8; } + background: #eee; } option { padding: 3px; color: #222; - background: #e8e8e8; + background: #eee; &[selected="selected"] { color: #111; background: #cca; } } From 584ac68ae4a230c7a61b2720be8bac3de34d68da Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 01:16:47 -0700 Subject: [PATCH 03/19] adding zrl support to social graphs --- boot.php | 2 +- database.sql | 2 ++ include/onepoll.php | 2 +- include/socgraph.php | 38 ++++++++++++++++++++++++-------------- update.php | 13 +++++++++++-- 5 files changed, 39 insertions(+), 18 deletions(-) diff --git a/boot.php b/boot.php index 44a8d8c32a..125dda2247 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.1328' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1141 ); +define ( 'DB_UPDATE_VERSION', 1142 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index 16e3964b58..dc586bc2be 100644 --- a/database.sql +++ b/database.sql @@ -384,11 +384,13 @@ CREATE TABLE IF NOT EXISTS `glink` ( `cid` int(11) NOT NULL, `uid` int(11) NOT NULL, `gcid` int(11) NOT NULL, + `zcid` int(11) NOT NULL, `updated` datetime NOT NULL, PRIMARY KEY (`id`), KEY `cid` (`cid`), KEY `uid` (`uid`), KEY `gcid` (`gcid`), + KEY `zcid` (`zcid`), KEY `updated` (`updated`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/include/onepoll.php b/include/onepoll.php index 51516d0598..42bce0f685 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -506,7 +506,7 @@ function onepoll_run($argv, $argc){ } if(count($r)) { if(! $r[0]['total']) { - poco_load($contact['id'],$importer_uid,$contact['poco']); + poco_load($contact['id'],$importer_uid,0,$contact['poco']); } } diff --git a/include/socgraph.php b/include/socgraph.php index 3f51940492..4ab3780989 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -20,7 +20,7 @@ require_once('include/datetime.php'); -function poco_load($cid,$uid = 0,$url = null) { +function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { $a = get_app(); if($cid) { @@ -128,35 +128,45 @@ function poco_load($cid,$uid = 0,$url = null) { if(! $gcid) return; - $r = q("select * from glink where `cid` = %d and `uid` = %d and `gcid` = %d limit 1", + $r = q("select * from glink where `cid` = %d and `uid` = %d and `gcid` = %d and `zcid` = %d limit 1", intval($cid), intval($uid), - intval($gcid) + intval($gcid), + intval($zcid) ); if(! count($r)) { - q("insert into glink ( `cid`,`uid`,`gcid`,`updated`) values (%d,%d,%d,'%s') ", + q("insert into glink ( `cid`,`uid`,`gcid`,`zcid`, `updated`) values (%d,%d,%d,%d, '%s') ", intval($cid), intval($uid), intval($gcid), + intval($zcid), dbesc(datetime_convert()) ); } else { - q("update glink set updated = '%s' where `cid` = %d and `uid` = %d and `gcid` = %d limit 1", + q("update glink set updated = '%s' where `cid` = %d and `uid` = %d and `gcid` = %d and zcid = %d limit 1", dbesc(datetime_convert()), intval($cid), intval($uid), - intval($gcid) + intval($gcid), + intval($zcid) ); } } logger("poco_load: loaded $total entries",LOGGER_DEBUG); - q("delete from glink where `cid` = %d and `uid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY", - intval($cid), - intval($uid) - ); + if($zcid) { + q("delete from glink where `zcid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 14 DAY", + intval($zcid) + ); + } + else { + q("delete from glink where `cid` = %d and `uid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY", + intval($cid), + intval($uid) + ); + } } @@ -254,7 +264,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) { $r2 = q("SELECT gcontact.* from gcontact left join glink on glink.gcid = gcontact.id - where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d ) + where glink.uid = 0 and glink.cid = 0 and glink.zcid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d ) and not gcontact.name in ( select name from contact where uid = %d ) and not gcontact.id in ( select gcid from gcign where uid = %d ) order by rand() limit %d, %d ", @@ -276,7 +286,7 @@ function update_suggestions() { $done = array(); - poco_load(0,0,$a->get_baseurl() . '/poco'); + poco_load(0,0,0,$a->get_baseurl() . '/poco'); $done[] = $a->get_baseurl() . '/poco'; @@ -288,7 +298,7 @@ function update_suggestions() { foreach($j->entries as $entry) { $url = $entry->url . '/poco'; if(! in_array($url,$done)) - poco_load(0,0,$entry->url . '/poco'); + poco_load(0,0,0,$entry->url . '/poco'); } } } @@ -302,7 +312,7 @@ function update_suggestions() { foreach($r as $rr) { $base = substr($rr['poco'],0,strrpos($rr['poco'],'/')); if(! in_array($base,$done)) - poco_load(0,0,$base); + poco_load(0,0,0,$base); } } } diff --git a/update.php b/update.php index f793b89dd5..cce942f27e 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ Date: Tue, 1 May 2012 01:34:47 -0700 Subject: [PATCH 04/19] link socgraph to zrls --- include/gprobe.php | 28 ++++++++++++++++------------ include/socgraph.php | 18 +++++------------- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/include/gprobe.php b/include/gprobe.php index 26254ad28b..fdf786ca81 100644 --- a/include/gprobe.php +++ b/include/gprobe.php @@ -36,21 +36,25 @@ function gprobe_run($argv, $argc){ dbesc(normalise_link($url)) ); - if(count($r)) - return; + if(! count($r)) { - $arr = probe_url($url); - - if(count($arr) && x($arr,'network') && $arr['network'] === NETWORK_DFRN) { - q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`) - values ( '%s', '%s', '%s', '%s') ", - dbesc($arr['name']), - dbesc($arr['url']), - dbesc(normalise_link($arr['url'])), - dbesc($arr['photo']) + $arr = probe_url($url); + if(count($arr) && x($arr,'network') && $arr['network'] === NETWORK_DFRN) { + q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`) + values ( '%s', '%s', '%s', '%s') ", + dbesc($arr['name']), + dbesc($arr['url']), + dbesc(normalise_link($arr['url'])), + dbesc($arr['photo']) + ); + } + $r = q("select * from gcontact where nurl = '%s' limit 1", + dbesc(normalise_link($url)) ); } - + if(count($r)) + poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url'])); + return; } diff --git a/include/socgraph.php b/include/socgraph.php index 4ab3780989..4a1c8a1cad 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -53,7 +53,6 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { if(($a->get_curl_code() > 299) || (! $s)) return; - $j = json_decode($s); logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA); @@ -81,7 +80,6 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { $connect_url = str_replace('acct:' , '', $url->value); continue; } - } foreach($entry->photos as $photo) { if($photo->type == 'profile') { @@ -156,17 +154,11 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { } logger("poco_load: loaded $total entries",LOGGER_DEBUG); - if($zcid) { - q("delete from glink where `zcid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 14 DAY", - intval($zcid) - ); - } - else { - q("delete from glink where `cid` = %d and `uid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY", - intval($cid), - intval($uid) - ); - } + q("delete from glink where `cid` = %d and `uid` = %d and `zcid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY", + intval($cid), + intval($uid), + intval($zcid) + ); } From ab556857f0be489ce681c41069690c13df77024c Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Tue, 1 May 2012 16:46:08 +0200 Subject: [PATCH 05/19] diabook-themes: small fix at "community pages"-box --- view/theme/diabook/communityhome.tpl | 6 +++--- view/theme/diabook/theme.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 982e2bd264..f2f8b4d5e5 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -53,9 +53,6 @@ $nv.search {{ endif }} -
-
-
{{ if $lastusers_title }}

$lastusers_title

@@ -96,4 +93,7 @@ $nv.search {{ endfor }} {{ endif }} +
+ +
\ No newline at end of file diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 945c3f36b4..07fef7d7cc 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -195,9 +195,9 @@ function diabook_community_info(){ //Community Page if(local_user()) { - $page = '
+ $page = '

'.t("Community Pages").'

-
    '; +
      '; $pagelist = array(); @@ -218,7 +218,7 @@ function diabook_community_info(){ $contacts = $pageD; foreach($contacts as $contact) { - $page .= '
    • ' . $contact['url'] . ' '. + $page .= '
    • ' . $contact['url'] . ' '. $contact["name"]."
      • "; } $page .= '
'; From a5f78cf6558e1012619f4bf2cfc5d92c7b9cf595 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 1 May 2012 21:05:55 +0100 Subject: [PATCH 06/19] modified: images/smiley-thumbsup.gif Restored some yellow where there shouldn't have been transparency. Probably introduced by me in the first place. --- images/smiley-thumbsup.gif | Bin 1350 -> 1350 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/smiley-thumbsup.gif b/images/smiley-thumbsup.gif index a9533a64d26a92f01796d72f47de06bdbea9c732..1bc6b124ea951adcb34d234b15612dd1e8de3dbb 100644 GIT binary patch delta 65 zcmV-H0KWgm3dRbsg9IDJgfopGZ_FdaKM_!J&MgNxRKPB)5R%6~GZd4a1WpyjR8q(W X0_pHV5G*)Q5CVSiG7d1slK}-qIKvmK delta 65 zcmV-H0KWgm3dRbsg9ID@gfopGZ_FdaKM_!J&MgNxRKPB)5R%6~GyIdD1WpzIR8q(W X0_pHV5G*)Q5CVSiG7d2RlK}-qXptE~ From 671a10f5d4250d44b7eb2437538da3c73467fe15 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 1 May 2012 21:37:49 +0100 Subject: [PATCH 07/19] More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway. --- view/theme/diabook/diabook-dark/style-network.css | 3 ++- view/theme/diabook/diabook-dark/style.css | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index 8a7083d9d4..43541d2660 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -1597,9 +1597,10 @@ transition: all 0.2s ease-in-out; width: 99%; font-size: 15px; color: #eec; - border: 1px solid #444; + border: 1px solid #eec; padding: 0.3em; margin-bottom: 10px; + background: #444 } .grey { diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css index b59ab5dc15..f00973085f 100644 --- a/view/theme/diabook/diabook-dark/style.css +++ b/view/theme/diabook/diabook-dark/style.css @@ -547,7 +547,7 @@ code { float: right; } .tool a { - color: #3465a4; + color: #88a9d2; } .tool a:hover { text-decoration: none; @@ -594,7 +594,7 @@ header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { - color: #2e2f2e; + color: #eec; text-decoration: none; outline: none; vertical-align: middle; @@ -806,7 +806,7 @@ nav .nav-menu-icon:hover { } nav .nav-menu-icon.selected { - background-color: #fff; + background-color: #308dbf; } nav .nav-menu-icon img { width: 22px; @@ -929,7 +929,7 @@ ul.menu-popup { } ul.menu-popup a { display: block; - color: #2e302e; + color: #eec; padding: 5px 10px; text-decoration: none; } @@ -1923,6 +1923,7 @@ body .pageheader{ margin: 0 0 5px; width: 60%; border: 1px solid #d2d2d2; + background: #444; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; From 38ccd2e6554bac4f0f1bb927eec7f228f21e74bf Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 15:49:22 -0700 Subject: [PATCH 08/19] convert html entities to utf-8 before email header encoding --- boot.php | 2 +- include/enotify.php | 4 +- util/messages.po | 418 ++++++++++++++++++++++---------------------- 3 files changed, 216 insertions(+), 208 deletions(-) diff --git a/boot.php b/boot.php index 125dda2247..e1687030d5 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.1328' ); +define ( 'FRIENDICA_VERSION', '2.3.1329' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1142 ); diff --git a/include/enotify.php b/include/enotify.php index 8385bdec59..ca134ac86c 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -402,8 +402,8 @@ class enotify { */ static public function send($params) { - $fromName = email_header_encode($params['fromName'],'UTF-8'); - $messageSubject = email_header_encode($params['messageSubject'],'UTF-8'); + $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8'); + $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8'); // generate a mime boundary $mimeBoundary =rand(0,9)."-" diff --git a/util/messages.po b/util/messages.po index 535f1de8b7..f5612882c1 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1328\n" +"Project-Id-Version: 2.3.1329\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-30 10:00-0700\n" +"POT-Creation-Date: 2012-05-01 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,8 +39,8 @@ msgstr "" #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125 -#: ../../mod/settings.php:104 ../../mod/settings.php:519 -#: ../../mod/settings.php:524 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/settings.php:104 ../../mod/settings.php:521 +#: ../../mod/settings.php:526 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -56,7 +56,7 @@ msgstr "" #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 #: ../../addon/facebook/facebook.php:485 ../../include/items.php:3187 -#: ../../index.php:309 +#: ../../index.php:306 msgid "Permission denied." msgstr "" @@ -85,8 +85,8 @@ msgstr "" msgid "Return to contact editor" msgstr "" -#: ../../mod/crepair.php:148 ../../mod/settings.php:539 -#: ../../mod/settings.php:565 ../../mod/admin.php:638 ../../mod/admin.php:647 +#: ../../mod/crepair.php:148 ../../mod/settings.php:541 +#: ../../mod/settings.php:567 ../../mod/admin.php:638 ../../mod/admin.php:647 msgid "Name" msgstr "" @@ -128,8 +128,8 @@ msgstr "" #: ../../mod/photos.php:1273 ../../mod/photos.php:1304 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:322 -#: ../../mod/settings.php:537 ../../mod/settings.php:683 -#: ../../mod/settings.php:744 ../../mod/settings.php:935 +#: ../../mod/settings.php:539 ../../mod/settings.php:685 +#: ../../mod/settings.php:746 ../../mod/settings.php:940 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:400 #: ../../mod/admin.php:635 ../../mod/admin.php:771 ../../mod/admin.php:970 #: ../../mod/admin.php:1057 ../../mod/profiles.php:534 @@ -173,11 +173,11 @@ msgstr "" msgid "Help" msgstr "" -#: ../../mod/help.php:38 ../../index.php:228 +#: ../../mod/help.php:38 ../../index.php:225 msgid "Not Found" msgstr "" -#: ../../mod/help.php:41 ../../index.php:231 +#: ../../mod/help.php:41 ../../index.php:228 msgid "Page not found." msgstr "" @@ -219,7 +219,7 @@ msgstr "" msgid "link to source" msgstr "" -#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:255 +#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:274 #: ../../include/nav.php:52 ../../boot.php:1493 msgid "Events" msgstr "" @@ -279,8 +279,8 @@ msgid "Share this event" msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:818 ../../mod/settings.php:538 -#: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:818 ../../mod/settings.php:540 +#: ../../mod/settings.php:566 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -324,23 +324,23 @@ msgid "" msgstr "" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:806 -#: ../../mod/settings.php:849 ../../mod/settings.php:855 -#: ../../mod/settings.php:863 ../../mod/settings.php:867 -#: ../../mod/settings.php:872 ../../mod/settings.php:878 -#: ../../mod/settings.php:884 ../../mod/settings.php:890 -#: ../../mod/settings.php:926 ../../mod/settings.php:927 -#: ../../mod/settings.php:928 ../../mod/settings.php:929 +#: ../../mod/settings.php:854 ../../mod/settings.php:860 +#: ../../mod/settings.php:868 ../../mod/settings.php:872 +#: ../../mod/settings.php:877 ../../mod/settings.php:883 +#: ../../mod/settings.php:889 ../../mod/settings.php:895 +#: ../../mod/settings.php:931 ../../mod/settings.php:932 +#: ../../mod/settings.php:933 ../../mod/settings.php:934 #: ../../mod/register.php:532 ../../mod/profiles.php:511 msgid "Yes" msgstr "" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:807 -#: ../../mod/settings.php:849 ../../mod/settings.php:855 -#: ../../mod/settings.php:863 ../../mod/settings.php:867 -#: ../../mod/settings.php:872 ../../mod/settings.php:878 -#: ../../mod/settings.php:884 ../../mod/settings.php:890 -#: ../../mod/settings.php:926 ../../mod/settings.php:927 -#: ../../mod/settings.php:928 ../../mod/settings.php:929 +#: ../../mod/settings.php:854 ../../mod/settings.php:860 +#: ../../mod/settings.php:868 ../../mod/settings.php:872 +#: ../../mod/settings.php:877 ../../mod/settings.php:883 +#: ../../mod/settings.php:889 ../../mod/settings.php:895 +#: ../../mod/settings.php:931 ../../mod/settings.php:932 +#: ../../mod/settings.php:933 ../../mod/settings.php:934 #: ../../mod/register.php:533 ../../mod/profiles.php:512 msgid "No" msgstr "" @@ -352,7 +352,7 @@ msgstr "" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:135 +#: ../../view/theme/diabook/theme.php:155 msgid "Contact Photos" msgstr "" @@ -375,7 +375,7 @@ msgstr "" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:136 +#: ../../view/theme/diabook/theme.php:156 msgid "Profile Photos" msgstr "" @@ -397,7 +397,7 @@ msgstr "" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:107 ../../include/text.php:1304 +#: ../../view/theme/diabook/theme.php:127 ../../include/text.php:1304 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -554,8 +554,8 @@ msgstr "" msgid "Preview" msgstr "" -#: ../../mod/photos.php:1331 ../../mod/settings.php:600 -#: ../../mod/settings.php:681 ../../mod/group.php:168 ../../mod/admin.php:642 +#: ../../mod/photos.php:1331 ../../mod/settings.php:602 +#: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:642 #: ../../include/conversation.php:318 ../../include/conversation.php:584 msgid "Delete" msgstr "" @@ -572,7 +572,7 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:257 +#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:276 #: ../../include/nav.php:101 msgid "Community" msgstr "" @@ -581,35 +581,35 @@ msgstr "" msgid "No results." msgstr "" -#: ../../mod/friendica.php:47 +#: ../../mod/friendica.php:55 msgid "This is Friendica, version" msgstr "" -#: ../../mod/friendica.php:48 +#: ../../mod/friendica.php:56 msgid "running at web location" msgstr "" -#: ../../mod/friendica.php:50 +#: ../../mod/friendica.php:58 msgid "" "Please visit Friendica.com to learn " "more about the Friendica project." msgstr "" -#: ../../mod/friendica.php:52 +#: ../../mod/friendica.php:60 msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/friendica.php:53 +#: ../../mod/friendica.php:61 msgid "" "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " "dot com" msgstr "" -#: ../../mod/friendica.php:58 +#: ../../mod/friendica.php:75 msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/friendica.php:71 +#: ../../mod/friendica.php:88 msgid "No installed plugins/addons/apps" msgstr "" @@ -625,7 +625,7 @@ msgstr "" msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:95 ../../mod/settings.php:599 +#: ../../mod/editpost.php:95 ../../mod/settings.php:601 #: ../../include/conversation.php:571 msgid "Edit" msgstr "" @@ -855,7 +855,7 @@ msgstr "" msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:634 +#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:636 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "" @@ -1214,7 +1214,7 @@ msgstr "" msgid "Personal" msgstr "" -#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:251 +#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:270 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "" @@ -1655,7 +1655,7 @@ msgstr "" msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:253 +#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:272 #: ../../include/nav.php:139 msgid "Contacts" msgstr "" @@ -1688,7 +1688,7 @@ msgstr "" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/register.php:388 ../../mod/register.php:442 -#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:756 +#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:742 #: ../../addon/facebook/facebook.php:658 #: ../../addon/facebook/facebook.php:1148 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2716 @@ -1783,7 +1783,7 @@ msgstr "" msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:134 ../../mod/settings.php:563 +#: ../../mod/settings.php:134 ../../mod/settings.php:565 msgid "Update" msgstr "" @@ -1811,23 +1811,23 @@ msgstr "" msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:384 +#: ../../mod/settings.php:385 msgid " Please use a shorter name." msgstr "" -#: ../../mod/settings.php:386 +#: ../../mod/settings.php:387 msgid " Name too short." msgstr "" -#: ../../mod/settings.php:392 +#: ../../mod/settings.php:393 msgid " Not valid email." msgstr "" -#: ../../mod/settings.php:394 +#: ../../mod/settings.php:395 msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:470 +#: ../../mod/settings.php:468 ../../addon/facebook/facebook.php:470 #: ../../addon/impressum/impressum.php:77 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 @@ -1835,405 +1835,409 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:536 ../../mod/settings.php:562 -#: ../../mod/settings.php:598 +#: ../../mod/settings.php:538 ../../mod/settings.php:564 +#: ../../mod/settings.php:600 msgid "Add application" msgstr "" -#: ../../mod/settings.php:540 ../../mod/settings.php:566 +#: ../../mod/settings.php:542 ../../mod/settings.php:568 #: ../../addon/statusnet/statusnet.php:547 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:541 ../../mod/settings.php:567 +#: ../../mod/settings.php:543 ../../mod/settings.php:569 #: ../../addon/statusnet/statusnet.php:546 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:542 ../../mod/settings.php:568 +#: ../../mod/settings.php:544 ../../mod/settings.php:570 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:543 ../../mod/settings.php:569 +#: ../../mod/settings.php:545 ../../mod/settings.php:571 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:554 +#: ../../mod/settings.php:556 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:597 +#: ../../mod/settings.php:599 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:603 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:602 +#: ../../mod/settings.php:604 msgid "No name" msgstr "" -#: ../../mod/settings.php:603 +#: ../../mod/settings.php:605 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:614 +#: ../../mod/settings.php:616 msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:622 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:624 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "" -#: ../../mod/settings.php:634 ../../mod/settings.php:635 +#: ../../mod/settings.php:636 ../../mod/settings.php:637 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: ../../mod/settings.php:634 ../../mod/settings.php:635 +#: ../../mod/settings.php:636 ../../mod/settings.php:637 msgid "enabled" msgstr "" -#: ../../mod/settings.php:634 ../../mod/settings.php:635 +#: ../../mod/settings.php:636 ../../mod/settings.php:637 msgid "disabled" msgstr "" -#: ../../mod/settings.php:635 +#: ../../mod/settings.php:637 msgid "StatusNet" msgstr "" -#: ../../mod/settings.php:665 +#: ../../mod/settings.php:667 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:670 +#: ../../mod/settings.php:672 msgid "Email/Mailbox Setup" msgstr "" -#: ../../mod/settings.php:671 +#: ../../mod/settings.php:673 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:674 msgid "Last successful email check:" msgstr "" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:675 msgid "Email access is disabled on this site." msgstr "" -#: ../../mod/settings.php:674 +#: ../../mod/settings.php:676 msgid "IMAP server name:" msgstr "" -#: ../../mod/settings.php:675 +#: ../../mod/settings.php:677 msgid "IMAP port:" msgstr "" -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:678 msgid "Security:" msgstr "" -#: ../../mod/settings.php:676 ../../mod/settings.php:681 +#: ../../mod/settings.php:678 ../../mod/settings.php:683 msgid "None" msgstr "" -#: ../../mod/settings.php:677 +#: ../../mod/settings.php:679 msgid "Email login name:" msgstr "" -#: ../../mod/settings.php:678 +#: ../../mod/settings.php:680 msgid "Email password:" msgstr "" -#: ../../mod/settings.php:679 +#: ../../mod/settings.php:681 msgid "Reply-to address:" msgstr "" -#: ../../mod/settings.php:680 +#: ../../mod/settings.php:682 msgid "Send public posts to all email contacts:" msgstr "" -#: ../../mod/settings.php:681 +#: ../../mod/settings.php:683 msgid "Action after import:" msgstr "" -#: ../../mod/settings.php:681 +#: ../../mod/settings.php:683 msgid "Mark as seen" msgstr "" -#: ../../mod/settings.php:681 +#: ../../mod/settings.php:683 msgid "Move to folder" msgstr "" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:684 msgid "Move to folder:" msgstr "" -#: ../../mod/settings.php:742 +#: ../../mod/settings.php:744 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:748 +#: ../../mod/settings.php:750 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:749 +#: ../../mod/settings.php:751 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:749 +#: ../../mod/settings.php:751 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:750 +#: ../../mod/settings.php:752 msgid "Number of items to display on the network page:" msgstr "" -#: ../../mod/settings.php:750 +#: ../../mod/settings.php:752 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:751 +#: ../../mod/settings.php:753 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:816 ../../mod/admin.php:180 ../../mod/admin.php:616 +#: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:616 msgid "Normal Account" msgstr "" -#: ../../mod/settings.php:817 +#: ../../mod/settings.php:822 msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:820 ../../mod/admin.php:181 ../../mod/admin.php:617 +#: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:617 msgid "Soapbox Account" msgstr "" -#: ../../mod/settings.php:821 +#: ../../mod/settings.php:826 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:824 ../../mod/admin.php:182 ../../mod/admin.php:618 +#: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:618 msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/settings.php:825 +#: ../../mod/settings.php:830 msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:828 ../../mod/admin.php:183 ../../mod/admin.php:619 +#: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:619 msgid "Automatic Friend Account" msgstr "" -#: ../../mod/settings.php:829 +#: ../../mod/settings.php:834 msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: ../../mod/settings.php:839 +#: ../../mod/settings.php:844 msgid "OpenID:" msgstr "" -#: ../../mod/settings.php:839 +#: ../../mod/settings.php:844 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:854 msgid "Publish your default profile in your local site directory?" msgstr "" -#: ../../mod/settings.php:855 +#: ../../mod/settings.php:860 msgid "Publish your default profile in the global social directory?" msgstr "" -#: ../../mod/settings.php:863 +#: ../../mod/settings.php:868 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: ../../mod/settings.php:867 +#: ../../mod/settings.php:872 msgid "Hide your profile details from unknown viewers?" msgstr "" -#: ../../mod/settings.php:872 +#: ../../mod/settings.php:877 msgid "Allow friends to post to your profile page?" msgstr "" -#: ../../mod/settings.php:878 +#: ../../mod/settings.php:883 msgid "Allow friends to tag your posts?" msgstr "" -#: ../../mod/settings.php:884 +#: ../../mod/settings.php:889 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:895 msgid "Permit unknown people to send you private mail?" msgstr "" -#: ../../mod/settings.php:901 +#: ../../mod/settings.php:906 msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:907 ../../mod/profile_photo.php:211 +#: ../../mod/settings.php:912 ../../mod/profile_photo.php:211 msgid "or" msgstr "" -#: ../../mod/settings.php:912 +#: ../../mod/settings.php:917 msgid "Your Identity Address is" msgstr "" -#: ../../mod/settings.php:923 +#: ../../mod/settings.php:928 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:923 +#: ../../mod/settings.php:928 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:924 +#: ../../mod/settings.php:929 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:925 +#: ../../mod/settings.php:930 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:926 +#: ../../mod/settings.php:931 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:927 +#: ../../mod/settings.php:932 msgid "Expire personal notes:" msgstr "" -#: ../../mod/settings.php:928 +#: ../../mod/settings.php:933 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:929 +#: ../../mod/settings.php:934 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:938 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:942 +#: ../../mod/settings.php:947 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:943 +#: ../../mod/settings.php:948 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:944 +#: ../../mod/settings.php:949 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:944 +#: ../../mod/settings.php:949 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:948 +#: ../../mod/settings.php:953 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:949 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:954 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "" -#: ../../mod/settings.php:950 +#: ../../mod/settings.php:955 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:951 +#: ../../mod/settings.php:956 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:952 +#: ../../mod/settings.php:957 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:958 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:961 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:958 +#: ../../mod/settings.php:963 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:958 ../../mod/settings.php:973 +#: ../../mod/settings.php:963 ../../mod/settings.php:978 msgid "(to prevent spam abuse)" msgstr "" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:964 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:965 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:973 +#: ../../mod/settings.php:978 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:976 +#: ../../mod/settings.php:981 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:982 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:983 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:979 -msgid "making an interesting profile change" -msgstr "" - -#: ../../mod/settings.php:980 -msgid "Send a notification email when:" -msgstr "" - -#: ../../mod/settings.php:981 -msgid "You receive an introduction" -msgstr "" - -#: ../../mod/settings.php:982 -msgid "Your introductions are confirmed" -msgstr "" - -#: ../../mod/settings.php:983 -msgid "Someone writes on your profile wall" -msgstr "" - #: ../../mod/settings.php:984 -msgid "Someone writes a followup comment" +msgid "joining a forum/community" msgstr "" #: ../../mod/settings.php:985 -msgid "You receive a private message" +msgid "making an interesting profile change" msgstr "" #: ../../mod/settings.php:986 -msgid "You receive a friend suggestion" +msgid "Send a notification email when:" msgstr "" #: ../../mod/settings.php:987 -msgid "You are tagged in a post" +msgid "You receive an introduction" +msgstr "" + +#: ../../mod/settings.php:988 +msgid "Your introductions are confirmed" +msgstr "" + +#: ../../mod/settings.php:989 +msgid "Someone writes on your profile wall" msgstr "" #: ../../mod/settings.php:990 +msgid "Someone writes a followup comment" +msgstr "" + +#: ../../mod/settings.php:991 +msgid "You receive a private message" +msgstr "" + +#: ../../mod/settings.php:992 +msgid "You receive a friend suggestion" +msgstr "" + +#: ../../mod/settings.php:993 +msgid "You are tagged in a post" +msgstr "" + +#: ../../mod/settings.php:996 msgid "Advanced Page Settings" msgstr "" @@ -2556,7 +2560,7 @@ msgstr "" msgid "Group name changed." msgstr "" -#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305 msgid "Permission denied" msgstr "" @@ -2596,7 +2600,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:252 +#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:271 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/nav.php:50 ../../boot.php:1478 msgid "Profile" @@ -2782,8 +2786,8 @@ msgstr "" #: ../../addon/facebook/facebook.php:1542 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:102 -#: ../../view/theme/diabook/theme.php:111 ../../include/diaspora.php:1654 +#: ../../view/theme/diabook/theme.php:122 +#: ../../view/theme/diabook/theme.php:131 ../../include/diaspora.php:1654 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" @@ -2791,7 +2795,7 @@ msgstr "" #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1546 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:116 ../../include/diaspora.php:1670 +#: ../../view/theme/diabook/theme.php:136 ../../include/diaspora.php:1670 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2812,7 +2816,7 @@ msgstr "" msgid "Access denied." msgstr "" -#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:254 +#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:273 #: ../../include/nav.php:51 ../../boot.php:1484 msgid "Photos" msgstr "" @@ -4043,7 +4047,7 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:163 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:183 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -4058,7 +4062,7 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:161 +#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:181 msgid "Global Directory" msgstr "" @@ -4197,58 +4201,58 @@ msgstr "" msgid "Unable to set contact photo." msgstr "" -#: ../../mod/dfrn_confirm.php:488 -#, php-format -msgid "%1$s welcomes new member %2$s" -msgstr "" - -#: ../../mod/dfrn_confirm.php:498 ../../include/diaspora.php:507 +#: ../../mod/dfrn_confirm.php:482 ../../include/diaspora.php:507 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" msgstr "" -#: ../../mod/dfrn_confirm.php:572 +#: ../../mod/dfrn_confirm.php:554 #, php-format msgid "No user record found for '%s' " msgstr "" -#: ../../mod/dfrn_confirm.php:582 +#: ../../mod/dfrn_confirm.php:564 msgid "Our site encryption key is apparently messed up." msgstr "" -#: ../../mod/dfrn_confirm.php:593 +#: ../../mod/dfrn_confirm.php:575 msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "" -#: ../../mod/dfrn_confirm.php:614 +#: ../../mod/dfrn_confirm.php:596 msgid "Contact record was not found for you on our site." msgstr "" -#: ../../mod/dfrn_confirm.php:628 +#: ../../mod/dfrn_confirm.php:610 #, php-format msgid "Site public key not available in contact record for URL %s." msgstr "" -#: ../../mod/dfrn_confirm.php:648 +#: ../../mod/dfrn_confirm.php:630 msgid "" "The ID provided by your system is a duplicate on our system. It should work " "if you try again." msgstr "" -#: ../../mod/dfrn_confirm.php:659 +#: ../../mod/dfrn_confirm.php:641 msgid "Unable to set your contact credentials on our system." msgstr "" -#: ../../mod/dfrn_confirm.php:724 +#: ../../mod/dfrn_confirm.php:706 msgid "Unable to update your contact profile details on our system" msgstr "" -#: ../../mod/dfrn_confirm.php:754 +#: ../../mod/dfrn_confirm.php:740 #, php-format msgid "Connection accepted at %s" msgstr "" +#: ../../mod/dfrn_confirm.php:789 +#, php-format +msgid "%1$s has joined %2$s" +msgstr "" + #: ../../addon/facebook/facebook.php:491 msgid "Facebook disabled" msgstr "" @@ -4625,7 +4629,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:99 ../../include/text.php:1302 +#: ../../view/theme/diabook/theme.php:119 ../../include/text.php:1302 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -5546,72 +5550,76 @@ msgid "Color scheme" msgstr "" #: ../../view/theme/diabook/theme.php:48 +msgid "Community Profiles" +msgstr "" + +#: ../../view/theme/diabook/theme.php:68 msgid "Last users" msgstr "" -#: ../../view/theme/diabook/theme.php:77 +#: ../../view/theme/diabook/theme.php:97 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook/theme.php:122 +#: ../../view/theme/diabook/theme.php:142 msgid "Last photos" msgstr "" -#: ../../view/theme/diabook/theme.php:159 +#: ../../view/theme/diabook/theme.php:179 msgid "Find Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:160 +#: ../../view/theme/diabook/theme.php:180 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook/theme.php:162 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:182 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook/theme.php:164 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:184 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:180 -#: ../../view/theme/diabook/theme.php:258 +#: ../../view/theme/diabook/theme.php:199 +#: ../../view/theme/diabook/theme.php:277 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:213 +#: ../../view/theme/diabook/theme.php:232 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook/theme.php:219 +#: ../../view/theme/diabook/theme.php:238 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook/theme.php:251 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:270 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "" -#: ../../view/theme/diabook/theme.php:252 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:271 ../../include/nav.php:50 msgid "Your profile page" msgstr "" -#: ../../view/theme/diabook/theme.php:253 +#: ../../view/theme/diabook/theme.php:272 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:254 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:273 ../../include/nav.php:51 msgid "Your photos" msgstr "" -#: ../../view/theme/diabook/theme.php:255 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:274 ../../include/nav.php:52 msgid "Your events" msgstr "" -#: ../../view/theme/diabook/theme.php:256 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:275 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook/theme.php:256 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:275 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" From f24ffa8ef0bbda13c12f130a413a8660fff45493 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 17:10:26 -0700 Subject: [PATCH 09/19] improve handling of relative feed url's --- include/Scrape.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Scrape.php b/include/Scrape.php index b20d7d6046..2272526009 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -282,7 +282,7 @@ function scrape_feed($url) { } } if(! $basename) - $basename = substr($url,0,strrpos($url,'/')) . '/'; + $basename = implode('/', array_slice(explode('/',$url),0,3)) . '/'; $items = $dom->getElementsByTagName('link'); From 8bd6e1aef9bcace19e4517b4f53c976d4c0a2760 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 19:16:18 -0700 Subject: [PATCH 10/19] first try common friends for visitors --- include/contact_widgets.php | 39 ++++++++++++++++++++++++++++++++++ include/socgraph.php | 42 +++++++++++++++++++++++++++++++++++++ mod/profile.php | 4 ++++ view/match.tpl | 2 +- 4 files changed, 86 insertions(+), 1 deletion(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 96b02f2939..1aaef115c9 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -133,3 +133,42 @@ function categories_widget($baseurl,$selected = '') { )); } +function common_friends_visitor_widget($profile_uid) { + + $a = get_app(); + + if(local_user() == $profile_uid) + return; + + $cid = $zcid = 0; + + if(can_write_wall($a,$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())) + ); + if(count($r)) + $zcid = $r[0]['id']; + } + } + + if($cid == 0 && $zcid == 0) + return; + + require_once('include/socgraph.php'); + + + $t = count_common_friends_remote($profile_uid,$cid,$zcid); + if(! $t) + return; + + $r = common_friends_remote($profile_uid,$cid,$zcid); + + return replace_macros(get_markup_template('remote_friends_common.tpl'), array( + '$desc' => sprintf( tt("%d friend in common", "%d friends in common", $t), $t), + '$items = $r + )); + +}; \ No newline at end of file diff --git a/include/socgraph.php b/include/socgraph.php index 4a1c8a1cad..bd1fbded5c 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -199,6 +199,48 @@ function common_friends($uid,$cid) { } + +function count_common_friends_remote($uid,$cid,$zid) { + + $r = q("SELECT count(*) as `total` + FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` + where ((`glink`.cid != 0 and `glink`.`cid` = %d) or ( `glink`.`zcid` != 0 and `glink`.`zcid` = %d )) + and `glink`.`uid` = %d + and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) ", + intval($cid), + intval($zid), + intval($uid), + intval($uid), + intval($cid) + ); + + if(count($r)) + return $r[0]['total']; + return 0; + +} + +function common_friends_remote($uid,$cid,$zid,$limit = 6) { + + $r = q("SELECT `gcontact`.* + FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` + where ((`glink`.cid != 0 and `glink`.`cid` = %d) or ( `glink`.`zcid` != 0 and `glink`.`zcid` = %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", + intval($cid), + intval($zid), + intval($uid), + intval($uid), + intval($cid), + intval($limit) + ); + + return $r; + +} + + function count_all_friends($uid,$cid) { $r = q("SELECT count(*) as `total` diff --git a/mod/profile.php b/mod/profile.php index e9d4ca344e..41c5eed4bd 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -143,6 +143,10 @@ function profile_content(&$a, $update = 0) { return $o; } + + $o .= common_friends_vistor_widget($a->profile['profile_uid']); + + if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner) $o .= '' . t('Tips for New Members') . '' . EOL; diff --git a/view/match.tpl b/view/match.tpl index 5f2fc7a302..b052845ae7 100644 --- a/view/match.tpl +++ b/view/match.tpl @@ -13,4 +13,4 @@
$conntxt
{{ endif }} -
\ No newline at end of file + From 1fc796b2766abfee2d55c9b434d584a61fdb4b07 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 19:19:24 -0700 Subject: [PATCH 11/19] typo --- include/contact_widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 1aaef115c9..fedb946112 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -168,7 +168,7 @@ function common_friends_visitor_widget($profile_uid) { return replace_macros(get_markup_template('remote_friends_common.tpl'), array( '$desc' => sprintf( tt("%d friend in common", "%d friends in common", $t), $t), - '$items = $r + '$items' = $r )); }; \ No newline at end of file From 15c185015690664f9b6aef849cc6f79b68fd9c63 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 19:20:41 -0700 Subject: [PATCH 12/19] another one --- include/contact_widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index fedb946112..0bf0b29d41 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -168,7 +168,7 @@ function common_friends_visitor_widget($profile_uid) { return replace_macros(get_markup_template('remote_friends_common.tpl'), array( '$desc' => sprintf( tt("%d friend in common", "%d friends in common", $t), $t), - '$items' = $r + '$items' => $r )); }; \ No newline at end of file From 91085f0969afbdca93c79d9be3d8fa815e9dfa27 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 19:24:22 -0700 Subject: [PATCH 13/19] really fat fingers today - though none of this has gone further than my own site --- mod/profile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/profile.php b/mod/profile.php index 41c5eed4bd..69f044e89f 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -144,7 +144,7 @@ function profile_content(&$a, $update = 0) { } - $o .= common_friends_vistor_widget($a->profile['profile_uid']); + $o .= common_friends_visitor_widget($a->profile['profile_uid']); if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner) From 72dbc2faeef26c6cdc749ce8403ebbd77b9b896f Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 20:11:35 -0700 Subject: [PATCH 14/19] fn not found --- include/gprobe.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/gprobe.php b/include/gprobe.php index fdf786ca81..5ca42729a7 100644 --- a/include/gprobe.php +++ b/include/gprobe.php @@ -2,6 +2,7 @@ require_once("boot.php"); require_once('include/Scrape.php'); +require_once('include/socgraph.php'); function gprobe_run($argv, $argc){ global $a, $db; From 066d69b21c4d612b35a3e15ae1d5db6344935e53 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 20:22:59 -0700 Subject: [PATCH 15/19] add template --- view/remote_friends_common.tpl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 view/remote_friends_common.tpl diff --git a/view/remote_friends_common.tpl b/view/remote_friends_common.tpl new file mode 100644 index 0000000000..b44a5b639d --- /dev/null +++ b/view/remote_friends_common.tpl @@ -0,0 +1,21 @@ +
+
$desc
+ {{ if $items }} + {{ for $items as $item }} +
+
+ + $item.name + +
+
+
+ $item.name +
+
+
+ {{ endfor }} + {{ endif }} +
+
+ From 594803afca25bf173cc42bb523a6931cc386777a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 20:33:19 -0700 Subject: [PATCH 16/19] reduce the scope a bit --- include/contact_widgets.php | 6 +++--- include/socgraph.php | 24 ++++++++---------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 0bf0b29d41..3fd311e4a2 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -154,17 +154,17 @@ function common_friends_visitor_widget($profile_uid) { } } - if($cid == 0 && $zcid == 0) + if($zcid == 0) return; require_once('include/socgraph.php'); - $t = count_common_friends_remote($profile_uid,$cid,$zcid); + $t = count_common_friends_zcid($profile_uid,$zcid); if(! $t) return; - $r = common_friends_remote($profile_uid,$cid,$zcid); + $r = common_friends_zcid($profile_uid,$zcid); 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 bd1fbded5c..a3e20a6414 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -200,18 +200,14 @@ function common_friends($uid,$cid) { } -function count_common_friends_remote($uid,$cid,$zid) { +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`.cid != 0 and `glink`.`cid` = %d) or ( `glink`.`zcid` != 0 and `glink`.`zcid` = %d )) - and `glink`.`uid` = %d - and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) ", - intval($cid), - intval($zid), + where `glink`.`zcid` = %d + and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) ", + intval($zcid), intval($uid), - intval($uid), - intval($cid) ); if(count($r)) @@ -220,19 +216,15 @@ function count_common_friends_remote($uid,$cid,$zid) { } -function common_friends_remote($uid,$cid,$zid,$limit = 6) { +function common_friends_zcid($uid,$zcid,$limit = 6) { $r = q("SELECT `gcontact`.* FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` - where ((`glink`.cid != 0 and `glink`.`cid` = %d) or ( `glink`.`zcid` != 0 and `glink`.`zcid` = %d )) - and `glink`.`uid` = %d - and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) + 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", - intval($cid), - intval($zid), + intval($zcid), intval($uid), - intval($uid), - intval($cid), intval($limit) ); From e247ed3de25e740c8a0993b35a78e7bb5134c3f3 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 20:36:35 -0700 Subject: [PATCH 17/19] cross fingers --- include/socgraph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/socgraph.php b/include/socgraph.php index a3e20a6414..cf00422560 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -207,7 +207,7 @@ function count_common_friends_zcid($uid,$zcid) { where `glink`.`zcid` = %d and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) ", intval($zcid), - intval($uid), + intval($uid) ); if(count($r)) From 1fab28c413d79a132b1592ff51db3729141d6998 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 20:38:06 -0700 Subject: [PATCH 18/19] fix size --- view/remote_friends_common.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/remote_friends_common.tpl b/view/remote_friends_common.tpl index b44a5b639d..a5a36b1376 100644 --- a/view/remote_friends_common.tpl +++ b/view/remote_friends_common.tpl @@ -5,7 +5,7 @@
- $item.name + $item.name
From becdb1f5085f2561b8b0acebbdbf43e4a81d50da Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 21:22:27 -0700 Subject: [PATCH 19/19] final touches - show friends in common with total strangers from different sites --- include/contact_widgets.php | 13 +++++++++---- include/socgraph.php | 7 ++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 3fd311e4a2..cfe27c5c9b 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -154,17 +154,22 @@ function common_friends_visitor_widget($profile_uid) { } } - if($zcid == 0) + if($cid == 0 && $zcid == 0) return; require_once('include/socgraph.php'); - - $t = count_common_friends_zcid($profile_uid,$zcid); + if($cid) + $t = count_common_friends($profile_uid,$cid); + else + $t = count_common_friends($profile_uid,$cid); if(! $t) return; - $r = common_friends_zcid($profile_uid,$zcid); + if($cid) + $r = common_friends($profile_uid,$cid,5); + else + $r = common_friends_zcid($profile_uid,$zcid); 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 cf00422560..a08d580741 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -182,17 +182,18 @@ function count_common_friends($uid,$cid) { } -function common_friends($uid,$cid) { +function common_friends($uid,$cid,$limit=9999) { $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 ", + order by `gcontact`.`name` asc limit 0, %d", intval($cid), intval($uid), intval($uid), - intval($cid) + intval($cid), + intval($limit) ); return $r;