Changeset 20833 for events

Timestamp:

10/06/08 10:52:31 (2 months ago)

Author:

kenji

Message:

Revert to r20829

Location:

events/phpframework/codeigniter/trunk/system/application

Files:

• config/config.php (modified) (1 diff)
• config/database.php (modified) (1 diff)
• controllers/public_timeline.php (modified) (1 diff)
• controllers/status.php (modified) (1 diff)
• helpers/MY_url_helper.php (modified) (4 diffs)
• models/status_model.php (modified) (3 diffs)
• views/home/main.php (modified) (1 diff)
• views/home/main_archive.php (modified) (1 diff)
• views/home/main_reply.php (modified) (1 diff)
• views/public_timeline/main.php (modified) (1 diff)
• views/public_timeline/main_logged_in.php (modified) (1 diff)
• views/user/main.php (modified) (1 diff)
• views/user/main_comment.php (modified) (1 diff)

events/phpframework/codeigniter/trunk/system/application/config/config.php

@@ -174 +174 @@
 |
 */
-$config['log_threshold'] = 4;
+$config['log_threshold'] = 1;
 
 /*

events/phpframework/codeigniter/trunk/system/application/config/database.php

@@ -47 +47 @@
 $db['default']['db_debug'] = TRUE;
 $db['default']['cache_on'] = FALSE;
-$db['default']['cachedir'] = BASEPATH . "cache/";
+$db['default']['cachedir'] = "";
 $db['default']['char_set'] = "utf8";
 $db['default']['dbcollat'] = "utf8_general_ci";

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

@@ -11 +11 @@
         function index()
         {
-                $this->output->enable_profiler(TRUE);
-
                 $this->load->helper('url');
                 $this->load->model('Status_model', '', TRUE);
 
-$this->db->cache_on();
+
                 $data->list   = $this->Status_model->get_public_timeline();
-$this->db->cache_off();
-
                 $data->title  = 'Phwittr';
 

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

@@ -66 +66 @@
                         $data->image    = $this->session->userdata('image');
                         
-                        $comment = auto_link(h($comment), 'url');
+                        $comment = h($comment);
                         if ($reply_username) {
                                 $comment = preg_replace('/^@(\w+)\s/', '@' . anchor(site_url('user/index/' . $reply_username), $reply_username) . ' ', $comment);

events/phpframework/codeigniter/trunk/system/application/helpers/MY_url_helper.php

@@ -1 +1 @@
 <?php
 
-/* 本来は HTML helper かな */
 function h($string)
 {
-        return htmlspecialchars($string, ENT_QUOTES);
+    return htmlspecialchars($string, ENT_QUOTES);
 }
 
-/* 本来は HTML helper かな */
 function picture($username, $image, $size, $class)
 {
@@ -69 +67 @@
 }
 
-/* 本来は HTML helper かな */
 function my_pict($size)
 {
@@ -78 +75 @@
 }
 
-/* 本来は HTML helper かな */
 function js($js = 'default', $timestamp = TRUE)
 {
@@ -127 +123 @@
         return $str;
 }
-
-/* auto_link() を一部修正 */
-if ( ! function_exists('auto_link'))
-{
-        function auto_link($str, $type = 'both', $popup = FALSE)
-        {
-                if ($type != 'email')
-                {               
-                        if (preg_match_all("#((http(s?)://)|(www\.))(\w+[^\s\)\<]+)#i", $str, $matches))
-                        {
-                                $pop = ($popup == TRUE) ? " target=\"_blank\" " : "";
-
-                                for ($i = 0; $i < sizeof($matches['0']); $i++)
-                                {
-                                        $period = '';
-                                        if (preg_match("|\.$|", $matches['5'][$i]))
-                                        {
-                                                $period = '.';
-                                                $matches['5'][$i] = substr($matches['5'][$i], 0, -1);
-                                        }
-
-                                        $str = str_replace($matches['0'][$i],
-                                                                                '<a href="http'.
-                                                                                $matches['3'][$i].'://'.
-                                                                                $matches['4'][$i].
-                                                                                $matches['5'][$i].'"'.$pop.'>http'.
-                                                                                $matches['3'][$i].'://'.
-                                                                                $matches['4'][$i].
-                                                                                $matches['5'][$i].'</a>'.
-                                                                                $period, $str);
-                                }
-                        }
-                }
-
-                if ($type != 'url')
-                {       
-                        if (preg_match_all("/([a-zA-Z0-9_\.\-]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z0-9\-\.]*)/i", $str, $matches))
-                        {
-                                for ($i = 0; $i < sizeof($matches['0']); $i++)
-                                {
-                                        $period = '';
-                                        if (preg_match("|\.$|", $matches['3'][$i]))
-                                        {
-                                                $period = '.';
-                                                $matches['3'][$i] = substr($matches['3'][$i], 0, -1);
-                                        }
-
-                                        $str = str_replace($matches['0'][$i], safe_mailto($matches['1'][$i].'@'.$matches['2'][$i].'.'.$matches['3'][$i]).$period, $str);
-                                }
-
-                        }
-                }
-                return $str;
-        }
-}

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

@@ -6 +6 @@
         {
                 parent::Model();
+                $this->load->helper('date');
         }
 
@@ -23 +24 @@
                         $statuses->reply_user_id = '';
                 }
-
-                $this->load->helper('date');
                 $statuses->comment       = $comment;
                 $statuses->created_at    = mdate('%Y-%m-%d %H:%i:%s');
 
-                if ($this->db->insert('statuses', $statuses))
-                {
-                        $this->db->cache_delete('public_timeline', 'index');
-                }
+                $this->db->insert('statuses', $statuses);
                 $id = $this->db->insert_id();
 
@@ -64 +60 @@
                 $statuses['user_id'] = $user_id;
 
-                if ($ret = $this->db->delete('statuses', $statuses))
-                {
-                        $this->db->cache_delete('public_timeline', 'index');
-                }
-
-                return $ret;
+                return($this->db->delete('statuses', $statuses));
         }
 

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

@@ -34 +34 @@
                                 <p class="murmur">
                                 <?=anchor(site_url('user/index/' . $row->username), $row->username)?>
-                                <?php
-                                        $row->comment = auto_link(h($row->comment), 'url');
+                                <?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);

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

@@ -34 +34 @@
                         <td>
                                 <p class="murmur">
-                                <?php
-                                        $row->comment = auto_link(h($row->comment), 'url');
+                                <?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);

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

@@ -35 +35 @@
                                 <p class="murmur">
                                 <?=anchor(site_url('user/index/' . $row->username), $row->username)?>
-                                <?=auto_link(h($row->comment), 'url')?>
+                                <?=h($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

@@ -12 +12 @@
                                 <p class="murmur">
                                 <?=anchor(site_url('user/index/' . $row->username), $row->username)?>
-                                <?php
-                                        $row->comment = auto_link(h($row->comment), 'url');
+                                <?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);

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)?>
-                                <?php
-                                        $row->comment = auto_link(h($row->comment), 'url');
+                                <?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);

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

@@ -71 +71 @@
                         <td>
                                 <p class="murmur">
-                                <?php
-                                        $row->comment = auto_link(h($row->comment), 'url');
+                                <?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);

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

@@ -5 +5 @@
                 <?php foreach($list as $row):?>
                                 <p>
-                                <?php
-                                        $row->comment = auto_link(h($row->comment), 'url');
+                                <?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);