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

configurable FB poll interval, default 1hr.

This commit is contained in:
Friendika 2011-05-02 20:14:37 -07:00
parent 4332e39d4d
commit 0f261ef8fa
4 changed files with 100 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addon/facebook/facebook.php
View File

@ -291,8 +291,12 @@ function facebook_cron($a,$b) {
$last = get_config('facebook','last_poll'); $last = get_config('facebook','last_poll');
$poll_interval = get_config('facebook','poll_interval');
if(! $poll_interval)
$poll_interval = 3600;
if($last) { if($last) {
$next = $last + 3600; $next = $last + $poll_interval;
if($next > time()) if($next > time())
return; return;
} }

3
mod/item.php
View File

@ -671,7 +671,8 @@ function item_content(&$a) {
// send the notification upstream/downstream as the case may be // send the notification upstream/downstream as the case may be
proc_run('php',"include/notifier.php","drop","$drop_id"); proc_run('php',"include/notifier.php","drop","$drop_id");
// We seem to lose the return url occasionally. Have not been able to reliably duplicate
// logger('drop_return_url: ' . $_SESSION['return_url']);
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
//NOTREACHED //NOTREACHED
} }

168
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.1.961\n" "Project-Id-Version: 2.1.967\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-04-27 04:23-0700\n" "POT-Creation-Date: 2011-05-02 20:13-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"
@ -36,7 +36,7 @@ msgstr ""
#: ../../mod/settings.php:251 ../../mod/manage.php:75 ../../mod/network.php:6 #: ../../mod/settings.php:251 ../../mod/manage.php:75 ../../mod/network.php:6
#: ../../mod/group.php:19 ../../mod/viewcontacts.php:21 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:21
#: ../../mod/register.php:25 ../../mod/regmod.php:16 ../../mod/item.php:57 #: ../../mod/register.php:25 ../../mod/regmod.php:16 ../../mod/item.php:57
#: ../../mod/item.php:679 ../../mod/profile_photo.php:19 #: ../../mod/item.php:680 ../../mod/profile_photo.php:19
#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:144 #: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:144
#: ../../mod/profile_photo.php:155 ../../mod/message.php:8 #: ../../mod/profile_photo.php:155 ../../mod/message.php:8
#: ../../mod/message.php:116 ../../mod/wall_upload.php:42 #: ../../mod/message.php:116 ../../mod/wall_upload.php:42
@ -103,7 +103,7 @@ msgstr ""
#: ../../mod/install.php:133 ../../mod/contacts.php:264 #: ../../mod/install.php:133 ../../mod/contacts.php:264
#: ../../mod/settings.php:426 ../../mod/manage.php:106 ../../mod/group.php:76 #: ../../mod/settings.php:426 ../../mod/manage.php:106 ../../mod/group.php:76
#: ../../mod/group.php:159 ../../mod/profiles.php:370 ../../mod/invite.php:68 #: ../../mod/group.php:159 ../../mod/profiles.php:370 ../../mod/invite.php:68
#: ../../addon/facebook/facebook.php:262 #: ../../addon/facebook/facebook.php:268
#: ../../addon/randplace/randplace.php:179 #: ../../addon/randplace/randplace.php:179
#: ../../addon/statusnet/statusnet.php:163 #: ../../addon/statusnet/statusnet.php:163
#: ../../addon/statusnet/statusnet.php:189 #: ../../addon/statusnet/statusnet.php:189
@ -350,13 +350,13 @@ msgid "I don't like this (toggle)"
msgstr "" msgstr ""
#: ../../mod/photos.php:1099 ../../include/conversation.php:367 #: ../../mod/photos.php:1099 ../../include/conversation.php:367
#: ../../include/conversation.php:734 #: ../../include/conversation.php:735
msgid "Share" msgid "Share"
msgstr "" msgstr ""
#: ../../mod/photos.php:1100 ../../mod/editpost.php:95 #: ../../mod/photos.php:1100 ../../mod/editpost.php:95
#: ../../mod/message.php:190 ../../mod/message.php:324 #: ../../mod/message.php:190 ../../mod/message.php:324
#: ../../include/conversation.php:368 ../../include/conversation.php:743 #: ../../include/conversation.php:368 ../../include/conversation.php:744
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
@ -402,7 +402,7 @@ msgstr ""
msgid "Edit post" msgid "Edit post"
msgstr "" msgstr ""
#: ../../mod/editpost.php:74 ../../include/conversation.php:723 #: ../../mod/editpost.php:74 ../../include/conversation.php:724
msgid "Post to Email" msgid "Post to Email"
msgstr "" msgstr ""
@ -412,44 +412,44 @@ msgid "Edit"
msgstr "" msgstr ""
#: ../../mod/editpost.php:88 ../../mod/message.php:188 #: ../../mod/editpost.php:88 ../../mod/message.php:188
#: ../../mod/message.php:322 ../../include/conversation.php:735 #: ../../mod/message.php:322 ../../include/conversation.php:736
msgid "Upload photo" msgid "Upload photo"
msgstr "" msgstr ""
#: ../../mod/editpost.php:89 ../../mod/message.php:189 #: ../../mod/editpost.php:89 ../../mod/message.php:189
#: ../../mod/message.php:323 ../../include/conversation.php:736 #: ../../mod/message.php:323 ../../include/conversation.php:737
msgid "Insert web link" msgid "Insert web link"
msgstr "" msgstr ""
#: ../../mod/editpost.php:90 ../../include/conversation.php:737 #: ../../mod/editpost.php:90 ../../include/conversation.php:738
msgid "Insert YouTube video" msgid "Insert YouTube video"
msgstr "" msgstr ""
#: ../../mod/editpost.php:91 ../../include/conversation.php:738 #: ../../mod/editpost.php:91 ../../include/conversation.php:739
msgid "Insert Vorbis [.ogg] video" msgid "Insert Vorbis [.ogg] video"
msgstr "" msgstr ""
#: ../../mod/editpost.php:92 ../../include/conversation.php:739 #: ../../mod/editpost.php:92 ../../include/conversation.php:740
msgid "Insert Vorbis [.ogg] audio" msgid "Insert Vorbis [.ogg] audio"
msgstr "" msgstr ""
#: ../../mod/editpost.php:93 ../../include/conversation.php:740 #: ../../mod/editpost.php:93 ../../include/conversation.php:741
msgid "Set your location" msgid "Set your location"
msgstr "" msgstr ""
#: ../../mod/editpost.php:94 ../../include/conversation.php:741 #: ../../mod/editpost.php:94 ../../include/conversation.php:742
msgid "Clear browser location" msgid "Clear browser location"
msgstr "" msgstr ""
#: ../../mod/editpost.php:96 ../../include/conversation.php:744 #: ../../mod/editpost.php:96 ../../include/conversation.php:745
msgid "Permission settings" msgid "Permission settings"
msgstr "" msgstr ""
#: ../../mod/editpost.php:102 ../../include/conversation.php:750 #: ../../mod/editpost.php:102 ../../include/conversation.php:751
msgid "CC: email addresses" msgid "CC: email addresses"
msgstr "" msgstr ""
#: ../../mod/editpost.php:104 ../../include/conversation.php:752 #: ../../mod/editpost.php:104 ../../include/conversation.php:753
msgid "Example: bob@example.com, mary@example.com" msgid "Example: bob@example.com, mary@example.com"
msgstr "" msgstr ""
@ -1610,7 +1610,7 @@ msgstr ""
msgid "All Contacts (with secure profile access)" msgid "All Contacts (with secure profile access)"
msgstr "" msgstr ""
#: ../../mod/viewcontacts.php:25 ../../boot.php:1999 #: ../../mod/viewcontacts.php:25 ../../boot.php:2001
msgid "View Contacts" msgid "View Contacts"
msgstr "" msgstr ""
@ -1746,12 +1746,12 @@ msgstr ""
msgid "Register" msgid "Register"
msgstr "" msgstr ""
#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:679 #: ../../mod/like.php:110 ../../addon/facebook/facebook.php:720
#: ../../include/conversation.php:20 #: ../../include/conversation.php:20
msgid "status" msgid "status"
msgstr "" msgstr ""
#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:683 #: ../../mod/like.php:127 ../../addon/facebook/facebook.php:724
#: ../../include/conversation.php:25 #: ../../include/conversation.php:25
#, php-format #, php-format
msgid "%1$s likes %2$s's %3$s" msgid "%1$s likes %2$s's %3$s"
@ -1981,7 +1981,7 @@ msgstr ""
msgid "Conversation removed." msgid "Conversation removed."
msgstr "" msgstr ""
#: ../../mod/message.php:172 ../../include/conversation.php:690 #: ../../mod/message.php:172 ../../include/conversation.php:691
msgid "Please enter a link URL:" msgid "Please enter a link URL:"
msgstr "" msgstr ""
@ -2025,7 +2025,7 @@ msgstr ""
msgid "Send Reply" msgid "Send Reply"
msgstr "" msgstr ""
#: ../../mod/profile.php:11 ../../boot.php:2201 #: ../../mod/profile.php:11 ../../boot.php:2203
msgid "No profile" msgid "No profile"
msgstr "" msgstr ""
@ -2093,7 +2093,7 @@ msgstr ""
msgid "Applications" msgid "Applications"
msgstr "" msgstr ""
#: ../../mod/search.php:26 ../../include/nav.php:71 ../../boot.php:2045 #: ../../mod/search.php:26 ../../include/nav.php:71 ../../boot.php:2047
msgid "Search" msgid "Search"
msgstr "" msgstr ""
@ -2450,49 +2450,53 @@ msgstr ""
msgid "Facebook disabled" msgid "Facebook disabled"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:235 #: ../../addon/facebook/facebook.php:232
msgid "Updating contacts"
msgstr ""
#: ../../addon/facebook/facebook.php:241
msgid "Facebook API key is missing." msgid "Facebook API key is missing."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:242 #: ../../addon/facebook/facebook.php:248
msgid "Facebook Connect" msgid "Facebook Connect"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:248 #: ../../addon/facebook/facebook.php:254
msgid "Install Facebook connector for this account." msgid "Install Facebook connector for this account."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:255 #: ../../addon/facebook/facebook.php:261
msgid "Remove Facebook connector" msgid "Remove Facebook connector"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:261 #: ../../addon/facebook/facebook.php:267
msgid "Post to Facebook by default" msgid "Post to Facebook by default"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:319 #: ../../addon/facebook/facebook.php:329
msgid "Facebook" msgid "Facebook"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:320 #: ../../addon/facebook/facebook.php:330
msgid "Facebook Connector Settings" msgid "Facebook Connector Settings"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:334 #: ../../addon/facebook/facebook.php:344
msgid "Post to Facebook" msgid "Post to Facebook"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:396 #: ../../addon/facebook/facebook.php:411
msgid "" msgid ""
"Post to Facebook cancelled because of multi-network access permission " "Post to Facebook cancelled because of multi-network access permission "
"conflict." "conflict."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:441 #: ../../addon/facebook/facebook.php:466
msgid "Image: " msgid "Image: "
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:489 #: ../../addon/facebook/facebook.php:526
msgid "View on Friendika" msgid "View on Friendika"
msgstr "" msgstr ""
@ -2707,7 +2711,7 @@ msgstr ""
msgid "Send public postings to Twitter" msgid "Send public postings to Twitter"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:23 ../../boot.php:2287 #: ../../include/profile_advanced.php:23 ../../boot.php:2289
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
@ -2731,7 +2735,7 @@ msgstr ""
msgid "<span class=\"heart\">&hearts;</span> Status:" msgid "<span class=\"heart\">&hearts;</span> Status:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:103 ../../boot.php:2293 #: ../../include/profile_advanced.php:103 ../../boot.php:2295
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -3051,7 +3055,7 @@ msgstr ""
msgid "Everybody" msgid "Everybody"
msgstr "" msgstr ""
#: ../../include/nav.php:41 ../../boot.php:850 #: ../../include/nav.php:41 ../../boot.php:852
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
@ -3155,6 +3159,10 @@ msgstr ""
msgid " ago" msgid " ago"
msgstr "" msgstr ""
#: ../../include/bbcode.php:83
msgid "Image/photo"
msgstr ""
#: ../../include/dba.php:31 #: ../../include/dba.php:31
#, php-format #, php-format
msgid "Cannot locate DNS info for database server '%s'" msgid "Cannot locate DNS info for database server '%s'"
@ -3270,27 +3278,31 @@ msgstr ""
msgid "%s don't like this." msgid "%s don't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:691 #: ../../include/conversation.php:690
msgid "Please enter a YouTube link:" msgid "Visible to <strong>everybody</strong>"
msgstr "" msgstr ""
#: ../../include/conversation.php:692 #: ../../include/conversation.php:692
msgid "Please enter a video(.ogg) link/URL:" msgid "Please enter a YouTube link:"
msgstr "" msgstr ""
#: ../../include/conversation.php:693 #: ../../include/conversation.php:693
msgid "Please enter an audio(.ogg) link/URL:" msgid "Please enter a video(.ogg) link/URL:"
msgstr "" msgstr ""
#: ../../include/conversation.php:694 #: ../../include/conversation.php:694
msgid "Where are you right now?" msgid "Please enter an audio(.ogg) link/URL:"
msgstr "" msgstr ""
#: ../../include/conversation.php:695 #: ../../include/conversation.php:695
msgid "Where are you right now?"
msgstr ""
#: ../../include/conversation.php:696
msgid "Enter a title for this item" msgid "Enter a title for this item"
msgstr "" msgstr ""
#: ../../include/conversation.php:742 #: ../../include/conversation.php:743
msgid "Set title" msgid "Set title"
msgstr "" msgstr ""
@ -3322,146 +3334,146 @@ msgstr ""
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:1091 #: ../../boot.php:1093
msgid "prev" msgid "prev"
msgstr "" msgstr ""
#: ../../boot.php:1093 #: ../../boot.php:1095
msgid "first" msgid "first"
msgstr "" msgstr ""
#: ../../boot.php:1122 #: ../../boot.php:1124
msgid "last" msgid "last"
msgstr "" msgstr ""
#: ../../boot.php:1125 #: ../../boot.php:1127
msgid "next" msgid "next"
msgstr "" msgstr ""
#: ../../boot.php:1986 #: ../../boot.php:1988
msgid "No contacts" msgid "No contacts"
msgstr "" msgstr ""
#: ../../boot.php:1994 #: ../../boot.php:1996
#, php-format #, php-format
msgid "%d Contact" msgid "%d Contact"
msgid_plural "%d Contacts" msgid_plural "%d Contacts"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../boot.php:2260 #: ../../boot.php:2262
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
#: ../../boot.php:2275 #: ../../boot.php:2277
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
#: ../../boot.php:2279 #: ../../boot.php:2281
msgid ", " msgid ", "
msgstr "" msgstr ""
#: ../../boot.php:2291 #: ../../boot.php:2293
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../boot.php:2384 #: ../../boot.php:2386
msgid "Monday" msgid "Monday"
msgstr "" msgstr ""
#: ../../boot.php:2384 #: ../../boot.php:2386
msgid "Tuesday" msgid "Tuesday"
msgstr "" msgstr ""
#: ../../boot.php:2384 #: ../../boot.php:2386
msgid "Wednesday" msgid "Wednesday"
msgstr "" msgstr ""
#: ../../boot.php:2384 #: ../../boot.php:2386
msgid "Thursday" msgid "Thursday"
msgstr "" msgstr ""
#: ../../boot.php:2384 #: ../../boot.php:2386
msgid "Friday" msgid "Friday"
msgstr "" msgstr ""
#: ../../boot.php:2384 #: ../../boot.php:2386
msgid "Saturday" msgid "Saturday"
msgstr "" msgstr ""
#: ../../boot.php:2384 #: ../../boot.php:2386
msgid "Sunday" msgid "Sunday"
msgstr "" msgstr ""
#: ../../boot.php:2388 #: ../../boot.php:2390
msgid "January" msgid "January"
msgstr "" msgstr ""
#: ../../boot.php:2388 #: ../../boot.php:2390
msgid "February" msgid "February"
msgstr "" msgstr ""
#: ../../boot.php:2388 #: ../../boot.php:2390
msgid "March" msgid "March"
msgstr "" msgstr ""
#: ../../boot.php:2388 #: ../../boot.php:2390
msgid "April" msgid "April"
msgstr "" msgstr ""
#: ../../boot.php:2388 #: ../../boot.php:2390
msgid "May" msgid "May"
msgstr "" msgstr ""
#: ../../boot.php:2388 #: ../../boot.php:2390
msgid "June" msgid "June"
msgstr "" msgstr ""
#: ../../boot.php:2388 #: ../../boot.php:2390
msgid "July" msgid "July"
msgstr "" msgstr ""
#: ../../boot.php:2388 #: ../../boot.php:2390
msgid "August" msgid "August"
msgstr "" msgstr ""
#: ../../boot.php:2388 #: ../../boot.php:2390
msgid "September" msgid "September"
msgstr "" msgstr ""
#: ../../boot.php:2388 #: ../../boot.php:2390
msgid "October" msgid "October"
msgstr "" msgstr ""
#: ../../boot.php:2388 #: ../../boot.php:2390
msgid "November" msgid "November"
msgstr "" msgstr ""
#: ../../boot.php:2388 #: ../../boot.php:2390
msgid "December" msgid "December"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2405
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:2420 #: ../../boot.php:2422
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:2421 #: ../../boot.php:2423
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:2422 #: ../../boot.php:2424
msgid "(Adjusted for local time)" msgid "(Adjusted for local time)"
msgstr "" msgstr ""
#: ../../boot.php:2433 #: ../../boot.php:2435
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:2634 #: ../../boot.php:2636
msgid "link to source" msgid "link to source"
msgstr "" msgstr ""

