Commit: 34a4ca0b0d69995f903e808936abceeb49ec1711 - pukiwiki-fork (git)

Commit MetaInfo

• Revisão: 34a4ca0b0d69995f903e808936abceeb49ec1711 (tree)
• Hora: 2017-06-11 21:47:12
• Autor: umorigu <umorigu@gmai...>
• Commiter: umorigu

Mensagem de Log

BugTrack/2422 popular plugin supports Dababase counter

Mudança Sumário

• modified: plugin/counter.inc.php
• modified: plugin/popular.inc.php

Diff

--- a/plugin/counter.inc.php
+++ b/plugin/counter.inc.php
@@ -203,6 +203,108 @@ function plugin_counter_get_count($page)
 	return $c;
 }
 
+function plugin_counter_get_popular_list($today, $except, $max) {
+	if (PLUGIN_COUNTER_USE_DB === 0) {
+		return plugin_counter_get_popular_list_file($today, $except, $max);
+	} else {
+		return plugin_counter_get_popular_list_db($today, $except, $max);
+	}
+}
+
+function plugin_counter_get_popular_list_file($today, $except, $max) {
+	global $whatsnew;
+	$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);
+	return $counters;
+}
+
+function plugin_counter_get_popular_list_db($today, $except, $max) {
+	global $whatsnew;
+	$page_counter_t = PLUGIN_COUNTER_DB_TABLE_NAME_PREFIX . 'page_counter';
+	if ($today) {
+		$order_by_c = 'today_viewcount';
+	} else {
+		$order_by_c = 'total';
+	}
+	$counters = array();
+	try {
+		$pdo = new PDO(PLUGIN_COUNTER_DB_CONNECT_STRING,
+			PLUGIN_COUNTER_DB_USERNAME, PLUGIN_COUNTER_DB_PASSWORD,
+			$plugin_counter_db_options);
+		$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		$pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
+		$pdo->setAttribute(PDO::ATTR_TIMEOUT, 5);
+		if ($today) {
+			$stmt = $pdo->prepare(
+"SELECT page_name, total, update_date,
+   today_viewcount, yesterday_viewcount
+ FROM $page_counter_t
+ WHERE update_date = ?
+ ORDER BY $order_by_c DESC
+ LIMIT ?"
+			);
+		} else {
+			$stmt = $pdo->prepare(
+"SELECT page_name, total, update_date,
+   today_viewcount, yesterday_viewcount
+ FROM $page_counter_t
+ ORDER BY $order_by_c DESC
+ LIMIT ?"
+			);
+		}
+		$except_quote = str_replace('#', '\#', $except);
+		$limit = $max + 100;
+		if ($today) {
+			$stmt->execute(array($today, $limit));
+		} else {
+			$stmt->execute(array($limit));
+		}
+		foreach ($stmt as $r) {
+			$page = $r['page_name'];
+			if (($except != '' && preg_match("#$except_quote#", $page)) ||
+					$page == $whatsnew || check_non_list($page) ||
+					! is_page($page)) {
+				continue;
+			}
+			if ($today) {
+				$counters['_' . $page] = $r['today_viewcount'];
+			} else {
+				$counters['_' . $page] = $r['total'];
+			}
+		}
+		$stmt->closeCursor();
+		return array_splice($counters, 0, $max);
+	} catch (Exception $e) {
+		die('counter.inc.php: Error occurred on getting pupular pages');
+	}
+}
+
 /**
  * php -r "include 'plugin/counter.inc.php'; plugin_counter_tool_setup_table();"
  */

--- 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 <[e-mail]>
 // 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 <[e-mail]>
+/**
  *
  * 通算および今日に別けて一覧を作ることができます。
  *
@@ -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);
 }
-