[php-blog-cvs] serendipity comment.php,1.6,1.7 serendipity_functions.inc.php,1.47,1.48

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv11366

Modified Files:
	comment.php serendipity_functions.inc.php 
Log Message:
You can now delete trackbacks

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- comment.php	24 May 2003 01:33:19 -0000	1.6
+++ comment.php	24 May 2003 14:35:24 -0000	1.7
@@ -2,8 +2,8 @@
 session_start();
 include_once('serendipity_config.inc.php');
 
-if ( isset($_GET['delete'],$_GET['entry']) ) {
-    serendipity_deleteComment($_GET['delete'],$_GET['entry']);
+if ( isset($serendipity['GET']['delete'],$serendipity['GET']['entry'],$serendipity['GET']['type']) ) {
+    serendipity_deleteComment($serendipity['GET']['delete'],$serendipity['GET']['entry'],$serendipity['GET']['type']);
 }
 
 /* It's time to finally check if we need to remember the entered information, 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- serendipity_functions.inc.php	24 May 2003 14:10:39 -0000	1.47
+++ serendipity_functions.inc.php	24 May 2003 14:35:24 -0000	1.48
@@ -358,7 +358,7 @@
 
 }
 
-function serendipity_deleteComment($id,$entry_id)
+function serendipity_deleteComment($id,$entry_id,$type='comments')
 {
     global $serendipity;
 
@@ -366,7 +366,7 @@
         $query = "DELETE FROM {$serendipity['dbPrefix']}comments WHERE entry_id = ". $entry_id ." AND id = ". $id;
         serendipity_db_query($query);
 
-        $query = "UPDATE {$serendipity['dbPrefix']}entries SET comments = comments-1 WHERE id = ". $entry_id;
+        $query = "UPDATE {$serendipity['dbPrefix']}entries SET $type = $type-1 WHERE id = ". $entry_id;
         serendipity_db_query($query);
         header('Location: '. $_SERVER['HTTP_REFERER']);
     } else {
@@ -428,7 +428,7 @@
     <?php
     	if ($_SESSION["serendipityAuthedUser"] === true) {
     ?>
-    (<a href="<?=$serendipity["baseURL"]?>comment.php?delete=<?=$comment['id']?>&entry=<?=$comment['entry_id']?>"><?= DELETE ?></a>)
+    (<a href="<?=$serendipity["baseURL"]?>comment.php?serendipity[delete]=<?=$comment['id']?>&serendipity[entry]=<?=$comment['entry_id']?>&serendipity[type]=comments"><?= DELETE ?></a>)
     <?php
     	}
     ?></div>
@@ -461,11 +461,11 @@
     <?=htmlentities(strip_tags($comment['body']))?><br />
 	<div class="serendipity_comment_source">
     <b>Weblog: </b> <?=strip_tags($name)?><br />
-    <b>Tracked: </b><?=date("M d, h:i", $comment['timestamp'])?><p />
+    <b>Tracked: </b><?=date("M d, h:i", $comment['timestamp'])?>
     <?php
     	if ($_SESSION["serendipityAuthedUser"] === true) {
     ?>
-    (<a href="<?=$serendipity["baseURL"]?>comment.php?delete=<?=$comment['id']?>&entry=<?=$comment['entry_id']?>"><?= DELETE ?></a>)
+    (<a href="<?=$serendipity["baseURL"]?>comment.php?serendipity[delete]=<?=$comment['id']?>&serendipity[entry]=<?=$comment['entry_id']?>&serendipity[type]=trackbacks"><?= DELETE ?></a>)
     <?php
     	}
     ?></div>