diff options
37 files changed, 419 insertions, 184 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1272' ); +define ( 'FRIENDICA_VERSION', '2.3.1273' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1131 ); diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index b5e757dbc..164a6be46 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 <a href ="http://dir.friendica.com/siteinfo">list of public servers here</a>, and find one that meets your needs. + +If you'd like to have your own server, you can do that too. Visit <a href = "http://friendica.com/download">the Friendica website</a> 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) @@ -66,4 +73,3 @@ A ['Tips for New Members'](newmember) link will show up on your home page for tw * [Remove Account](help/Remove-Account) -
\ No newline at end of file diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md index c119b9968..46abea9a3 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 <a href = "http://bugs.friendica.com/">Bug Tracker</a>. 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. +<a href = "http://www.chiark.greenend.org.uk/~sgtatham/bugs.html">See this article</a> 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. diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md index 1a9c8d898..3f1a24c8d 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 <a href = "http://kakste.com/profile/newhere">New Here</a> 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. diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md index f526b78a8..ae5de2cb6 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. diff --git a/images/smiley-beard.png b/images/smiley-beard.png Binary files differnew file mode 100644 index 000000000..5d4b28463 --- /dev/null +++ b/images/smiley-beard.png diff --git a/images/smiley-cool.gif b/images/smiley-cool.gif Binary files differindex ba90cc36f..cee1c1aa3 100755 --- a/images/smiley-cool.gif +++ b/images/smiley-cool.gif diff --git a/images/smiley-cry.gif b/images/smiley-cry.gif Binary files differindex 74d897a4f..06e6ca2c2 100755 --- a/images/smiley-cry.gif +++ b/images/smiley-cry.gif diff --git a/images/smiley-embarassed.gif b/images/smiley-embarassed.gif Binary files differindex 963a96b8a..adc12e7c5 100755 --- a/images/smiley-embarassed.gif +++ b/images/smiley-embarassed.gif diff --git a/images/smiley-foot-in-mouth.gif b/images/smiley-foot-in-mouth.gif Binary files differindex 16f68cc1e..b444e5781 100755 --- a/images/smiley-foot-in-mouth.gif +++ b/images/smiley-foot-in-mouth.gif diff --git a/images/smiley-frown.gif b/images/smiley-frown.gif Binary files differindex 716f55e16..9ff19850d 100755 --- a/images/smiley-frown.gif +++ b/images/smiley-frown.gif diff --git a/images/smiley-heart.gif b/images/smiley-heart.gif Binary files differindex 21c0c6530..6a11e7065 100755 --- a/images/smiley-heart.gif +++ b/images/smiley-heart.gif diff --git a/images/smiley-innocent.gif b/images/smiley-innocent.gif Binary files differindex 334d49e0e..9d747140e 100755 --- a/images/smiley-innocent.gif +++ b/images/smiley-innocent.gif diff --git a/images/smiley-kiss.gif b/images/smiley-kiss.gif Binary files differindex 4efd549ed..cc356611e 100755 --- a/images/smiley-kiss.gif +++ b/images/smiley-kiss.gif diff --git a/images/smiley-laughing.gif b/images/smiley-laughing.gif Binary files differindex 1606c119e..1bf29de79 100755 --- a/images/smiley-laughing.gif +++ b/images/smiley-laughing.gif diff --git a/images/smiley-money-mouth.gif b/images/smiley-money-mouth.gif Binary files differindex ca2451e10..1e8ccd0f3 100755 --- a/images/smiley-money-mouth.gif +++ b/images/smiley-money-mouth.gif diff --git a/images/smiley-sealed.gif b/images/smiley-sealed.gif Binary files differindex b33d3cca1..98186742d 100755 --- a/images/smiley-sealed.gif +++ b/images/smiley-sealed.gif diff --git a/images/smiley-smile.gif b/images/smiley-smile.gif Binary files differindex e6a9e60d5..b9bff40a4 100755 --- a/images/smiley-smile.gif +++ b/images/smiley-smile.gif diff --git a/images/smiley-surprised.gif b/images/smiley-surprised.gif Binary files differindex cb99cdd91..b07465326 100755 --- a/images/smiley-surprised.gif +++ b/images/smiley-surprised.gif diff --git a/images/smiley-tongue-out.gif b/images/smiley-tongue-out.gif Binary files differindex 2075dc160..48867dc26 100755 --- a/images/smiley-tongue-out.gif +++ b/images/smiley-tongue-out.gif diff --git a/images/smiley-undecided.gif b/images/smiley-undecided.gif Binary files differindex bef7e2573..28029794f 100755 --- a/images/smiley-undecided.gif +++ b/images/smiley-undecided.gif diff --git a/images/smiley-whitebeard.png b/images/smiley-whitebeard.png Binary files differnew file mode 100644 index 000000000..2a1fccbb7 --- /dev/null +++ b/images/smiley-whitebeard.png diff --git a/images/smiley-wink.gif b/images/smiley-wink.gif Binary files differindex 9faf1aff8..e1cefb05c 100755 --- a/images/smiley-wink.gif +++ b/images/smiley-wink.gif diff --git a/images/smiley-yell.gif b/images/smiley-yell.gif Binary files differindex 648e6e879..5296c8836 100755 --- a/images/smiley-yell.gif +++ b/images/smiley-yell.gif diff --git a/include/conversation.php b/include/conversation.php index f4740688c..b458923e5 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -217,7 +217,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { if($update) $return_url = $_SESSION['return_url']; else - $return_url = $_SESSION['return_url'] = $a->cmd; + $return_url = $_SESSION['return_url'] = $a->query_string; load_contact_links(local_user()); diff --git a/include/security.php b/include/security.php index 6b8128bdd..9042d4d64 100755 --- a/include/security.php +++ b/include/security.php @@ -202,7 +202,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { " AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' ) AND ( allow_gid = '' OR allow_gid REGEXP '%s' ) - AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s') + AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s') ", intval($remote_user), intval($remote_user), @@ -212,4 +212,78 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { } } return $sql; -}
\ No newline at end of file +} + + +function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) { + + $local_user = local_user(); + $remote_user = remote_user(); + + /** + * Construct permissions + * + * default permissions - anonymous user + */ + + $sql = " AND allow_cid = '' + AND allow_gid = '' + AND deny_cid = '' + AND deny_gid = '' + AND private = 0 + "; + + /** + * Profile owner - everything is visible + */ + + if(($local_user) && ($local_user == $owner_id)) { + $sql = ''; + } + + /** + * Authenticated visitor. Unless pre-verified, + * check that the contact belongs to this $owner_id + * and load the groups the visitor belongs to. + * If pre-verified, the caller is expected to have already + * done this and passed the groups into this function. + */ + + elseif($remote_user) { + + if(! $remote_verified) { + $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1", + intval($remote_user), + intval($owner_id) + ); + if(count($r)) { + $remote_verified = true; + $groups = init_groups_visitor($remote_user); + } + } + if($remote_verified) { + + $gs = '<<>>'; // should be impossible to match + + if(is_array($groups) && count($groups)) { + foreach($groups as $g) + $gs .= '|<' . intval($g) . '>'; + } + + $sql = sprintf( + " AND ( private = 0 OR (( allow_cid = '' OR allow_cid REGEXP '<%d>' ) + AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' ) + AND ( allow_gid = '' OR allow_gid REGEXP '%s' ) + AND ( deny_gid = '' OR NOT deny_gid REGEXP '%s'))) + ", + intval($remote_user), + intval($remote_user), + dbesc($gs), + dbesc($gs) + ); + } + } + return $sql; +} + + diff --git a/include/text.php b/include/text.php index c8c03174e..5ad0154d7 100755..100644 --- a/include/text.php +++ b/include/text.php @@ -738,6 +738,9 @@ function smilies($s, $sample = false) { '~friendika', '~friendica', // 'Diaspora*' + ':beard', + ':whitebeard' + ); $icons = array( @@ -779,7 +782,8 @@ function smilies($s, $sample = false) { '<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>', '<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>', // '<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>', - + '<img src="' . $a->get_baseurl() . '/images/smiley-beard.png" alt=":beard" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-whitebeard.png" alt=":whitebeard" />' ); $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s); diff --git a/mod/admin.php b/mod/admin.php index 2115f9241..93714bb5f 100755 --- a/mod/admin.php +++ b/mod/admin.php @@ -321,32 +321,32 @@ function admin_page_site(&$a) { '$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""), '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), - '$theme' => array('theme', t("System theme"), get_config('system','theme'), "Default system theme (which may be over-ridden by user profiles)", $theme_choices), + '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles"), $theme_choices), - '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), "Maximum size in bytes of uploaded images. Default is 0, which means no limits."), + '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), '$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices), - '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), "Will be displayed prominently on the registration page."), + '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), t("Will be displayed prominently on the registration page.")), '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), - '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"), - '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"), - '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), "Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."), - '$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), "Check to force all profiles on this site to be listed in the site directory."), - '$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), "URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."), + '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), + '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), + '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")), + '$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")), + '$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")), - '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), "Disallow users to register additional accounts for use as pages."), - '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), "OpenID support for registration and logins."), - '$no_gravatar' => array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), "Search new user's photo on Gravatar."), - '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), "Force users to register with a space between firstname and lastname in Full name, as an antispam measure"), - '$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), "Use PHP UTF8 regular expressions"), - '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."), - '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), "Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."), - '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), "Provide built-in Diaspora network compatibility."), - '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), "All contacts must use Friendica protocols. All other built-in communication protocols disabled."), - '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."), + '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")), + '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")), + '$no_gravatar' => array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), t("Search new user's photo on Gravatar.")), + '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")), + '$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")), + '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")), + '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), t("Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), + '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")), + '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")), + '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")), '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), - '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), "Value is in seconds. Set to 0 for unlimited (not recommended)."), + '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")), )); diff --git a/mod/display.php b/mod/display.php index f510f793d..f428149e8 100755 --- a/mod/display.php +++ b/mod/display.php @@ -85,7 +85,7 @@ function display_content(&$a) { $o .= status_editor($a,$x,0,true); - $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups); + $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups); $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, diff --git a/mod/network.php b/mod/network.php index 894ac48ed..8da1561a0 100755 --- a/mod/network.php +++ b/mod/network.php @@ -51,14 +51,14 @@ function network_init(&$a) { function saved_searches($search) { - $srchurl = '/network' - . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') - . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '') - . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '') - . ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '') - . ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '') - . ((x($_GET,'cmin')) ? '?cmin=' . $_GET['cmin'] : '') - . ((x($_GET,'cmax')) ? '?cmax=' . $_GET['cmax'] : ''); + $srchurl = '/network?f=' + . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') + . ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') + . ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '') + . ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '') + . ((x($_GET,'nets')) ? '&nets=' . $_GET['nets'] : '') + . ((x($_GET,'cmin')) ? '&cmin=' . $_GET['cmin'] : '') + . ((x($_GET,'cmax')) ? '&cmax=' . $_GET['cmax'] : ''); $o = ''; @@ -164,33 +164,33 @@ function network_content(&$a, $update = 0) { $tabs = array( array( 'label' => t('Commented Order'), - 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : ''), + 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?f=&cid=' . $_GET['cid'] : ''), 'sel'=>$all_active, ), array( 'label' => t('Posted Order'), - 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), + 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 'sel'=>$postord_active, ), array( 'label' => t('Personal'), - 'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&conv=1', + 'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1', 'sel' => $conv_active, ), array( 'label' => t('New'), - 'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : ''), + 'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''), 'sel' => $new_active, ), array( 'label' => t('Starred'), - 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1', + 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1', 'sel'=>$starred_active, ), array( 'label' => t('Bookmarks'), - 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1', + 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1', 'sel'=>$bookmarked_active, ), // array( @@ -256,8 +256,6 @@ function network_content(&$a, $update = 0) { nav_set_selected('network'); - $_SESSION['return_url'] = $a->query_string; - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); $x = array( diff --git a/mod/profile.php b/mod/profile.php index 74e1a2302..1a701f407 100755 --- a/mod/profile.php +++ b/mod/profile.php @@ -159,7 +159,7 @@ function profile_content(&$a, $update = 0) { * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups */ - $sql_extra = permissions_sql($a->profile['profile_uid'],$remote_contact,$groups); + $sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups); if($update) { diff --git a/mod/search.php b/mod/search.php index fe09b671f..386592ea1 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 diff --git a/mod/share.php b/mod/share.php index bba527342..f6c025e3c 100755 --- a/mod/share.php +++ b/mod/share.php @@ -16,10 +16,18 @@ function share_init(&$a) { $o = ''; - $o .= '♲ <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />'; - if($r[0]['title']) - $o .= '<strong>' . $r[0]['title'] . '</strong><br />'; - $o .= bbcode($r[0]['body'], true); - echo $o . '<br />'; + if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) { + $o .= '♲ [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]'; + if($r[0]['title']) + $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n"; + $o .= $r[0]['body'] . "\n"; + } + else { + $o .= '♲ <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />'; + if($r[0]['title']) + $o .= '<strong>' . $r[0]['title'] . '</strong><br />'; + $o .= bbcode($r[0]['body'], true) . '<br />'; + } + echo $o; killme(); } diff --git a/util/messages.po b/util/messages.po index 140ed0427..7f88e2288 100755 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1272\n" +"Project-Id-Version: 2.3.1273\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-05 16:34-0800\n" +"POT-Creation-Date: 2012-03-06 15:09-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -48,11 +48,11 @@ msgstr "" #: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159 #: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9 #: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9 -#: ../../mod/display.php:130 ../../mod/profiles.php:7 +#: ../../mod/display.php:133 ../../mod/profiles.php:7 #: ../../mod/profiles.php:229 ../../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:332 -#: ../../include/items.php:3005 ../../index.php:288 +#: ../../include/items.php:3030 ../../index.php:288 msgid "Permission denied." msgstr "" @@ -82,7 +82,7 @@ msgid "Return to contact editor" msgstr "" #: ../../mod/crepair.php:148 ../../mod/settings.php:462 -#: ../../mod/settings.php:488 ../../mod/admin.php:483 ../../mod/admin.php:492 +#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493 msgid "Name" msgstr "" @@ -126,8 +126,8 @@ msgstr "" #: ../../mod/localtime.php:45 ../../mod/contacts.php:319 #: ../../mod/settings.php:460 ../../mod/settings.php:603 #: ../../mod/settings.php:797 ../../mod/manage.php:109 ../../mod/group.php:80 -#: ../../mod/admin.php:312 ../../mod/admin.php:480 ../../mod/admin.php:606 -#: ../../mod/admin.php:772 ../../mod/admin.php:852 ../../mod/profiles.php:375 +#: ../../mod/admin.php:313 ../../mod/admin.php:481 ../../mod/admin.php:609 +#: ../../mod/admin.php:776 ../../mod/admin.php:856 ../../mod/profiles.php:375 #: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:411 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:92 #: ../../addon/nsfw/nsfw.php:57 @@ -149,7 +149,8 @@ msgstr "" #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175 #: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355 -#: ../../addon/posterous/posterous.php:90 ../../include/conversation.php:552 +#: ../../addon/posterous/posterous.php:90 +#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552 msgid "Submit" msgstr "" @@ -539,7 +540,7 @@ msgid "Preview" msgstr "" #: ../../mod/photos.php:1320 ../../mod/settings.php:520 -#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:487 +#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:488 #: ../../include/conversation.php:304 ../../include/conversation.php:573 msgid "Delete" msgstr "" @@ -772,7 +773,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:582 ../../include/items.php:2541 +#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566 msgid "[Name Withheld]" msgstr "" @@ -1225,7 +1226,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:486 msgid "Approve" msgstr "" @@ -1422,12 +1423,12 @@ msgid "View all contacts" msgstr "" #: ../../mod/contacts.php:297 ../../mod/contacts.php:344 -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:490 msgid "Unblock" msgstr "" #: ../../mod/contacts.php:297 ../../mod/contacts.php:344 -#: ../../mod/admin.php:488 +#: ../../mod/admin.php:489 msgid "Block" msgstr "" @@ -1496,7 +1497,7 @@ msgstr "" msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:341 ../../mod/admin.php:901 +#: ../../mod/contacts.php:341 ../../mod/admin.php:905 msgid "Update now" msgstr "" @@ -1583,7 +1584,7 @@ msgstr "" #: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106 #: ../../mod/register.php:380 ../../mod/register.php:434 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:726 -#: ../../include/items.php:2550 +#: ../../include/items.php:2575 msgid "Administrator" msgstr "" @@ -1850,7 +1851,7 @@ msgstr "" msgid "Move to folder:" msgstr "" -#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:461 +#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462 msgid "Normal Account" msgstr "" @@ -1858,7 +1859,7 @@ msgstr "" msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:462 +#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463 msgid "Soapbox Account" msgstr "" @@ -1866,7 +1867,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:463 +#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464 msgid "Community/Celebrity Account" msgstr "" @@ -1874,7 +1875,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:464 +#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465 msgid "Automatic Friend Account" msgstr "" @@ -2140,27 +2141,27 @@ msgstr[1] "" msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:300 +#: ../../mod/network.php:298 msgid "No such group" msgstr "" -#: ../../mod/network.php:311 +#: ../../mod/network.php:309 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:315 +#: ../../mod/network.php:313 msgid "Group: " msgstr "" -#: ../../mod/network.php:325 +#: ../../mod/network.php:323 msgid "Contact: " msgstr "" -#: ../../mod/network.php:327 +#: ../../mod/network.php:325 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:332 +#: ../../mod/network.php:330 msgid "Invalid contact." msgstr "" @@ -2488,7 +2489,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:540 ../../mod/admin.php:313 +#: ../../mod/register.php:540 ../../mod/admin.php:314 msgid "Registration" msgstr "" @@ -2542,9 +2543,9 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127 -#: ../../mod/admin.php:521 ../../mod/admin.php:697 ../../mod/display.php:29 -#: ../../mod/display.php:134 ../../mod/viewd.php:14 -#: ../../include/items.php:2917 +#: ../../mod/admin.php:522 ../../mod/admin.php:700 ../../mod/display.php:29 +#: ../../mod/display.php:137 ../../mod/viewd.php:14 +#: ../../include/items.php:2942 msgid "Item not found." msgstr "" @@ -2778,23 +2779,23 @@ msgstr "" msgid "No friends to display." msgstr "" -#: ../../mod/admin.php:71 ../../mod/admin.php:311 +#: ../../mod/admin.php:71 ../../mod/admin.php:312 msgid "Site" msgstr "" -#: ../../mod/admin.php:72 ../../mod/admin.php:479 ../../mod/admin.php:491 +#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492 msgid "Users" msgstr "" -#: ../../mod/admin.php:73 ../../mod/admin.php:568 ../../mod/admin.php:605 +#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:74 ../../mod/admin.php:739 ../../mod/admin.php:771 +#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775 msgid "Themes" msgstr "" -#: ../../mod/admin.php:89 ../../mod/admin.php:851 +#: ../../mod/admin.php:89 ../../mod/admin.php:855 msgid "Logs" msgstr "" @@ -2802,333 +2803,439 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:160 ../../mod/admin.php:310 ../../mod/admin.php:478 -#: ../../mod/admin.php:567 ../../mod/admin.php:604 ../../mod/admin.php:738 -#: ../../mod/admin.php:770 ../../mod/admin.php:850 +#: ../../mod/admin.php:161 ../../mod/admin.php:311 ../../mod/admin.php:479 +#: ../../mod/admin.php:568 ../../mod/admin.php:607 ../../mod/admin.php:741 +#: ../../mod/admin.php:774 ../../mod/admin.php:854 msgid "Administration" msgstr "" -#: ../../mod/admin.php:161 +#: ../../mod/admin.php:162 msgid "Summary" msgstr "" -#: ../../mod/admin.php:162 +#: ../../mod/admin.php:163 msgid "Registered users" msgstr "" -#: ../../mod/admin.php:164 +#: ../../mod/admin.php:165 msgid "Pending registrations" msgstr "" -#: ../../mod/admin.php:165 +#: ../../mod/admin.php:166 msgid "Version" msgstr "" -#: ../../mod/admin.php:167 +#: ../../mod/admin.php:168 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:259 +#: ../../mod/admin.php:260 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:303 +#: ../../mod/admin.php:304 msgid "Closed" msgstr "" -#: ../../mod/admin.php:304 +#: ../../mod/admin.php:305 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:305 +#: ../../mod/admin.php:306 msgid "Open" msgstr "" -#: ../../mod/admin.php:314 +#: ../../mod/admin.php:315 msgid "File upload" msgstr "" -#: ../../mod/admin.php:315 +#: ../../mod/admin.php:316 msgid "Policies" msgstr "" -#: ../../mod/admin.php:316 +#: ../../mod/admin.php:317 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:320 ../../addon/statusnet/statusnet.php:523 +#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523 msgid "Site name" msgstr "" -#: ../../mod/admin.php:321 +#: ../../mod/admin.php:322 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:322 +#: ../../mod/admin.php:323 msgid "System language" msgstr "" -#: ../../mod/admin.php:323 +#: ../../mod/admin.php:324 msgid "System theme" msgstr "" -#: ../../mod/admin.php:325 +#: ../../mod/admin.php:324 +msgid "Default system theme - may be over-ridden by user profiles" +msgstr "" + +#: ../../mod/admin.php:326 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:327 -msgid "Register policy" +#: ../../mod/admin.php:326 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." msgstr "" #: ../../mod/admin.php:328 +msgid "Register policy" +msgstr "" + +#: ../../mod/admin.php:329 msgid "Register text" msgstr "" #: ../../mod/admin.php:329 +msgid "Will be displayed prominently on the registration page." +msgstr "" + +#: ../../mod/admin.php:330 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:329 +#: ../../mod/admin.php:330 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:331 msgid "Allowed friend domains" msgstr "" #: ../../mod/admin.php:331 +msgid "" +"Comma separated list of domains which are allowed to establish friendships " +"with this site. Wildcards are accepted. Empty to allow any domains" +msgstr "" + +#: ../../mod/admin.php:332 msgid "Allowed email domains" msgstr "" #: ../../mod/admin.php:332 +msgid "" +"Comma separated list of domains which are allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains" +msgstr "" + +#: ../../mod/admin.php:333 msgid "Block public" msgstr "" #: ../../mod/admin.php:333 +msgid "" +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently logged in." +msgstr "" + +#: ../../mod/admin.php:334 msgid "Force publish" msgstr "" #: ../../mod/admin.php:334 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "" + +#: ../../mod/admin.php:335 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:336 +#: ../../mod/admin.php:335 +msgid "" +"URL to update the global directory. If this is not set, the global directory " +"is completely unavailable to the application." +msgstr "" + +#: ../../mod/admin.php:337 msgid "Block multiple registrations" msgstr "" #: ../../mod/admin.php:337 +msgid "Disallow users to register additional accounts for use as pages." +msgstr "" + +#: ../../mod/admin.php:338 msgid "OpenID support" msgstr "" #: ../../mod/admin.php:338 +msgid "OpenID support for registration and logins." +msgstr "" + +#: ../../mod/admin.php:339 msgid "Gravatar support" msgstr "" #: ../../mod/admin.php:339 +msgid "Search new user's photo on Gravatar." +msgstr "" + +#: ../../mod/admin.php:340 msgid "Fullname check" msgstr "" #: ../../mod/admin.php:340 +msgid "" +"Force users to register with a space between firstname and lastname in Full " +"name, as an antispam measure" +msgstr "" + +#: ../../mod/admin.php:341 msgid "UTF-8 Regular expressions" msgstr "" #: ../../mod/admin.php:341 +msgid "Use PHP UTF8 regular expressions" +msgstr "" + +#: ../../mod/admin.php:342 msgid "Show Community Page" msgstr "" #: ../../mod/admin.php:342 +msgid "" +"Display a Community page showing all recent public postings on this site." +msgstr "" + +#: ../../mod/admin.php:343 msgid "Enable OStatus support" msgstr "" #: ../../mod/admin.php:343 +msgid "" +"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " +"communications in OStatus are public, so privacy warnings will be " +"occasionally displayed." +msgstr "" + +#: ../../mod/admin.php:344 msgid "Enable Diaspora support" msgstr "" #: ../../mod/admin.php:344 +msgid "Provide built-in Diaspora network compatibility." +msgstr "" + +#: ../../mod/admin.php:345 msgid "Only allow Friendica contacts" msgstr "" #: ../../mod/admin.php:345 +msgid "" +"All contacts must use Friendica protocols. All other built-in communication " +"protocols disabled." +msgstr "" + +#: ../../mod/admin.php:346 msgid "Verify SSL" msgstr "" #: ../../mod/admin.php:346 -msgid "Proxy user" +msgid "" +"If you wish, you can turn on strict certificate checking. This will mean you " +"cannot connect (at all) to self-signed SSL sites." msgstr "" #: ../../mod/admin.php:347 -msgid "Proxy URL" +msgid "Proxy user" msgstr "" #: ../../mod/admin.php:348 +msgid "Proxy URL" +msgstr "" + +#: ../../mod/admin.php:349 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:369 +#: ../../mod/admin.php:349 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "" + +#: ../../mod/admin.php:370 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:376 +#: ../../mod/admin.php:377 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:411 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:418 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:418 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:482 msgid "select all" msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:483 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:484 msgid "Request date" msgstr "" -#: ../../mod/admin.php:483 ../../mod/admin.php:492 +#: ../../mod/admin.php:484 ../../mod/admin.php:493 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:485 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:487 msgid "Deny" msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:493 msgid "Register date" msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:493 msgid "Last login" msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:493 msgid "Last item" msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:493 msgid "Account" msgstr "" -#: ../../mod/admin.php:494 +#: ../../mod/admin.php:495 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:495 +#: ../../mod/admin.php:496 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:531 +#: ../../mod/admin.php:532 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:535 +#: ../../mod/admin.php:536 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:545 ../../mod/admin.php:721 +#: ../../mod/admin.php:546 ../../mod/admin.php:724 msgid "Disable" msgstr "" -#: ../../mod/admin.php:547 ../../mod/admin.php:723 +#: ../../mod/admin.php:548 ../../mod/admin.php:726 msgid "Enable" msgstr "" -#: ../../mod/admin.php:569 ../../mod/admin.php:740 +#: ../../mod/admin.php:570 ../../mod/admin.php:743 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:570 ../../mod/admin.php:741 ../../include/nav.php:130 +#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130 msgid "Settings" msgstr "" -#: ../../mod/admin.php:686 +#: ../../mod/admin.php:578 ../../mod/admin.php:753 +msgid "Author: " +msgstr "" + +#: ../../mod/admin.php:579 ../../mod/admin.php:754 +msgid "Maintainer: " +msgstr "" + +#: ../../mod/admin.php:689 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:776 +#: ../../mod/admin.php:780 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:777 +#: ../../mod/admin.php:781 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:800 +#: ../../mod/admin.php:804 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:853 +#: ../../mod/admin.php:857 msgid "Clear" msgstr "" -#: ../../mod/admin.php:859 +#: ../../mod/admin.php:863 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:860 +#: ../../mod/admin.php:864 msgid "Log file" msgstr "" -#: ../../mod/admin.php:860 +#: ../../mod/admin.php:864 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:861 +#: ../../mod/admin.php:865 msgid "Log level" msgstr "" -#: ../../mod/admin.php:902 +#: ../../mod/admin.php:906 msgid "Close" msgstr "" -#: ../../mod/admin.php:908 +#: ../../mod/admin.php:912 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:909 +#: ../../mod/admin.php:913 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:910 +#: ../../mod/admin.php:914 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:911 +#: ../../mod/admin.php:915 msgid "FTP Password" msgstr "" @@ -3247,7 +3354,7 @@ msgstr "" msgid "No friends in common." msgstr "" -#: ../../mod/display.php:127 +#: ../../mod/display.php:130 msgid "Item has been removed." msgstr "" @@ -4650,6 +4757,22 @@ msgstr "" msgid "Post to Posterous by default" msgstr "" +#: ../../view/theme/quattro/theme.php:17 +msgid "Theme settings" +msgstr "" + +#: ../../view/theme/quattro/theme.php:18 +msgid "Alignment" +msgstr "" + +#: ../../view/theme/quattro/theme.php:18 +msgid "Left" +msgstr "" + +#: ../../view/theme/quattro/theme.php:18 +msgid "Center" +msgstr "" + #: ../../include/profile_advanced.php:17 ../../boot.php:982 msgid "Gender:" msgstr "" @@ -5692,11 +5815,11 @@ msgstr "" msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/items.php:2548 +#: ../../include/items.php:2573 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2548 +#: ../../include/items.php:2573 msgid "You have a new follower at " msgstr "" diff --git a/view/nets.tpl b/view/nets.tpl index 0953e66a6..cbadf1361 100755 --- a/view/nets.tpl +++ b/view/nets.tpl @@ -5,7 +5,7 @@ <ul class="nets-ul"> <li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a> {{ for $nets as $net }} - <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link">$net.name</a></li> + <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li> {{ endfor }} </ul> diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index dc339131d..a77f4ce04 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -147,6 +147,10 @@ </ul> +<ul id="nav-notifications-template" style="display:none;" rel="template"> + <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> +</ul> + {# diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 0032c4866..671d9652b 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -24,9 +24,9 @@ audio:not([controls]) { display: none; } -/* ============================================================================= - Base - ========================================================================== */ +/* + * Base + */ /* * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units @@ -613,14 +613,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link aside { position: absolute; right: 15px; - width: 255px; + width: 230px; font-size: smaller; } .vcard .fn { font-size: 1.7em; font-weight: bold; border-bottom: 1px solid #729fcf; - padding-top: 3px; + padding-bottom: 3px; } .vcard #profile-photo-wrapper { margin: 20px; @@ -956,7 +956,7 @@ aside #viewcontacts { section { margin: 20px 6% 0 4%; font-size: 0.8em; - padding-right: 250px; + padding-right: 220px; min-width: 475px; } @@ -1002,7 +1002,6 @@ section { .wall-item-content-wrapper { position: relative; padding: 10px; - overflow-x: auto; width: auto; } .wall-item-outside-wrapper .wall-item-comment-wrapper { @@ -1107,9 +1106,9 @@ section { clear:both; } .wall-item-location { - margin-top: 5px; + margin-top: 10px; width: 100px; - overflow:hidden; + overflow: hidden; text-overflow: ellipsis; -o-text-overflow: ellipsis; } @@ -1130,14 +1129,14 @@ section { display: none; } .wallwall .wwto { - left:-10px; + left: 5px; margin: 0; - position:absolute; - top:65px; + position: absolute; + top: 75px; width: 30px; - z-index:10001; - width:30px; - height:30px; + z-index: 10001; + width: 30px; + height: 30px; } .wallwall .wwto img { width: 30px !important; @@ -1148,8 +1147,8 @@ section { } .wall-item-arrowphoto-wrapper { position: absolute; - left: 20px; - top: 70px; + left: 35px; + top: 80px; z-index: 10002; } .wall-item-photo-menu { @@ -1732,11 +1731,11 @@ div[id$="wrapper"] br { margin: 30px 0px; } .profile-edit-side-div { - margin-top: 10px; + margin-top: 0px; } .profile-edit-side-link { float: right; - margin: 10px 20px -16px 0; + margin: 0px 20px -18px 0; } .profile-listing { float: left; |
