X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ffacebookhome.php;h=f72f08a3454b9f04ce92d3f13c62cf9800fca309;hb=125f05563b5c7bd5b74b1afbea3c0b663795bff5;hp=dcdb102e65d93bbd1b36234c5c2a4d0c34e27b5f;hpb=b264c03d32d04d7a33d28a5830848660f4484943;p=quix0rs-gnu-social.git

diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index dcdb102e65..f72f08a345 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -28,77 +28,87 @@ class FacebookhomeAction extends FacebookAction
     {
         parent::handle($args);
 
-        $this->login();
-    }
-
-    function login()
-    {
-
-        $user = null;
-
-        $facebook = $this->get_facebook();
+        $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 {
+            $this->login($fbuid);
+        }
 
-            # Make the user put in her Laconica creds
-            $nickname = common_canonical_nickname($this->trimmed('nickname'));
-            $password = $this->arg('password');
+    }
 
-            if ($nickname) {
+    function login($fbuid)
+    {
+        $nickname = common_canonical_nickname($this->trimmed('nickname'));
+        $password = $this->arg('password');
 
-                if (common_check_user($nickname, $password)) {
+        $msg = null;
 
+        if ($nickname) {
 
-                    $user = User::staticGet('nickname', $nickname);
+            if (common_check_user($nickname, $password)) {
 
-                    if (!$user) {
-                        echo '<fb:error message="Coudln\'t get user!" />';
-                        $this->show_login_form();
-                    }
+                $user = User::staticGet('nickname', $nickname);
 
-                    $flink = DB_DataObject::factory('foreign_link');
-                    $flink->user_id = $user->id;
-                    $flink->foreign_id = $fbuid;
-                    $flink->service = 2; # Facebook
-                    $flink->created = common_sql_now();
+                if (!$user) {
+                    $this->showLoginForm(_("Server error - couldn't get user!"));
+                }
 
-                    # $this->set_flags($flink, $noticesync, $replysync, $friendsync);
+                $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();
+                $flink_id = $flink->insert();
 
-                    if ($flink_id) {
-                        echo '<fb:success message="You can now use the Identi.ca from Facebook!" />';
-                    }
+                // XXX: Do some error handling here
 
-                    $this->show_home($facebook, $fbuid, $user);
+                $this->setDefaults();
 
-                    return;
-                } else {
-                    echo '<fb:error message="Incorrect username or password." />';
-                }
-            }
+                $this->showHome($flink, _('You can now use Identi.ca from Facebook!'));
 
-            $this->show_login_form();
+            } else {
+                $msg = _('Incorrect username or password.');
+            }
         }
 
+        $this->showLoginForm($msg);
+    }
+
+    function setDefaults()
+    {
+        $facebook = get_facebook();
+
+        // A default prefix string for notices
+        $facebook->api_client->data_setUserPreference(1, 'dented: ');
     }
 
-    function show_home($facebook, $fbuid, $user)
+    function showHome($flink, $msg)
     {
 
+        $facebook = get_facebook();
+        $fbuid = $facebook->require_login();
+
+        $user = $flink->getUser();
+
+        $notice = $user->getCurrentNotice();
+        update_profile_box($facebook, $fbuid, $user, $notice);
+
+
         $this->show_header('Home');
 
+        if ($msg) {
+            common_element('fb:success', array('message' => $msg));
+        }
+
         echo $this->show_notices($user);
-        $this->update_profile_box($facebook, $fbuid, $user);
 
         $this->show_footer();
     }
@@ -113,25 +123,16 @@ class FacebookhomeAction extends FacebookAction
 
         $notice = $user->noticesWithFriends(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
 
-        echo '<ul id="notices">';
-
-        $cnt = 0;
+        $cnt = $this->show_notice_list($notice);
 
-        while ($notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
-            $cnt++;
-
-            if ($cnt > NOTICES_PER_PAGE) {
-                break;
-            }
-
-            echo $this->render_notice($notice);
-        }
-
-        echo '<ul>';
-
-        $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();
     }
 
 }