| Revision | 5afab1c5261cd0d7a57af80fe0a3d895b82f0c40 (tree) |
|---|---|
| Time | 2016-12-03 06:12:44 |
| Author |  umorigu <umorigu@gmai...> |
| Commiter | umorigu |
BugTrack/2403 bugtrack plugin - new numbering spec
* New: New page number is (largest exisging page number) + 1.
* Prev: It has local numbering logic (1 -> 51 -> 101 -> 151 -> 102,...)
lib/func.php (diff) plugin/bugtrack.inc.php (diff)| @@ -26,6 +26,23 @@ function pkwk_log($message) | ||
| 26 | 26 | error_log($timestamp . ' ' . $message . "\n", 3, $log_filepath); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | +/** | |
| 30 | + * ctype_digit that supports PHP4+. | |
| 31 | + * | |
| 32 | + * PHP official document says PHP4 has ctype_digit() function. | |
| 33 | + * But sometimes it doen't exists on PHP 4.1. | |
| 34 | + */ | |
| 35 | +function pkwk_ctype_digit($s) { | |
| 36 | + static $ctype_digit_exists; | |
| 37 | + if (!isset($ctype_digit_exists)) { | |
| 38 | + $ctype_digit_exists = function_exists('ctype_digit'); | |
| 39 | + } | |
| 40 | + if ($ctype_digit_exists) { | |
| 41 | + return ctype_digit($s); | |
| 42 | + } | |
| 43 | + return preg_match('/^[0-9]+$/', $s) ? true : false; | |
| 44 | +} | |
| 45 | + | |
| 29 | 46 | function is_interwiki($str) |
| 30 | 47 | { |
| 31 | 48 | global $InterWikiName; |
| @@ -191,16 +191,15 @@ function plugin_bugtrack_write($base, $pagename, $summary, $name, $priority, $st | ||
| 191 | 191 | $postdata = plugin_bugtrack_template($base, $summary, $name, $priority, |
| 192 | 192 | $state, $category, $version, $body); |
| 193 | 193 | |
| 194 | - $id = $jump = 1; | |
| 195 | - $page = $base . '/' . sprintf(PLUGIN_BUGTRACK_NUMBER_FORMAT, $id); | |
| 196 | - while (is_page($page)) { | |
| 197 | - $id = $jump; | |
| 198 | - $jump += 50; | |
| 199 | - $page = $base . '/' . sprintf(PLUGIN_BUGTRACK_NUMBER_FORMAT, $jump); | |
| 194 | + $page_list = plugin_bugtrack_get_page_list($base, false); | |
| 195 | + usort($page_list, '_plugin_bugtrack_list_paganame_compare'); | |
| 196 | + if (count($page_list) == 0) { | |
| 197 | + $id = 1; | |
| 198 | + } else { | |
| 199 | + $latest_page = $page_list[count($page_list) - 1]['name']; | |
| 200 | + $id = intval(substr($latest_page, strlen($base) + 1)) + 1; | |
| 200 | 201 | } |
| 201 | 202 | $page = $base . '/' . sprintf(PLUGIN_BUGTRACK_NUMBER_FORMAT, $id); |
| 202 | - while (is_page($page)) | |
| 203 | - $page = $base . '/' . sprintf(PLUGIN_BUGTRACK_NUMBER_FORMAT, ++$id); | |
| 204 | 203 | |
| 205 | 204 | if ($pagename == '') { |
| 206 | 205 | page_write($page, $postdata); |
| @@ -255,15 +254,24 @@ function _plugin_bugtrack_list_paganame_compare($a, $b) | ||
| 255 | 254 | return strnatcmp($a['name'], $b['name']); |
| 256 | 255 | } |
| 257 | 256 | |
| 258 | -function __pkwk_ctype_digit($s) { | |
| 259 | - static $ctype_digits_exists; | |
| 260 | - if (!isset($ctype_digits_exists)) { | |
| 261 | - $ctype_digits_exists = function_exists('ctype_digit'); | |
| 262 | - } | |
| 263 | - if ($ctype_digits_exists) { | |
| 264 | - return ctype_digit($s); | |
| 257 | + | |
| 258 | +/** | |
| 259 | + * Get page list for "$page/" | |
| 260 | + */ | |
| 261 | +function plugin_bugtrack_get_page_list($page, $needs_filetime) { | |
| 262 | + $page_list = array(); | |
| 263 | + $pattern = $page . '/'; | |
| 264 | + $pattern_len = strlen($pattern); | |
| 265 | + foreach (get_existpages() as $p) { | |
| 266 | + if (strncmp($p, $pattern, $pattern_len) === 0 && pkwk_ctype_digit(substr($p, $pattern_len))) { | |
| 267 | + if ($needs_filetime) { | |
| 268 | + $page_list[] = array('name'=>$p,'filetime'=>get_filetime($p)); | |
| 269 | + } else { | |
| 270 | + $page_list[] = array('name'=>$p); | |
| 271 | + } | |
| 272 | + } | |
| 265 | 273 | } |
| 266 | - return preg_match('/^[0-9]+$/', $s) ? true : false; | |
| 274 | + return $page_list; | |
| 267 | 275 | } |
| 268 | 276 | |
| 269 | 277 | /** |
| @@ -291,14 +299,7 @@ function plugin_bugtrack_list_convert() | ||
| 291 | 299 | if (is_pagename($_page)) $page = $_page; |
| 292 | 300 | } |
| 293 | 301 | $data = array(); |
| 294 | - $page_list = array(); | |
| 295 | - $pattern = $page . '/'; | |
| 296 | - $pattern_len = strlen($pattern); | |
| 297 | - foreach (get_existpages() as $p) { | |
| 298 | - if (strncmp($p, $pattern, $pattern_len) === 0 && __pkwk_ctype_digit(substr($p, $pattern_len))) { | |
| 299 | - $page_list[] = array('name'=>$p,'filetime'=>get_filetime($p)); | |
| 300 | - } | |
| 301 | - } | |
| 302 | + $page_list = plugin_bugtrack_get_page_list($page, true); | |
| 302 | 303 | usort($page_list, '_plugin_bugtrack_list_paganame_compare'); |
| 303 | 304 | $count_list = count($_plugin_bugtrack['state_list']); |
| 304 | 305 | $data_map = array(); |
Fork