strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape

Browse source
This commit is contained in:
Michael Vogel 2015-02-09 10:16:48 +01:00
parent 842ac46857 88b86bf6f6
commit 21c63e8b65
13 changed files with 5100 additions and 5110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
boot.php
View file

@ -18,7 +18,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_CODENAME', 'Ginger'); define ( 'FRIENDICA_CODENAME', 'Ginger');
define ( 'FRIENDICA_VERSION', '3.3.3-RC' ); define ( 'FRIENDICA_VERSION', '3.3.3-RC' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1178 ); define ( 'DB_UPDATE_VERSION', 1179 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@ -127,6 +127,11 @@ define ( 'PAGE_FREELOVE', 3 );
define ( 'PAGE_BLOG', 4 ); define ( 'PAGE_BLOG', 4 );
define ( 'PAGE_PRVGROUP', 5 ); define ( 'PAGE_PRVGROUP', 5 );
// Type of the community page
define ( 'CP_NO_COMMUNITY_PAGE', -1 );
define ( 'CP_USERS_ON_SERVER', 0 );
define ( 'CP_GLOBAL_COMMUNITY', 1 );
/** /**
* Network and protocol family types * Network and protocol family types
*/ */

6
include/bbcode.php
View file

@ -1183,12 +1183,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
//$Text = str_replace('<br /><li>','<li>', $Text); //$Text = str_replace('<br /><li>','<li>', $Text);
// $Text = str_replace('<br /><ul','<ul ', $Text); // $Text = str_replace('<br /><ul','<ul ', $Text);
// Remove all hashtag addresses
/* if (!$tryoembed AND get_config("system", "remove_hashtags_on_export")) {
$pattern = '/#<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
$Text = preg_replace($pattern, '#$2', $Text);
}
*/
call_hooks('bbcode',$Text); call_hooks('bbcode',$Text);
$a->save_timestamp($stamp1, "parser"); $a->save_timestamp($stamp1, "parser");

6
include/html2plain.php
View file

@ -113,12 +113,6 @@ function html2plain($html, $wraplength = 75, $compact = false)
$message = str_replace("\r", "", $html); $message = str_replace("\r", "", $html);
// replace all hashtag addresses
/* if (get_config("system", "remove_hashtags_on_export")) {
$pattern = '/#<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
$message = preg_replace($pattern, '#$2', $message);
}
*/
$doc = new DOMDocument(); $doc = new DOMDocument();
$doc->preserveWhiteSpace = false; $doc->preserveWhiteSpace = false;

4
include/nav.php
View file

@ -125,8 +125,10 @@ function nav_info(&$a) {
if(strlen($gdir)) if(strlen($gdir))
$gdirpath = $gdir; $gdirpath = $gdir;
} }
elseif(! get_config('system','no_community_page')) elseif(get_config('system','community_page_style') == CP_USERS_ON_SERVER)
$nav['community'] = array('community', t('Community'), "", t('Conversations on this site')); $nav['community'] = array('community', t('Community'), "", t('Conversations on this site'));
elseif(get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
$nav['community'] = array('community', t('Community'), "", t('Conversations on the network'));
$nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory')); $nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));

4
include/threads.php
View file

@ -19,10 +19,6 @@ function add_thread($itemid, $onlyshadow = false) {
logger("add_thread: Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG); logger("add_thread: Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
} }
// Store a shadow copy of public items for displaying a global community page?
if (!get_config('system', 'global_community'))
return;
// is it already a copy? // is it already a copy?
if (($itemid == 0) OR ($item['uid'] == 0)) if (($itemid == 0) OR ($item['uid'] == 0))
return; return;

46
mod/admin.php
View file

@ -312,8 +312,10 @@ function admin_page_site_post(&$a){
$sitename = ((x($_POST,'sitename')) ? notags(trim($_POST['sitename'])) : ''); $sitename = ((x($_POST,'sitename')) ? notags(trim($_POST['sitename'])) : '');
$hostname = ((x($_POST,'hostname')) ? notags(trim($_POST['hostname'])) : ''); $hostname = ((x($_POST,'hostname')) ? notags(trim($_POST['hostname'])) : '');
$sender_email = ((x($_POST,'sender_email')) ? notags(trim($_POST['sender_email'])) : ''); $sender_email = ((x($_POST,'sender_email')) ? notags(trim($_POST['sender_email'])) : '');
$banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false); $banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false);
$shortcut_icon = ((x($_POST,'shortcut_icon')) ? notags(trim($_POST['shortcut_icon'])) : '');
$touch_icon = ((x($_POST,'touch_icon')) ? notags(trim($_POST['touch_icon'])) : '');
$info = ((x($_POST,'info')) ? trim($_POST['info']) : false); $info = ((x($_POST,'info')) ? trim($_POST['info']) : false);
$language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : ''); $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : '');
$theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : ''); $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : '');
@ -345,7 +347,8 @@ function admin_page_site_post(&$a){
$no_openid = !((x($_POST,'no_openid')) ? True : False); $no_openid = !((x($_POST,'no_openid')) ? True : False);
$no_regfullname = !((x($_POST,'no_regfullname')) ? True : False); $no_regfullname = !((x($_POST,'no_regfullname')) ? True : False);
$no_utf = !((x($_POST,'no_utf')) ? True : False); $no_utf = !((x($_POST,'no_utf')) ? True : False);
$no_community_page = !((x($_POST,'no_community_page')) ? True : False); $community_page_style = ((x($_POST,'community_page_style')) ? intval(trim($_POST['community_page_style'])) : 0);
$max_author_posts_community_page = ((x($_POST,'max_author_posts_community_page')) ? intval(trim($_POST['max_author_posts_community_page'])) : 0);
$verifyssl = ((x($_POST,'verifyssl')) ? True : False); $verifyssl = ((x($_POST,'verifyssl')) ? True : False);
$proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['proxyuser'])) : ''); $proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['proxyuser'])) : '');
@ -356,13 +359,14 @@ function admin_page_site_post(&$a){
$maxloadavg = ((x($_POST,'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50); $maxloadavg = ((x($_POST,'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50);
$dfrn_only = ((x($_POST,'dfrn_only')) ? True : False); $dfrn_only = ((x($_POST,'dfrn_only')) ? True : False);
$ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False);
$ostatus_poll_interval = ((x($_POST,'ostatus_poll_interval')) ? intval(trim($_POST['ostatus_poll_interval'])) : 0); $ostatus_poll_interval = ((x($_POST,'ostatus_poll_interval')) ? intval(trim($_POST['ostatus_poll_interval'])) : 0);
$diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False); $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False);
$ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0); $ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0);
$force_ssl = ((x($_POST,'force_ssl')) ? True : False); $force_ssl = ((x($_POST,'force_ssl')) ? True : False);
$old_share = ((x($_POST,'old_share')) ? True : False); $old_share = ((x($_POST,'old_share')) ? True : False);
$hide_help = ((x($_POST,'hide_help')) ? True : False); $hide_help = ((x($_POST,'hide_help')) ? True : False);
$suppress_language = ((x($_POST,'suppress_language')) ? True : False); $suppress_language = ((x($_POST,'suppress_language')) ? True : False);
$suppress_tags = ((x($_POST,'suppress_tags')) ? True : False);
$use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False); $use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False);
$itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : ''); $itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : '');
$itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0); $itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0);
@ -373,6 +377,7 @@ function admin_page_site_post(&$a){
$singleuser = ((x($_POST,'singleuser')) ? notags(trim($_POST['singleuser'])) : ''); $singleuser = ((x($_POST,'singleuser')) ? notags(trim($_POST['singleuser'])) : '');
$proxy_disabled = ((x($_POST,'proxy_disabled')) ? True : False); $proxy_disabled = ((x($_POST,'proxy_disabled')) ? True : False);
$old_pager = ((x($_POST,'old_pager')) ? True : False); $old_pager = ((x($_POST,'old_pager')) ? True : False);
$only_tag_search = ((x($_POST,'only_tag_search')) ? True : False);
if($ssl_policy != intval(get_config('system','ssl_policy'))) { if($ssl_policy != intval(get_config('system','ssl_policy'))) {
if($ssl_policy == SSL_POLICY_FULL) { if($ssl_policy == SSL_POLICY_FULL) {
@ -422,6 +427,9 @@ function admin_page_site_post(&$a){
set_config('config','hostname',$hostname); set_config('config','hostname',$hostname);
set_config('config','sender_email', $sender_email); set_config('config','sender_email', $sender_email);
set_config('system','suppress_language',$suppress_language); set_config('system','suppress_language',$suppress_language);
set_config('system','suppress_tags',$suppress_tags);
set_config('system','shortcut_icon',$shortcut_icon);
set_config('system','touch_icon',$touch_icon);
if ($banner==""){ if ($banner==""){
// don't know why, but del_config doesn't work... // don't know why, but del_config doesn't work...
q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
@ -478,7 +486,8 @@ function admin_page_site_post(&$a){
set_config('system','block_extended_register', $no_multi_reg); set_config('system','block_extended_register', $no_multi_reg);
set_config('system','no_openid', $no_openid); set_config('system','no_openid', $no_openid);
set_config('system','no_regfullname', $no_regfullname); set_config('system','no_regfullname', $no_regfullname);
set_config('system','no_community_page', $no_community_page); set_config('system','community_page_style', $community_page_style);
set_config('system','max_author_posts_community_page', $max_author_posts_community_page);
set_config('system','no_utf', $no_utf); set_config('system','no_utf', $no_utf);
set_config('system','verifyssl', $verifyssl); set_config('system','verifyssl', $verifyssl);
set_config('system','proxyuser', $proxyuser); set_config('system','proxyuser', $proxyuser);
@ -486,7 +495,7 @@ function admin_page_site_post(&$a){
set_config('system','curl_timeout', $timeout); set_config('system','curl_timeout', $timeout);
set_config('system','dfrn_only', $dfrn_only); set_config('system','dfrn_only', $dfrn_only);
set_config('system','ostatus_disabled', $ostatus_disabled); set_config('system','ostatus_disabled', $ostatus_disabled);
set_config('system','ostatus_poll_interval', $ostatus_poll_interval); set_config('system','ostatus_poll_interval', $ostatus_poll_interval);
set_config('system','diaspora_enabled', $diaspora_enabled); set_config('system','diaspora_enabled', $diaspora_enabled);
set_config('config','private_addons', $private_addons); set_config('config','private_addons', $private_addons);
@ -502,6 +511,7 @@ function admin_page_site_post(&$a){
set_config('system','basepath', $basepath); set_config('system','basepath', $basepath);
set_config('system','proxy_disabled', $proxy_disabled); set_config('system','proxy_disabled', $proxy_disabled);
set_config('system','old_pager', $old_pager); set_config('system','old_pager', $old_pager);
set_config('system','only_tag_search', $only_tag_search);
info( t('Site settings updated.') . EOL); info( t('Site settings updated.') . EOL);
goaway($a->get_baseurl(true) . '/admin/site' ); goaway($a->get_baseurl(true) . '/admin/site' );
@ -547,14 +557,21 @@ function admin_page_site(&$a) {
} }
} }
/* Community page style */
$community_page_style_choices = array(
CP_NO_COMMUNITY_PAGE => t("No community page"),
CP_USERS_ON_SERVER => t("Public postings from users of this site"),
CP_GLOBAL_COMMUNITY => t("Global community page")
);
/* OStatus conversation poll choices */ /* OStatus conversation poll choices */
$ostatus_poll_choices = array( $ostatus_poll_choices = array(
"-2" => t("Never"), "-2" => t("Never"),
"-1" => t("At post arrival"), "-1" => t("At post arrival"),
"0" => t("Frequently"), "0" => t("Frequently"),
"60" => t("Hourly"), "60" => t("Hourly"),
"720" => t("Twice daily"), "720" => t("Twice daily"),
"1440" => t("Daily") "1440" => t("Daily")
); );
/* get user names to make the install a personal install of X */ /* get user names to make the install a personal install of X */
@ -613,6 +630,8 @@ function admin_page_site(&$a) {
'$hostname' => array('hostname', t("Host name"), $a->config['hostname'], ""), '$hostname' => array('hostname', t("Host name"), $a->config['hostname'], ""),
'$sender_email' => array('sender_email', t("Sender Email"), $a->config['sender_email'], "The email address your server shall use to send notification emails from.", "", "", "email"), '$sender_email' => array('sender_email', t("Sender Email"), $a->config['sender_email'], "The email address your server shall use to send notification emails from.", "", "", "email"),
'$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$banner' => array('banner', t("Banner/Logo"), $banner, ""),
'$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), get_config('system','shortcut_icon'), "Link to an icon that will be used for browsers."),
'$touch_icon' => array('touch_icon', t("Touch icon"), get_config('system','touch_icon'), "Link to an icon that will be used for tablets and mobiles."),
'$info' => array('info',t('Additional Info'), $info, t('For public servers: you can add additional information here that will be listed at dir.friendica.com/siteinfo.')), '$info' => array('info',t('Additional Info'), $info, t('For public servers: you can add additional information here that will be listed at dir.friendica.com/siteinfo.')),
'$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
'$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
@ -645,7 +664,8 @@ function admin_page_site(&$a) {
'$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")), '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
'$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_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_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.")), '$community_page_style' => array('community_page_style', t("Community Page Style"), get_config('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices),
'$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), get_config('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")),
'$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),
'$ostatus_poll_interval' => array('ostatus_poll_interval', t("OStatus conversation completion interval"), (string) intval(get_config('system','ostatus_poll_interval')), t("How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."), $ostatus_poll_choices), '$ostatus_poll_interval' => array('ostatus_poll_interval', t("OStatus conversation completion interval"), (string) intval(get_config('system','ostatus_poll_interval')), t("How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."), $ostatus_poll_choices),
'$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")), '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")),
@ -660,6 +680,7 @@ function admin_page_site(&$a) {
'$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")), '$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")),
'$suppress_language' => array('suppress_language', t("Suppress Language"), get_config('system','suppress_language'), t("Suppress language information in meta information about a posting.")), '$suppress_language' => array('suppress_language', t("Suppress Language"), get_config('system','suppress_language'), t("Suppress language information in meta information about a posting.")),
'$suppress_tags' => array('suppress_tags', t("Suppress Tags"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")),
'$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), "The item caches buffers generated bbcode and external images."), '$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), "The item caches buffers generated bbcode and external images."),
'$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")), '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")),
'$max_comments' => array('max_comments', t("Maximum numbers of comments per post"), get_config('system','max_comments'), t("How much comments should be shown for each post? Default value is 100.")), '$max_comments' => array('max_comments', t("Maximum numbers of comments per post"), get_config('system','max_comments'), t("How much comments should be shown for each post? Default value is 100.")),
@ -668,6 +689,7 @@ function admin_page_site(&$a) {
'$basepath' => array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."), '$basepath' => array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
'$proxy_disabled' => array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")), '$proxy_disabled' => array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
'$old_pager' => array('old_pager', t("Enable old style pager"), get_config('system','old_pager'), t("The old style pager has page numbers but slows down massively the page speed.")), '$old_pager' => array('old_pager', t("Enable old style pager"), get_config('system','old_pager'), t("The old style pager has page numbers but slows down massively the page speed.")),
'$only_tag_search' => array('only_tag_search', t("Only search in tags"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
'$relocate_url' => array('relocate_url', t("New base url"), $a->get_baseurl(), "Change base url for this server. Sends relocate message to all DFRN contacts of all users."), '$relocate_url' => array('relocate_url', t("New base url"), $a->get_baseurl(), "Change base url for this server. Sends relocate message to all DFRN contacts of all users."),
'$form_security_token' => get_form_security_token("admin_site") '$form_security_token' => get_form_security_token("admin_site")

5
mod/community.php
View file

@ -19,7 +19,7 @@ function community_content(&$a, $update = 0) {
return; return;
} }
if(get_config('system','no_community_page')) { if(get_config('system','community_page_style') == CP_NO_COMMUNITY_PAGE) {
notice( t('Not available.') . EOL); notice( t('Not available.') . EOL);
return; return;
} }
@ -113,8 +113,7 @@ function community_content(&$a, $update = 0) {
} }
function community_getitems($start, $itemspage) { function community_getitems($start, $itemspage) {
// Work in progress if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY)
if (get_config('system', 'global_community'))
return(community_getpublicitems($start, $itemspage)); return(community_getpublicitems($start, $itemspage));
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,

22
mod/search.php
View file

@ -130,8 +130,8 @@ function search_content(&$a) {
if($tag) { if($tag) {
$sql_extra = ""; $sql_extra = "";
$sql_table = sprintf("`item` INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d) AS `term` ON `item`.`id` = `term`.`oid` ", $sql_table = sprintf("`item` INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` IN (%d, 0)) AS `term` ON `item`.`id` = `term`.`oid` ",
dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG)); dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval(local_user()));
$sql_order = "`item`.`id`"; $sql_order = "`item`.`id`";
} else { } else {
@ -154,14 +154,12 @@ function search_content(&$a) {
$r = q("SELECT distinct(`item`.`uri`) as `total` $r = q("SELECT distinct(`item`.`uri`) as `total`
FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0) AND ((`item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `item`.`uid` = 0)
OR ( `item`.`uid` = %d )) OR (`item`.`uid` = %d))
$sql_extra ", $sql_extra ",
intval(local_user()) intval(local_user())
); );
// $sql_extra group by `item`.`uri` ",
if(count($r)) if(count($r))
$a->set_pager_total(count($r)); $a->set_pager_total(count($r));
@ -175,22 +173,20 @@ function search_content(&$a) {
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`, `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
`user`.`nickname`, `user`.`uid`, `user`.`hidewall`
FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM $sql_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) AND ((`item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `item`.`uid`=0)
OR ( `item`.`uid` = %d )) OR `item`.`uid` = %d)
$sql_extra GROUP BY `item`.`uri` $sql_extra
GROUP BY `item`.`uri`
ORDER BY $sql_order DESC LIMIT %d , %d ", ORDER BY $sql_order DESC LIMIT %d , %d ",
intval(local_user()), intval(local_user()),
intval($a->pager['start']), intval($a->pager['start']),
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
); );
// group by `item`.`uri`
if(! count($r)) { if(! count($r)) {
info( t('No results.') . EOL); info( t('No results.') . EOL);

12
update.php
View file

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1178 ); define( 'UPDATE_VERSION' , 1179 );
/** /**
* *
@ -1630,3 +1630,13 @@ function update_1177() {
); );
} }
} }
function update_1178() {
if (get_config('system','no_community_page'))
set_config('system','community_page_style', CP_NO_COMMUNITY_PAGE);
// Update the central item storage with uid=0
proc_run('php',"include/threadupdate.php");
return UPDATE_SUCCESS;
}

10001
util/messages.po
View file

File diff suppressed because it is too large Load diff

46
view/cs/messages.po
View file

@ -10,8 +10,8 @@ msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-04 11:35+0100\n" "POT-Creation-Date: 2015-02-04 11:35+0100\n"
"PO-Revision-Date: 2015-02-05 09:47+0000\n" "PO-Revision-Date: 2015-02-08 22:34+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n" "Last-Translator: Michal Šupler <msupler@gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n" "Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -614,77 +614,77 @@ msgstr "standardní"
#: ../../view/theme/clean/config.php:57 #: ../../view/theme/clean/config.php:57
msgid "Midnight" msgid "Midnight"
msgstr "" msgstr "půlnoc"
#: ../../view/theme/clean/config.php:58 #: ../../view/theme/clean/config.php:58
msgid "Bootstrap" msgid "Bootstrap"
msgstr "" msgstr "Bootstrap"
#: ../../view/theme/clean/config.php:59 #: ../../view/theme/clean/config.php:59
msgid "Shades of Pink" msgid "Shades of Pink"
msgstr "" msgstr "Odstíny růžové"
#: ../../view/theme/clean/config.php:60 #: ../../view/theme/clean/config.php:60
msgid "Lime and Orange" msgid "Lime and Orange"
msgstr "" msgstr "Limetka a pomeranč"
#: ../../view/theme/clean/config.php:61 #: ../../view/theme/clean/config.php:61
msgid "GeoCities Retro" msgid "GeoCities Retro"
msgstr "" msgstr "GeoCities Retro"
#: ../../view/theme/clean/config.php:85 #: ../../view/theme/clean/config.php:85
msgid "Background Image" msgid "Background Image"
msgstr "" msgstr "Obrázek pozadí"
#: ../../view/theme/clean/config.php:85 #: ../../view/theme/clean/config.php:85
msgid "" msgid ""
"The URL to a picture (e.g. from your photo album) that should be used as " "The URL to a picture (e.g. from your photo album) that should be used as "
"background image." "background image."
msgstr "" msgstr "URL odkaz na obrázek (např. z Vašeho foto alba), který bude použit jako obrázek na pozadí."
#: ../../view/theme/clean/config.php:86 #: ../../view/theme/clean/config.php:86
msgid "Background Color" msgid "Background Color"
msgstr "" msgstr "Barva pozadí"
#: ../../view/theme/clean/config.php:86 #: ../../view/theme/clean/config.php:86
msgid "HEX value for the background color. Don't include the #" msgid "HEX value for the background color. Don't include the #"
msgstr "" msgstr "HEXadecimální hodnota barvy pozadí. Nevkládejte znak #"
#: ../../view/theme/clean/config.php:88 #: ../../view/theme/clean/config.php:88
msgid "font size" msgid "font size"
msgstr "" msgstr "velikost fondu"
#: ../../view/theme/clean/config.php:88 #: ../../view/theme/clean/config.php:88
msgid "base font size for your interface" msgid "base font size for your interface"
msgstr "" msgstr "základní velikost fontu"
#: ../../view/theme/duepuntozero/config.php:45 #: ../../view/theme/duepuntozero/config.php:45
msgid "greenzero" msgid "greenzero"
msgstr "" msgstr "zelená nula"
#: ../../view/theme/duepuntozero/config.php:46 #: ../../view/theme/duepuntozero/config.php:46
msgid "purplezero" msgid "purplezero"
msgstr "" msgstr "fialová nula"
#: ../../view/theme/duepuntozero/config.php:47 #: ../../view/theme/duepuntozero/config.php:47
msgid "easterbunny" msgid "easterbunny"
msgstr "" msgstr "velikonoční zajíček"
#: ../../view/theme/duepuntozero/config.php:48 #: ../../view/theme/duepuntozero/config.php:48
msgid "darkzero" msgid "darkzero"
msgstr "" msgstr "tmavá nula"
#: ../../view/theme/duepuntozero/config.php:49 #: ../../view/theme/duepuntozero/config.php:49
msgid "comix" msgid "comix"
msgstr "" msgstr "komiksová"
#: ../../view/theme/duepuntozero/config.php:50 #: ../../view/theme/duepuntozero/config.php:50
msgid "slackr" msgid "slackr"
msgstr "" msgstr "flákač"
#: ../../view/theme/duepuntozero/config.php:62 #: ../../view/theme/duepuntozero/config.php:62
msgid "Variations" msgid "Variations"
msgstr "" msgstr "Variace"
#: ../../view/theme/vier/config.php:56 #: ../../view/theme/vier/config.php:56
#: ../../view/theme/vier-mobil/config.php:50 #: ../../view/theme/vier-mobil/config.php:50
@ -2050,11 +2050,11 @@ msgstr "Logy"
#: ../../mod/admin.php:124 #: ../../mod/admin.php:124
msgid "probe address" msgid "probe address"
msgstr "" msgstr "vyzkoušet adresu"
#: ../../mod/admin.php:125 #: ../../mod/admin.php:125
msgid "check webfinger" msgid "check webfinger"
msgstr "" msgstr "vyzkoušet webfinger"
#: ../../mod/admin.php:130 ../../include/nav.php:182 #: ../../mod/admin.php:130 ../../include/nav.php:182
msgid "Admin" msgid "Admin"
@ -6233,7 +6233,7 @@ msgid ""
"\n" "\n"
"\n" "\n"
"\t\tThank you and welcome to %2$s." "\t\tThank you and welcome to %2$s."
msgstr "" msgstr "\n\t\tVaše přihlašovací údaje jsou následující:\n\t\t\tAdresa webu:\t%3$s\n\t\t\tpřihlašovací jméno:\t%1$s\n\t\t\theslo:\t%5$s\n\n\t\tHeslo si můžete změnit na stránce \"Nastavení\" vašeho účtu poté, co se přihlásíte.\n\n\t\tProsím věnujte pár chvil revizi dalšího nastavení vašeho účtu na dané stránce.\n\n\t\tTaké su můžete přidat nějaké základní informace do svého výchozího profilu (na stránce \"Profily\"), takže ostatní lidé vás snáze najdou.\n\n\t\tDoporučujeme Vám uvést celé jméno a i foto. Přidáním nějakých \"klíčových slov\" (velmi užitečné pro hledání nových přátel) a možná také zemi, ve které žijete, pokud nechcete být více konkrétní.\n\n\t\tPlně resepktujeme vaše právo na soukromí a nic z výše uvedeného není povinné.\n\t\tPokud jste zde nový a neznáte zde nikoho, uvedením daných informací můžete získat nové přátele.\n\n\n\t\tDíky a vítejte na %2$s."
#: ../../include/conversation.php:207 #: ../../include/conversation.php:207
#, php-format #, php-format

42
view/cs/strings.php
View file

@ -120,24 +120,24 @@ $a->strings["Set resize level for images in posts and comments (width and height
$a->strings["Set theme width"] = "Nastavení šířku grafické šablony"; $a->strings["Set theme width"] = "Nastavení šířku grafické šablony";
$a->strings["Set colour scheme"] = "Nastavit barevné schéma"; $a->strings["Set colour scheme"] = "Nastavit barevné schéma";
$a->strings["default"] = "standardní"; $a->strings["default"] = "standardní";
$a->strings["Midnight"] = ""; $a->strings["Midnight"] = "půlnoc";
$a->strings["Bootstrap"] = ""; $a->strings["Bootstrap"] = "Bootstrap";
$a->strings["Shades of Pink"] = ""; $a->strings["Shades of Pink"] = "Odstíny růžové";
$a->strings["Lime and Orange"] = ""; $a->strings["Lime and Orange"] = "Limetka a pomeranč";
$a->strings["GeoCities Retro"] = ""; $a->strings["GeoCities Retro"] = "GeoCities Retro";
$a->strings["Background Image"] = ""; $a->strings["Background Image"] = "Obrázek pozadí";
$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = ""; $a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "URL odkaz na obrázek (např. z Vašeho foto alba), který bude použit jako obrázek na pozadí.";
$a->strings["Background Color"] = ""; $a->strings["Background Color"] = "Barva pozadí";
$a->strings["HEX value for the background color. Don't include the #"] = ""; $a->strings["HEX value for the background color. Don't include the #"] = "HEXadecimální hodnota barvy pozadí. Nevkládejte znak #";
$a->strings["font size"] = ""; $a->strings["font size"] = "velikost fondu";
$a->strings["base font size for your interface"] = ""; $a->strings["base font size for your interface"] = "základní velikost fontu";
$a->strings["greenzero"] = ""; $a->strings["greenzero"] = "zelená nula";
$a->strings["purplezero"] = ""; $a->strings["purplezero"] = "fialová nula";
$a->strings["easterbunny"] = ""; $a->strings["easterbunny"] = "velikonoční zajíček";
$a->strings["darkzero"] = ""; $a->strings["darkzero"] = "tmavá nula";
$a->strings["comix"] = ""; $a->strings["comix"] = "komiksová";
$a->strings["slackr"] = ""; $a->strings["slackr"] = "flákač";
$a->strings["Variations"] = ""; $a->strings["Variations"] = "Variace";
$a->strings["Set style"] = "Nastavit styl"; $a->strings["Set style"] = "Nastavit styl";
$a->strings["Delete this item?"] = "Odstranit tuto položku?"; $a->strings["Delete this item?"] = "Odstranit tuto položku?";
$a->strings["show fewer"] = "zobrazit méně"; $a->strings["show fewer"] = "zobrazit méně";
@ -421,8 +421,8 @@ $a->strings["Plugins"] = "Pluginy";
$a->strings["Themes"] = "Témata"; $a->strings["Themes"] = "Témata";
$a->strings["DB updates"] = "Aktualizace databáze"; $a->strings["DB updates"] = "Aktualizace databáze";
$a->strings["Logs"] = "Logy"; $a->strings["Logs"] = "Logy";
$a->strings["probe address"] = ""; $a->strings["probe address"] = "vyzkoušet adresu";
$a->strings["check webfinger"] = ""; $a->strings["check webfinger"] = "vyzkoušet webfinger";
$a->strings["Admin"] = "Administrace"; $a->strings["Admin"] = "Administrace";
$a->strings["Plugin Features"] = "Funkčnosti rozšíření"; $a->strings["Plugin Features"] = "Funkčnosti rozšíření";
$a->strings["diagnostics"] = "diagnostika"; $a->strings["diagnostics"] = "diagnostika";
@ -1405,7 +1405,7 @@ $a->strings["An error occurred during registration. Please try again."] = "Došl
$a->strings["An error occurred creating your default profile. Please try again."] = "Došlo k chybě při vytváření Vašeho výchozího profilu. Zkuste to prosím znovu."; $a->strings["An error occurred creating your default profile. Please try again."] = "Došlo k chybě při vytváření Vašeho výchozího profilu. Zkuste to prosím znovu.";
$a->strings["Friends"] = "Přátelé"; $a->strings["Friends"] = "Přátelé";
$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tDrahý %1\$s,\n\t\t\tDěkujeme Vám za registraci na %2\$s. Váš účet byl vytvořen.\n\t"; $a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tDrahý %1\$s,\n\t\t\tDěkujeme Vám za registraci na %2\$s. Váš účet byl vytvořen.\n\t";
$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = ""; $a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\n\t\tVaše přihlašovací údaje jsou následující:\n\t\t\tAdresa webu:\t%3\$s\n\t\t\tpřihlašovací jméno:\t%1\$s\n\t\t\theslo:\t%5\$s\n\n\t\tHeslo si můžete změnit na stránce \"Nastavení\" vašeho účtu poté, co se přihlásíte.\n\n\t\tProsím věnujte pár chvil revizi dalšího nastavení vašeho účtu na dané stránce.\n\n\t\tTaké su můžete přidat nějaké základní informace do svého výchozího profilu (na stránce \"Profily\"), takže ostatní lidé vás snáze najdou.\n\n\t\tDoporučujeme Vám uvést celé jméno a i foto. Přidáním nějakých \"klíčových slov\" (velmi užitečné pro hledání nových přátel) a možná také zemi, ve které žijete, pokud nechcete být více konkrétní.\n\n\t\tPlně resepktujeme vaše právo na soukromí a nic z výše uvedeného není povinné.\n\t\tPokud jste zde nový a neznáte zde nikoho, uvedením daných informací můžete získat nové přátele.\n\n\n\t\tDíky a vítejte na %2\$s.";
$a->strings["%1\$s poked %2\$s"] = "%1\$s šťouchnul %2\$s"; $a->strings["%1\$s poked %2\$s"] = "%1\$s šťouchnul %2\$s";
$a->strings["poked"] = "šťouchnut"; $a->strings["poked"] = "šťouchnut";
$a->strings["post/item"] = "příspěvek/položka"; $a->strings["post/item"] = "příspěvek/položka";

7
view/templates/admin_site.tpl
View file

@ -48,6 +48,8 @@
{{include file="field_input.tpl" field=$hostname}} {{include file="field_input.tpl" field=$hostname}}
{{include file="field_input.tpl" field=$sender_email}} {{include file="field_input.tpl" field=$sender_email}}
{{include file="field_textarea.tpl" field=$banner}} {{include file="field_textarea.tpl" field=$banner}}
{{include file="field_input.tpl" field=$shortcut_icon}}
{{include file="field_input.tpl" field=$touch_icon}}
{{include file="field_textarea.tpl" field=$info}} {{include file="field_textarea.tpl" field=$info}}
{{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$language}}
{{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme}}
@ -81,7 +83,8 @@
{{include file="field_input.tpl" field=$allowed_email}} {{include file="field_input.tpl" field=$allowed_email}}
{{include file="field_checkbox.tpl" field=$block_public}} {{include file="field_checkbox.tpl" field=$block_public}}
{{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$force_publish}}
{{include file="field_checkbox.tpl" field=$no_community_page}} {{include file="field_select.tpl" field=$community_page_style}}
{{include file="field_input.tpl" field=$max_author_posts_community_page}}
{{include file="field_checkbox.tpl" field=$ostatus_disabled}} {{include file="field_checkbox.tpl" field=$ostatus_disabled}}
{{include file="field_select.tpl" field=$ostatus_poll_interval}} {{include file="field_select.tpl" field=$ostatus_poll_interval}}
{{include file="field_checkbox.tpl" field=$diaspora_enabled}} {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
@ -109,9 +112,11 @@
{{include file="field_input.tpl" field=$temppath}} {{include file="field_input.tpl" field=$temppath}}
{{include file="field_input.tpl" field=$basepath}} {{include file="field_input.tpl" field=$basepath}}
{{include file="field_checkbox.tpl" field=$suppress_language}} {{include file="field_checkbox.tpl" field=$suppress_language}}
{{include file="field_checkbox.tpl" field=$suppress_tags}}
<h3>{{$performance}}</h3> <h3>{{$performance}}</h3>
{{include file="field_checkbox.tpl" field=$use_fulltext_engine}} {{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
{{include file="field_checkbox.tpl" field=$only_tag_search}}
{{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache}}
{{include file="field_input.tpl" field=$itemcache_duration}} {{include file="field_input.tpl" field=$itemcache_duration}}
{{include file="field_input.tpl" field=$max_comments}} {{include file="field_input.tpl" field=$max_comments}}