cvs: php-bugs-web / bug.php style.css /include functions.inc
| From: | Jani Taskinen | Date: | Mon, 15 Dec 2003 21:54:55 +0000 |
| Subject: | cvs: php-bugs-web / bug.php style.css /include functions.inc | ||
| Groups: | php.mirrors | ||
| Request: | Send a blank email to php-mirrors+get-22564@lists.php.net to get a copy of this message | ||
sniper Mon Dec 15 16:54:55 2003 EDT
Modified files:
/php-bugs-web bug.php style.css
/php-bugs-web/include functions.inc
Log:
- Revert unnecessary patch that made reports unreadable.
# Please, this thing is supposed to be usable, not look fancy..
Index: php-bugs-web/bug.php
diff -u php-bugs-web/bug.php:1.55 php-bugs-web/bug.php:1.56
--- php-bugs-web/bug.php:1.55 Mon Dec 15 12:30:17 2003
+++ php-bugs-web/bug.php Mon Dec 15 16:54:54 2003
@@ -22,7 +22,7 @@
list($user,$pw) = explode(":", base64_decode($MAGIC_COOKIE));
}
-@mysql_connect("localhost","nobody","")
+@mysql_pconnect("localhost","nobody","")
or die("Unable to connect to SQL server.");
@mysql_select_db("php3");
@@ -485,10 +485,10 @@
echo "<div class=\"comment\">";
echo "<b>[",format_date($ts),"] ",
htmlspecialchars(spam_protect($email)), "</b>\n";
echo ($edit == 1 && $com_id !== 0 && in_array($user, $trusted_developers)) ?
"<a
href=\"$PHP_SELF?id=$id&edit=1&delete_comment=$com_id\">[delete]</a>\n"
: '';
- echo "<div class=\"note\">";
+ echo "<pre class=\"note\">";
$note =
addlinks(preg_replace("/(\r?\n){3,}/","\n\n",wordwrap($comment,72,"\n",1)));
echo preg_replace('/(bug\ *#([0-9]+))/i', "<a
href=\"$PHP_SELF?id=\\2\">\\1</a>", $note);
- echo "</div>\n";
+ echo "</pre>\n";
echo "</div>";
}
Index: php-bugs-web/style.css
diff -u php-bugs-web/style.css:1.20 php-bugs-web/style.css:1.21
--- php-bugs-web/style.css:1.20 Mon Dec 15 12:30:17 2003
+++ php-bugs-web/style.css Mon Dec 15 16:54:54 2003
@@ -37,7 +37,7 @@
font-size: 90%;
}
-div.note {
+pre.note {
margin-left: 20px;
}
Index: php-bugs-web/include/functions.inc
diff -u php-bugs-web/include/functions.inc:1.104 php-bugs-web/include/functions.inc:1.105
--- php-bugs-web/include/functions.inc:1.104 Mon Dec 15 12:30:18 2003
+++ php-bugs-web/include/functions.inc Mon Dec 15 16:54:55 2003
@@ -432,8 +432,8 @@
function addlinks($text)
{
- $text = highlight_string($text, true);
- $text =
preg_replace("/((mailto|http|ftp|nntp|news):.+?)(>|\\s|[,)<]|\\.\\s|$)/i","<a
href=\"\\1\">\\1</a>\\3",$text);
+ $text = htmlspecialchars($text);
+ $text =
preg_replace("/((mailto|http|ftp|nntp|news):.+?)(>|\\s|\\)|\\.\\s|$)/i","<a
href=\"\\1\">\\1</a>\\3",$text);
# what the heck is this for?
$text = preg_replace("/[.,]?-=-\"/", '"', $text);
return $text;