summaryrefslogtreecommitdiff
path: root/_darcs/pristine
diff options
context:
space:
mode:
Diffstat (limited to '_darcs/pristine')
-rw-r--r--_darcs/pristine/actions/facebookhome.php3
-rw-r--r--_darcs/pristine/actions/facebooksettings.php66
-rw-r--r--_darcs/pristine/actions/twittersettings.php26
-rw-r--r--_darcs/pristine/classes/Foreign_link.php23
-rw-r--r--_darcs/pristine/lib/facebookaction.php83
-rw-r--r--_darcs/pristine/scripts/update_facebook.php17
6 files changed, 137 insertions, 81 deletions
diff --git a/_darcs/pristine/actions/facebookhome.php b/_darcs/pristine/actions/facebookhome.php
index a23d1aa07..069ea5e75 100644
--- a/_darcs/pristine/actions/facebookhome.php
+++ b/_darcs/pristine/actions/facebookhome.php
@@ -70,8 +70,7 @@ class FacebookhomeAction extends FacebookAction
$flink->foreign_id = $fbuid;
$flink->service = 2; # Facebook
$flink->created = common_sql_now();
-
- # $this->set_flags($flink, $noticesync, $replysync, $friendsync);
+ $flink->set_flags(true, false, false);
$flink_id = $flink->insert();
diff --git a/_darcs/pristine/actions/facebooksettings.php b/_darcs/pristine/actions/facebooksettings.php
index 17812850c..469bcfc45 100644
--- a/_darcs/pristine/actions/facebooksettings.php
+++ b/_darcs/pristine/actions/facebooksettings.php
@@ -28,30 +28,82 @@ class FacebooksettingsAction extends FacebookAction
{
parent::handle($args);
- $this->display();
+ if ($this->arg('save')) {
+ $this->save_settings();
+ } else {
+ $this->show_form();
+ }
}
- function display()
- {
+
+ function save_settings() {
+
+ $noticesync = $this->arg('noticesync');
+ $replysync = $this->arg('replysync');
$facebook = get_facebook();
+ $fbuid = $facebook->require_login();
+
+ $flink = Foreign_link::getByForeignID($fbuid, 2); // 2 == Facebook
+
+ $original = clone($flink);
+ $flink->set_flags($noticesync, $replysync, false);
+ $result = $flink->update($original);
+
+ if ($result) {
+ echo '<fb:success message="Sync preferences saved." />';
+ }
+
+ $this->show_form();
+
+ }
+
+ function show_form() {
+ $facebook = get_facebook();
$fbuid = $facebook->require_login();
+ $flink = Foreign_link::getByForeignID($fbuid, 2); // 2 == Facebook
+
+ $this->show_header('Settings');
+
$fbml = '<fb:if-section-not-added section="profile">'
- .'<h2>Add an Identi.ca box to your profile!</h2>'
+ .'<h2>Add an Identi.ca box to my profile</h2>'
.'<fb:add-section-button section="profile"/>'
.'</fb:if-section-not-added>';
-
$fbml .= '<fb:prompt-permission perms="status_update"><h2>Allow Identi.ca to update my Facebook status</h2></fb:prompt-permission>';
- $this->show_header('Settings');
+ $fbml .= '<form method="post" id="facebook_settings">'
+ .'<h2>Sync preferences</h2>'
+ .'<p>';
+
+ if ($flink->noticesync & FOREIGN_NOTICE_SEND) {
+ $fbml .= '<input name="noticesync" type="checkbox" class="checkbox" id="noticesync" checked="checked"/>';
+ } else {
+ $fbml .= '<input name="noticesync" type="checkbox" class="checkbox" id="noticesync">';
+ }
+
+ $fbml .= '<label class="checkbox_label" for="noticesync">Automatically update my Facebook status with my notices.</label>'
+ .'</p>'
+ .'<p>';
+
+ if ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) {
+ $fbml .= '<input name="replysync" type="checkbox" class="checkbox" id="replysync" checked="checked"/>';
+ } else {
+ $fbml .= '<input name="replysync" type="checkbox" class="checkbox" id="replysync"/>';
+ }
+
+ $fbml .= '<label class="checkbox_label" for="replysync">Send &quot;@&quot; replies to Facebook.</label>'
+ .'</p>'
+ .'<p>'
+ .'<input type="submit" id="save" name="save" class="submit" value="Save"/>'
+ .'</p>'
+ .'</form>';
echo $fbml;
$this->show_footer();
-
}
}
diff --git a/_darcs/pristine/actions/twittersettings.php b/_darcs/pristine/actions/twittersettings.php
index 26dede0ac..d66427339 100644
--- a/_darcs/pristine/actions/twittersettings.php
+++ b/_darcs/pristine/actions/twittersettings.php
@@ -251,7 +251,7 @@ class TwittersettingsAction extends SettingsAction
$flink->credentials = $password;
$flink->created = common_sql_now();
- $this->set_flags($flink, $noticesync, $replysync, $friendsync);
+ $flink->set_flags($noticesync, $replysync, $friendsync);
$flink_id = $flink->insert();
@@ -323,7 +323,7 @@ class TwittersettingsAction extends SettingsAction
$screen_name = $fuser->nickname;
$original = clone($flink);
- $this->set_flags($flink, $noticesync, $replysync, $friendsync);
+ $flink->set_flags($noticesync, $replysync, $friendsync);
$result = $flink->update($original);
if ($result === false) {
@@ -363,27 +363,5 @@ class TwittersettingsAction extends SettingsAction
return false;
}
- function set_flags(&$flink, $noticesync, $replysync, $friendsync)
- {
- if ($noticesync) {
- $flink->noticesync |= FOREIGN_NOTICE_SEND;
- } else {
- $flink->noticesync &= ~FOREIGN_NOTICE_SEND;
- }
-
- if ($replysync) {
- $flink->noticesync |= FOREIGN_NOTICE_SEND_REPLY;
- } else {
- $flink->noticesync &= ~FOREIGN_NOTICE_SEND_REPLY;
- }
-
- if ($friendsync) {
- $flink->friendsync |= FOREIGN_FRIEND_RECV;
- } else {
- $flink->friendsync &= ~FOREIGN_FRIEND_RECV;
- }
-
- $flink->profilesync = 0;
- }
} \ No newline at end of file
diff --git a/_darcs/pristine/classes/Foreign_link.php b/_darcs/pristine/classes/Foreign_link.php
index c89124d19..afc0e2180 100644
--- a/_darcs/pristine/classes/Foreign_link.php
+++ b/_darcs/pristine/classes/Foreign_link.php
@@ -57,6 +57,29 @@ class Foreign_link extends Memcached_DataObject
return null;
}
+ function set_flags($noticesync, $replysync, $friendsync)
+ {
+ if ($noticesync) {
+ $this->noticesync |= FOREIGN_NOTICE_SEND;
+ } else {
+ $this->noticesync &= ~FOREIGN_NOTICE_SEND;
+ }
+
+ if ($replysync) {
+ $this->noticesync |= FOREIGN_NOTICE_SEND_REPLY;
+ } else {
+ $this->noticesync &= ~FOREIGN_NOTICE_SEND_REPLY;
+ }
+
+ if ($friendsync) {
+ $this->friendsync |= FOREIGN_FRIEND_RECV;
+ } else {
+ $this->friendsync &= ~FOREIGN_FRIEND_RECV;
+ }
+
+ $this->profilesync = 0;
+ }
+
# Convenience methods
function getForeignUser()
{
diff --git a/_darcs/pristine/lib/facebookaction.php b/_darcs/pristine/lib/facebookaction.php
index ee9f783c4..7fa097587 100644
--- a/_darcs/pristine/lib/facebookaction.php
+++ b/_darcs/pristine/lib/facebookaction.php
@@ -37,47 +37,48 @@ class FacebookAction extends Action
# Need to include inline CSS for styling the Profile box
- $style = '<style>
- #notices {
- clear: both;
- margin: 0 auto;
- padding: 0;
- list-style-type: none;
- width: 600px;
- border-top: 1px solid #dec5b5;
- }
- #notices a:hover {
- text-decoration: underline;
- }
- .notice_single {
- clear: both;
- display: block;
- margin: 0;
- padding: 5px 5px 5px 0;
- min-height: 48px;
- font-family: Georgia, "Times New Roman", Times, serif;
- font-size: 13px;
- line-height: 16px;
- border-bottom: 1px solid #dec5b5;
- background-color:#FCFFF5;
- opacity:1;
- }
- .notice_single:hover {
- background-color: #f7ebcc;
- }
- .notice_single p {
- display: inline;
- margin: 0;
- padding: 0;
- }
- </style>';
-
- $html = $this->render_notice($notice);
-
- $fbml = "<fb:wide>$content $html</fb:wide>";
- $fbml .= "<fb:narrow>$content $html</fb:narrow>";
-
- $fbml_main = "<fb:narrow>$content $html</fb:narrow>";
+ $style = '<style>
+ #notices {
+ clear: both;
+ margin: 0 auto;
+ padding: 0;
+ list-style-type: none;
+ width: 600px;
+ border-top: 1px solid #dec5b5;
+ }
+ #notices a:hover {
+ text-decoration: underline;
+ }
+ .notice_single {
+ clear: both;
+ display: block;
+ margin: 0;
+ padding: 5px 5px 5px 0;
+ min-height: 48px;
+ font-family: Georgia, "Times New Roman", Times, serif;
+ font-size: 13px;
+ line-height: 16px;
+ border-bottom: 1px solid #dec5b5;
+ background-color:#FCFFF5;
+ opacity:1;
+ }
+ .notice_single:hover {
+ background-color: #f7ebcc;
+ }
+ .notice_single p {
+ display: inline;
+ margin: 0;
+ padding: 0;
+ }
+ </style>';
+
+ $html = Facebookaction::Aender_notice($notice);
+
+
+ $fbml = "<fb:wide>$style $html</fb:wide>";
+ $fbml .= "<fb:narrow>$style $html</fb:narrow>";
+
+ $fbml_main = "<fb:narrow>$style $html</fb:narrow>";
$facebook->api_client->profile_setFBML(null, $fbuid, $fbml, null, null, $fbml_main);
}
diff --git a/_darcs/pristine/scripts/update_facebook.php b/_darcs/pristine/scripts/update_facebook.php
index d2440b163..02e47cefe 100644
--- a/_darcs/pristine/scripts/update_facebook.php
+++ b/_darcs/pristine/scripts/update_facebook.php
@@ -52,9 +52,16 @@ while($notice->fetch()) {
$flink = Foreign_link::getByUserID($notice->profile_id, 2);
$fbuid = $flink->foreign_id;
+ $content = $notice->content;
- update_status($fbuid, $notice);
+ if (($flink->noticesync & FOREIGN_NOTICE_SEND) == FOREIGN_NOTICE_SEND) {
+ // If it's not a reply, or if the user WANTS to send replies...
+ if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $content) ||
+ (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY)) {
+ update_status($fbuid, $content);
+ }
+ }
}
update_last_updated($current_time);
@@ -63,18 +70,14 @@ exit(0);
-function update_status($fbuid, $notice) {
+function update_status($fbuid, $content) {
global $facebook;
try {
-
- $result = $facebook->api_client->users_setStatus($notice->content, $fbuid, false, true);
-
+ $result = $facebook->api_client->users_setStatus($content, $fbuid, false, true);
} catch(FacebookRestClientException $e){
-
print_r($e);
}
-
}
function get_last_updated(){
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-06 11:00:55 +0000