Changeset 20373 for events

Timestamp:

10/01/08 17:35:19 (2 months ago)

Author:

kenji

Message:

Refactoring Follow/Remove

Location:

events/phpframework/codeigniter/trunk/system/application

Files:

• controllers/friendships.php (modified) (9 diffs)
• controllers/status.php (modified) (2 diffs)
• controllers/user.php (modified) (2 diffs)
• views/user/main.php (modified) (2 diffs)
• views/user/main_friends.php (modified) (1 diff)

events/phpframework/codeigniter/trunk/system/application/controllers/friendships.php

@@ -14 +14 @@
         }
 
+        // Ajax「フォローする」の受信
         function create()
         {
+                $this->session->keep_flashdata('ticket');
+                header('Content-Type: application/json; charset=UTF-8');
+
                 // CSRF チェック
-                $ticket = $this->session->userdata('ticket');
+                $ticket = $this->session->flashdata('ticket');
                 if ( ! $this->input->post('ticket') 
                         || $this->input->post('ticket') !== $ticket)
                 {
                         log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted but Wrong Ticket');
+                        echo json_encode(array('status' => 'ng', 'html' => 'チケットが異なります'));
                         exit;
                 }
@@ -29 +34 @@
                 {
                         log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted but Not Logged in');
+                        echo json_encode(array('status' => 'ng', 'html' => 'ログインしていません'));
                         exit;
                 }
@@ -39 +45 @@
                 {
                         log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted but follow_id = 0');
+                        echo json_encode(array('status' => 'ng', 'html' => 'ユーザIDが不正です'));
                         exit;
                 }
@@ -44 +51 @@
                 {
                         log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted but follow_id = user_id');
+                        echo json_encode(array('status' => 'ng', 'html' => 'ユーザIDが不正です'));
                         exit;
                 }
@@ -51 +59 @@
                 $this->Follower_model->create($user_id, $follow_id);
 
-                header('Content-Type: text/html; charset=UTF-8');
-                echo '<h1 id="msg">あなたはフォローを開始しました。</h1>';
+                $html = '<h1 id="msg">あなたはフォローを開始しました。</h1>';
+                echo json_encode(array('status' => 'ok', 'html' => $html));
         }
 
+        // Ajax「フォロー解除する」の受信
         function destroy()
         {
+                $this->session->keep_flashdata('ticket');
+                header('Content-Type: application/json; charset=UTF-8');
+
                 // CSRF チェック
-                $ticket = $this->session->userdata('ticket');
+                $ticket = $this->session->flashdata('ticket');
                 if ( ! $this->input->post('ticket') 
                         || $this->input->post('ticket') !== $ticket)
                 {
                         log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted but Wrong Ticket');
+                        echo json_encode(array('status' => 'ng', 'html' => 'チケットが異なります'));
                         exit;
                 }
@@ -70 +83 @@
                 {
                         log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted but Not Logged in');
+                        echo json_encode(array('status' => 'ng', 'html' => 'ログインしていません'));
                         exit;
                 }
@@ -80 +94 @@
                 {
                         log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted but follow_id = 0');
+                        echo json_encode(array('status' => 'ng', 'html' => 'ユーザIDが不正です'));
                         exit;
                 }
@@ -85 +100 @@
                 {
                         log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted but follow_id = user_id');
+                        echo json_encode(array('status' => 'ng', 'html' => 'ユーザIDが不正です'));
                         exit;
                 }
@@ -92 +108 @@
                 $this->Follower_model->destroy($user_id, $follow_id);
 
-                header('Content-Type: text/html; charset=UTF-8');
-                echo '<h1 id="msg">あなたはフォローを解除しました。</h1>';
-        }
-
-        function destroy2()
-        {
-                // CSRF チェック
-                $ticket = $this->session->userdata('ticket');
-                if ( ! $this->input->post('ticket') 
-                        || $this->input->post('ticket') !== $ticket)
-                {
-                        log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted but Wrong Ticket');
-                        exit;
-                }
-
-                // ログインチェック
-                if ( ! $this->redux_auth->logged_in())
-                {
-                        log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted but Not Logged in');
-                        exit;
-                }
-
-                $user_id   = intval($this->session->userdata('id'));
-                $follow_id = intval($this->input->post('id'));
-
-                // バリデーション
-                if ($follow_id == 0)
-                {
-                        log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted but follow_id = 0');
-                        exit;
-                }
-                if ($user_id == $follow_id)
-                {
-                        log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted but follow_id = user_id');
-                        exit;
-                }
-
-                $this->load->model('Follower_model', '', TRUE);
-                log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted Follow: ' . $user_id . ' > ' . $follow_id);
-                $this->Follower_model->destroy($user_id, $follow_id);
-
-                header('Content-Type: text/html; charset=UTF-8');
-                echo '#id' . $follow_id;
+                $html = '<h1 id="msg">あなたはフォローを解除しました。</h1>';
+                echo json_encode(array('status' => 'ok', 'html' => $html, 'id' => '#id' . $follow_id));
         }
         

