diff --git a/actions/facebookhome.php b/actions/facebookhome.php index 6206fb6c27..4e67494f04 100644 --- a/actions/facebookhome.php +++ b/actions/facebookhome.php @@ -28,75 +28,73 @@ class FacebookhomeAction extends FacebookAction { parent::handle($args); - $this->login(); - } - - function login() - { - - $user = null; - $facebook = get_facebook(); $fbuid = $facebook->require_login(); - # check to see whether there's already a Facebook link for this user - $flink = Foreign_link::getByForeignID($fbuid, 2); // 2 == Facebook + // Check to see whether there's already a Facebook link for this user + $flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE); if ($flink) { - - $user = $flink->getUser(); - $this->show_home($facebook, $fbuid, $user); - + $this->showHome($flink, null); } else { - - # Make the user put in her Laconica creds - $nickname = common_canonical_nickname($this->trimmed('nickname')); - $password = $this->arg('password'); - - if ($nickname) { - - if (common_check_user($nickname, $password)) { - - - $user = User::staticGet('nickname', $nickname); - - if (!$user) { - echo ''; - $this->show_login_form(); - } - - $flink = DB_DataObject::factory('foreign_link'); - $flink->user_id = $user->id; - $flink->foreign_id = $fbuid; - $flink->service = 2; # Facebook - $flink->created = common_sql_now(); - $flink->set_flags(true, false, false); - - $flink_id = $flink->insert(); - - if ($flink_id) { - echo ''; - } - - $this->show_home($facebook, $fbuid, $user); - - return; - } else { - echo ''; - } - } - - $this->show_login_form(); + $this->login($fbuid); } } - function show_home($facebook, $fbuid, $user) + function login($fbuid) { + $nickname = common_canonical_nickname($this->trimmed('nickname')); + $password = $this->arg('password'); + $msg = null; + + if ($nickname) { + + if (common_check_user($nickname, $password)) { + + $user = User::staticGet('nickname', $nickname); + + if (!$user) { + $this->showLoginForm(_("Server error - couldn't get user!")); + } + + $flink = DB_DataObject::factory('foreign_link'); + $flink->user_id = $user->id; + $flink->foreign_id = $fbuid; + $flink->service = FACEBOOK_SERVICE; + $flink->created = common_sql_now(); + $flink->set_flags(true, false, false); + + $flink_id = $flink->insert(); + + // XXX: Do some error handling here + + $this->showHome($flink, _('You can now use Identi.ca from Facebook!')); + + } else { + $msg = _('Incorrect username or password.'); + } + } + + $this->showLoginForm($msg); + } + + function showHome($flink, $msg) + { $this->show_header('Home'); + if ($msg) { + common_element('fb:success', array('message' => $msg)); + } + + $facebook = get_facebook(); + $fbuid = $facebook->require_login(); + + $user = $flink->getUser(); + echo $this->show_notices($user); + $this->update_profile_box($facebook, $fbuid, $user); $this->show_footer(); @@ -112,25 +110,16 @@ class FacebookhomeAction extends FacebookAction $notice = $user->noticesWithFriends(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - echo '
    '; + $cnt = $this->show_notice_list($notice); - $cnt = 0; - - while ($notice->fetch() && $cnt <= NOTICES_PER_PAGE) { - $cnt++; - - if ($cnt > NOTICES_PER_PAGE) { - break; - } - - echo $this->render_notice($notice); - } - - echo '
      '; - - $this->pagination($page > 1, $cnt > NOTICES_PER_PAGE, - $page, 'index.php', array('nickname' => $user->nickname)); + common_pagination($page > 1, $cnt > NOTICES_PER_PAGE, + $page, 'all', array('nickname' => $user->nickname)); + } + function show_notice_list($notice) + { + $nl = new NoticeList($notice); + return $nl->show(); } } diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php index 0b966cf261..b3653c78b3 100644 --- a/actions/facebookinvite.php +++ b/actions/facebookinvite.php @@ -40,17 +40,20 @@ class FacebookinviteAction extends FacebookAction $this->show_header('Invite'); - $fbml = '') . '">' - .'' - .''; + $content = 'You have been invited to Identi.ca! ' . + htmlentities(''); - echo $fbml; + common_element_start('fb:request-form', array('action' => 'invite.php', + 'method' => 'POST', + 'invite' => 'true', + 'type' => 'Identi.ca', + 'content' => $content)); + + $actiontext = 'Invite your friends to use Identi.ca.'; + common_element_start('fb:multi-friend-selector', array('showborder' => 'false', + 'actiontext' => $actiontext)); + + common_element_end('fb:request-form'); $this->show_footer(); diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php index d28b1aa5ca..88364c7979 100644 --- a/actions/facebooksettings.php +++ b/actions/facebooksettings.php @@ -35,7 +35,6 @@ class FacebooksettingsAction extends FacebookAction } } - function save_settings() { $noticesync = $this->arg('noticesync'); @@ -44,69 +43,60 @@ class FacebooksettingsAction extends FacebookAction $facebook = get_facebook(); $fbuid = $facebook->require_login(); - $flink = Foreign_link::getByForeignID($fbuid, 2); // 2 == Facebook + $flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE); $original = clone($flink); $flink->set_flags($noticesync, $replysync, false); $result = $flink->update($original); if ($result) { - echo ''; + $this->show_form('Sync preferences saved.', true); + } else { + $this->show_form('There was a problem saving your sync preferences!'); } - - $this->show_form(); - } - function show_form() { + function show_form($msg = null, $success = false) { $facebook = get_facebook(); $fbuid = $facebook->require_login(); - $flink = Foreign_link::getByForeignID($fbuid, 2); // 2 == Facebook + $flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE); - $this->show_header('Settings'); + $this->show_header('Settings', $msg, $success); - $fbml = '' - .'

      Add an Identi.ca box to my profile

      ' - .'

      ' - .'
      '; + common_element_start('fb:if-section-not-added', array('section' => 'profile')); + common_element('h2', null, _('Add an Identi.ca box to my profile')); + common_element_start('p'); + common_element('fb:add-section-button', array('section' => 'profile')); + common_element_end('p'); + common_element_end('fb:if-section-not-added'); - $fbml .= '

      Allow Identi.ca to update my Facebook status

      '; + common_element_start('p'); + common_element_start('fb:prompt-permission', array('perms' => 'status_update')); + common_element('h2', null, _('Allow Identi.ca to update my Facebook status')); + common_element_end('fb:prompt-permission'); + common_element_end('p'); if ($facebook->api_client->users_hasAppPermission('status_update')) { - $fbml .= '
      ' - .'

      Sync preferences

      ' - .'

      '; + common_element_start('form', array('method' => 'post', + 'id' => 'facebook_settings')); + + common_element('h2', null, _('Sync preferences')); + + common_checkbox('noticesync', _('Automatically update my Facebook status with my notices.'), + ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND) : true); + + common_checkbox('replysync', _('Send local "@" replies to Facebook.'), + ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true); + + common_submit('save', _('Save')); + + common_element_end('form'); - if ($flink->noticesync & FOREIGN_NOTICE_SEND) { - $fbml .= ''; - } else { - $fbml .= ''; } - $fbml .= '' - .'

      ' - .'

      '; - - if ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) { - $fbml .= ''; - } else { - $fbml .= ''; - } - - $fbml .= '' - .'

      ' - .'

      ' - .'' - .'

      ' - .'
      '; - - } - - echo $fbml; - $this->show_footer(); } diff --git a/lib/facebookaction.php b/lib/facebookaction.php index 9230bad593..04bbd67bae 100644 --- a/lib/facebookaction.php +++ b/lib/facebookaction.php @@ -21,7 +21,6 @@ if (!defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/facebookutil.php'); - class FacebookAction extends Action { @@ -74,7 +73,7 @@ class FacebookAction extends Action $html = Facebookaction::render_notice($notice); - + $fbml = "$style $html"; $fbml .= "$style $html"; @@ -85,205 +84,96 @@ class FacebookAction extends Action # Display methods - function show_header($selected ='Home') + function show_header($selected = 'Home', $msg = null, $success = false) { + start_fbml(); + # Add a timestamp to the CSS file so Facebook cache wont ignore our changes $ts = filemtime(theme_file('facebookapp.css')); $cssurl = theme_path('facebookapp.css') . "?ts=$ts"; - $header = ''; - # $header .=''; - $header .= ''; + common_element('link', array('rel' => 'stylesheet', + 'type' => 'text/css', + 'href' => $cssurl)); - $header .= - '' - .'' - .'' - .'' - .''; - $header .= '
      '; + common_element('fb:dashboard'); - echo $header; + common_element_start('fb:tabs'); + common_element('fb:tab-item', array('title' => 'Home', + 'href' => 'index.php', + 'selected' => ($selected == 'Home'))); + common_element('fb:tab-item', array('title' => 'Invite Friends', + 'href' => 'invite.php', + 'selected' => ($selected == 'Invite'))); + common_element('fb:tab-item', array('title' => 'Settings', + 'href' => 'settings.php', + 'selected' => ($selected == 'Settings'))); + common_element_end('fb:tabs'); + + + if ($msg) { + if ($success) { + common_element('fb:success', array('message' => $msg)); + } else { + // XXX do an error message here + } + } + + common_element_start('div', 'main_body'); } function show_footer() { - $footer = '
      '; - echo $footer; + common_element_end('div'); + common_end_xml(); } - function show_login_form() + function showLoginForm($msg = null) { + start_fbml(); - $loginform = - '

      To add the Identi.ca application, you need to log into your Identi.ca account.

      ' - .'' - .' ' - .'' - .'

      Login

      ' - .'
      ' - .'

      Login with your username and password. Don\'t have a username yet?' - .' Register a new account.' - .'

      ' - .'
      ' - .'
      ' - .'
      ' - .'

      ' - .' ' - .' ' - .'

      ' - .'

      ' - .' ' - .' ' - .'

      ' - .'

      ' - .' ' - .'

      ' - .'
      ' - .'

      ' - .' Lost or forgotten password?' - .'

      ' - .' 'http://identi.ca')); + common_element('img', array('src' => 'http://theme.identi.ca/identica/logo.png', + 'alt' => 'Identi.ca', + 'id' => 'logo')); + common_element_end('a'); + + if ($msg) { + common_element('fb:error', array('message' => $msg)); + } + + common_element("h2", null, + _('To add the Identi.ca application, you need to log into your Identi.ca account.')); + + + common_element_start('div', array('class' => 'instructions')); + common_element_start('p'); + common_raw('Login with your username and password. Don\'t have a username yet?' + .' Register a new account.'); + common_element_end('p'); + common_element_end('div'); + + common_element_start('div', array('id' => 'content')); + common_element_start('form', array('method' => 'post', + 'id' => 'login', + 'action' => 'index.php')); + common_input('nickname', _('Nickname')); + common_password('password', _('Password')); + + common_submit('submit', _('Login')); + common_element_end('form'); + + common_element_start('p'); + common_element('a', array('href' => common_local_url('recoverpassword')), + _('Lost or forgotten password?')); + common_element_end('p'); + common_element_end('div'); + + common_end_xml(); - echo $loginform; } - function render_notice($notice) - { - - global $config; - - $profile = $notice->getProfile(); - $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); - - $noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); - - # XXX: we need to figure this out better. Is this right? - if (strcmp($notice->uri, $noticeurl) != 0 && preg_match('/^http/', $notice->uri)) { - $noticeurl = $notice->uri; - } - - $html = - '
    • ' - .'' - .'';
-
-        if ($profile->fullname) {
-            $html .= $profile->fullname;
-        } else {
-            $html .= $profile->nickname;
-        }
-
-        $html .=
-        '' - .'' . $profile->nickname . '' - .'

      ' . $notice->rendered . '

      ' - .'

      ' - .''; - - if ($notice->source) { - $html .= _(' from '); - $html .= $this->source_link($notice->source); - } - - if ($notice->reply_to) { - $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to)); - $html .= - ' (' . _('in reply to...') . ')'; - } - - $html .= '

    • '; - - return $html; - } - - function source_link($source) - { - $source_name = _($source); - - $html = ''; - - switch ($source) { - case 'web': - case 'xmpp': - case 'mail': - case 'omb': - case 'api': - $html .= $source_name; - break; - default: - $ns = Notice_source::staticGet($source); - if ($ns) { - $html .= '' . $ns->name . ''; - } else { - $html .= $source_name; - } - break; - } - - $html .= ''; - - return $html; - } - - function pagination($have_before, $have_after, $page, $fbaction, $args=null) - { - - $html = ''; - - if ($have_before || $have_after) { - $html = '