Changeset 14534

Timestamp:

06/24/08 22:18:30 (5 years ago)

Author:

riaf

Message:

Request 実装できてないのに、 protected を実装した。早まった。反省はしていない。

Location:

events/phpframework/rhaco/trunk

Files:

• index.php (modified) (3 diffs)
• library/Phwittr.php (modified) (2 diffs)
• library/PhwittrUser.php (modified) (1 diff)
• resources/templates/default/account/password.html (added)
• resources/templates/default/account/settings.html (added)
• resources/templates/default/layout.html (modified) (1 diff)
• resources/templates/default/protected.html (added)

events/phpframework/rhaco/trunk/index.php

@@ -18 +18 @@
 $parser = Urls::parser(
     array(
+        // Index Page
         '^$' => array(
             'class' => 'Phwittr',
             'method' => 'index',
-        ),
-        '^home$' => array(
-            'class' => 'Phwittr',
-            'method' => 'home',
-        ),
-        '^status\/update$' => array(
-            'class' => 'PhwittrStatus',
-            'method' => 'status_update',
-        ),
-        '^account\/archive$' => array(
-            'class' => 'Phwittr',
-            'method' => 'archive',
         ),
         '^public_timeline$' => array(
@@ -42 +31 @@
             'method' => 'replies',
         ),
+
+        // 更新
+        '^status\/update$' => array(
+            'class' => 'PhwittrStatus',
+            'method' => 'status_update',
+        ),
+
+        // Home Page (Logged in)
+        '^home$' => array(
+            'class' => 'Phwittr',
+            'method' => 'home',
+        ),
+        '^account\/archive$' => array(
+            'class' => 'Phwittr',
+            'method' => 'archive',
+        ),
         '^statuses\/(\d+)$' => array(
             'class' => 'PhwittrStatus',
             'method' => 'status_detail',
+        ),
+
+        // Follow
+        '^friendships\/create\/(\d+)$' => array(
+            'class' => 'PhwittrUser',
+            'method' => 'follow',
+        ),
+        '^friendships\/destroy\/(\d+)$' => array(
+            'class' => 'PhwittrUser',
+            'method' => 'disFollow',
+        ),
+
+        // ログイン／サインアップ
+        '^login$' => array(
+            'class' => 'PhwittrUser',
+            'method' => 'login',
+        ),
+        '^logout$' => array(
+            'class' => 'PhwittrUser',
+            'method' => 'logout',
         ),
         '^signup$' => array(
@@ -54 +79 @@
             'method' => 'signup',
         ),
-         '^login$' => array(
+        '^account\/settings$' => array(
             'class' => 'PhwittrUser',
-            'method' => 'login',
+            'method' => 'settings',
         ),
-        '^logout$' => array(
+        '^account\/password$' => array(
             'class' => 'PhwittrUser',
-            'method' => 'logout',
+            'method' => 'passwordChange',
         ),
+        // '^account\/picture$' => array(
+        //     'class' => 'PhwittrUser',
+        //     'method' => 'picture',
+        // ),
         '^account\/confirm\/(.*?)$' => array(
             'class' => 'PhwittrUser',
             'method' => 'confirm',
         ),
-        '^friendships\/create\/(\d+)$' => array(
-            'class' => 'PhwittrUser',
-            'method' => 'follow',
-        ),
-        '^friendships\/destroy\/(\d+)$' => array(
-            'class' => 'PhwittrUser',
-            'method' => 'disFollow',
-        ),
+
         // 最後じゃないとダメよ
         '^([A-Za-z0-9_-]+)$' => array(

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

@@ -46 +46 @@
         }
 
-        $parser = $this->read(
-            new Status(),
-            new Criteria(
+        // protected な人とか居るよねえ。こんな雰囲気で良いのかなあ
+        $login = $this->getLoginSession();
+        if($this->isLogin() && $user->getId() == $login->getId()){
+            $criteria = new C(
                 Q::eq(Status::columnUserId(), $user->getId()),
                 Q::orc(
@@ -58 +59 @@
                 ),
                 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);

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

@@ -53 +53 @@
         return $parser;
     }
-    
+
+    function settings(){
+        $user = $this->loginRequired();
+        $this->clearVariable('id', 'password', 'createdAt', 'updatedAt', 'deleteFlag', 'statusCount', 'followingCount', 'followerCount');
+        $user = $this->dbUtil->get(new User($user->getId()));
+        $this->setVariable('privateFlag', ($this->isVariable('privateFlag')) ? 1 : 0);
+        $parser = $this->update(Rhaco::url('account/settings'), $this->toObject($user));
+        $parser->setTemplate(Rhaco::constant('THEME') . '/account/settings.html');
+        return $parser;
+    }
+
+    function passwordChange(){
+        $user = $this->loginRequired();
+        $user = $this->dbUtil->get(new User($user->getId()));
+        if(
+            $this->isPost()
+            && sha1($this->getVariable('oldPassword')) == $user->getPassword()
+            && $this->getVariable('password') == $this->getVariable('passwordConf')
+        ){
+            $user->setPassword(sha1($this->getVariable('password')));
+            if($user->save($this->dbUtil)){
+                Header::redirect(Rhaco::url('account/password'));
+            }
+        }
+        return new HtmlParser(Rhaco::constant('THEME') .'/account/password.html');
+    }
+
     function follow($followId){
         $user = $this->loginRequired();

events/phpframework/rhaco/trunk/resources/templates/default/layout.html

@@ -39 +39 @@
                 <ul>
                         <li><a href="{$rhaco.url()}">home</a></li>
-                        <li><a href="http://phwittr.riaf.jp.s.hatena.ne.jp/">Favorites</a></li>
                         <li><a href="{$rhaco.url('public_timeline')}">everyone</a></li>
                 <rt:if param="{$isLogin}">
                         <li><a href="{$rhaco.url('replies')}">replies</a></li>
                         <li><a href="{$rhaco.url('account/archive')}">archive</a></li>
+                        <li><a href="{$rhaco.url('account/settings')}">settings</a></li>
                         <li><a href="{$rhaco.url('logout')}">logout</a></li>
                 <rt:else />