[php-blog-cvs] serendipity serendipity_functions.inc.php,1.44,1.45 comment.php,1.5,1.6

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

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

Modified Files:
	serendipity_functions.inc.php comment.php 
Log Message:
We now remember commentDetails, we can also forget them, both on request - no need for javascript

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- serendipity_functions.inc.php	23 May 2003 22:49:39 -0000	1.44
+++ serendipity_functions.inc.php	24 May 2003 01:33:19 -0000	1.45
@@ -12,15 +12,15 @@
 <table border="0" width="100%" cellpadding="3">
 <tr>
 <td class="serendipity_commentsLabel"><?=NAME?></td>
-<td class="serendipity_commentsValue"><input type="text" name="serendipity[name]" value="" size="30" /></td>
+<td class="serendipity_commentsValue"><input type="text" name="serendipity[name]" value="<?= $serendipity['COOKIE']['name'] ?>" size="30" /></td>
 </tr>
 <tr>
 <td class="serendipity_commentsLabel"><?=EMAIL?></td>
-<td class="serendipity_commentsValue"><input type="text" name="serendipity[email]" value="" /></td>
+<td class="serendipity_commentsValue"><input type="text" name="serendipity[email]" value="<?= $serendipity['COOKIE']['email'] ?>" /></td>
 </tr>
 <tr>
 <td class="serendipity_commentsLabel"><?=HOMEPAGE?></td>
-<td class="serendipity_commentsValue"><input type="text" name="serendipity[url]" value="" /></td>
+<td class="serendipity_commentsValue"><input type="text" name="serendipity[url]" value="<?= $serendipity['COOKIE']['url'] ?>" /></td>
 </tr>
 <tr>
 <td class="serendipity_commentsLabel"><?=COMMENT?></td>
@@ -28,26 +28,32 @@
 </tr>
 </table>
 <?=REMEMBER_INFO?>
-<input type="checkbox" name="serendipity_remember" /><br />
+<input type="checkbox" name="serendipity[remember]" <?= $serendipity['COOKIE']['remember'] ?>/><br />
 <input type="submit" value="<?=SUBMIT_COMMENT?>" />
 </form>
-<script type="text/javascript" language="javascript">
-<!--
-if (!document.serendipity_comment['serendipity[name]'].value)
-    document.serendipity_comment['serendipity[name]'].value = getCookie("serendipity_cmt_name");
-
-if (!document.serendipity_comment['serendipity[email]'].value)
-    document.serendipity_comment['serendipity[email]'].value = getCookie("serendipity_cmt_email");
-
-if (!document.serendipity_comment['serendipity[url]'].value)
-    document.serendipity_comment['serendipity[url]'].value = getCookie("serendipity_cmt_url");
-
-if (getCookie("serendipity_cmt_name"))
-    document.serendipity_comment.serendipity_remember.checked = 1;
-// -->
-</script>
 </div>
 <?php
+}
+function serendipity_setCookie($name,$value) {
+	global $serendipity;
+	setcookie("serendipity[$name]", $value, time()+60*60*24*30, $serendipity['serendipityHTTPPath']);
+	$_COOKIE[$name] = $value;
+}
+
+function serendipity_deleteCookie($name) {
+	setcookie("serendipity[$name]", "", time()-4000);
+	unset($_COOKIE[$name]);
+}
+function serendipity_rememberCommentDetails($details) {
+	foreach ( $details as $n=>$v ) {
+		serendipity_setCookie($n,$v);
+	}
+}
+function serendipity_forgetCommentDetails() {
+	global $serendipity;
+	foreach ($serendipity['COOKIE'] as $n => $v) {
+		serendipity_deleteCookie($n);
+	}
 }
 
 // Draws a little calendar in HTML

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- comment.php	22 May 2003 23:01:00 -0000	1.5
+++ comment.php	24 May 2003 01:33:19 -0000	1.6
@@ -6,6 +6,18 @@
     serendipity_deleteComment($_GET['delete'],$_GET['entry']);
 }
 
+/* It's time to finally check if we need to remember the entered information, 
+   the reason we are doing this up here, is because we want to send cookie-headers */
+if ( isset($serendipity['POST']['remember']) ) {
+    $details['url'] = $serendipity['POST']['url'];
+    $details['name'] = $serendipity['POST']['name'];
+    $details['email'] = $serendipity['POST']['email'];
+    $details['remember'] = 'checked';		
+    serendipity_rememberCommentDetails($details);
+} elseif ( isset($serendipity['POST']['comment']) ) {
+    serendipity_forgetCommentDetails();
+}
+
 
 if (!($type = @$_GET['type'])) {
     $type = 'normal';
@@ -43,26 +55,23 @@
 <body>
 <?php
 if (!isset($serendipity['POST']['comment'])) {
-if ($serendipity['GET']['type'] == "trackbacks") {
-echo '<div class="serendipity_commentsTitle">Trackbacks</div>';
-	serendipity_printTrackbacks(serendipity_fetchTrackbacks($id));
-}
-else {
+	if ($serendipity['GET']['type'] == "trackbacks") {
+		echo '<div class="serendipity_commentsTitle">Trackbacks</div>';
+		serendipity_printTrackbacks(serendipity_fetchTrackbacks($id));
+	} else {
 ?>
 <div class="serendipity_commentsTitle">Comments</div>
 <?php serendipity_printComments(serendipity_fetchComments($id)); ?>
 <div class="serendipity_commentsTitle">Add A Comment</div>
 <?php serendipity_displayCommentForm($id);
-}
+	}
 } else {
-    $remember = 0;
     $comment['url'] = $serendipity['POST']['url'];
     $comment['comment'] = trim($serendipity['POST']['comment']);
     $comment['name'] = $serendipity['POST']['name'];
     $comment['email'] = $serendipity['POST']['email'];
-
     if ( !empty($comment['comment']) ) {
-        serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL');
+	serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL');
 ?>
 Your comment was successfully added.  Click <a href="<?=$PHP_SELF?>?serendipity[entry_id]=<?=$serendipity['POST']['entry_id']?>">here</a> to return to
 the comments, and <a href="#" onClick="self.close()">here</a> to close this window.