events/phpframework/codeigniter/trunk/system/application/controllers/status.php

@@ -14 +14 @@
         }
 
+        // Ajax つぶやき投稿の受信
         function update()
         {
@@ -21 +22 @@
                 // CSRF チェック
                 $ticket = $this->session->flashdata('ticket');
-
                 if ( ! $this->input->post('ticket') 
                         || $this->input->post('ticket') !== $ticket)

events/phpframework/codeigniter/trunk/system/application/controllers/user.php

@@ -56 +56 @@
                         // CSRF 対策のワンタイムチケット
                         $data->ticket = md5(uniqid(mt_rand(), TRUE));
-                        $this->session->set_userdata('ticket', $data->ticket);
+                        $this->session->set_flashdata('ticket', $data->ticket);
 
                         $this->load->model('User_model');
@@ -137 +137 @@
                                 // CSRF 対策のワンタイムチケット
                                 $data->ticket = md5(uniqid(mt_rand(), TRUE));
-                                $this->session->set_userdata('ticket', $data->ticket);
+                                $this->session->set_flashdata('ticket', $data->ticket);
         
                                 $this->load->model('Status_model');

events/phpframework/codeigniter/trunk/system/application/views/user/main.php

@@ -3 +3 @@
         $(function(){
                 $('#follow_button').click(function(){
-                        $.post('<?=site_url('friendships/create')?>', {id: $('#follow_id').val(), ticket: $('#ticket').val()}, followMsg, 'html');
+                        $.post('<?=site_url('friendships/create')?>', {id: $('#follow_id').val(), ticket: $('#ticket').val()}, followMsg, 'json');
                         return false;
                 });
         });
     function followMsg(data){
-                        $('div[class="main"]').prepend(data);
+                if (data.status == 'ok') {
+                        $('div[class="main"]').prepend(data.html);
                         $('#follow_button').hide();
                         $('#remove_button').show();
                         $('#msg').fadeOut(3000);
+                        count = parseInt($('#side_count_follow').text()) + 1;
+                        $('#side_count_follow').text(count);
+                }
+                else {
+                        alert(data.html);
+                }
     }
 
@@ -17 +24 @@
         $(function(){
                 $('#remove_button').click(function(){
-                        $.post('<?=site_url('friendships/destroy')?>', {id: $('#follow_id').val(), ticket: $('#ticket').val()}, removeMsg, 'html');
+                        $.post('<?=site_url('friendships/destroy')?>', {id: $('#follow_id').val(), ticket: $('#ticket').val()}, removeMsg, 'json');
                         return false;
                 });
         });
     function removeMsg(data){
-                        $('div[class="main"]').prepend(data);
+        if (data.status == 'ok') {
+                        $('div[class="main"]').prepend(data.html);
                         $('#follow_button').show();
                         $('#remove_button').hide();
                         $('#msg').fadeOut(3000);
+                        count = parseInt($('#side_count_follow').text()) - 1;
+                        $('#side_count_follow').text(count);
+                }
+                else {
+                        alert(data.html);
+                }
     }
 </script>

events/phpframework/codeigniter/trunk/system/application/views/user/main_friends.php

@@ -1 @@
-<script>
+<script type="text/javascript">
         /* 削除 */
         function removeFollow(id){
                 if (confirm('削除してもよいですか？取り消しできません！')){
-                        $.post('<?=site_url('friendships/destroy2')?>', {id: id, ticket: $('#ticket').val()}, removeLine, 'html');              
+                        $.post('<?=site_url('friendships/destroy')?>', {id: id, ticket: $('#ticket').val()}, removeLine, 'json');               
                 };
         }
-        function removeLine(id){
-                $('tr').remove(id);
-                count = $('span#count').text() - 1;
-                $('#count').text(count);
-                $('#side_count_friend').text(count);
+        function removeLine(data){
+                if (data.status == 'ok') {
+                        $('tr').remove(data.id);
+                        count = $('span#count').text() - 1;
+                        $('#count').text(count);
+                        $('#side_count_friend').text(count);
+                }
+                else {
+                        alert(data.html);
+                }
         }
 </script>