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

- more small improvements

3-00
Dries Buytaert 2001-03-08 19:30:41 +00:00
parent b109bb8644
commit a1b158334a
5 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
includes/comment.inc
View File

@ -59,7 +59,7 @@ function comment_reply($pid, $id) {
$pid = 0; $pid = 0;
if ($link == "story") { if ($link == "story") {
$item = db_fetch_object(db_query("SELECT stories.*, users.userid FROM stories LEFT JOIN users ON stories.author = users.id WHERE stories.status != 0 AND stories.id = '$id'")); $item = db_fetch_object(db_query("SELECT stories.*, users.userid FROM stories LEFT JOIN users ON stories.author = users.id WHERE stories.status != 0 AND stories.id = '$id'"));
$theme->story($item, ""); $theme->story($item, "[ ". t("reply to this story") ." ]");
} }
} }
@ -93,9 +93,6 @@ function comment_reply($pid, $id) {
function comment_preview($pid, $id, $subject, $comment) { function comment_preview($pid, $id, $subject, $comment) {
global $allowed_html, $link, $REQUEST_URI, $theme, $user; global $allowed_html, $link, $REQUEST_URI, $theme, $user;
$subject = check_output($subject);
$comment = check_output($comment);
// Preview comment: // Preview comment:
comment_view(new Comment($user->userid, $subject, $comment, time(), $user->url, $user->fake_email, 0, 0, 0, 0), t("reply to this comment")); comment_view(new Comment($user->userid, $subject, $comment, time(), $user->url, $user->fake_email, 0, 0, 0, 0), t("reply to this comment"));

2
includes/function.inc
View File

@ -88,7 +88,7 @@ function format_email($address) {
function format_url($address, $description = "") { function format_url($address, $description = "") {
global $na; global $na;
$description = ($description) ? $description : $address; $description = ($description) ? $description : $address;
return ($address) ? "<A HREF=\"$address\">$description</A>" : $na; return ($address) ? "<A HREF=\"$address\">". check_output($description) ."</A>" : $na;
} }
?> ?>

7
modules/diary.module
View File

@ -143,9 +143,6 @@ function diary_page_edit($id) {
function diary_page_preview($text, $timestamp, $id = 0) { function diary_page_preview($text, $timestamp, $id = 0) {
global $theme, $user, $allowed_html; global $theme, $user, $allowed_html;
$text = ($text) ? check_output($text) : "";
$timestamp = ($timestamp) ? check_output($timestamp) : "";
$output .= diary_page_entry($timestamp, $text); $output .= diary_page_entry($timestamp, $text);
$output .= "<FORM ACTION=\"module.php?mod=diary\" METHOD=\"post\">\n"; $output .= "<FORM ACTION=\"module.php?mod=diary\" METHOD=\"post\">\n";
@ -205,8 +202,8 @@ function diary_page() {
diary_page_display(check_input($name)); diary_page_display(check_input($name));
break; break;
case "Preview diary entry": case "Preview diary entry":
if ($id) diary_page_preview(check_input($text), check_input($timestamp), check_input($id)); if ($id) diary_page_preview(($text ? check_output($text) : ""), check_input($timestamp), check_input($id));
else diary_page_preview(check_input($text), time()); else diary_page_preview(($text ? check_output($text) : ""), time());
break; break;
case "Submit diary entry": case "Submit diary entry":
if ($id) diary_page_submit(check_input($text), check_input($id)); if ($id) diary_page_submit(check_input($text), check_input($id));

2
story.php
View File

@ -20,7 +20,7 @@ function story_render($id, $cid) {
switch($op) { switch($op) {
case t("Preview comment"): case t("Preview comment"):
$theme->header(); $theme->header();
comment_preview(check_input($pid), check_input($id), check_input($subject), check_input($comment)); comment_preview(check_input($pid), check_input($id), ($subject ? check_output($subject) : ""), ($comment ? check_output($comment) : ""));
$theme->footer(); $theme->footer();
break; break;
case t("Post comment"): case t("Post comment"):

8
submit.php
View File

@ -46,10 +46,6 @@ function submit_preview($subject, $abstract, $article, $section) {
include "includes/story.inc"; include "includes/story.inc";
$subject = ($subject) ? check_output($subject) : "";
$article = ($article) ? check_output($article) : "";
$abstract = ($abstract) ? check_output($abstract) : "";
$output .= "<FORM ACTION=\"submit.php\" METHOD=\"post\">\n"; $output .= "<FORM ACTION=\"submit.php\" METHOD=\"post\">\n";
$output .= "<B>". t("Your name") .":</B><BR>\n"; $output .= "<B>". t("Your name") .":</B><BR>\n";
@ -91,7 +87,7 @@ function submit_preview($subject, $abstract, $article, $section) {
$output .= "</FORM>\n"; $output .= "</FORM>\n";
$theme->header(); $theme->header();
$theme->story(new Story($user->userid, $subject, $abstract, $article, $section, time())); $theme->story(new Story($user->userid, $subject, $abstract, $article, $section, time()), "[ ". t("reply to this story") ." ]");
$theme->box(t("Submit a story"), $output); $theme->box(t("Submit a story"), $output);
$theme->footer(); $theme->footer();
} }
@ -113,7 +109,7 @@ function submit_submit($subject, $abstract, $article, $section) {
switch($op) { switch($op) {
case t("Preview submission"): case t("Preview submission"):
submit_preview(check_input($subject), check_input($abstract), check_input($article), check_input($section)); submit_preview(($subject ? check_output($subject) : ""), ($abstract ? check_output($abstract) : ""), ($article ? check_output($article) : ""), check_output($section));
break; break;
case t("Submit submission"): case t("Submit submission"):
submit_submit(check_input($subject), check_input($abstract), check_input($article), check_input($section)); submit_submit(check_input($subject), check_input($abstract), check_input($article), check_input($section));