X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=blobdiff_plain;f=nucleus%2Flibs%2FBAN.php;h=27f7af6f8320004efa3f4b87c99cd4e244801445;hp=cd8f8cff05e7db17056d5cbac7020eac418ecf0d;hb=c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c;hpb=fe4e862f6b23596d657c5228588785dfe537fb8f

diff --git a/nucleus/libs/BAN.php b/nucleus/libs/BAN.php
index cd8f8cf..27f7af6 100644
--- a/nucleus/libs/BAN.php
+++ b/nucleus/libs/BAN.php
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -125,3 +126,115 @@ class BanInfo
 		return;
 	}
 }
+=======
+<?php
+/*
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+ * Copyright (C) 2002-2009 The Nucleus Group
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * (see nucleus/documentation/index.html#license for more info)
+ */
+/**
+ * PHP class responsible for ban-management.
+ *
+ * @license http://nucleuscms.org/license.txt GNU General Public License
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group
+ * @version $Id: BAN.php 1812 2012-05-01 14:59:07Z sakamocchi $
+ */
+
+class Ban
+{
+	/**
+	 * Checks if a given IP is banned from commenting/voting
+	 *
+	 * Returns 0 when not banned, or a BanInfo object containing the
+	 * message and other information of the ban
+	 */
+	public function isBanned($blogid, $ip)
+	{
+		$blogid = intval($blogid);
+		$query = sprintf('SELECT * FROM %s WHERE blogid=%d', sql_table('ban'), intval($blogid));
+		$res = DB::getResult($query);
+		foreach ( $res as $row )
+		{
+			$found = i18n::strpos ($ip, $row['iprange']);
+			if ( $found !== false )
+			{
+				// found a match!
+				return new BanInfo($row['iprange'], $row['reason']);
+			}
+		}
+		return 0;
+	}
+
+	/**
+	 * Ban::addBan()
+	 * Adds a new ban to the banlist. Returns 1 on success, 0 on error
+	 * 
+	 * @param	Integer	$blogid	ID for weblog
+	 * @param	String 	$iprange	IP range
+	 * @param	String 	$reason	reason for banning
+	 * @return	Boolean
+	 * 
+	 */
+	public function addBan($blogid, $iprange, $reason)
+	{
+		global $manager;
+
+		$data = array(
+				'blogid'	=> $blogid,
+				'iprange'	=> &$iprange,
+				'reason'	=> &$reason
+			);
+		$manager->notify('PreAddBan', $data);
+		
+		$query = 'INSERT INTO %s (blogid, iprange, reason) VALUES (%d, %s, %s)';
+		$query = sprintf($query, sql_table('ban'), intval($blogid), DB::quoteValue($iprange), DB::quoteValue($reason));
+		$res = DB::execute($query);
+		
+		$manager->notify('PostAddBan', $data);
+		
+		return $res !== FALSE ? 1 : 0;
+	}
+	
+	/**
+	 * Removes a ban from the banlist (correct iprange is needed as argument)
+	 * Returns 1 on success, 0 on error
+	 */
+	public function removeBan($blogid, $iprange)
+	{
+		global $manager;
+		
+		$data = array(
+			'blogid'	=> $blogid,
+			'range'		=> $iprange
+		);
+		$manager->notify('PreDeleteBan', $data);
+		
+		$query = 'DELETE FROM %s WHERE blogid=%d and iprange=%s';
+		$query = sprintf($query, sql_table('ban'), intval($blogid), DB::quoteValue($iprange));
+		$res = DB::execute($query);
+		
+		$manager->notify('PostDeleteBan', $data);
+		
+		return $res !== FALSE ? 1 : 0;
+	}
+}
+
+class BanInfo
+{
+	public $iprange;
+	public $message;
+	
+	public function __construct($iprange, $message)
+	{
+		$this->iprange = $iprange;
+		$this->message = $message;
+		return;
+	}
+}
+>>>>>>> skinnable-master