BugTrack/2422 popular plugin supports Dababase counter

[pukiwiki/pukiwiki.git] / plugin / popular.inc.php

diff --git a/plugin/popular.inc.php b/plugin/popular.inc.php
index c19adbd..04657b3 100644 (file)
--- a/plugin/popular.inc.php
+++ b/plugin/popular.inc.php
@@ -1,17 +1,15 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: popular.inc.php,v 1.20 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C)
-//   2003-2005, 2007 PukiWiki Developers Team
+// popular.inc.php
+// Copyright
+//   2003-2017 PukiWiki Development Team
 //   2002 Kazunori Mizushima <kazunori@uc.netyou.jp>
 // License: WHERE IS THE RECORD?
 //
 // Popular pages plugin: Show an access ranking of this wiki
 // -- like recent plugin, using counter plugin's count --
 
-/*
- * (C) 2003-2005 PukiWiki Developers Team
- * (C) 2002 Kazunori Mizushima <kazunori@uc.netyou.jp>
+/**
  *
  * 通算および今日に別けて一覧を作ることができます。
  *
@@ -29,9 +27,11 @@
 
 define('PLUGIN_POPULAR_DEFAULT', 10);
 
+require_once(PLUGIN_DIR . 'counter.inc.php');
+
 function plugin_popular_convert()
 {
-       global $vars, $whatsnew;
+       global $vars;
        global $_popular_plugin_frame, $_popular_plugin_today_frame;
 
        $max    = PLUGIN_POPULAR_DEFAULT;
@@ -42,37 +42,9 @@ function plugin_popular_convert()
        switch (func_num_args()) {
        case 3: if ($array[2]) $today = get_date('Y/m/d');
        case 2: $except = $array[1];
-       case 1: $max    = $array[0];
+       case 1: $max    = (int)$array[0];
        }
-
-       $counters = array();
-       $except_quote = str_replace('#', '\#', $except);
-       foreach (get_existpages(COUNTER_DIR, '.count') as $file=>$page) {
-               if (($except != '' && preg_match("#$except_quote#", $page)) ||
-                   $page == $whatsnew || check_non_list($page) ||
-                   ! is_page($page))
-                       continue;
-
-               $array = file(COUNTER_DIR . $file);
-               $count = rtrim($array[0]);
-               $date  = rtrim($array[1]);
-               $today_count = rtrim($array[2]);
-
-               if ($today) {
-                       // $pageが数値に見える(たとえばencode('BBS')=424253)とき、
-                       // array_splice()によってキー値が変更されてしまうのを防ぐ
-                       // ため、キーに '_' を連結する
-                       if ($today == $date) $counters['_' . $page] = $today_count;
-               } else {
-                       $counters['_' . $page] = $count;
-               }
-       }
-
-       asort($counters, SORT_NUMERIC);
-
-       // BugTrack2/106: Only variables can be passed by reference from PHP 5.0.5
-       $counters = array_reverse($counters, TRUE); // with array_splice()
-       $counters = array_splice($counters, 0, $max);
+       $counters = plugin_counter_get_popular_list($today, $except, $max);
 
        $items = '';
        if (! empty($counters)) {
@@ -99,4 +71,3 @@ function plugin_popular_convert()
 
        return sprintf($today ? $_popular_plugin_today_frame : $_popular_plugin_frame, count($counters), $items);
 }
-