require() subroutines

diff --git a/spam/checker.php b/spam/checker.php
index 1138c81..1df1f61 100644 (file)
--- a/spam/checker.php
+++ b/spam/checker.php
@@ -1,5 +1,5 @@
 <?php
 <?php

-// $Id: checker.php,v 1.5 2009/01/02 09:30:50 henoheno Exp $
+// $Id: checker.php,v 1.6 2009/01/02 11:55:45 henoheno Exp $

 // Concept-work of spam-uri metrics
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 // Concept-work of spam-uri metrics
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version


@@ -7,7 +7,6 @@
 error_reporting(E_ALL); // Debug purpose
 
 require('spam.php');
 error_reporting(E_ALL); // Debug purpose
 
 require('spam.php');

-require('spam_pickup.php');

 
 // Recursive array_map()
 // e.g. Sanitilze ALL values (Debug purpose): var_dump(recursive_map('htmlspecialchars', $array));
 
 // Recursive array_map()
 // e.g. Sanitilze ALL values (Debug purpose): var_dump(recursive_map('htmlspecialchars', $array));

diff --git a/spam/spam.php b/spam/spam.php
index eaf5952..420492e 100644 (file)
--- a/spam/spam.php
+++ b/spam/spam.php
@@ -1,5 +1,5 @@
 <?php
 <?php

-// $Id: spam.php,v 1.216 2009/01/02 10:44:53 henoheno Exp $
+// $Id: spam.php,v 1.217 2009/01/02 11:55:45 henoheno Exp $

 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //


@@ -7,6 +7,11 @@
 //
 // (PHP 4 >= 4.3.0): preg_match_all(PREG_OFFSET_CAPTURE): $method['uri_XXX'] related feature
 
 //
 // (PHP 4 >= 4.3.0): preg_match_all(PREG_OFFSET_CAPTURE): $method['uri_XXX'] related feature
 

+
+if (! defined('LIB_DIR'))   define('LIB_DIR', './');
+require(LIB_DIR . 'spam_pickup.php');
+require(LIB_DIR . 'spam_util.php');
+

 if (! defined('SPAM_INI_FILE'))   define('SPAM_INI_FILE',   'spam.ini.php');
 
 
 if (! defined('SPAM_INI_FILE'))   define('SPAM_INI_FILE',   'spam.ini.php');