Changeset 20593 for events/phpframework/rhaco/trunk/library/Phwittr.php

Timestamp:

10/03/08 12:53:45 (3 months ago)

Author:

riaf

Message:

どうやらローカルではそれなりに更新してあったらしい。どこまでやってるかわからないけどとりあえずコミットしておく。あとでちゃんと見ますごめんなさいごめんなさい。

Files:

• events/phpframework/rhaco/trunk/library/Phwittr.php (modified) (4 diffs)

events/phpframework/rhaco/trunk/library/Phwittr.php

@@ -50 +50 @@
         $login = $this->getLoginSession();
         if($this->isLogin() && $user->getId() == $login->getId()){
-            $criteria = new C(
+            $selectC = new Criteria(Q::eq(Follow::columnUserId(), $user->getId()));
+        } else {
+            $selectC = new Criteria(Q::eq(Follow::columnUserId(), $user->getId()), Q::eq(User::columnPrivateFlag(), false));
+        }
+
+        $parser = $this->read(
+            new Status(),
+            new C(
                 Q::eq(Status::columnUserId(), $user->getId()),
                 Q::orc(
@@ -56 +63 @@
                         Status::columnUserId(),
                         Follow::columnFollowId(),
-                        new Criteria(Q::eq(Follow::columnUserId(), $user->getId()))
+                        $selectC
                     )
                 ),
                 Q::orderDesc(Status::columnCreatedAt())
-            );
-        } else {
-            $criteria = new C(
-                Q::eq(Status::columnUserId(), $user->getId()),
-                Q::orc(
-                    Q::selectIn(
-                        Status::columnUserId(),
-                        Follow::columnFollowId(),
-                        new Criteria(Q::eq(Follow::columnUserId(), $user->getId()), Q::eq(User::columnPrivateFlag(), false))
-                    )
-                ),
-                Q::orderDesc(Status::columnCreatedAt())
-            );
-        }
-
-        $parser = $this->read(
-            new Status(),
-            $criteria
+            )
         );
         $parser->setVariable('user', $user);
@@ -134 +124 @@
         Header::inline(Rhaco::constant(VAR_UPLOAD_PATH).'/default.gif', 'default', 'image/gif');
         Rhaco::end();
-    }
-    
-    function _getLoginedParser(){
-        if(RequestLogin::isLogin()){
-            $user = RequestLogin::getLoginSession();
-            $parser = new HtmlParser();
-            $parser->setVariable('user', $user);
-            $parser->setVariable('following', $this->_getFollowing($user));
-            return $parser;
-        }
-        return false;
     }
 
@@ -206 +185 @@
     
     function loginRequired(){
-        if(RequestLogin::silent(new RequestLoginConditionDb($this->dbUtil, new User()))){
+        if(RequestLogin::isLoginSession()) return RequestLogin::getLoginSession();
+        if(RequestLogin::isLoginCookie() && RequestLogin::silent(new RequestLoginConditionDb($this->dbUtil, new User()))){
             return RequestLogin::getLoginSession();
         }
+        RequestLogin::loginRequired(new RequestLoginConditionDb($this->dbUtil, new User()));
         Header::redirect(Rhaco::url('login'));
         Rhaco::end();