Changeset 1258
- Timestamp:
- 11/25/2007 04:09:46 AM (11 months ago)
- Location:
- trunk/system
- Files:
-
- 7 modified
-
helpers/html.php (modified) (1 diff)
-
helpers/text.php (modified) (3 diffs)
-
libraries/Pagination.php (modified) (1 diff)
-
views/pagination/classic.php (modified) (3 diffs)
-
views/pagination/digg.php (modified) (7 diffs)
-
views/pagination/extended.php (modified) (2 diffs)
-
views/pagination/punbb.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/system/helpers/html.php
r1230 r1258 122 122 return 123 123 // Base URL + URI = full URL 124 '<a href="'.url::base(FALSE ).$file.'"'124 '<a href="'.url::base(FALSE, $protocol).$file.'"' 125 125 // Attributes empty? Use an empty string 126 126 .(empty($attributes) ? '' : self::attributes($attributes)).'>' -
trunk/system/helpers/text.php
r1250 r1258 23 23 * A word-limited string with the end character attached. 24 24 */ 25 public static function limit_words($str, $limit = 100, $end_char = '…')25 public static function limit_words($str, $limit = 100, $end_char = NULL) 26 26 { 27 27 $limit = (int) $limit; 28 $end_char = ($end_char === NULL) ? '…' : $end_char; 28 29 29 30 if (trim($str) == '') … … 141 142 142 143 $str = ''; 143 $pool_size = utf8::strlen($pool);144 $pool_size = (class_exists('utf8', FALSE)) ? utf8::strlen($pool) : strlen($pool); 144 145 145 146 for ($i = 0; $i < $length; $i++) 146 147 { 147 $str .= utf8::substr($pool, mt_rand(0, $pool_size - 1), 1);148 $str .= (class_exists('utf8', FALSE)) ? utf8::substr($pool, mt_rand(0, $pool_size - 1), 1) : substr($pool, mt_rand(0, $pool_size - 1), 1); 148 149 } 149 150 … … 196 197 $regex = '!'.$regex.'!ui'; 197 198 198 if (utf8::strlen($replacement) == 1) 199 $strlen = (class_exists('utf8', FALSE)) ? utf8::strlen($replacement) : strlen($replacement); 200 if ($strlen == 1) 199 201 { 200 202 $regex .= 'e'; 201 return preg_replace($regex, 'str_repeat($replacement, utf8::strlen(\'$1\'))', $str);203 return preg_replace($regex, 'str_repeat($replacement, (class_exists(\'utf8\', FALSE)) ? utf8::strlen(\'$1\') : strlen(\'$1\'))', $str); 202 204 } 203 205 -
trunk/system/libraries/Pagination.php
r1230 r1258 145 145 146 146 /** 147 * Method: url148 * Gets the base_url with the specified page number.149 *150 * Parameters:151 * page - page number152 *153 * Returns:154 * Base URL with specified page number.155 */156 public function url($page = NULL)157 {158 $page = (int) (isset($page)) ? $page : $this->current_page;159 160 return str_replace('{page}', $page, $this->base_url);161 }162 163 /**164 147 * Method: sql_offset 165 148 * Gets the SQL offset of the first row to return. -
trunk/system/views/pagination/classic.php
r904 r1258 10 10 11 11 <?php if ($first_page): ?> 12 <a href="<?php echo $this->pagination->url(1) ?>">‹ <?php echo Kohana::lang('pagination.first') ?></a>12 <a href="<?php echo str_replace('{page}', 1, $base_url) ?>">‹ <?php echo Kohana::lang('pagination.first') ?></a> 13 13 <?php endif; ?> 14 14 15 15 <?php if ($previous_page): ?> 16 <a href="<?php echo $this->pagination->url($previous_page) ?>"><</a>16 <a href="<?php echo str_replace('{page}', $previous_page, $base_url) ?>"><</a> 17 17 <?php endif; ?> 18 18 … … 23 23 <strong><?php echo $i ?></strong> 24 24 <?php else: ?> 25 <a href="<?php echo $this->pagination->url($i) ?>"><?php echo $i ?></a>25 <a href="<?php echo str_replace('{page}', $i, $base_url) ?>"><?php echo $i ?></a> 26 26 <?php endif; ?> 27 27 … … 30 30 31 31 <?php if ($next_page): ?> 32 <a href="<?php echo $this->pagination->url($next_page) ?>">></a>32 <a href="<?php echo str_replace('{page}', $next_page, $base_url) ?>">></a> 33 33 <?php endif; ?> 34 34 35 35 <?php if ($last_page): ?> 36 <a href="<?php echo $this->pagination->url($last_page) ?>"><?php echo Kohana::lang('pagination.last') ?> ›</a>36 <a href="<?php echo str_replace('{page}', $last_page, $base_url) ?>"><?php echo Kohana::lang('pagination.last') ?> ›</a> 37 37 <?php endif; ?> 38 38 -
trunk/system/views/pagination/digg.php
r904 r1258 10 10 11 11 <?php if ($previous_page): ?> 12 <a href="<?php echo $this->pagination->url($previous_page) ?>">« <?php echo Kohana::lang('pagination.previous') ?></a>12 <a href="<?php echo str_replace('{page}', $previous_page, $base_url) ?>">« <?php echo Kohana::lang('pagination.previous') ?></a> 13 13 <?php else: ?> 14 14 « <?php echo Kohana::lang('pagination.previous') ?> … … 22 22 <strong><?php echo $i ?></strong> 23 23 <?php else: ?> 24 <a href="<?php echo $this->pagination->url($i) ?>"><?php echo $i ?></a>24 <a href="<?php echo str_replace('{page}', $i, $base_url) ?>"><?php echo $i ?></a> 25 25 <?php endif; ?> 26 26 <?php endfor; ?> … … 32 32 <strong><?php echo $i ?></strong> 33 33 <?php else: ?> 34 <a href="<?php echo $this->pagination->url($i) ?>"><?php echo $i ?></a>34 <a href="<?php echo str_replace('{page}', $i, $base_url) ?>"><?php echo $i ?></a> 35 35 <?php endif; ?> 36 36 <?php endfor; ?> 37 37 38 38 … 39 <a href="<?php echo $this->pagination->url($total_pages - 1) ?>"><?php echo $total_pages - 1 ?></a>40 <a href="<?php echo $this->pagination->url($total_pages) ?>"><?php echo $total_pages ?></a>39 <a href="<?php echo str_replace('{page}', $total_pages - 1, $base_url) ?>"><?php echo $total_pages - 1 ?></a> 40 <a href="<?php echo str_replace('{page}', $total_pages, $base_url) ?>"><?php echo $total_pages ?></a> 41 41 42 42 <?php elseif ($current_page > $total_pages - 8): /* « Previous 1 2 … 17 18 19 20 21 22 23 24 25 26 Next » */ ?> 43 43 44 <a href="<?php echo $this->pagination->url(1) ?>">1</a>45 <a href="<?php echo $this->pagination->url(2) ?>">2</a>44 <a href="<?php echo str_replace('{page}', 1, $base_url) ?>">1</a> 45 <a href="<?php echo str_replace('{page}', 2, $base_url) ?>">2</a> 46 46 … 47 47 … … 50 50 <strong><?php echo $i ?></strong> 51 51 <?php else: ?> 52 <a href="<?php echo $this->pagination->url($i) ?>"><?php echo $i ?></a>52 <a href="<?php echo str_replace('{page}', $i, $base_url) ?>"><?php echo $i ?></a> 53 53 <?php endif; ?> 54 54 <?php endfor; ?> … … 56 56 <?php else: /* « Previous 1 2 … 5 6 7 8 9 10 11 12 13 14 … 25 26 Next » */ ?> 57 57 58 <a href="<?php echo $this->pagination->url(1) ?>">1</a>59 <a href="<?php echo $this->pagination->url(2) ?>">2</a>58 <a href="<?php echo str_replace('{page}', 1, $base_url) ?>">1</a> 59 <a href="<?php echo str_replace('{page}', 2, $base_url) ?>">2</a> 60 60 … 61 61 … … 64 64 <strong><?php echo $i ?></strong> 65 65 <?php else: ?> 66 <a href="<?php echo $this->pagination->url($i) ?>"><?php echo $i ?></a>66 <a href="<?php echo str_replace('{page}', $i, $base_url) ?>"><?php echo $i ?></a> 67 67 <?php endif; ?> 68 68 <?php endfor; ?> 69 69 70 70 … 71 <a href="<?php echo $this->pagination->url($total_pages - 1) ?>"><?php echo $total_pages - 1 ?></a>72 <a href="<?php echo $this->pagination->url($total_pages) ?>"><?php echo $total_pages ?></a>71 <a href="<?php echo str_replace('{page}', $total_pages - 1, $base_url) ?>"><?php echo $total_pages - 1 ?></a> 72 <a href="<?php echo str_replace('{page}', $total_pages, $base_url) ?>"><?php echo $total_pages ?></a> 73 73 74 74 <?php endif; ?> … … 76 76 77 77 <?php if ($next_page): ?> 78 <a href="<?php echo $this->pagination->url($next_page) ?>"><?php echo Kohana::lang('pagination.next') ?> »</a>78 <a href="<?php echo str_replace('{page}', $next_page, $base_url) ?>"><?php echo Kohana::lang('pagination.next') ?> »</a> 79 79 <?php else: ?> 80 80 <?php echo Kohana::lang('pagination.next') ?> » -
trunk/system/views/pagination/extended.php
r987 r1258 10 10 11 11 <?php if ($previous_page): ?> 12 <a href="<?php echo $this->pagination->url($previous_page) ?>">« <?php echo Kohana::lang('pagination.previous') ?></a>12 <a href="<?php echo str_replace('{page}', $previous_page, $base_url) ?>">« <?php echo Kohana::lang('pagination.previous') ?></a> 13 13 <?php else: ?> 14 14 « <?php echo Kohana::lang('pagination.previous') ?> … … 20 20 21 21 | <?php if ($next_page): ?> 22 <a href="<?php echo $this->pagination->url($next_page) ?>"><?php echo Kohana::lang('pagination.next') ?> »</a>22 <a href="<?php echo str_replace('{page}', $next_page, $base_url) ?>"><?php echo Kohana::lang('pagination.next') ?> »</a> 23 23 <?php else: ?> 24 24 <?php echo Kohana::lang('pagination.next') ?> » -
trunk/system/views/pagination/punbb.php
r907 r1258 12 12 13 13 <?php if ($current_page > 3): ?> 14 <a href="<?php echo $this->pagination->url(1) ?>">1</a>14 <a href="<?php echo str_replace('{page}', 1, $base_url) ?>">1</a> 15 15 <?php if ($current_page != 4) echo '…' ?> 16 16 <?php endif; ?> … … 24 24 <strong><?php echo $i ?></strong> 25 25 <?php else: ?> 26 <a href="<?php echo $this->pagination->url($i) ?>"><?php echo $i ?></a>26 <a href="<?php echo str_replace('{page}', $i, $base_url) ?>"><?php echo $i ?></a> 27 27 <?php endif; ?> 28 28 … … 32 32 <?php if ($current_page <= $total_pages - 3): ?> 33 33 <?php if ($current_page != $total_pages - 3) echo '…' ?> 34 <a href="<?php echo $this->pagination->url($total_pages) ?>"><?php echo $total_pages ?></a>34 <a href="<?php echo str_replace('{page}', $total_pages, $base_url) ?>"><?php echo $total_pages ?></a> 35 35 <?php endif; ?> 36 36
