From 4b9800b35c33fae6aa561909e87cc7d027cea372 Mon Sep 17 00:00:00 2001 From: hsur Date: Tue, 17 Oct 2006 15:37:58 +0000 Subject: [PATCH] =?utf8?q?Ticket=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD?= =?utf8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/plugin@457 1ca29b6e-896d-4ea0-84a5-967f57386b96 --- trunk/NP_Blacklist/NP_Blacklist.php | 5 +- trunk/NP_Blacklist/blacklist/blacklist_lib.php | 57 +++++++++++++++------- .../NP_Blacklist/blacklist/cache_eaccelerator.php | 6 +-- trunk/NP_Blacklist/blacklist/help.html | 1 + trunk/NP_Blacklist/blacklist/index.php | 20 +++++--- 5 files changed, 56 insertions(+), 33 deletions(-) diff --git a/trunk/NP_Blacklist/NP_Blacklist.php b/trunk/NP_Blacklist/NP_Blacklist.php index bd134f1..0e020d1 100644 --- a/trunk/NP_Blacklist/NP_Blacklist.php +++ b/trunk/NP_Blacklist/NP_Blacklist.php @@ -110,10 +110,7 @@ class NP_Blacklist extends NucleusPlugin { function getEventList() { $this->_initSettings(); -// cles::blog - //return array('QuickMenu','PreAddComment','PreSkinParse','ValidateForm', 'SpamCheck'); - return array('QuickMenu', 'SpamCheck', 'PreSkinParse'); -// cles::blog + return array('QuickMenu','PreAddComment','PreSkinParse','ValidateForm', 'SpamCheck'); } function hasAdminArea() { diff --git a/trunk/NP_Blacklist/blacklist/blacklist_lib.php b/trunk/NP_Blacklist/blacklist/blacklist_lib.php index 92c5b8b..59423c5 100644 --- a/trunk/NP_Blacklist/blacklist/blacklist_lib.php +++ b/trunk/NP_Blacklist/blacklist/blacklist_lib.php @@ -199,21 +199,22 @@ function is_domain($stheDomain) { function pbl_nucmenu() { + global $manager; echo "

Blacklist menu

\n"; echo "\n"; } function pbl_blacklisteditor() { - global $pblmessage; + global $pblmessage, $manager; if(strlen($pblmessage) > 0) { echo "
$pblmessage
\n"; @@ -255,7 +256,9 @@ function pbl_blacklisteditor() { echo "\n"; echo "
\n"; echo "
\n"; - echo "\n"; + $manager->addTicketHidden(); + + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -295,7 +298,7 @@ function pbl_blacklisteditor() { echo "\n"; echo "\n"; echo ""; echo "\n"; } @@ -335,6 +338,7 @@ function pbl_addexpression($expression, $comment) { } fwrite($handle, $expression."\n"); fclose($handle); + } } @@ -419,6 +423,7 @@ function pbl_log($text) { function pbl_logtable() { + global $manager; if (file_exists(__WEBLOG_ROOT.__EXT."/settings/blacklist.log")) { $handle = fopen(__WEBLOG_ROOT.__EXT."/settings/blacklist.log", "r"); $logrows = ""; @@ -452,8 +457,10 @@ function pbl_logtable() { } echo "
\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; + $manager->addTicketHidden(); + echo "\n"; echo "
\n"; } @@ -628,13 +635,15 @@ function pbl_suspectIP($threshold, $remote_ip = '') { } function pbl_showipblock() { - global $pblmessage; + global $pblmessage, $manager; $filename = __WEBLOG_ROOT.__EXT."/settings/blockip.pbl"; $line = 0; $fp = fopen($filename,'r'); echo "
\n"; echo "
\n"; - echo "\n"; + echo "\n"; + $manager->addTicketHidden(); + echo "Add IP to block: "; echo "\n"; echo "\n"; @@ -652,7 +661,8 @@ function pbl_showipblock() { echo "
"; } echo "
expression".htmlspecialchars($key,ENT_QUOTES)."".htmlspecialchars($value,ENT_QUOTES).""; - echo "delete"; + echo "addTicketToUrl(serverVar('PHP_SELF')."?action=deleteexpression&line=".$line),ENT_QUOTES)."\">delete"; echo "
".$ip."[".gethostbyaddr(rtrim($ip))."]"; else echo "
".$ip."[skipped]"; - echo "delete"; + // TODO: aaa + echo "addTicketToUrl(serverVar('PHP_SELF')."?action=deleteipblock&line=".$line),ENT_QUOTES)."\">delete"; echo "
"; @@ -725,7 +735,7 @@ function pbl_htaccess($type) { } function pbl_htaccesspage() { - global $pblmessage; + global $pblmessage, $manager; if(strlen($pblmessage) > 0) { echo "
$pblmessage
\n"; } @@ -739,11 +749,13 @@ function pbl_htaccesspage() { } echo "
\n"; echo "\n"; + $manager->addTicketHidden(); + echo "\n"; echo "\n"; echo "
"; echo "
"; - echo "\n"; + echo "\n"; echo "
"; echo "
"; echo "\n"; @@ -795,6 +807,8 @@ function pbl_test () { } function pbl_testpage () { + global $manager; + // shows user testpage ... global $pblmessage; if(strlen($pblmessage) > 0) { @@ -802,7 +816,9 @@ function pbl_testpage () { } echo "
\n"; echo "\n"; - echo "\n"; + echo "\n"; + $manager->addTicketHidden(); + echo "
"; echo "\n"; echo "\n"; @@ -810,8 +826,13 @@ function pbl_testpage () { } function pbl_spamsubmission_form() { + global $manager; + // form - echo "
\n"; + echo "\n"; + echo "\n"; + echo "\n"; + $manager->addTicketHidden(); // table echo "\n"; diff --git a/trunk/NP_Blacklist/blacklist/cache_eaccelerator.php b/trunk/NP_Blacklist/blacklist/cache_eaccelerator.php index b615abf..9fc26fd 100644 --- a/trunk/NP_Blacklist/blacklist/cache_eaccelerator.php +++ b/trunk/NP_Blacklist/blacklist/cache_eaccelerator.php @@ -1,10 +1,10 @@ \ No newline at end of file +?> diff --git a/trunk/NP_Blacklist/blacklist/help.html b/trunk/NP_Blacklist/blacklist/help.html index e8e808d..265b7fc 100644 --- a/trunk/NP_Blacklist/blacklist/help.html +++ b/trunk/NP_Blacklist/blacklist/help.html @@ -3,6 +3,7 @@
  • Version 0.98 jp9: (2006/*/*)
  • 　[Changed] 正規表現に/m修飾子を追加
    • +
  • 　[Added] Ticket処理を追加(CSRF対策)
    diff --git a/trunk/NP_Blacklist/blacklist/index.php b/trunk/NP_Blacklist/blacklist/index.php index a3dee06..9843ebc 100644 --- a/trunk/NP_Blacklist/blacklist/index.php +++ b/trunk/NP_Blacklist/blacklist/index.php @@ -21,10 +21,14 @@ $oPluginAdmin->end(); exit; } - - - if (isset($_GET['page'])) {$action = $_GET['page'];} - if (isset($_POST['page'])) {$action = $_POST['page'];} + + $action = requestVar('action'); + $aActionsNotToCheck = array( + '', + ); + if (!in_array($action, $aActionsNotToCheck)) { + if (!$manager->checkTicket()) doError(_ERROR_BADTICKET); + } // Okay; we are allowed. let's go // create the admin area page @@ -100,13 +104,13 @@ echo "

    Here you can generate .htaccess snippets

    "; pbl_htaccesspage(); } elseif ($action == 'spamsubmission') { - if( $_REQUEST['action'] == 'send' && !empty($_REQUEST['url']) ){ - $result = $oPluginAdmin->plugin->submitSpamToBulkfeeds($_REQUEST['url']); + $url = requestVar('url'); + if( requestVar('type') == 'send' && ! empty($url) ){ + $result = $oPluginAdmin->plugin->submitSpamToBulkfeeds( $url ); echo "

    Spam submission

    "; echo "

    result

    "; - echo "
    " . htmlspecialchars($result) . "
    "; - + echo "
    " . htmlspecialchars($result, ENT_QUOTES) . "
    "; } else { echo "

    Spam submission

    "; pbl_spamsubmission_form(); -- 2.11.0