mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Bugtracker #4553 - check for poll comments, odd tidying up

Browse Source
This commit is contained in:
e107steved
2008-11-16 17:49:24 +00:00
parent 33d6e29123
commit 5f42c93758
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
e107_plugins/poll/poll_class.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_plugins/poll/poll_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_plugins/poll/poll_class.php,v $
| $Revision: 1.11 $ | $Revision: 1.12 $
| $Date: 2008-08-17 11:54:39 $ | $Date: 2008-11-16 17:49:24 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -137,14 +137,12 @@ class poll
if ($sql->db_Select_gen($query)) if ($sql->db_Select_gen($query))
{ {
$pollArray = $sql -> db_Fetch(); $pollArray = $sql -> db_Fetch();
if (!check_class($pollArray['poll_vote_userclass'])) if (!check_class($pollArray['poll_vote_userclass']))
{ {
$POLLMODE = "disallowed"; $POLLMODE = "disallowed";
} }
else else
{ {
switch($pollArray['poll_storage_method']) switch($pollArray['poll_storage_method'])
{ {
case POLL_MODE_COOKIE: case POLL_MODE_COOKIE:
@@ -195,6 +193,10 @@ class poll
} }
} }
} }
else
{
return FALSE;
}
if(isset($_POST['pollvote']) && $POLLMODE == "notvoted" && ($POLLMODE != "disallowed")) if(isset($_POST['pollvote']) && $POLLMODE == "notvoted" && ($POLLMODE != "disallowed"))
{ {
if ($_POST['votea']) if ($_POST['votea'])
@@ -251,7 +253,10 @@ class poll
switch ($POLLMODE) switch ($POLLMODE)
{ {
case "query" : // Show poll, register any vote case "query" : // Show poll, register any vote
$this->get_poll($pollArray); if ($this->get_poll($pollArray) === FALSE)
{
return ''; // No display if no poll
}
$pollArray = $this->pollRow; $pollArray = $this->pollRow;
$POLLMODE = $this->pollmode; $POLLMODE = $this->pollmode;
break; break;
@@ -270,8 +275,7 @@ class poll
if($type == "preview") if($type == "preview")
{ {
/* load lan file */ /* load lan file */
@include_once(e_PLUGIN."poll/languages/".e_LANGUAGE.".php"); @include_lan(e_PLUGIN."poll/languages/".e_LANGUAGE.".php");
@include_once(e_PLUGIN."poll/languages/English.php");
$optionArray = $pollArray['poll_option']; $optionArray = $pollArray['poll_option'];
$voteArray = array(); $voteArray = array();
$voteArray = array_pad($voteArray, count($optionArray), 0); $voteArray = array_pad($voteArray, count($optionArray), 0);
@@ -279,8 +283,7 @@ class poll
} }
else if($type == "forum") else if($type == "forum")
{ {
@include_once(e_PLUGIN."poll/languages/".e_LANGUAGE.".php"); @include_lan(e_PLUGIN."poll/languages/".e_LANGUAGE.".php");
@include_once(e_PLUGIN."poll/languages/English.php");
if(isset($_POST['fpreview'])) if(isset($_POST['fpreview']))
{ {
$pollArray['poll_allow_multiple'] = $pollArray['multipleChoice']; $pollArray['poll_allow_multiple'] = $pollArray['multipleChoice'];
@@ -341,12 +344,16 @@ class poll
$preview = TRUE; $preview = TRUE;
} }
$comment_total = 0;
if ($pollArray['poll_comment'])
{ // Only get comments if they're allowed on poll
$comment_total = $sql->db_Select("comments", "*", "comment_item_id='".intval($pollArray['poll_id'])."' AND comment_type=4"); $comment_total = $sql->db_Select("comments", "*", "comment_item_id='".intval($pollArray['poll_id'])."' AND comment_type=4");
}
$QUESTION = $tp -> toHTML($pollArray['poll_title'], TRUE,"emotes_off, defs"); $QUESTION = $tp -> toHTML($pollArray['poll_title'], TRUE,"emotes_off, defs");
$VOTE_TOTAL = POLLAN_31.": ".$voteTotal; $VOTE_TOTAL = POLLAN_31.": ".$voteTotal;
$COMMENTS = ($pollArray['poll_comment'] ? " <a href='".e_BASE."comment.php?comment.poll.".$pollArray['poll_id']."'>".POLLAN_27.": ".$comment_total."</a>" : ""); $COMMENTS = ($pollArray['poll_comment'] ? " <a href='".e_BASE."comment.php?comment.poll.".$pollArray['poll_id']."'>".POLLAN_27.": ".$comment_total."</a>" : "");
$OLDPOLLS = ($type == "menu" ? "<a href='".e_PLUGIN."poll/oldpolls.php'>".POLLAN_28."</a>" : ""); $OLDPOLLS = ($type == "menu" ? "<a href='".e_PLUGIN_ABS."poll/oldpolls.php'>".POLLAN_28."</a>" : "");
$AUTHOR = POLLAN_35." ".($type == "preview" || $type == "forum" ? USERNAME : "<a href='".e_BASE."user.php?id.".$pollArray['poll_admin_id']."'>".$pollArray['user_name']."</a>"); $AUTHOR = POLLAN_35." ".($type == "preview" || $type == "forum" ? USERNAME : "<a href='".e_BASE."user.php?id.".$pollArray['poll_admin_id']."'>".$pollArray['user_name']."</a>");
switch ($POLLMODE) switch ($POLLMODE)