Changeset 643 for team

Timestamp:

09/16/07 17:00:23 (14 months ago)

Author:

www-data

Message:

automerge commit

Location:

team/michiel/import_blogs

Files:

• . (modified) (1 prop)
• common/js/xmlhttp.js (copied) (copied from trunk/common/js/xmlhttp.js)
• common/mvblog.php (modified) (5 diffs)
• common/mvblog_admin.php (modified) (1 diff)
• common/previewcomment.php (copied) (copied from trunk/common/previewcomment.php)

team/michiel/import_blogs/common/mvblog.php

@@ -480 +480 @@
 
                                 foreach ($comments as $comment_id=>$comment) {
-                                        ?>
-                                        <a name="comment<?php echo $comment_id; ?>"></a>
-                                        <div class="log_comment_head">
-                                                <span class="log_comment_subject">
-                                                        <h1 class="log_comment_h1"><?php echo $comment["title"]; ?></h1>
-                                                </span>
-                                        </div>
-                                        <div class="log_comment_body">
-                                                <?php echo $comment["comment"];
-                                                ?>
-                                        </div>
-                                        <div class="log_comment_foot">
-                                                <span class="log_comment_author">
-                                                        <?php
-                                                                echo gettext("posted by").": ".$comment["name"];
-                                                                if ($comment["ip"])
-                                                                        echo "&nbsp;(".$comment["ip"].")&nbsp;";
-                                                                echo gettext("on").": ".$comment["hdate"];
-                                                        ?>
-                                                </span>
-
-                                                <?php if ($comment["email"]) { ?>
-                                                        <br /><span class="log_comment_email"><a href="mailto:<?php echo $comment["email"]; ?>"><?php echo $comment["email"]; ?></a></span>
-                                                <?php } ?>
-                                                <?php if ($comment["website"] && $comment["website"] != "http://") { ?>
-                                                        <span class="log_comment_website"><a href="<?php echo $comment["website"]; ?>"><?php echo $comment["website"]; ?></a></span>
-                                                <?php } ?>
-                                        </div>
-                                        <?php
+                                        echo $this->show_comment($comment);
                                 }
                         }
                         ?>
+                </div>
+                <div class="log_comment" id="commentpreviewdiv" style="visibility: hidden;">
                 </div>
                 <div class="log_form">
@@ -546 +520 @@
                                         }
                                         ?>
-                                        <form name="comment" method="post" action="index.php">
+                                        <form name="comment" id="commentform" method="post" action="index.php">
                                         <input type="hidden" name="action" value="post_comment" />
+                                        <input type="hidden" name="id" id="id" value="" />
                                         <input type="hidden" name="articles_id" value="<?php echo (int)$id; ?>" />
                                         <table><tr>
@@ -581 +556 @@
                                         </tr><tr>
                                                 <td class="log_form_name"><?php echo gettext("title"); ?>:</td>
-                                                <td class="log_form_value"><input type="text" name="comment_title" size="30" value="" /></td>
+                                                <td class="log_form_value"><input type="text" name="comment_title" size="30" value="<?php if (array_key_exists("comment_title", $_POST)) echo $_POST["comment_title"]; ?>" /></td>
                                         <?php if ($locked == 0) { ?>
                                                 </tr><tr>
@@ -594 +569 @@
                                                                 echo "[b][i][u][url=http...][quote][code][strike][email][img]<br />";
                                                         ?>
-                                                        <textarea name="comment_content" rows="20" cols="50"></textarea><br />
+                                                        <textarea name="comment_content" rows="20" cols="50"><?php if (array_key_exists("comment_content", $_POST)) echo $_POST["comment_content"]; ?></textarea><br />
                                                         <?php
                                                                 if ($anoncomments && !array_key_exists("blog_user", $_SESSION) && !array_key_exists("author_email", $_SESSION))
                                                                         $this->show_captcha();
                                                         ?>
+                                                        <script type="text/javascript" language="Javascript1.2" src="common/js/xmlhttp.js"></script>
+                                                        <script type="text/javascript" language="Javascript1.2">
+                                                                function previewComment() {
+                                                                        var commentform = document.getElementById('commentform');
+                                                                        var title = escape(commentform.comment_title.value);
+                                                                        var comment = escape(commentform.comment_content.value);
+                                                                        var name = escape(commentform.comment_author.value);
+                                                                        var email = escape(commentform.comment_email.value);
+                                                                        var website = escape(commentform.comment_url.value);
+                                                                        var previewurl = 'common/previewcomment.php?action=show_comment_preview&title=' + title + '&comment=' + comment + '&name=' + name + '&email=' + email + '&website=' + website;
+                                                                        document.getElementById('commentpreviewdiv').innerHTML = loadXMLContent(previewurl);
+                                                                        document.getElementById('commentpreviewdiv').style.visibility='visible';
+                                                                }
+                                                        </script>
+                                                        <input type="button" onclick="javascript: previewComment();" value="<?php echo gettext("preview comment"); ?>" />
                                                         <input type="submit" value="<?php echo gettext("post comment"); ?>" />
                                                 </td>
@@ -607 +597 @@
                 </div>
                 <?php
+        }
+        /* }}} */
+        /* show_comment {{{ */
+        /**
+         * Format the output for a comment.
+         *
+         * @param array $commentdata The data for this comment
+         */
+        public function show_comment($commentdata) {
+                $output ="";
+                $output .= "<div class=\"log_comment_head\">\n";
+                $output .= "\t<span class=\"log_comment_subject\">\n";
+                $output .= "\t\t<h1 class=\"log_comment_h1\">".$commentdata["title"]."</h1>\n";
+                $output .= "\t</span>\n";
+                $output .= "</div>\n";
+                $output .= "<div class=\"log_comment_body\">\n";
+                $output .= "\t".$commentdata["comment"]."\n";
+                $output .= "</div>\n";
+                $output .= "<div class=\"log_comment_foot\">\n";
+                $output .= "\t<span class=\"log_comment_author\">\n";
+                $output .= "\t\t".gettext("posted by").": ".$commentdata["name"];
+                if ($commentdata["ip"])
+                        $output .= "&nbsp;(".$commentdata["ip"].")&nbsp;";
+                if (array_key_exists("hdate", $commentdata))
+                        $output .= gettext("on").": ".$commentdata["hdate"]."\n";
+                else
+                        $output .= gettext("on").": ".date("d-m-Y H:i")."\n";
+                $output .= "\t</span>\n";
+                if ($commentdata["email"])
+                        $output .= "\t<br /><span class=\"log_comment_email\"><a href=\"mailto:".$commentdata["email"]."\">".$commentdata["email"]."</a></span>\n";
+                if ($commentdata["website"] && $commentdata["website"] != "http://")
+                        $output .= "\t<span class=\"log_comment_website\"><a href=\"".$commentdata["website"]."\">".$commentdata["website"]."</a></span>\n";
+                $output .= "</div>\n";
+
+                return $output;
         }
         /* }}} */

team/michiel/import_blogs/common/mvblog_admin.php

@@ -1013 +1013 @@
                         <select name="options[year]">
                                 <option value="0">---</option>
-                                <?
+                                <?php
                                 /* find the first post we made so we know the start year */
                                 $sql1 = sprintf("SELECT %s FROM articles ORDER BY date ASC", $this->db_quote("date"));