friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'master' of github.com:annando/friendica

This commit is contained in:
Michael Vogel 2012-05-26 15:42:23 +02:00
parent 7f19d39b14 817fc37f41
commit a08232fa95
8 changed files with 67 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1353' ); define ( 'FRIENDICA_VERSION', '3.0.1354' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1144 ); define ( 'DB_UPDATE_VERSION', 1144 );

2
mod/dfrn_confirm.php
View File

@ -500,7 +500,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
); );
if($contact && $g && intval($g[0]['def_gid'])) { if($contact && $g && intval($g[0]['def_gid'])) {
require_once('include/group.php'); require_once('include/group.php');
group_add_member($uid,'',$contact[0]['id'],$g[0]['def_gid']); group_add_member($uid,'',$contact['id'],$g[0]['def_gid']);
} }
// Let's send our user to the contact editor in case they want to // Let's send our user to the contact editor in case they want to

4
mod/item.php
View File

@ -355,13 +355,15 @@ function item_post(&$a) {
$image_uri = substr($image_uri,0, strpos($image_uri,'-')); $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
if(! strlen($image_uri)) if(! strlen($image_uri))
continue; continue;
$srch = '<' . intval($contact_record['id']) . '>'; $srch = '<' . intval($contact_id) . '>';
$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' $r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
AND `resource-id` = '%s' AND `uid` = %d LIMIT 1", AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
dbesc($srch), dbesc($srch),
dbesc($image_uri), dbesc($image_uri),
intval($profile_uid) intval($profile_uid)
); );
if(! count($r)) if(! count($r))
continue; continue;

3
mod/network.php
View File

