Changeset 20315 for events

Timestamp:

09/30/08 22:16:35 (2 months ago)

Author:

kenji

Message:

Update Ajax post

Location:

events/phpframework/codeigniter/trunk/system/application

Files:

• controllers/status.php (modified) (4 diffs)
• models/status_model.php (modified) (2 diffs)
• views/js/default.php (modified) (1 diff)
• views/status/comment.php (modified) (1 diff)

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

@@ -16 +16 @@
         function update()
         {
+                $this->session->keep_flashdata('ticket');
+                header('Content-Type: application/json; charset=UTF-8');
+
                 // CSRF チェック
                 $ticket = $this->session->flashdata('ticket');
@@ -23 +26 @@
                 {
                         log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted Comment but Wrong Ticket');
+                        echo json_encode(array('status' => 'ng', 'html' => 'チケットが異なります'));
                         exit;
                 }
-
-                $this->session->keep_flashdata('ticket');
 
                 $comment = $this->input->post('msg');
@@ -36 +38 @@
                 {
                         log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted Comment but strlen = ' . $len);
+                        echo json_encode(array('status' => 'ng', 'html' => '文字数が不正です: ' . $len));
                         exit;
                 }
@@ -55 +58 @@
                         log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted Page: ' . $page);
 
-                        $id = $this->Status_model->add_comment($user_id, $reply_username, $comment);
+                        list($id, $reply_username) = $this->Status_model->add_comment($user_id, $reply_username, $comment);
 
+                        $this->load->helper(array('url'));
+                        
                         $data->page     = $page;
                         $data->username = $this->session->userdata('username');
                         $data->image    = $this->session->userdata('image');
-                        $data->comment  = htmlspecialchars($comment, ENT_QUOTES);
+                        
+                        $comment = h($comment);
+                        if ($reply_username) {
+                                $comment = preg_replace('/^@(\w+)\s/', '@' . anchor(site_url('user/index/' . $reply_username), $reply_username) . ' ', $comment);
+                        }
+                        
+                        $data->comment  = $comment;
                         $data->user_id  = $user_id;
                         $data->id       = $id;
 
-                        $this->load->helper(array('url'));
                         $data->created_at = time();
 
-                        $this->load->view('status/comment', $data);
+                        $html = $this->load->view('status/comment', $data, TRUE);
+
+                        echo json_encode(array('status' => 'ok', 'html' => $html));
                 }
                 else
                 {
+                        echo json_encode(array('status' => 'ng', 'html' => 'ログインしていません'));
                         log_message('info', '[class]' . __CLASS__ . '/' . __FUNCTION__ . '(): Posted Comment but Not Logged in');
                 }

events/phpframework/codeigniter/trunk/system/application/models/status_model.php

@@ -15 +15 @@
                 {
                         $statuses->reply_user_id = $this->get_userid($reply_username);
+                        if ( ! $statuses->reply_user_id )
+                        {
+                                $reply_username = '';
+                        }
                 }
                 else
@@ -26 +30 @@
                 $id = $this->db->insert_id();
 
-                return $id;
+                return array($id, $reply_username);
         }
 

events/phpframework/codeigniter/trunk/system/application/views/js/default.php

@@ -4 +4 @@
                 comment = $('#message').val();
                 $.post('<?=site_url('status/update')?>', {msg: comment, 
-                                ticket: $('#ticket').val(), p: $('#page_').val()}, addComment, 'html');
+                                ticket: $('#ticket').val(), p: $('#page_').val()}, addComment, 'json');
                 $('#message').val('').focus();
+        });
+});
+function addComment(data){
+        if (data.status == 'ok') {
+                $('tbody:first').prepend(data.html);
                 $('p#last_comment').text(comment);
                 count = parseInt($('#side_count_post').text()) + 1;
                 $('#side_count_post').text(count);
-        });
-});
-function addComment(data){
-        $('tbody:first').prepend(data);         
+        }
+        else {
+                alert(data.html);
+        }
 }
 

events/phpframework/codeigniter/trunk/system/application/views/status/comment.php

@@ -8 +8 @@
                                 <?=anchor(site_url('user/index/' . $username), $username)?>
                                 <?php endif ?>
-                                <?=h($comment)?>
+                                <?=$comment?>
                                 <?=anchor(site_url('user/statuses/' . $username . '/' . $id), posted_time($created_at))?>
                                 </p>