コミット: 3b2094784e7976cf0e053f71ff9ce76deee20221 - nqhm (git)

コミットメタ情報

• リビジョン: 3b2094784e7976cf0e053f71ff9ce76deee20221 (tree)
• 日時: 2017-01-07 16:24:06
• 作者: Keishi Tanaka <kc@hoku...>
• コミッター: Keishi Tanaka

ログメッセージ

Add is_downloadable_file function.

変更サマリ

• modified: plugin/dlexec.php
• modified: pukiwiki.ini.php

差分

--- a/plugin/dlexec.php
+++ b/plugin/dlexec.php
@@ -53,7 +53,6 @@ download($key);
 
 function download($auth_key){
 
-	global $downloadable_path;
 	$qm = get_qm();
 
 	$filename = isset($_GET['filename']) ? $_GET['filename'] : '';
@@ -63,14 +62,12 @@ function download($auth_key){
 	$page     = isset($_GET['refer'])    ? $_GET['refer']    : '';
 
 	$filename = urldecode($filename);
-	$pathinfo  = pathinfo($filename);
-	$downloadable_path_array = explode(";", $downloadable_path);
 
 	//validate
 	$wikifile = 'wiki/'. encode($page) . '.txt';
 	$source = file_exists($wikifile) ? file_get_contents($wikifile) : '';
 
-	if(! in_array($pathinfo['dirname'], $downloadable_path_array, true))
+	if(! is_downloadable_file($filename))
 	{
 		header('HTTP/1.1 403 Forbidden');
 		error_msg('Error : Invalid access');
@@ -130,6 +127,13 @@ function download($auth_key){
 
 }
 
+function is_downloadable_file($filename){
+	global $downloadable_path;
+	$pathinfo  = pathinfo($filename);
+	$paths = explode(";", $downloadable_path);
+	return in_array($pathinfo['dirname'], $paths, true);
+}
+
 function dl_sendmail($email, $filename, $title){
 
     global $smtp_auth, $smtp_server, $google_apps, $google_apps_domain;

--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -160,7 +160,7 @@ $modifierlink = 'http://www.example.co.jp/'; // Site admin's Web page
 $googlemaps_apikey = 'ABQIAAAAiGS5xMxFoCjNEIdoMGiCBRSh3wgB-evfR4k_uhb9NTlXTFSqGRScvANPOtehBVz7qEVDLEwY4PlLng';
 // Fit videos to screen
 $enable_fitvids = true;
-// Downloadable path
+// Downloadable path delimitered semicolon (;)
 $downloadable_path = 'swfu/d;pub';