Commit 7dfd5f0b authored by Kjartan's avatar Kjartan

- my editor got set up to insert tabs instead of spaces. Cleaning up.

parent 6d959ebe
......@@ -565,7 +565,7 @@ function comment_search($keys) {
$find = do_search(array("keys" => $keys,
"type" => "comment",
"select" => "select s.lno as lno, c.nid as nid, c.subject as title, c.timestamp as created, u.uid as uid, u.name as name, s.count as count FROM search_index s, comments c LEFT JOIN users u ON c.uid = u.uid WHERE s.lno = c.cid AND s.type = 'comment' AND s.word like '%'"));
return $find;
}
......@@ -761,8 +761,8 @@ function comment_update_index() {
// the table we are indexing. In this case, we also check against the
// last run date for the comments update.
return array("last_update" => "comment_cron_last",
"node_type" => "comment",
"select" => "SELECT c.cid as lno, c.subject as text1, c.comment as text2 FROM comments c WHERE timestamp > ". variable_get("comment_cron_last", 1));
"node_type" => "comment",
"select" => "SELECT c.cid as lno, c.subject as text1, c.comment as text2 FROM comments c WHERE timestamp > ". variable_get("comment_cron_last", 1));
}
?>
......@@ -565,7 +565,7 @@ function comment_search($keys) {
$find = do_search(array("keys" => $keys,
"type" => "comment",
"select" => "select s.lno as lno, c.nid as nid, c.subject as title, c.timestamp as created, u.uid as uid, u.name as name, s.count as count FROM search_index s, comments c LEFT JOIN users u ON c.uid = u.uid WHERE s.lno = c.cid AND s.type = 'comment' AND s.word like '%'"));
return $find;
}
......@@ -761,8 +761,8 @@ function comment_update_index() {
// the table we are indexing. In this case, we also check against the
// last run date for the comments update.
return array("last_update" => "comment_cron_last",
"node_type" => "comment",
"select" => "SELECT c.cid as lno, c.subject as text1, c.comment as text2 FROM comments c WHERE timestamp > ". variable_get("comment_cron_last", 1));
"node_type" => "comment",
"select" => "SELECT c.cid as lno, c.subject as text1, c.comment as text2 FROM comments c WHERE timestamp > ". variable_get("comment_cron_last", 1));
}
?>
......@@ -109,21 +109,21 @@ function page_view($node, $main = 0) {
$theme->node($node, $main);
}
else {
/*
** Extract the page body. If body is dynamic (using PHP code), the body
** will be generated.
*/
$output .= page_body($node);
/*
** Add the node specific links:
*/
$output .= "<div align=\"right\">". $theme->links(link_node($node, $main)) ."</div>";
$theme->box($node->title, $output);
}
/*
** Extract the page body. If body is dynamic (using PHP code), the body
** will be generated.
*/
$output .= page_body($node);
/*
** Add the node specific links:
*/
$output .= "<div align=\"right\">". $theme->links(link_node($node, $main)) ."</div>";
$theme->box($node->title, $output);
}
}
function page_form(&$node, &$help, &$error) {
......
......@@ -109,21 +109,21 @@ function page_view($node, $main = 0) {
$theme->node($node, $main);
}
else {
/*
** Extract the page body. If body is dynamic (using PHP code), the body
** will be generated.
*/
$output .= page_body($node);
/*
** Add the node specific links:
*/
$output .= "<div align=\"right\">". $theme->links(link_node($node, $main)) ."</div>";
$theme->box($node->title, $output);
}
/*
** Extract the page body. If body is dynamic (using PHP code), the body
** will be generated.
*/
$output .= page_body($node);
/*
** Add the node specific links:
*/
$output .= "<div align=\"right\">". $theme->links(link_node($node, $main)) ."</div>";
$theme->box($node->title, $output);
}
}
function page_form(&$node, &$help, &$error) {
......
......@@ -118,32 +118,32 @@ function queue_view($nid) {
if ($user->uid != $node->uid && !field_get($node->users, $user->uid)) {
if ($op == t("Vote") && $votes[$edit["vote"]]) {
/*
** If it is a valid vote, record it.
*/
queue_vote($node, $edit["vote"]);
$output = t("Your vote has been recorded.");
}
else {
/*
** Display some explanation or voting guidelines:
*/
$output .= "<p>". t("When new content get submitted it goes to the submission queue. Most, if not all, registered users can access this queue and can vote whether they think the content should be approved or not. When enough people vote to approve the content, it is pushed over the threshold and up it goes. On the other hand, when too many people voted to drop some content, the content will get trashed.") ."</p>";
/*
** Display a voting form:
*/
$output .= form_select(t("Your vote"), "vote", "", $votes);
$output .= form_hidden("id", $node->nid);
$output .= form_submit(t("Vote"));
$output = form($output);
}
}
/*
** If it is a valid vote, record it.
*/
queue_vote($node, $edit["vote"]);
$output = t("Your vote has been recorded.");
}
else {
/*
** Display some explanation or voting guidelines:
*/
$output .= "<p>". t("When new content get submitted it goes to the submission queue. Most, if not all, registered users can access this queue and can vote whether they think the content should be approved or not. When enough people vote to approve the content, it is pushed over the threshold and up it goes. On the other hand, when too many people voted to drop some content, the content will get trashed.") ."</p>";
/*
** Display a voting form:
*/
$output .= form_select(t("Your vote"), "vote", "", $votes);
$output .= form_hidden("id", $node->nid);
$output .= form_submit(t("Vote"));
$output = form($output);
}
}
$theme->header();
node_view($node);
......
......@@ -408,7 +408,7 @@ function search_view() {
}
$theme->footer();
}
}
else {
$theme->header();
$theme->box(t("Access denied"), message_access());
......
......@@ -408,7 +408,7 @@ function search_view() {
}
$theme->footer();
}
}
else {
$theme->header();
$theme->box(t("Access denied"), message_access());
......
Markdown is supported
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