clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

set writable for ostatus followers

This commit is contained in:
friendica 2012-11-06 01:10:12 -08:00
parent 1d91b2d1b3
commit fd4d35b16c
3 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1517' );
define ( 'FRIENDICA_VERSION', '3.0.1518' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1156 );

2
include/items.php
View File

@ -3232,7 +3232,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
if(is_array($contact)) {
if(($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
|| ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
$r = q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
$r = q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval(CONTACT_IS_FRIEND),
intval($contact['id']),
intval($importer['uid'])

164
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 3.0.1517\n"
"Project-Id-Version: 3.0.1518\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-11-04 10:00-0800\n"
"POT-Creation-Date: 2012-11-05 10:00-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"
@ -135,7 +135,7 @@ msgstr ""
#: ../../mod/photos.php:1406 ../../mod/photos.php:1450
#: ../../mod/photos.php:1522 ../../mod/install.php:246
#: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
#: ../../mod/content.php:693 ../../mod/contacts.php:348
#: ../../mod/content.php:693 ../../mod/contacts.php:351
#: ../../mod/settings.php:543 ../../mod/settings.php:697
#: ../../mod/settings.php:769 ../../mod/settings.php:976
#: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
@ -1497,7 +1497,7 @@ msgstr ""
msgid "via Wall-To-Wall:"
msgstr ""
#: ../../mod/home.php:28 ../../addon/communityhome/communityhome.php:179
#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179
#: ../../addon.old/communityhome/communityhome.php:179
#, php-format
msgid "Welcome to %s"
@ -1513,8 +1513,8 @@ msgid "Discard"
msgstr ""
#: ../../mod/notifications.php:51 ../../mod/notifications.php:163
#: ../../mod/notifications.php:209 ../../mod/contacts.php:321
#: ../../mod/contacts.php:375
#: ../../mod/notifications.php:209 ../../mod/contacts.php:324
#: ../../mod/contacts.php:378
msgid "Ignore"
msgstr ""
@ -1566,7 +1566,7 @@ msgid "suggested by %s"
msgstr ""
#: ../../mod/notifications.php:156 ../../mod/notifications.php:203
#: ../../mod/contacts.php:381
#: ../../mod/contacts.php:384
msgid "Hide this contact from others"
msgstr ""
@ -1716,279 +1716,279 @@ msgstr ""
msgid "Contact has been unignored"
msgstr ""
#: ../../mod/contacts.php:216
#: ../../mod/contacts.php:219
msgid "Contact has been archived"
msgstr ""
#: ../../mod/contacts.php:216
#: ../../mod/contacts.php:219
msgid "Contact has been unarchived"
msgstr ""
#: ../../mod/contacts.php:229
#: ../../mod/contacts.php:232
msgid "Contact has been removed."
msgstr ""
#: ../../mod/contacts.php:263
#: ../../mod/contacts.php:266
#, php-format
msgid "You are mutual friends with %s"
msgstr ""
#: ../../mod/contacts.php:267
#: ../../mod/contacts.php:270
#, php-format
msgid "You are sharing with %s"
msgstr ""
#: ../../mod/contacts.php:272
#: ../../mod/contacts.php:275
#, php-format
msgid "%s is sharing with you"
msgstr ""
#: ../../mod/contacts.php:289
#: ../../mod/contacts.php:292
msgid "Private communications are not available for this contact."
msgstr ""
#: ../../mod/contacts.php:292
#: ../../mod/contacts.php:295
msgid "Never"
msgstr ""
#: ../../mod/contacts.php:296
#: ../../mod/contacts.php:299
msgid "(Update was successful)"
msgstr ""
#: ../../mod/contacts.php:296
#: ../../mod/contacts.php:299
msgid "(Update was not successful)"
msgstr ""
#: ../../mod/contacts.php:298
#: ../../mod/contacts.php:301
msgid "Suggest friends"
msgstr ""
#: ../../mod/contacts.php:302
#: ../../mod/contacts.php:305
#, php-format
msgid "Network type: %s"
msgstr ""
#: ../../mod/contacts.php:305 ../../include/contact_widgets.php:190
#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190
#, php-format
msgid "%d contact in common"
msgid_plural "%d contacts in common"
msgstr[0] ""
msgstr[1] ""
#: ../../mod/contacts.php:310
#: ../../mod/contacts.php:313
msgid "View all contacts"
msgstr ""
#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
#: ../../mod/admin.php:698
msgid "Unblock"
msgstr ""
#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
#: ../../mod/admin.php:697
msgid "Block"
msgstr ""
#: ../../mod/contacts.php:318
#: ../../mod/contacts.php:321
msgid "Toggle Blocked status"
msgstr ""
#: ../../mod/contacts.php:321 ../../mod/contacts.php:375
#: ../../mod/contacts.php:324 ../../mod/contacts.php:378
msgid "Unignore"
msgstr ""
#: ../../mod/contacts.php:324
#: ../../mod/contacts.php:327
msgid "Toggle Ignored status"
msgstr ""
#: ../../mod/contacts.php:328
#: ../../mod/contacts.php:331
msgid "Unarchive"
msgstr ""
#: ../../mod/contacts.php:328
#: ../../mod/contacts.php:331
msgid "Archive"
msgstr ""
#: ../../mod/contacts.php:331
#: ../../mod/contacts.php:334
msgid "Toggle Archive status"
msgstr ""
#: ../../mod/contacts.php:334
#: ../../mod/contacts.php:337
msgid "Repair"
msgstr ""
#: ../../mod/contacts.php:337
#: ../../mod/contacts.php:340
msgid "Advanced Contact Settings"
msgstr ""
#: ../../mod/contacts.php:343
#: ../../mod/contacts.php:346
msgid "Communications lost with this contact!"
msgstr ""
#: ../../mod/contacts.php:346
#: ../../mod/contacts.php:349
msgid "Contact Editor"
msgstr ""
#: ../../mod/contacts.php:349
#: ../../mod/contacts.php:352
msgid "Profile Visibility"
msgstr ""
#: ../../mod/contacts.php:350
#: ../../mod/contacts.php:353
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr ""
#: ../../mod/contacts.php:351
#: ../../mod/contacts.php:354
msgid "Contact Information / Notes"
msgstr ""
#: ../../mod/contacts.php:352
#: ../../mod/contacts.php:355
msgid "Edit contact notes"
msgstr ""
#: ../../mod/contacts.php:357 ../../mod/contacts.php:549
#: ../../mod/contacts.php:360 ../../mod/contacts.php:552
#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
#, php-format
msgid "Visit %s's profile [%s]"
msgstr ""
#: ../../mod/contacts.php:358
#: ../../mod/contacts.php:361
msgid "Block/Unblock contact"
msgstr ""
#: ../../mod/contacts.php:359
#: ../../mod/contacts.php:362
msgid "Ignore contact"
msgstr ""
#: ../../mod/contacts.php:360
#: ../../mod/contacts.php:363
msgid "Repair URL settings"
msgstr ""
#: ../../mod/contacts.php:361
#: ../../mod/contacts.php:364
msgid "View conversations"
msgstr ""
#: ../../mod/contacts.php:363
#: ../../mod/contacts.php:366
msgid "Delete contact"
msgstr ""
#: ../../mod/contacts.php:367
#: ../../mod/contacts.php:370
msgid "Last update:"
msgstr ""
#: ../../mod/contacts.php:369
#: ../../mod/contacts.php:372
msgid "Update public posts"
msgstr ""
#: ../../mod/contacts.php:371 ../../mod/admin.php:1170
#: ../../mod/contacts.php:374 ../../mod/admin.php:1170
msgid "Update now"
msgstr ""
#: ../../mod/contacts.php:378
#: ../../mod/contacts.php:381
msgid "Currently blocked"
msgstr ""
#: ../../mod/contacts.php:379
#: ../../mod/contacts.php:382
msgid "Currently ignored"
msgstr ""
#: ../../mod/contacts.php:380
#: ../../mod/contacts.php:383
msgid "Currently archived"
msgstr ""
#: ../../mod/contacts.php:381
#: ../../mod/contacts.php:384
msgid ""
"Replies/likes to your public posts <strong>may</strong> still be visible"
msgstr ""
#: ../../mod/contacts.php:434
#: ../../mod/contacts.php:437
msgid "Suggestions"
msgstr ""
#: ../../mod/contacts.php:437
#: ../../mod/contacts.php:440
msgid "Suggest potential friends"
msgstr ""
#: ../../mod/contacts.php:440 ../../mod/group.php:191
#: ../../mod/contacts.php:443 ../../mod/group.php:191
msgid "All Contacts"
msgstr ""
#: ../../mod/contacts.php:443
#: ../../mod/contacts.php:446
msgid "Show all contacts"
msgstr ""
#: ../../mod/contacts.php:446
#: ../../mod/contacts.php:449
msgid "Unblocked"
msgstr ""
#: ../../mod/contacts.php:449
#: ../../mod/contacts.php:452
msgid "Only show unblocked contacts"
msgstr ""
#: ../../mod/contacts.php:453
#: ../../mod/contacts.php:456
msgid "Blocked"
msgstr ""
#: ../../mod/contacts.php:456
#: ../../mod/contacts.php:459
msgid "Only show blocked contacts"
msgstr ""
#: ../../mod/contacts.php:460
#: ../../mod/contacts.php:463
msgid "Ignored"
msgstr ""
#: ../../mod/contacts.php:463
#: ../../mod/contacts.php:466
msgid "Only show ignored contacts"
msgstr ""
#: ../../mod/contacts.php:467
#: ../../mod/contacts.php:470
msgid "Archived"
msgstr ""
#: ../../mod/contacts.php:470
#: ../../mod/contacts.php:473
msgid "Only show archived contacts"
msgstr ""
#: ../../mod/contacts.php:474
#: ../../mod/contacts.php:477
msgid "Hidden"
msgstr ""
#: ../../mod/contacts.php:477
#: ../../mod/contacts.php:480
msgid "Only show hidden contacts"
msgstr ""
#: ../../mod/contacts.php:525
#: ../../mod/contacts.php:528
msgid "Mutual Friendship"
msgstr ""
#: ../../mod/contacts.php:529
#: ../../mod/contacts.php:532
msgid "is a fan of yours"
msgstr ""
#: ../../mod/contacts.php:533
#: ../../mod/contacts.php:536
msgid "you are a fan of"
msgstr ""
#: ../../mod/contacts.php:550 ../../mod/nogroup.php:41
#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41
msgid "Edit contact"
msgstr ""
#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88
#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:88
#: ../../include/nav.php:139
msgid "Contacts"
msgstr ""
#: ../../mod/contacts.php:575
#: ../../mod/contacts.php:578
msgid "Search your contacts"
msgstr ""
#: ../../mod/contacts.php:576 ../../mod/directory.php:59
#: ../../mod/contacts.php:579 ../../mod/directory.php:59
msgid "Finding: "
msgstr ""
#: ../../mod/contacts.php:577 ../../mod/directory.php:61
#: ../../mod/contacts.php:580 ../../mod/directory.php:61
#: ../../include/contact_widgets.php:33
msgid "Find"
msgstr ""
@ -6130,7 +6130,7 @@ msgstr ""
#: ../../addon/dav/friendica/main.php:279
#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
#: ../../include/enotify.php:28 ../../include/notifier.php:710
#: ../../include/enotify.php:28 ../../include/notifier.php:724
#: ../../addon.old/dav/friendica/main.php:279
#: ../../addon.old/dav/friendica/main.php:280
msgid "noreply"
@ -8122,7 +8122,7 @@ msgstr ""
msgid "Finishes:"
msgstr ""
#: ../../include/delivery.php:457 ../../include/notifier.php:703
#: ../../include/delivery.php:457 ../../include/notifier.php:717
msgid "(no subject)"
msgstr ""
@ -9035,37 +9035,37 @@ msgid ""
"form has been opened for too long (>3 hours) before submitting it."
msgstr ""
#: ../../include/Contact.php:111
#: ../../include/Contact.php:115
msgid "stopped following"
msgstr ""
#: ../../include/Contact.php:220 ../../include/conversation.php:795
#: ../../include/Contact.php:225 ../../include/conversation.php:795
msgid "Poke"
msgstr ""
#: ../../include/Contact.php:221 ../../include/conversation.php:789
#: ../../include/Contact.php:226 ../../include/conversation.php:789
msgid "View Status"
msgstr ""
#: ../../include/Contact.php:222 ../../include/conversation.php:790
#: ../../include/Contact.php:227 ../../include/conversation.php:790
msgid "View Profile"
msgstr ""
#: ../../include/Contact.php:223 ../../include/conversation.php:791
#: ../../include/Contact.php:228 ../../include/conversation.php:791
msgid "View Photos"
msgstr ""
#: ../../include/Contact.php:224 ../../include/Contact.php:237
#: ../../include/Contact.php:229 ../../include/Contact.php:242
#: ../../include/conversation.php:792
msgid "Network Posts"
msgstr ""
#: ../../include/Contact.php:225 ../../include/Contact.php:237
#: ../../include/Contact.php:230 ../../include/Contact.php:242
#: ../../include/conversation.php:793
msgid "Edit Contact"
msgstr ""
#: ../../include/Contact.php:226 ../../include/Contact.php:237
#: ../../include/Contact.php:231 ../../include/Contact.php:242
#: ../../include/conversation.php:794
msgid "Send PM"
msgstr ""