Changeset 20337

Timestamp:

10/01/08 07:40:30 (3 months ago)

Author:

anatoo

Message:

足りてなかったアクション追加など

Location:

events/phpframework/plain_php/trunk/action

Files:

• AcountCreateAction.php (modified) (3 diffs)
• AcountSettingsAction.php (modified) (1 diff)
• FollowAction.php (added)
• FriendRequestAction.php (deleted)
• FriendsAction.php (modified) (1 diff)
• PublicTimelineRssAction.php (added)
• RemoveAction.php (added)
• RequestHandleAction.php (added)
• StatusUpdateAction.php (modified) (2 diffs)
• StatusUpdateAjaxAction.php (added)
• StatusesAction.php (modified) (1 diff)
• UserAction.php (modified) (1 diff)
• UserFriendsAction.php (modified) (1 diff)
• UserRssAction.php (added)

events/phpframework/plain_php/trunk/action/AcountCreateAction.php

@@ -19 +19 @@
         }
         
-        if (empty($email)) {
-            $t->addMessage('メールアドレスが空です。');
+        if (strlen($user_name) < 5) {
+            $t->addMessage('ユーザー名は最低5文字以上入力してください。');        
             return $t;
         }
-        
-        if (empty($password)) {
-            $t->addMessage('パスワードが空です。');        
-            return $t;
-        }
-        
-        if (strlen($password) < 6) {
-            $t->addMessage('パスワードは最低六文字以上入力してください。');        
-            return $t;
-        }
-        
         
         if (in_array($user_name, 
@@ -53 +42 @@
         }
         
+        if (empty($email)) {
+            $t->addMessage('メールアドレスが空です。');
+            return $t;
+        }
+        
         if (!preg_match('/^([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})$/i', $email)) {
             $t->addMessage('不正なメールアドレスです。');
@@ -58 +52 @@
         }
         
+        if (empty($password)) {
+            $t->addMessage('パスワードが空です。');        
+            return $t;
+        }
+        
+        if (strlen($password) < 6) {
+            $t->addMessage('パスワードは最低6文字以上入力してください。');        
+            return $t;
+        }
+        
+
+        
+        
         $token = md5($user_name . (string)time());
         $this->getAcountService()->insert($user_name, $email, $password, $token);
+        
+        $activate_url = $this->baseUrl . '/activate/' . $token;
+        send_mail($email, 'Phwittrへようこそ！', 
+            'ようこそ！ ' . $user_name . '
+ 
+下のリンクで ' . $user_name . 'のアカウントを有効にしてください。
+  ' . $activate_url . '
+
+それでは
+Phwittr', 
+            $this->getConfig()->mail_from);
         
         $t->setTemplateName('acount_create');

events/phpframework/plain_php/trunk/action/AcountSettingsAction.php

@@ -44 +44 @@
         $as = $this->getAcountService();
         $as->updateEmail($session->user_id, $email);
-        if ($t->user['private_flag'] !== $private_flag) 
-            $private_flag ? $as->setPrivate($session->user_id) : $as->setPublic($session->user_id);
-        
+        if ($t->user['private_flag'] !== $private_flag) {
+            if (!$private_flag) {
+                $result = $as->setPublic($session->user_id);
+            } else {
+                $result = $as->setPrivate($session->user_id);
+            }
+        }
+        $t->user = $this->getAcountService()->fetchByID($session->user_id);
+            
         $t->addMessage('設定を保存しました');
         return $t;

events/phpframework/plain_php/trunk/action/FriendsAction.php

@@ -13 +13 @@
         $r = new TemplateResponse('followings');
         $r->user_name = $session->user_name;
+        $r->session = $session;
         $r->page = intval($this->req->GET('page', 0));
         if ($r->page < 0) $r->page = 0;

events/phpframework/plain_php/trunk/action/StatusUpdateAction.php

@@ -13 +13 @@
         $url = $this->req->HTTP_REFERER;
         $comment = $this->req->POST('comment', '');
-        // @todo このへん上位モデルを作っておくべきか
+
         if (preg_match('#^@([[:word:]]{1,30})#', $comment, $matches)) { 
             $reply_user = $this->getAcountService()->fetchByUserName($matches[1]);
@@ -26 +26 @@
             $this->getStatusService()->reply($this->getSession()->user_id, $comment, $reply_user_id);
             
-        throw new RedirectResponse($url);
+        throw new RedirectResponse($this->baseUrl . '/home');
     }
 }

events/phpframework/plain_php/trunk/action/StatusesAction.php

@@ -8 +8 @@
         
         $st = $this->getStatusService()->fetch($this->args[0]) or raise(new NotFoundResponse);
-        $st['title_comment'] = h($st['comment']);
-        $st['comment'] = preg_replace('#@([[:word:]]{1,30})#', 
-                                      '@<a href="' . $this->baseUrl . '/$1">$1</a>', 
-                                      h($st['comment']));
         $t->status = $st;
         $t->session = $this->getSession();

events/phpframework/plain_php/trunk/action/UserAction.php

@@ -35 +35 @@
         $r->follower_count = $fs->fetchFollowerCount($user['id']);
         
+        if ($r->is_logined) {
+            $r->is_self = $is_self = $r->session->user_id === $user['id'];
+            $r->is_following = $is_self || $fs->isFollowing($r->session->user_id, $user['id']);
+            $r->is_requesting = !$is_self && $fs->isRequesting($r->session->user_id, $user['id']);
+            $r->is_requesting_self = !$is_self && $fs->isRequesting($user['id'], $r->session->user_id);
+        }
+        
         return $r;
     }

events/phpframework/plain_php/trunk/action/UserFriendsAction.php

@@ -14 +14 @@
         $r = new TemplateResponse('user_followings');
         $r->user = $user;
+        $r->session = $this->getSession();
         $r->user_name = $user['user_name'];
         $r->page = intval($this->req->GET('page', 0));