From cd57f1aef8b7c59e536f1f1ac2ceaa7199654b8b Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Wed, 23 Mar 2016 20:13:26 -0700
Subject: [PATCH] Forum notice fixes and bootstrap3 poll styling.

---
 e107_plugins/forum/forum.css                         |  1 +
 e107_plugins/forum/forum_class.php                   |  6 ++++--
 e107_plugins/forum/forum_viewtopic.php               |  2 +-
 e107_plugins/forum/templates/forum_poll_template.php | 12 ++++++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/e107_plugins/forum/forum.css b/e107_plugins/forum/forum.css
index 9734209d7..b14b252a8 100644
--- a/e107_plugins/forum/forum.css
+++ b/e107_plugins/forum/forum.css
@@ -17,6 +17,7 @@
 ul.newforumposts-menu                                    { padding-left: 10px; }
 ul.newforumposts-menu li                                 { margin-bottom: 15px;  }
 
+div.forum-poll-results                                  { padding-left:0 }
 
 @media all and (min-height: 800px) {
     #forum, #forum-stats, #forum-rules                  { min-height: 500px;  }
diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php
index f79673197..d6ec40b1b 100644
--- a/e107_plugins/forum/forum_class.php
+++ b/e107_plugins/forum/forum_class.php
@@ -1337,13 +1337,15 @@ class e107forum
 			$sql->select('user', 'user_id, user_name','user_admin = 1 ORDER BY user_name ASC');
 			while($row = $sql->fetch())
 			{
-				$this->modArray[$row['user_id']] = $row['user_name'];
+				$this->modArray[$row['user_id']] = $row;
 			}
 		}
 		else
 		{
-			$this->modArray = $this->e107->user_class->get_users_in_class($uclass, 'user_name', true);
+			$this->modArray = e107::getUserClass()->get_users_in_class($uclass, 'user_name', true);
 		}
+
+
 		return $this->modArray;
 	}
 
diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php
index 4b3a93f81..aebba3e3f 100644
--- a/e107_plugins/forum/forum_viewtopic.php
+++ b/e107_plugins/forum/forum_viewtopic.php
@@ -532,7 +532,7 @@ require_once (HEADERF);
 if ($forum->prefs->get('enclose'))
 {
 	$forumTitle = e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME);
-	$ns->tablerender($forumTitle, $forumstring, $mes->render(). array('forum_viewtopic', 'main'));
+	$ns->tablerender($forumTitle, $mes->render().$forumstring,  array('forum_viewtopic', 'main'));
 }
 else
 {
diff --git a/e107_plugins/forum/templates/forum_poll_template.php b/e107_plugins/forum/templates/forum_poll_template.php
index e2513f826..2f0c611ce 100644
--- a/e107_plugins/forum/templates/forum_poll_template.php
+++ b/e107_plugins/forum/templates/forum_poll_template.php
@@ -17,7 +17,7 @@ $FORUM_POLL_TEMPLATE = array();
 
 $FORUM_POLL_TEMPLATE['form']['start'] = "
 <div class='clearfix'>
-	<div class='well col-md-8 span6'>
+	<div class='well col-md-8 span6 forum-poll-form'>
 		<div class='form-group control-group'>
 			Poll: {QUESTION}
 			
@@ -44,8 +44,10 @@ $FORUM_POLL_TEMPLATE['form']['end'] = "
 
 $FORUM_POLL_TEMPLATE['results']['start'] = "
 <div class='clearfix'>
-	<div class='well span6'>
-		<h5>Poll: {QUESTION}</h5>
+<div class='col-md-10 forum-poll-results'>
+	<div class='panel panel-primary'>
+		<div class='panel-heading'>Poll: {QUESTION}</div>
+		<div class='panel-body'>
 ";
 
 $FORUM_POLL_TEMPLATE['results']['item'] = "
@@ -54,7 +56,9 @@ $FORUM_POLL_TEMPLATE['results']['item'] = "
 ";
 
 $FORUM_POLL_TEMPLATE['results']['end'] = "
-		<div class='text-center'><small>{VOTE_TOTAL}</small></div>
+			<div class='text-center'><small>{VOTE_TOTAL}</small></div>
+		</div>
+	</div>
 	</div>
 </div>
 ";