@ -426,7 +426,7 @@ function network_content(&$a, $update = 0) {
if($conv) { if($conv) {
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname']; $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
$myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = substr($myurl,strpos($myurl,'://')+3);
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); $myurl = str_replace('www.','',$myurl);
$diasp_url = str_replace('/profile/','/u/',$myurl); $diasp_url = str_replace('/profile/','/u/',$myurl);
if (get_config('system','use_fulltext_engine')) if (get_config('system','use_fulltext_engine'))
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ", $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
@ -443,7 +443,6 @@ function network_content(&$a, $update = 0) {
} }
if($update) { if($update) {
// only setup pagination on initial page view // only setup pagination on initial page view

6
mod/notes.php
View File

@ -80,7 +80,8 @@ function notes_content(&$a,$update = false) {
$r = q("SELECT COUNT(*) AS `total` $r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0
AND `item`.`deleted` = 0 AND `item`.`origin` = 1
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
$sql_extra ", $sql_extra ",
@ -95,7 +96,8 @@ function notes_content(&$a,$update = false) {
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid` $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
and `item`.`moderated` = 0 AND `item`.`origin` = 1
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
$sql_extra $sql_extra

11
mod/profiles.php
View File

@ -176,9 +176,18 @@ function profiles_post(&$a) {
$changes[] = t('Interests'); $changes[] = t('Interests');
$value = $interest; $value = $interest;
} }
if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region'] if($address != $orig[0]['address']) {
$changes[] = t('Address');
// New address not sent in notifications, potential privacy issues
// in case this leaks to unintended recipients. Yes, it's in the public
// profile but that doesn't mean we have to broadcast it to everybody.
}
if($locality != $orig[0]['locality'] || $region != $orig[0]['region']
|| $country_name != $orig[0]['country-name']) { || $country_name != $orig[0]['country-name']) {
$changes[] = t('Location'); $changes[] = t('Location');
$comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' ');
$comma2 = (($region && $country_name) ? ', ' : '');
$value = $locality . $comma1 . $region . $comma2 . $country_name;
} }
profile_activity($changes,$value); profile_activity($changes,$value);

4
mod/wallmessage.php
View File

@ -44,7 +44,7 @@ function wallmessage_post(&$a) {
} }
// Work around doubled linefeeds in Tinymce 3.5b2 // Work around doubled linefeeds in Tinymce 3.5b2
dbg(1);
$body = str_replace("\r\n","\n",$body); $body = str_replace("\r\n","\n",$body);
$body = str_replace("\n\n","\n",$body); $body = str_replace("\n\n","\n",$body);
@ -67,7 +67,7 @@ dbg(1);
default: default:
info( t('Message sent.') . EOL ); info( t('Message sent.') . EOL );
} }
dbg(0);
// goaway($a->get_baseurl() . '/profile/' . $user['nickname']); // goaway($a->get_baseurl() . '/profile/' . $user['nickname']);
} }

81
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1353\n" "Project-Id-Version: 3.0.1354\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-05-24 16:51-0700\n" "POT-Creation-Date: 2012-05-25 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -904,7 +904,7 @@ msgid ""
msgstr "" msgstr ""
#: ../../mod/install.php:139 ../../mod/install.php:203 #: ../../mod/install.php:139 ../../mod/install.php:203
#: ../../mod/install.php:480 #: ../../mod/install.php:482
msgid "Please see the file \"INSTALL.txt\"." msgid "Please see the file \"INSTALL.txt\"."
msgstr "" msgstr ""
@ -976,151 +976,160 @@ msgstr ""
msgid "Could not find a command line version of PHP in the web server PATH." msgid "Could not find a command line version of PHP in the web server PATH."
msgstr "" msgstr ""
#: ../../mod/install.php:320 #: ../../mod/install.php:318
msgid ""
"If you don't have a command line version of PHP installed on server, you "
"will not be able to run background polling via cron. See <a href='http://"
"friendica.com/node/27'>'Activating scheduled tasks'</a>"
msgstr ""
#: ../../mod/install.php:322
msgid "PHP executable path" msgid "PHP executable path"
msgstr "" msgstr ""
#: ../../mod/install.php:320 #: ../../mod/install.php:322
msgid "Enter full path to php executable" msgid ""
"Enter full path to php executable. You can leave this blank to continue the "
"installation."
msgstr "" msgstr ""
#: ../../mod/install.php:325 #: ../../mod/install.php:327
msgid "Command line PHP" msgid "Command line PHP"
msgstr "" msgstr ""
#: ../../mod/install.php:334 #: ../../mod/install.php:336
msgid "" msgid ""
"The command line version of PHP on your system does not have " "The command line version of PHP on your system does not have "
"\"register_argc_argv\" enabled." "\"register_argc_argv\" enabled."
msgstr "" msgstr ""
#: ../../mod/install.php:335 #: ../../mod/install.php:337
msgid "This is required for message delivery to work." msgid "This is required for message delivery to work."
msgstr "" msgstr ""
#: ../../mod/install.php:337 #: ../../mod/install.php:339
msgid "PHP register_argc_argv" msgid "PHP register_argc_argv"
msgstr "" msgstr ""
#: ../../mod/install.php:358 #: ../../mod/install.php:360
msgid "" msgid ""
"Error: the \"openssl_pkey_new\" function on this system is not able to " "Error: the \"openssl_pkey_new\" function on this system is not able to "
"generate encryption keys" "generate encryption keys"
msgstr "" msgstr ""
#: ../../mod/install.php:359 #: ../../mod/install.php:361
msgid "" msgid ""
"If running under Windows, please see \"http://www.php.net/manual/en/openssl." "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
"installation.php\"." "installation.php\"."
msgstr "" msgstr ""
#: ../../mod/install.php:361 #: ../../mod/install.php:363
msgid "Generate encryption keys" msgid "Generate encryption keys"
msgstr "" msgstr ""
#: ../../mod/install.php:368 #: ../../mod/install.php:370
msgid "libCurl PHP module" msgid "libCurl PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:369 #: ../../mod/install.php:371
msgid "GD graphics PHP module" msgid "GD graphics PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:370 #: ../../mod/install.php:372
msgid "OpenSSL PHP module" msgid "OpenSSL PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:371 #: ../../mod/install.php:373
msgid "mysqli PHP module" msgid "mysqli PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:372 #: ../../mod/install.php:374
msgid "mb_string PHP module" msgid "mb_string PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:377 ../../mod/install.php:379 #: ../../mod/install.php:379 ../../mod/install.php:381
msgid "Apache mod_rewrite module" msgid "Apache mod_rewrite module"
msgstr "" msgstr ""
#: ../../mod/install.php:377 #: ../../mod/install.php:379
msgid "" msgid ""
"Error: Apache webserver mod-rewrite module is required but not installed." "Error: Apache webserver mod-rewrite module is required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:384 #: ../../mod/install.php:386
msgid "Error: libCURL PHP module required but not installed." msgid "Error: libCURL PHP module required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:388 #: ../../mod/install.php:390
msgid "" msgid ""
"Error: GD graphics PHP module with JPEG support required but not installed." "Error: GD graphics PHP module with JPEG support required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:392 #: ../../mod/install.php:394
msgid "Error: openssl PHP module required but not installed." msgid "Error: openssl PHP module required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:396 #: ../../mod/install.php:398
msgid "Error: mysqli PHP module required but not installed." msgid "Error: mysqli PHP module required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:400 #: ../../mod/install.php:402
msgid "Error: mb_string PHP module required but not installed." msgid "Error: mb_string PHP module required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:417 #: ../../mod/install.php:419
msgid "" msgid ""
"The web installer needs to be able to create a file called \".htconfig.php\" " "The web installer needs to be able to create a file called \".htconfig.php\" "
"in the top folder of your web server and it is unable to do so." "in the top folder of your web server and it is unable to do so."
msgstr "" msgstr ""
#: ../../mod/install.php:418 #: ../../mod/install.php:420
msgid "" msgid ""
"This is most often a permission setting, as the web server may not be able " "This is most often a permission setting, as the web server may not be able "
"to write files in your folder - even if you can." "to write files in your folder - even if you can."
msgstr "" msgstr ""
#: ../../mod/install.php:419 #: ../../mod/install.php:421
msgid "" msgid ""
"At the end of this procedure, we will give you a text to save in a file " "At the end of this procedure, we will give you a text to save in a file "
"named .htconfig.php in your Friendica top folder." "named .htconfig.php in your Friendica top folder."
msgstr "" msgstr ""
#: ../../mod/install.php:420 #: ../../mod/install.php:422
msgid "" msgid ""
"You can alternatively skip this procedure and perform a manual installation. " "You can alternatively skip this procedure and perform a manual installation. "
"Please see the file \"INSTALL.txt\" for instructions." "Please see the file \"INSTALL.txt\" for instructions."
msgstr "" msgstr ""
#: ../../mod/install.php:423 #: ../../mod/install.php:425
msgid ".htconfig.php is writable" msgid ".htconfig.php is writable"
msgstr "" msgstr ""
#: ../../mod/install.php:434 #: ../../mod/install.php:436
msgid "" msgid ""
"Url rewrite in .htconfig is not working. Check your server configuration." "Url rewrite in .htconfig is not working. Check your server configuration."
msgstr "" msgstr ""
#: ../../mod/install.php:436 #: ../../mod/install.php:438
msgid "Url rewrite is working" msgid "Url rewrite is working"
msgstr "" msgstr ""
#: ../../mod/install.php:442 #: ../../mod/install.php:444
msgid "" msgid ""
"The database configuration file \".htconfig.php\" could not be written. " "The database configuration file \".htconfig.php\" could not be written. "
"Please use the enclosed text to create a configuration file in your web " "Please use the enclosed text to create a configuration file in your web "
"server root." "server root."
msgstr "" msgstr ""
#: ../../mod/install.php:467 #: ../../mod/install.php:469
msgid "Errors encountered creating database tables." msgid "Errors encountered creating database tables."
msgstr "" msgstr ""
#: ../../mod/install.php:478 #: ../../mod/install.php:480
msgid "<h1>What next</h1>" msgid "<h1>What next</h1>"
msgstr "" msgstr ""
#: ../../mod/install.php:479 #: ../../mod/install.php:481
msgid "" msgid ""
"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
msgstr "" msgstr ""