- fixed potential quote problem: wrapped $story->section in a check_output

- removed all $story->update related logic - the update field is redundant
3-00
Dries Buytaert 2001-03-24 16:26:56 +00:00
parent 7afe387d9a
commit de7e1fb66a
4 changed files with 24 additions and 32 deletions

View File

@ -43,7 +43,7 @@
<TABLE BORDER="1">
<TR>
<TD COLSPAN="2">
<?php echo check_output($story->subject); ?>
<?php echo check_output($story->title); ?>
</TD>
</TR>
<TR>
@ -58,7 +58,7 @@
<TD>
<?php
echo "<A HREF=\"search.php?category=". urlencode($story->section) ."\">$story->section</A>";
echo "<A HREF=\"search.php?category=". urlencode($story->section) ."\">". check_output($story->section) ."</A>";
?>
@ -70,8 +70,6 @@
<?php
echo "<P>". check_output($story->abstract, 1) ."</P>";
if ($story->updates)
echo "<P>". t("Editor's note by <A HREF=\"account.php?op=userinfo&uname=$story->editor\">$story->editor</A>") .":". check_output($story->updates, 1) ."</P>";
if ($reply)
echo "<P>". check_output($story->article, 1) ."</P>";

View File

@ -91,7 +91,7 @@
function story($story, $reply = 0) {
echo "\n<!-- story: \"$story->subject\" -->\n";
echo "\n<!-- story: \"$story->title\" -->\n";
?>
<table border="0" cellspacing="0" cellpadding="0" width="100%">
@ -102,7 +102,7 @@
</tr>
<tr>
<td class="orl"><img src="themes/goofy/images/null.gif" alt=""></td>
<td class="orcnt" width="100%" valign="top" colspan="2"><?php echo check_output($story->subject); ?></td>
<td class="orcnt" width="100%" valign="top" colspan="2"><?php echo check_output($story->title); ?></td>
<td class="orr"><img src="themes/goofy/images/null.gif" alt=""></td>
</tr>
<tr>
@ -118,7 +118,7 @@
<tr>
<td class="lgl"><img src="themes/goofy/images/null.gif" alt=""></td>
<td class="lgcnt"><small><?php echo strtr(t("$how by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp, "large"))); ?></small></td>
<td class="lgcnt" nowrap><div align="right"><?php echo "<A HREF=\"search.php?category=". urlencode($story->section) ."\">$story->section</A>"; ?></div></td>
<td class="lgcnt" nowrap><div align="right"><?php echo "<A HREF=\"search.php?category=". urlencode($story->section) ."\">". check_output($story->section) ."</A>"; ?></div></td>
<td class="lgr"><img src="themes/goofy/images/null.gif" alt=""></td>
</tr>
<tr>
@ -126,8 +126,6 @@
<td class="lgcnt" width="100%" colspan="2"><hr color="#404040" size="1">
<?php
echo check_output($story->abstract, 1) ."<br><br>";
if ($story->updates)
echo t("Editor's note by <A HREF=\"account.php?op=userinfo&uname=$story->editor\">$story->editor</A>") .":". check_output($story->updates, 1) ."<br><br>";
if ($reply)
echo check_output($story->article, 1);
?>

View File

@ -85,7 +85,7 @@
<tr>
<td align="left" valign="bottom" width="20" height="20" background="themes/jeroen/images/<?php echo (rand(0, 1) ? "news1.gif" : "news3.gif"); ?>" nowrap>&nbsp;</td>
<td align="center" valign="top" width="100%" background="themes/jeroen/images/newsmiddle.gif" nowrap>
<B><?php echo "". check_output($story->subject) .""; ?></B>
<B><?php echo "". check_output($story->title) .""; ?></B>
</td>
<td align="right" valign="bottom" width="20" background="themes/jeroen/images/<?php echo (rand(0, 1) == 0) ? "news2.gif" : "news4.gif"; if (rand(0,100) == 50) "news5.gif"; ?>" nowrap>&nbsp;</td>
</tr>
@ -116,7 +116,7 @@
</FONT>
</td>
<td align=\"right\" background=\"themes/jeroen/images/menutitle.gif\" nowrap>
<B><a href=\"search.php?category=". urlencode($story->section) ."\"><FONT COLOR=\"#000000\">$story->section</FONT></A></B>";
<B><a href=\"search.php?category=". urlencode($story->section) ."\"><FONT COLOR=\"#000000\">". check_output($story->section) ."</FONT></A></B>";
?>
@ -128,8 +128,6 @@
<?php
echo "<br />". check_output($story->abstract, 1) ."<br />";
if ($story->updates)
echo "<P><FONT COLOR=\"#E09226\">". t("Editor's note by <a href=\"account.php?op=userinfo&uname=$story->editor\">$story->editor</A>") .":</FONT>". check_output($story->updates, 1) ."</P>";
if ($reply)
echo "<br />". check_output($story->article, 1) ."<br />";

View File

@ -86,7 +86,7 @@
<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" BGCOLOR="<?php echo $this->brcolor1; ?>" WIDTH="100%">
<TR><TD>
<TABLE BORDER="0" CELLPADDING="4" CELLSPACING="1" WIDTH="100%">
<TR><TD COLSPAN="2" BGCOLOR="<?php echo $this->bgcolor1; ?>" WIDTH="100%"><table width="100%" cellpadding="0" cellspacing="0"><tr><td width="100%"><FONT COLOR="<?php echo $this->fgcolor1; ?>"><B><?php echo "". check_output($story->subject, 1) .""; ?></B></FONT></td><td valign="middle" align="center"><IMG SRC="themes/<?php print $this->themename; ?>/images/icon.gif" valign="middle"></td></tr></table></TD></TR>
<TR><TD COLSPAN="2" BGCOLOR="<?php echo $this->bgcolor1; ?>" WIDTH="100%"><table width="100%" cellpadding="0" cellspacing="0"><tr><td width="100%"><FONT COLOR="<?php echo $this->fgcolor1; ?>"><B><?php echo "". check_output($story->title) .""; ?></B></FONT></td><td valign="middle" align="center"><IMG SRC="themes/<?php print $this->themename; ?>/images/icon.gif" valign="middle"></td></tr></table></TD></TR>
<TR BGCOLOR="<?php echo $this->bgcolor2; ?>">
<?php
if ($story->section) { print "<TD WIDTH=\"70%\" BGCOLOR=\"$this->bgcolor2\">"; }
@ -94,7 +94,7 @@
if ($story->userid) { print "<SMALL>Posted by " . format_username($story->userid) . " on $timestamp"; }
else { print "<SMALL>Posted by $anonymous on $timestamp"; }
if ($story->section) { print "</TD><TD WIDTH=\"30%\" BGCOLOR=\"$this->bgcolor2\" ALIGN=\"center\"><B><A HREF=\"index.php?section=" . urlencode($story->section) . "\"><FONT COLOR=\"$this->sectioncolor\">$story->section</FONT></A></B>"; }
if ($story->section) { print "</TD><TD WIDTH=\"30%\" BGCOLOR=\"$this->bgcolor2\" ALIGN=\"center\"><B><A HREF=\"index.php?section=" . urlencode($story->section) . "\"><FONT COLOR=\"$this->sectioncolor\">". check_output($story->section) ."</FONT></A></B>"; }
?>
</TD>
</TR>
@ -102,8 +102,6 @@
<TD BGCOLOR="<?php echo $this->bgcolor2 ?>" COLSPAN="2">
<?php
echo "<P>". check_output($story->abstract, 1) ."</P>";
if ($story->updates)
echo "<P><FONT COLOR=\"$this->fgcolor3\">Editor's note by " . format_username($editor) . ":</FONT> ". check_output($story->updates, 1) ."</P>";
if ($reply)
if ($story->article) print "<P>". check_output($story->article, 1) ."</P>\n";
?>