Skip to content
Snippets Groups Projects
Commit e0c19803 authored by Steven Wittens's avatar Steven Wittens
Browse files

Poll.module: 

Added a page showing a list of older polls.
parent f520a8b4
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Hide whitespace changes
Inline Side-by-side
modules/poll.module
+ 21
− 2
View file @ e0c19803
......@@ -122,6 +122,9 @@ function poll_link($type) {
if ($type == "menu.create" && user_access("post content")) {
$links[] = lm(t("create poll"), array("mod" => "node", "op" => "add", "type" => "poll"), "", array("title" => t("Add a new poll.")));
}
else if ($type == "page" && user_access("access content")) {
$links[] = lm(t("polls"), array("mod" => "poll"), "", array("title" => t("View the list of polls on this site.")));
}
return $links ? $links : array();
}
......@@ -145,6 +148,18 @@ function poll_node($field) {
return $info[$field];
}
function poll_page() {
global $theme;
$theme->header();
$result = db_query("SELECT n.nid, n.title, p.active, SUM(c.chvotes) AS votes FROM node n LEFT JOIN poll p ON n.nid=p.nid LEFT JOIN poll_choices c ON n.nid=c.nid WHERE type='poll' AND status='1' AND moderate='0' GROUP BY n.nid");
while ($node = db_fetch_object($result)) {
$output .= "<li>". l($node->title, array("id" => $node->nid)) ." - ". format_plural($node->votes, "vote", "votes") ." - ". ($node->active ? t("open") : t("closed")) ."</li>";
}
$theme->box(t("Polls"), $output);
$theme->footer();
}
function poll_perm() {
return array("vote on polls");
}
......@@ -233,7 +248,9 @@ function poll_view(&$node, $main = 0, $block = 0) {
else {
$output .= "</td><td valign=\"middle\"><div align=\"right\">&nbsp;&nbsp;&nbsp;". form_submit(t("Vote")) ."</div></td></tr></table>";
}
$output .= $block ? "<div align=\"center\">". $theme->links(link_node($node, $main)) ."</div>" : "";
$links = link_node($node, $main);
$links[] = lm(t("older polls"), array("mod" => "poll"), "", array("title" => t("View the list of polls on this site.")));
$output .= $block ? "<div align=\"center\">". $theme->links($links) ."</div>" : "";
$output .= "</form>";
}
else {
......@@ -273,7 +290,9 @@ function poll_view(&$node, $main = 0, $block = 0) {
// Prevent a 'read more' link in the side-block.
$node->body = $node->teaser = "";
}
$output .= "<br /><div align=\"center\">Total votes: ". $votestotal . ($block ? "<br />". $theme->links(link_node($node, $main)) : "") ."</div>";
$links = link_node($node, $main);
$links[] = lm(t("older polls"), array("mod" => "poll"), "", array("title" => t("View the list of polls on this site.")));
$output .= "<br /><div align=\"center\">Total votes: ". $votestotal . ($block ? "<br />". $theme->links($links) : "") ."</div>";
}
// Force the output on both the mainpage and elsewhere
$node->body = $output;
......
modules/poll/poll.module
+ 21
− 2
View file @ e0c19803
......@@ -122,6 +122,9 @@ function poll_link($type) {
if ($type == "menu.create" && user_access("post content")) {
$links[] = lm(t("create poll"), array("mod" => "node", "op" => "add", "type" => "poll"), "", array("title" => t("Add a new poll.")));
}
else if ($type == "page" && user_access("access content")) {
$links[] = lm(t("polls"), array("mod" => "poll"), "", array("title" => t("View the list of polls on this site.")));
}
return $links ? $links : array();
}
......@@ -145,6 +148,18 @@ function poll_node($field) {
return $info[$field];
}
function poll_page() {
global $theme;
$theme->header();
$result = db_query("SELECT n.nid, n.title, p.active, SUM(c.chvotes) AS votes FROM node n LEFT JOIN poll p ON n.nid=p.nid LEFT JOIN poll_choices c ON n.nid=c.nid WHERE type='poll' AND status='1' AND moderate='0' GROUP BY n.nid");
while ($node = db_fetch_object($result)) {
$output .= "<li>". l($node->title, array("id" => $node->nid)) ." - ". format_plural($node->votes, "vote", "votes") ." - ". ($node->active ? t("open") : t("closed")) ."</li>";
}
$theme->box(t("Polls"), $output);
$theme->footer();
}
function poll_perm() {
return array("vote on polls");
}
......@@ -233,7 +248,9 @@ function poll_view(&$node, $main = 0, $block = 0) {
else {
$output .= "</td><td valign=\"middle\"><div align=\"right\">&nbsp;&nbsp;&nbsp;". form_submit(t("Vote")) ."</div></td></tr></table>";
}
$output .= $block ? "<div align=\"center\">". $theme->links(link_node($node, $main)) ."</div>" : "";
$links = link_node($node, $main);
$links[] = lm(t("older polls"), array("mod" => "poll"), "", array("title" => t("View the list of polls on this site.")));
$output .= $block ? "<div align=\"center\">". $theme->links($links) ."</div>" : "";
$output .= "</form>";
}
else {
......@@ -273,7 +290,9 @@ function poll_view(&$node, $main = 0, $block = 0) {
// Prevent a 'read more' link in the side-block.
$node->body = $node->teaser = "";
}
$output .= "<br /><div align=\"center\">Total votes: ". $votestotal . ($block ? "<br />". $theme->links(link_node($node, $main)) : "") ."</div>";
$links = link_node($node, $main);
$links[] = lm(t("older polls"), array("mod" => "poll"), "", array("title" => t("View the list of polls on this site.")));
$output .= "<br /><div align=\"center\">Total votes: ". $votestotal . ($block ? "<br />". $theme->links($links) : "") ."</div>";
}
// Force the output on both the mainpage and elsewhere
$node->body = $output;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment