Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Tidied up node.inc and node.php a bit. 

- Fixed annoyance in comment.inc.
3-00
Dries Buytaert 2001-06-30 07:47:50 +00:00
parent 9c43e8fc7a
commit f56e745350
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/comment.inc
View File

@ -55,14 +55,14 @@ function comment_form($edit) {
$form .= form_item(t("Your name"), format_username($user->userid));
// subject field:
$form .= form_textfield(t("Subject"), "subject", check_output($edit[subject]), 50, 60);
$form .= form_textfield(t("Subject"), "subject", $edit[subject], 50, 64);
// comment field:
$form .= form_textarea(t("Comment"), "comment", check_output($edit[comment] ? $edit[comment] : $user->signature), 50, 10, t("Allowed HTML tags") .": ". htmlspecialchars(variable_get("allowed_html", "")));
$form .= form_textarea(t("Comment"), "comment", $edit[comment] ? $edit[comment] : $user->signature, 70, 10, t("Allowed HTML tags") .": ". htmlspecialchars(variable_get("allowed_html", "")));
// preview button:
$form .= form_hidden("pid", check_output($edit[pid]));
$form .= form_hidden("id", check_output($edit[id]));
$form .= form_hidden("pid", $edit[pid]);
$form .= form_hidden("id", $edit[id]);
if (!$edit[comment]) {
$form .= form_submit(t("Preview comment"));

5
includes/node.inc
View File

@ -234,13 +234,10 @@ function node_index($node) {
return $node->attributes ? implode(" / ", node_attributes_view($node->attributes)) : " ";
}
function node_visible($node) {
function node_access($node) {
global $user, $status;
return ($node->status == $status[posted]) || ($node->status == $status[queued] && $user->id) || user_access("administer nodes");
}
function node_access($account, $node) {
return strstr($node->moderate, $account->userid);
}
?>

4
node.php
View File

@ -91,7 +91,7 @@ if ($number > 1) {
$result = db_query("SELECT n.*, u.userid FROM node n LEFT JOIN users u ON n.author = u.id WHERE n.title = '$title'");
while ($node = db_fetch_object($result)) {
if (node_visible($node)) {
if (node_access($node)) {
$output .= "<P><B><A HREF=\"node.php?id=$node->nid\">". check_output($node->title) ."</A></B><BR><SMALL>$node->type - ". format_username($node->userid) ." - ". format_date($node->timestamp, "small") ."</SMALL></P>";
}
}
@ -102,7 +102,7 @@ if ($number > 1) {
}
elseif ($number) {
$node = ($title ? node_get_object(array("title" => $title)) : node_get_object(array("nid" => ($edit[id] ? $edit[id] : $id))));
if ($node && node_visible($node)) {
if ($node && node_access($node)) {
switch ($op) {
case "history":
$theme->header();