diff --git a/library/TorrentPier/Poll.php b/library/TorrentPier/Poll.php
new file mode 100644
index 000000000..a2cadbd70
--- /dev/null
+++ b/library/TorrentPier/Poll.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * Class Poll
+ */
+class Poll
+{
+	/**
+	 * @type string
+	 */
+	public $err_msg = '';
+
+	/**
+	 * @type array
+	 */
+	private $_poll_votes = [];
+	/**
+	 * @type int
+	 */
+	private $_max_votes = 0;
+
+	function __construct ()
+	{
+		global $bb_cfg;
+		$this->_max_votes = $bb_cfg['max_poll_options'];
+	}
+
+	/**
+	 * @param $posted_data
+	 *
+	 * @return string
+	 */
+	public function build_poll_data ($posted_data)
+	{
+		$poll_caption = (string) @$posted_data['poll_caption'];
+		$poll_votes   = (string) @$posted_data['poll_votes'];
+		
+		$this->_poll_votes = [];
+
+		if (!$poll_caption = str_compact($poll_caption))
+		{
+			global $lang;
+
+			return $this->err_msg = $lang['EMPTY_POLL_TITLE'];
+		}
+		$this->_poll_votes[] = $poll_caption; // заголовок имеет vote_id = 0
+
+		foreach (explode("\n", $poll_votes) as $vote)
+		{
+			if (!$vote = str_compact($vote))
+			{
+				continue;
+			}
+			$this->_poll_votes[] = $vote;
+		}
+
+		// проверять на "< 3" -- 2 варианта ответа + заголовок
+		if (count($this->_poll_votes) < 3 || count($this->_poll_votes) > $this->_max_votes + 1)
+		{
+			global $lang;
+
+			return $this->err_msg = sprintf($lang['NEW_POLL_VOTES'], $this->_max_votes);
+		}
+	}
+
+	/**
+	 * @param $topic_id
+	 */
+	public function insert_votes_into_db ($topic_id)
+	{
+		$this->delete_votes_data($topic_id);
+
+		$sql_ary = [];
+		foreach ($this->_poll_votes as $vote_id => $vote_text)
+		{
+			$sql_ary[] = [
+				'topic_id'    => (int) $topic_id,
+				'vote_id'     => (int) $vote_id,
+				'vote_text'   => (string) $vote_text,
+				'vote_result' => (int) 0,
+			];
+		}
+		$sql_args = DB()->build_array('MULTI_INSERT', $sql_ary);
+
+		DB()->query("REPLACE INTO " . BB_POLL_VOTES . $sql_args);
+
+		DB()->query("UPDATE " . BB_TOPICS . " SET topic_vote = 1 WHERE topic_id = $topic_id LIMIT 1");
+	}
+
+	/**
+	 * @param $topic_id
+	 */
+	public function delete_poll ($topic_id)
+	{
+		DB()->query("UPDATE " . BB_TOPICS . " SET topic_vote = 0 WHERE topic_id = $topic_id LIMIT 1");
+		$this->delete_votes_data($topic_id);
+	}
+
+	/**
+	 * @param $topic_id
+	 */
+	public function delete_votes_data ($topic_id)
+	{
+		DB()->query("DELETE FROM " . BB_POLL_VOTES . " WHERE topic_id = $topic_id");
+		DB()->query("DELETE FROM " . BB_POLL_USERS . " WHERE topic_id = $topic_id");
+		CACHE('bb_poll_data')->rm("poll_$topic_id");
+	}
+}
diff --git a/poll.php b/poll.php
index 3bec2d779..0fbaf4aec 100644
--- a/poll.php
+++ b/poll.php
@@ -3,7 +3,7 @@
 define('BB_SCRIPT', 'vote');
 require('./common.php');
 
-$user->session_start(array('req_login' => true));
+$user->session_start(['req_login' => true]);
 
 $mode     = (string) @$_POST['mode'];
 $topic_id = (int)    @$_POST['topic_id'];
@@ -15,7 +15,7 @@ $return_topic_url .= !empty($_POST['start']) ? "&amp;start=". intval($_POST['sta
 
 set_die_append_msg($forum_id, $topic_id);
 
-$poll = new bb_poll();
+$poll = new Poll();
 
 // проверка валидности $topic_id
 if (!$topic_id)
@@ -157,81 +157,3 @@ switch ($mode)
 	default:
 		bb_die('Invalid mode: '. htmlCHR($mode));
 }
-
-// Functions
-class bb_poll
-{
-	var $err_msg    = '';
-	var $poll_votes = array();
-	var $max_votes  = 0;
-
-	function bb_poll ()
-	{
-		global $bb_cfg;
-		$this->max_votes = $bb_cfg['max_poll_options'];
-	}
-
-	function build_poll_data ($posted_data)
-	{
-		$poll_caption = (string) @$posted_data['poll_caption'];
-		$poll_votes   = (string) @$posted_data['poll_votes'];
-		$this->poll_votes = array();
-
-		if (!$poll_caption = str_compact($poll_caption))
-		{
-			global $lang;
-			return $this->err_msg = $lang['EMPTY_POLL_TITLE'];
-		}
-		$this->poll_votes[] = $poll_caption; // заголовок имеет vote_id = 0
-
-		foreach (explode("\n", $poll_votes) as $vote)
-		{
-			if (!$vote = str_compact($vote))
-			{
-				continue;
-			}
-			$this->poll_votes[] = $vote;
-		}
-
-		// проверять на "< 3" -- 2 варианта ответа + заголовок
-		if (count($this->poll_votes) < 3 || count($this->poll_votes) > $this->max_votes + 1)
-		{
-			global $lang;
-			return $this->err_msg = sprintf($lang['NEW_POLL_VOTES'], $this->max_votes);
-		}
-	}
-
-	function insert_votes_into_db ($topic_id)
-	{
-		$this->delete_votes_data($topic_id);
-
-		$sql_ary = array();
-		foreach ($this->poll_votes as $vote_id => $vote_text)
-		{
-			$sql_ary[] = array(
-				'topic_id'    => (int) $topic_id,
-				'vote_id'     => (int) $vote_id,
-				'vote_text'   => (string) $vote_text,
-				'vote_result' => (int) 0,
-			);
-		}
-		$sql_args = DB()->build_array('MULTI_INSERT', $sql_ary);
-
-		DB()->query("REPLACE INTO ". BB_POLL_VOTES . $sql_args);
-
-		DB()->query("UPDATE ". BB_TOPICS ." SET topic_vote = 1 WHERE topic_id = $topic_id LIMIT 1");
-	}
-
-	function delete_poll ($topic_id)
-	{
-		DB()->query("UPDATE ". BB_TOPICS ." SET topic_vote = 0 WHERE topic_id = $topic_id LIMIT 1");
-		$this->delete_votes_data($topic_id);
-	}
-
-	function delete_votes_data ($topic_id)
-	{
-		DB()->query("DELETE FROM ". BB_POLL_VOTES ." WHERE topic_id = $topic_id");
-		DB()->query("DELETE FROM ". BB_POLL_USERS ." WHERE topic_id = $topic_id");
-		CACHE('bb_poll_data')->rm("poll_$topic_id");
-	}
-}
\ No newline at end of file