Changeset 20302 for events

Timestamp:

09/30/08 20:28:43 (2 months ago)

Author:

kenji

Message:

Add link to @username

Location:

events/phpframework/codeigniter/trunk/system/application

Files:

• controllers/home.php (modified) (2 diffs)
• models/status_model.php (modified) (2 diffs)
• views/home/main_archive.php (modified) (1 diff)
• views/public_timeline/main.php (modified) (1 diff)
• views/public_timeline/main_logged_in.php (modified) (1 diff)

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

@@ -11 +11 @@
                         redirect('login');
                 }
-                $this->output->enable_profiler(TRUE);
+                //$this->output->enable_profiler(TRUE);
         }
 
@@ -45 +45 @@
                                                                         $this->User_model->get_friends_list($id);
                 $data->followers_count = $this->User_model->get_followers_count($id);
-                
+
                 $data->title  = 'Phwittr';
                 $data->header = $this->load->view('home/header', '', TRUE);

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

@@ -78 +78 @@
         function get_public_timeline($limit = 20, $offset = 0)
         {
-                $this->db->select('statuses.id, username, comment, UNIX_TIMESTAMP(statuses.created_at) AS created_at, image');
+                $this->db->select('SQL_CALC_FOUND_ROWS statuses.id, u1.username AS username, comment, u2.username AS reply_username, UNIX_TIMESTAMP(statuses.created_at) AS created_at, u1.image AS image');
                 $this->db->from('statuses');
-                $this->db->join('users', 'statuses.user_id = users.id', 'left');
+                $this->db->join('users AS u1', 'statuses.user_id = u1.id', 'left');
+                $this->db->join('users AS u2', 'statuses.reply_user_id = u2.id', 'left');
                 $this->db->order_by('created_at', 'DESC');
                 $this->db->limit($limit, $offset);
@@ -89 +90 @@
         function get_archive_timeline($id, $limit = 20, $offset = 0)
         {
-                $this->db->select('SQL_CALC_FOUND_ROWS statuses.id, username, comment, UNIX_TIMESTAMP(statuses.created_at) AS created_at, image');
+                $this->db->select('SQL_CALC_FOUND_ROWS statuses.id, u1.username AS username, comment, u2.username AS reply_username, UNIX_TIMESTAMP(statuses.created_at) AS created_at, u1.image AS image');
                 $this->db->from('statuses');
-                $this->db->join('users', 'statuses.user_id = users.id', 'left');
-                $this->db->where('users.id', $id);
+                $this->db->join('users AS u1', 'statuses.user_id = u1.id', 'left');
+                $this->db->join('users AS u2', 'statuses.reply_user_id = u2.id', 'left');
+                $this->db->where('u1.id', $id);
                 $this->db->order_by('created_at', 'DESC');
                 $this->db->limit($limit, $offset);

events/phpframework/codeigniter/trunk/system/application/views/home/main_archive.php

@@ -34 +34 @@
                         <td>
                                 <p class="murmur">
-                                <?=h($row->comment)?>
+                                <?php 
+                                        $row->comment = h($row->comment);
+                                        if ($row->reply_username) {
+                                                $row->comment = preg_replace('/^@(\w+)\s/', '@' . anchor(site_url('user/index/' . $row->reply_username), $row->reply_username) . ' ', $row->comment);
+                                        }
+                                ?>
+                                <?=$row->comment?>
                                 <?=anchor(site_url('user/statuses/' . $row->username . '/' . $row->id), posted_time($row->created_at))?>
                                 </p>

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

@@ -11 +11 @@
                                 <p class="murmur">
                                 <?=anchor(site_url('user/index/' . $row->username), $row->username)?>
-                                <?=h($row->comment)?>
+                                <?php 
+                                        $row->comment = h($row->comment);
+                                        if ($row->reply_username) {
+                                                $row->comment = preg_replace('/^@(\w+)\s/', '@' . anchor(site_url('user/index/' . $row->reply_username), $row->reply_username) . ' ', $row->comment);
+                                        }
+                                ?>
+                                <?=$row->comment?>
                                 <?=anchor(site_url('user/statuses/' . $row->username . '/' . $row->id), posted_time($row->created_at))?>
                                 </p>

events/phpframework/codeigniter/trunk/system/application/views/public_timeline/main_logged_in.php

@@ -34 +34 @@
                                 <p class="murmur">
                                 <?=anchor(site_url('user/index/' . $row->username), $row->username)?>
-                                <?=h($row->comment)?>
+                                <?php 
+                                        $row->comment = h($row->comment);
+                                        if ($row->reply_username) {
+                                                $row->comment = preg_replace('/^@(\w+)\s/', '@' . anchor(site_url('user/index/' . $row->reply_username), $row->reply_username) . ' ', $row->comment);
+                                        }
+                                ?>
+                                <?=$row->comment?>
                                 <?=anchor(site_url('user/statuses/' . $row->username . '/' . $row->id), posted_time($row->created_at))?>
                                 </p>