Changeset 779

Timestamp:

04/30/08 12:50:07 (7 months ago)

Author:

michiel

Message:

move captcha stuff to a plugin

Location:

trunk

Files:

• common/captcha.php (deleted)
• common/mvblog.php (modified) (3 diffs)
• common/mvblog_common.php (modified) (1 diff)
• plugins/mvblog_captcha.php (added)
• plugins/mvblog_captcha_files (added)
• plugins/mvblog_captcha_files/image.php (added)

trunk/common/mvblog.php

@@ -584 +584 @@
                                                         <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();
+                                                                if ($anoncomments && !array_key_exists("blog_user", $_SESSION) && !array_key_exists("author_email", $_SESSION)) {
+                                                                        $captcha = $this->plugman->run_hooks("captcha_output", "");
+                                                                        echo $captcha;
+                                                                        echo "<input type=\"hidden\" name=\"checkcap\" value=\"1\" />\n";
+                                                                }
                                                         ?>
                                                         <script type="text/javascript" language="Javascript1.2" src="common/js/xmlhttp.js"></script>
@@ -916 +919 @@
                 $sanitize_options_email        = array("email" => 1);
                 if (array_key_exists("checkcap", $postdata) && $postdata["checkcap"]) {
-                        if ($postdata["caphid"] != md5($postdata["captcha"]))
+                        $captcha_check = $this->plugman->run_hooks("captcha_check", $postdata);
+                        if ($captcha_check) {
+                                $captcha_error = 0;
+                        } else {
                                 $captcha_error = 1;
-                        else
-                                $captcha_error = 0;
+                        }
 
                         /* check if name and email address are already in the database */
@@ -954 +959 @@
                         if ($row["count"] == 0) { die(gettext("no valid article given")); }
                         /* check for anon comments on non-anon comments enabled post/blog */
-                        if ($_SESSION["blog_user"]["user_id"] || $_SESSION["author_id"]) {
+                        if ((array_key_exists("blog_user", $_SESSION) && $_SESSION["blog_user"]["user_id"]) || (array_key_exists("author_id", $_SESSION) && $_SESSION["author_id"])) {
                                 $anon_user = false;
                         } else {

trunk/common/mvblog_common.php

@@ -1108 +1108 @@
         }
         /* }}} */
-        /* show_captcha {{{ */
-        /**
-         * Show a captcha and hidden input and user input field
-         */
-        public function show_captcha() {
-                // generate random text string
-                $txt = "";
-                for ($i=0; $i<6; $i++) {
-                        $set = array(rand(65,90), rand(97,122));
-                        $txt .= chr($set[rand(0,1)]);
-                }
-                $_SESSION["txt"] = $txt;
-                echo "<img src=\"common/captcha.php\">";
-                //create tmp image file
-                echo "<input type=\"hidden\" name=\"checkcap\" value=\"1\" />\n";
-                echo "<input type=\"hidden\" name=\"caphid\" value=\"".md5($txt)."\" />\n";
-                echo "<input type=\"text\" name=\"captcha\" style=\"width: 60px;\" />&nbsp;".gettext("Type the text as shown on the left.")."<br /><br />\n";
-        }
-        /* }}} */
 }