From 1bf9f3823ceb83febc26d227053f7582e011ce17 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 6 Mar 2012 18:48:39 +0000 Subject: [PATCH 01/11] doc/Account-Basics.md --- doc/Account-Basics.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index b5e757dbc5..fa773de783 100755 --- a/doc/Account-Basics.md +++ b/doc/Account-Basics.md @@ -6,7 +6,9 @@ Account Basics **Registration** -Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. +Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. The strength of our network is that lots of different sites are all completely compatible with each other. If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a list of public servers here, and find one that meets your needs. + +If you'd like to have your own server, you can do that too. Visit the Friendica website to download the code with setup instructions. It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily. *OpenID* @@ -14,11 +16,11 @@ The first field on the Registration page is for an OpenID address. If you do not *Your Full Name* -Please provide your full name as you would like it to be displayed on this system. +Please provide your full name **as you would like it to be displayed on this system**. Most people use their real name for this, but you're under no obligation to do so yourself. *Email Address* -Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these from your Settings page once you have logged in. +Please provide a valid email address. Your email address is **never** published. We need this to send you account information and your login details. You may also occasionally receive notifications of incoming messages or items requiring your attention, but you have the ability to completely disable these from your Settings page once you have logged in. This doesn't have to be your primary email address, but it does need to be a real email address. You can't get your initial password, or reset a lost password later without it. This is the only bit of personal information that has to be accurate. *Nickname* @@ -28,12 +30,12 @@ A nickname is used to generate web addresses for many of your personal pages, an *Directory Publishing* -The Registration form also allows you to choose whether or not to list your account in the online directory. This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. Whichever you choose, this can be changed any time from your Settings page after you login. - +The Registration form also allows you to choose whether or not to list your account in the online directory. This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. Whichever you choose, this can be changed any time from your Settings page after you login. *Register* -Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. Some sites may require administrator approval before the registration is processed, and you will be alerted if this is the case. Please watch your email (including spam folders) for your registration approval. +Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. Please watch your email (including spam folders) for your registration details and initial password. + @@ -58,6 +60,11 @@ After your first login, please visit the 'Settings' page from the top menu bar a A ['Tips for New Members'](newmember) link will show up on your home page for two weeks to provide some important Getting Started information. +**Retrieving Personal Data** + +You can export a copy of your personal data in XML format from the "Export personal data" link at the top of your settings page. + + **See Also** * [Profiles](help/Profiles) From ec1740cd40ef56d44836114c63505d7be0bebabd Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 6 Mar 2012 18:55:45 +0000 Subject: [PATCH 02/11] doc/Bugs-and-Issues.md --- doc/Bugs-and-Issues.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md index c119b99684..46abea9a3e 100755 --- a/doc/Bugs-and-Issues.md +++ b/doc/Bugs-and-Issues.md @@ -4,18 +4,19 @@ Bugs and Issues * [Home](help) -Please report any bugs/issues you encounter using our bug tracker at [[http://bugs.friendica.com]] +If your server has a support page, you should report any bugs/issues you encounter there first. Reporting to your support page before reporting to the developers makes their job easier, as they don't have to deal with bug reports that might not have anything to do with them, and that helps us get new features faster. -Try to provide as much information as you can about the bug (including the full text of any error messages or notices), and if possible your Friendica version. +If you're a technical user, or your site doesn't have a support page, you'll need to use the Bug Tracker. Please perform a search to see if there's already an open bug that matches yours before submitting anything. -Your Friendica version may be found in newer releases by visiting http://YOURFRIENDICASITE/friendica +Try to provide as much information as you can about the bug, including the **full** text of any error messages or notices, and any steps required to replicate the problem in as much detail as possible. It's generally better to provide too much information than not enough. -For older versions, view the HTML source of your profile page. The Friendica version is in the HTML header, 5-10 lines from the top of the page. +See this article to learn more about submitting **good** bug reports. -For really old versions which don't have a version number in the HTML header - please upgrade. Your bug was probably fixed a long time ago. **Bug Sponsorship** +If you find a bug, and it is caused by a problem in main branch (ie, is not specific to our site), you may sponsor it. + The bug/issue database allows you to sponsor issues. This provides an incentive for developers to work on your issue. This isn't necessary - we don't like bugs and will try to fix them. This has more importance for future development projects and feature requests. Bug sponsorship works on the honour system. If you agree to pay $10 to fix a bug, when the fix has been checked in and verified you should send a paypal payment to the developer assigned to the bug. Don't ever think you can get away with not paying a developer for work performed. Some of these guys could hack into your credit card account if you make them mad. From 2772bb7f58b93d3c92cc187202f4d0a051ca5ec1 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 6 Mar 2012 19:04:42 +0000 Subject: [PATCH 03/11] doc/Making-Friends.md --- doc/Making-Friends.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md index 1a9c8d8981..3f1a24c8de 100755 --- a/doc/Making-Friends.md +++ b/doc/Making-Friends.md @@ -5,7 +5,13 @@ Making Friends Friendship in Friendica can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody. How do you do it? -The first thing you can do is look at the Directory for somebody you would like to connect with. Visit their profile. Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile). +The easiest thing to do is to join the New Here group. This group is especially for people new to the Friendica network. Simply connect to the group, post to the wall, and make new friends. You don't even have to like us - comment on a few of our posts, and other people will start to add you too. + +The next thing you can do is look at the Directory. The directory is split up into two parts. If you click the directory button, you will be presented with a list of all members (who chose to be listed) on your server. You'll also see a link to the Global Directory. If you click through to the global directory, you will be presented with a list of everybody who chose to be listed across all instances of Friendica. You will also see a "Show Community Forums" link, which will direct you to Groups, Forums and Fanpages. You connect to people, groups and forums in the same way, except groups and forums will automatically accept your introduction request, whereas a human will approve you manually. + +To connect with other Friendica user + +Visit their profile. Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile). Click that. It will take you to a "Connect" form. @@ -23,6 +29,7 @@ When you've submitted the connection page, it will take you back to your own sit If you already know somebody's Identity Address, you can enter it in the "connect" box on your "Contacts" page. This will take you through a similar process. + **Alternate Networks** You can also use your Identity Address or other people's Identity Addresses to become friends across networks. The list of possible networks is growing all the time. If you know (for instance) "bob" on identi.ca (a Status.Net site) you could put bob@identi.ca into your Contact page and become friends across networks. (Or you can put in the URL to Bob's identi.ca page if you wish). You can also be "partial" friends with somebody on Google Buzz by putting in their gmail address. Google Buzz does not yet support all the protocols we need for direct messaging, but you should be able to follow status updates from within Friendica. You can do the same for Twitter accounts and Diaspora accounts. In fact you can "follow" most anybody or any website that produces a syndication feed (RSS/Atom,etc.). If we can find an information stream and a name to attach to the contact, we'll try to connect with them. From 6720c83a4af33dfb17a5403975a1cdd1ab5674f0 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 6 Mar 2012 19:07:15 +0000 Subject: [PATCH 04/11] doc/Remove-Account.md --- doc/Remove-Account.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md index f526b78a8f..ae5de2cb65 100755 --- a/doc/Remove-Account.md +++ b/doc/Remove-Account.md @@ -5,9 +5,20 @@ Remove Account We don't like to see people leave Friendica, but if you need to remove your account, you should visit the URL -http://friendica-site/removeme +http://sitename/removeme -with your web browser. You will need to be logged in at the time. (Replace "friendica-site" with the hostname of your Friendica server) +with your web browser. You will need to be logged in at the time. You will be asked for your password to confirm the request. If this matches your stored password, your account will immediately be removed. Unlike some social networks we do **not** hold onto it for a grace period in case you change your mind. Your user details, your conversations, your photos, your friends - everything; will be removed immediately and you will be logged out. +When we expire posts we send notifications out to Friendica to remove the posts. Diaspora doesn't have a bulk delete so this step is skipped on that network - and hopefully it will be obvious that deletion doesn't work on any other networks. If you manually delete a post or a range of posts we send individual delete notifications to Friendica and Diaspora for each deleted post. + +Diaspora often loses these. + +If you delete a post but somebody else has starred it, it is still removed. Your wishes take priority. + +When you remove your account we physically remove all your posts and your profile and user data, etc. immediately. + +In order to send out a bulk remove we would need to keep your account around to do this, as we would need to prove to your friends who it is that is submitting the request. We can't do this if you don't have an account. + +Your friends may still see your posts if your account is gone, but there is no public place within Friendica where they can be viewed. If you had friends on Diaspora, your public posts may stick around and be visible to others from that network. From aed5a8e2e52c22d2bbdf33f2542511a35d30c3f9 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 6 Mar 2012 19:11:24 +0000 Subject: [PATCH 05/11] a --- doc/Account-Basics.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index fa773de783..a2fb7bc9ff 100755 --- a/doc/Account-Basics.md +++ b/doc/Account-Basics.md @@ -6,9 +6,9 @@ Account Basics **Registration** -Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. The strength of our network is that lots of different sites are all completely compatible with each other. If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a list of public servers here, and find one that meets your needs. +Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site registration page. The strength of our network is that lots of different sites are all completely compatible with each other. If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a list of public servers here, and find one that meets your needs. -If you'd like to have your own server, you can do that too. Visit the Friendica website to download the code with setup instructions. It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily. +If you'd like to have your own server, you can do that too. Visit the Friendica website to download the code with setup instructions. It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily. *OpenID* From bab865b14e74fb74b2224abffd6cf6f4650b6162 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 6 Mar 2012 19:15:24 +0000 Subject: [PATCH 06/11] doc/Account-Basics.md --- doc/Account-Basics.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index a2fb7bc9ff..fa9860f1c1 100755 --- a/doc/Account-Basics.md +++ b/doc/Account-Basics.md @@ -8,7 +8,7 @@ Account Basics Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site registration page. The strength of our network is that lots of different sites are all completely compatible with each other. If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a list of public servers here, and find one that meets your needs. -If you'd like to have your own server, you can do that too. Visit the Friendica website to download the code with setup instructions. It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily. +If you'd like to have your own server, you can do that too. Visit the Friendica websiteto download the code with setup instructions. It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily. *OpenID* @@ -73,4 +73,3 @@ You can export a copy of your personal data in XML format from the "Export perso * [Remove Account](help/Remove-Account) - \ No newline at end of file From 7e10401ec008e88289829f311d49a7bdeffd7ee9 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 6 Mar 2012 19:15:40 +0000 Subject: [PATCH 07/11] doc/Account-Basics.md --- doc/Account-Basics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index fa9860f1c1..164a6be462 100755 --- a/doc/Account-Basics.md +++ b/doc/Account-Basics.md @@ -8,7 +8,7 @@ Account Basics Not all Friendica sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site registration page. The strength of our network is that lots of different sites are all completely compatible with each other. If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a list of public servers here, and find one that meets your needs. -If you'd like to have your own server, you can do that too. Visit the Friendica websiteto download the code with setup instructions. It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily. +If you'd like to have your own server, you can do that too. Visit the Friendica website to download the code with setup instructions. It's a very simple install process that anybody experienced in hosting websites, or with basic Linux experience can handle easily. *OpenID* From a265afe7eb43bfe494669ee245c97bd7460fb671 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 6 Mar 2012 20:44:53 +0000 Subject: [PATCH 08/11] added beard smileys --- images/beard.jpg | Bin 0 -> 989 bytes images/whitebeard.jpg | Bin 0 -> 951 bytes include/text.php | 43 ++++++++---------------------------------- 3 files changed, 8 insertions(+), 35 deletions(-) create mode 100644 images/beard.jpg create mode 100644 images/whitebeard.jpg mode change 100755 => 100644 include/text.php diff --git a/images/beard.jpg b/images/beard.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d65e0c33b685335a8ba07a8cf73fa0dafd3590ce GIT binary patch literal 989 zcmex=_1P|rX?qqI0P zFI~aY%U!`Mz|~!$%*;qrN1?DZF(@WcOG z3_L*XOoGgU4E79L;&0S1yvbL+Yu}@o*}j1ncc(?n)Hwd|#@T1_nisc~&$2$XWAf*# zyJRIDgF}@yXKl{gm+E3|5oI0ZY#TL6$78edjaL`!9bQ|=`(JO3p2NbK6R$ zeAZ3#?>cZZdKYhZk9_g;1M(8JreDmj&)^V`IlcJUl83R${kgk$el6X$#avS7YQ5`n zz9*IX2$PPfnf&#<<2bJnAbyhjHoailUoFALp1d$0OezUu`M`D(QS7yBG0 zc|OpcGS`NyF!#QbMw{I!#U-;OoOeiCqzR?Xteuz~bkk|&lcG(&OK0utJtpI1G)szS z#(##}D-Nz|DqB>%+c3K6S;Uc$MLTvFvfj!POr9XDq`mCM@|;;}9!~=c!Y^tFF>5GJ zmN+|6&Y`X1lk%Q4#zSF>ED2MxK2C9!p7n8JU$NYA)3Zg37OlS7!q_Lsz$C%I$fL** z)x_bVwwO(kqy99T;>HyRdwbms*Sc*L6cj!m@WGt1_ChSf)eEulrsd&hLqAtV{bwk? ze}2E+SK)_8R4(|}M4X>1Wiz92*&e2n9Us+&43`~cY0a7u_)KaaV=6;_#u6bO^O@^Q z5>~4?axSZ!Ww_<2W6x4IQ!d9=j)#U%T>i~FXtA{5*3+_1P|rX?qqI0P zFI~aY%U!`Mz|~!$%*;qrN1?DZF(@H|W}sdMCMITx0w9-_ zjfI^-P>4fVL{t%|Mx2p>8AU$>10x#;P(odhfq{*Yg^7V3W;WPlK{f_!a_m98N`L=p}>{p-C=kwlK z8bs*!)mzWInz7#U>z}&C({>(uy5-uu{^=^S-+%h^)7JOvKILu8zHi^6*KdCB*E`RR zZ=Sp6M`v%&*t-1H^4Gife15mfdV7Y^t)AamRaSHE-Rl;9v0mnVz3JDyzFoJQm+zZ& zTEEc!TA9t=HM#2gtlwF6@3ZmiPWaCdD*kuc>~4P73oo1!8uNis#$2Z%#zgGK}%{ut{-#)&hX{#@L$4@M>m*38nT${ALuz$kNFDAn389NKN zztH-kB$RUTh-b4zPrFm@Hkmyl-4!pzg3cGkSXFBje%6`OZF%gH;EzieN_C$lUup|7 z`OtGU=BXjq2QRt9G6xENOkStay&%#)F~q0$?xGuu?wa&9c9s6U%d&j+La!=Ge&=g^ z-jf`z?DUZ^-Ri@skaUBUjg7@A*}y4SSorhHMy>#+DNIXsT*S6^G+kp9P+(vNVnZe+ zLjh$$Ao%>YfXPIRxkTK-v_w42JiN5#YP|W%+~6dETF%O)ZeKc^V!WBM8ZQ}Kj8;=Q z5X~TPP^iN~@b9Afh(9hO8;vv8u&z}-9LZpC%;`~L!Qqa-ec~(u0>SocL=OD3H~#$m q41?tZyVWnO7jVDc_2~CHy&V_q5B!b2{^;MW9X~%mKkv5x|4jf!kxXF# literal 0 HcmV?d00001 diff --git a/include/text.php b/include/text.php old mode 100755 new mode 100644 index c8c03174e6..2667ddddc4 --- a/include/text.php +++ b/include/text.php @@ -14,13 +14,7 @@ if(! function_exists('replace_macros')) { function replace_macros($s,$r) { global $t; - //$ts = microtime(); - $r = $t->replace($s,$r); - //$tt = microtime() - $ts; - - //$a = get_app(); - //$a->page['debug'] .= "$tt
\n"; - return $r; + return $t->replace($s,$r); }} @@ -737,7 +731,9 @@ function smilies($s, $sample = false) { ':headdesk', '~friendika', '~friendica', -// 'Diaspora*' + 'Diaspora*', + ':beard', + ':whitebeard' ); $icons = array( @@ -778,7 +774,9 @@ function smilies($s, $sample = false) { ':headdesk', '~friendika ~friendika', '~friendica ~friendica', -// 'DiasporaDiaspora*', + 'DiasporaDiaspora*', + ':beard', + ':whitebeard' ); @@ -792,7 +790,6 @@ function smilies($s, $sample = false) { } } else { - $params['string'] = preg_replace_callback('/<(3+)/','preg_heart',$params['string']); $s = str_replace($params['texts'],$params['icons'],$params['string']); } @@ -811,18 +808,7 @@ function smile_decode($m) { return(str_replace($m[1],base64url_decode($m[1]),$m[0])); } -// expand <3333 to the correct number of hearts -function preg_heart($x) { - $a = get_app(); - if(strlen($x[1]) == 1) - return $x[0]; - $t = ''; - for($cnt = 0; $cnt < strlen($x[1]); $cnt ++) - $t .= '<3'; - $r = str_replace($x[0],$t,$x[0]); - return $r; -} if(! function_exists('day_translate')) { @@ -1014,7 +1000,7 @@ function lang_selector() { } $ll = substr($l,5); $ll = substr($ll,0,strrpos($ll,'/')); - $selected = (($ll === $lang && (x($_SESSION, 'language'))) ? ' selected="selected" ' : ''); + $selected = (($ll === $lang && (x($_SESSION['language']))) ? ' selected="selected" ' : ''); $o .= ''; } } @@ -1219,16 +1205,3 @@ function reltoabs($text, $base) return $text; } -function item_post_type($item) { - if(intval($item['event-id'])) - return t('event'); - if(strlen($item['resource-id'])) - return t('photo'); - if(strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) - return t('activity'); - if($item['id'] != $item['parent']) - return t('comment'); - return t('post'); -} - - From 67456bad067dd06c5775979c07c25c767164da36 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 6 Mar 2012 20:50:38 +0000 Subject: [PATCH 09/11] Fixed...merged with mainline THEN added beards. --- include/text.php | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/include/text.php b/include/text.php index 2667ddddc4..e7c95d35c9 100644 --- a/include/text.php +++ b/include/text.php @@ -14,7 +14,13 @@ if(! function_exists('replace_macros')) { function replace_macros($s,$r) { global $t; - return $t->replace($s,$r); + //$ts = microtime(); + $r = $t->replace($s,$r); + //$tt = microtime() - $ts; + + //$a = get_app(); + //$a->page['debug'] .= "$tt
\n"; + return $r; }} @@ -731,9 +737,10 @@ function smilies($s, $sample = false) { ':headdesk', '~friendika', '~friendica', - 'Diaspora*', +// 'Diaspora*' ':beard', ':whitebeard' + ); $icons = array( @@ -774,10 +781,9 @@ function smilies($s, $sample = false) { ':headdesk', '~friendika ~friendika', '~friendica ~friendica', - 'DiasporaDiaspora*', +// 'DiasporaDiaspora*', ':beard', ':whitebeard' - ); $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s); @@ -790,6 +796,7 @@ function smilies($s, $sample = false) { } } else { + $params['string'] = preg_replace_callback('/<(3+)/','preg_heart',$params['string']); $s = str_replace($params['texts'],$params['icons'],$params['string']); } @@ -808,7 +815,18 @@ function smile_decode($m) { return(str_replace($m[1],base64url_decode($m[1]),$m[0])); } +// expand <3333 to the correct number of hearts +function preg_heart($x) { + $a = get_app(); + if(strlen($x[1]) == 1) + return $x[0]; + $t = ''; + for($cnt = 0; $cnt < strlen($x[1]); $cnt ++) + $t .= '<3'; + $r = str_replace($x[0],$t,$x[0]); + return $r; +} if(! function_exists('day_translate')) { @@ -1000,7 +1018,7 @@ function lang_selector() { } $ll = substr($l,5); $ll = substr($ll,0,strrpos($ll,'/')); - $selected = (($ll === $lang && (x($_SESSION['language']))) ? ' selected="selected" ' : ''); + $selected = (($ll === $lang && (x($_SESSION, 'language'))) ? ' selected="selected" ' : ''); $o .= ''; } } @@ -1205,3 +1223,16 @@ function reltoabs($text, $base) return $text; } +function item_post_type($item) { + if(intval($item['event-id'])) + return t('event'); + if(strlen($item['resource-id'])) + return t('photo'); + if(strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) + return t('activity'); + if($item['id'] != $item['parent']) + return t('comment'); + return t('post'); +} + + From 6a5c4bab9c4e06c65fb68b0586853f169197ab0b Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 7 Mar 2012 00:07:27 +0100 Subject: [PATCH 10/11] messages-menu translation, add scroll-to-top and theme-bug-report in theme --- include/nav.php | 3 +++ view/theme/diabook/icons/ftdevs.gif | Bin 0 -> 1188 bytes view/theme/diabook/icons/scroll_top.png | Bin 0 -> 296 bytes view/theme/diabook/nav.tpl | 19 ++++++------------- view/theme/diabook/style.css | 23 +++++++++++++++-------- 5 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 view/theme/diabook/icons/ftdevs.gif create mode 100755 view/theme/diabook/icons/scroll_top.png diff --git a/include/nav.php b/include/nav.php index 511ca07fc0..aadfa82fd8 100755 --- a/include/nav.php +++ b/include/nav.php @@ -122,6 +122,9 @@ function nav(&$a) { } $nav['messages'] = array('message', t('Messages'), "", t('Private mail')); + $nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox')); + $nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox')); + $nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message')); if(is_array($a->identities) && count($a->identities) > 1) { $nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages')); diff --git a/view/theme/diabook/icons/ftdevs.gif b/view/theme/diabook/icons/ftdevs.gif new file mode 100644 index 0000000000000000000000000000000000000000..e0fc257434792e0b64406320444d9bed3f9478e2 GIT binary patch literal 1188 zcmV;V1Y7$@Nk%w1VG;lm0O$MwFfJ!FF)1@KEHyDIHa0OWK}9q_MM6M28%twDMMN`6 zR!~MQNl8UjN-Zo=WCvP_Y)b$sRcHuXk5f-dC0TWAP!A?scTH75UQswETzDs3cn@Ke z7hsDIVwG@H3`vWKm;eV_j)XUTI5YWn(3Bon2~8S!-5hW@de5DspB?y2!MfqX@-)CgJ*$*e}IF9NsqFDgnyxfEw_OLi-c>n zf&`y~Jc5OViimrMiIS0ua*~T~XO*y(j&_ZZkB5?yn~-zDj|`2Hjd_-#mXUv#k$;(z zdUlzfn38~wl$Dy4c!rmshL@m&nWb)?wrQZemzSGtp}BIPwv(Ek$(tc@roYFYA<~@~ z(w-^4q&3x_C8497)SxJ>q<+|;B)_LPcdyR2r)#yRamcALrl+dirWcE_zp$&1r>m{r zsUNwle#EX_<*pvFu(05-H|w$)zq69=vlX?pv+lDO@Us}XwxRE|7R$G8!M2v}wH=?o z$;7#vv%A8^yr1p8CB?m<_`Dwby&B2Cqw&Bd{=OH#z`_2%82-N*{l6T{!J5p%n*YEU z@WDa#hd@c9kj{M#Kyk%#6Zr)tpCL#|Hc{r z#v9DWw*SW#|Hm2s$05tdy#L4<)ybO6%E`LV%*xHi+s%~!%|pb})Bn##&(PA+(a`eI zb?Mcg_tkm-*I579T=>^~``35>*l7RSR{z;x_}GE}*lqvWWZBu-_}PX3+j9Baisjw9 z`Q48A-ILkh+~(iB;^5ik;mhgc$>`+HjPf|J{XJjpEaAjv8b}=q6ASiWnX>MmANlHf`N>D{dAa*t~ zDJ&pybzy92ba@~>ATcm73IHqs0000I01^NI2>t;1VN+&Im#b8#NO7uj2hX2q{POXO zwXGdHb?C@_;|6XDnmu~*c;d&8jka{>V9k{MlE2fDMB14J_ zaOh(y2?>%ON*!x9NC=J_GiV@qAj#U14jNQU^->lqav zjBJ!Zp~6HFNo$CxWy>r~6KQiIXt0oh!W%b3_V$96?A4<}UQRerU?2g5CwqC#lJ!f~ zB1{Ja1Q-B-z!k-}T7ilr2#_2&apyjf78m{dE$u4$nav.contacts.1 @@ -38,9 +38,9 @@ {{ endif }} @@ -138,18 +138,11 @@ +
$langselector
-
+
-$nav.login.1 - - - - - {# {{ if $nav.logout }}$nav.logout.1 {{ endif }} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index ddbbc2e53d..fe1d3d8829 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -619,6 +619,7 @@ nav .nav-menu-search { margin: 3px 17px; margin-right: 0px; height: 17px; + width: 205px; } nav .nav-menu-icon { @@ -856,7 +857,7 @@ aside { /* background: #F1F1F1; */ } aside .vcard .fn { - font-size: 16px; + font-size: 18px; font-weight: bold; margin-bottom: 5px; } @@ -1427,12 +1428,13 @@ section { margin-top: 10px; } #profile-jot-form #jot-title { - border: 0px; - margin: 0px; - height: 20px; - width: 700px; - font-weight: bold; - border: 1px solid #ffffff; + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #ffffff; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -1883,7 +1885,12 @@ blockquote { padding-left: 9px; margin: 0 0 0 .8ex; } - +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } /* ================== */ /* = Contacts Block = */ /* ================== */ From a464e4d33fbca9c02cd99abab092d43b631aa780 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 6 Mar 2012 15:15:59 -0800 Subject: [PATCH 11/11] search should be ok, but a little extra security won't hurt --- mod/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/search.php b/mod/search.php index fe09b671f6..386592ea19 100755 --- a/mod/search.php +++ b/mod/search.php @@ -127,7 +127,7 @@ function search_content(&$a) { FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `user`.`hidewall` = 0 ) + AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) OR `item`.`uid` = %d ) AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $search_alg