3
util/strings.php
View File

@ -605,6 +605,7 @@ $a->strings['Visible To:'] = 'Visible To:';
$a->strings['Groups'] = 'Groups'; $a->strings['Groups'] = 'Groups';
$a->strings['Except For:'] = 'Except For:'; $a->strings['Except For:'] = 'Except For:';
$a->strings['Logged out.'] = 'Logged out.'; $a->strings['Logged out.'] = 'Logged out.';
$a->strings['Image/photo'] = 'Image/photo';
$a->strings['Unknown | Not categorised'] = 'Unknown | Not categorised'; $a->strings['Unknown | Not categorised'] = 'Unknown | Not categorised';
$a->strings['Block immediately'] = 'Block immediately'; $a->strings['Block immediately'] = 'Block immediately';
$a->strings['Shady, spammer, self-marketer'] = 'Shady, spammer, self-marketer'; $a->strings['Shady, spammer, self-marketer'] = 'Shady, spammer, self-marketer';
@ -632,6 +633,7 @@ $a->strings['and'] = 'and';
$a->strings[', and %d other people'] = ', and %d other people'; $a->strings[', and %d other people'] = ', and %d other people';
$a->strings['%s like this.'] = '%s like this.'; $a->strings['%s like this.'] = '%s like this.';
$a->strings['%s don\'t like this.'] = '%s don\'t like this.'; $a->strings['%s don\'t like this.'] = '%s don\'t like this.';
$a->strings['Visible to <strong>everybody</strong>'] = 'Visible to <strong>everybody</strong>';
$a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:'; $a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:';
$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:"; $a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:"; $a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
@ -735,6 +737,7 @@ $a->strings['Complicated'] = 'Complicated';
$a->strings['Don\'t care'] = 'Don\'t care'; $a->strings['Don\'t care'] = 'Don\'t care';
$a->strings['Ask me'] = 'Ask me'; $a->strings['Ask me'] = 'Ask me';
$a->strings['Facebook disabled'] = 'Facebook disabled'; $a->strings['Facebook disabled'] = 'Facebook disabled';
$a->strings['Updating contacts'] = 'Updating contacts';
$a->strings['Facebook API key is missing.'] = 'Facebook API key is missing.'; $a->strings['Facebook API key is missing.'] = 'Facebook API key is missing.';
$a->strings['Facebook Connect'] = 'Facebook Connect'; $a->strings['Facebook Connect'] = 'Facebook Connect';
$a->strings['Install Facebook connector for this account.'] = 'Install Facebook connector for this account.'; $a->strings['Install Facebook connector for this account.'] = 'Install Facebook connector for this account.';