Changeset 692424

Timestamp:

04/05/2013 07:44:37 PM (13 years ago)

Author:

solvemedia

Message:

bug fixes

Location:

solvemedia/trunk

Files:

• readme.txt (modified) (3 diffs)
• solvemedia.admin.inc (modified) (6 diffs)
• solvemedia.comment.inc (modified) (1 diff)
• solvemedia.php (modified) (1 diff)
• solvemedia.reg.inc (modified) (2 diffs)

solvemedia/trunk/readme.txt

@@ -3 +3 @@
 Tags: akismet, captcha, registration, contact form 7, advertising, anti-spam, plugin, solve media, spam, captcha advertising, security, monetize, type-in, security captcha, iPhone, iPad, Blackberry, Android, Windows Phone 7, WPMS, BuddyPress
 Requires at least: 2.8.4
-Tested up to: 3.3.1
-Stable tag: 1.1.1
+Tested up to: 3.5.1
+Stable tag: 1.1.2
 
 Secure & Monetize your site with Solve Media's CAPTCHA replacement.
@@ -43 +43 @@
 == Changelog ==
 
+= 1.1.2 =
+* Bug fix
+
 = 1.1.1 =
 * CSRF protection for admin options page
@@ -60 +63 @@
 
 == Upgrade Notice ==
+
+= 1.1.2 =
+Bug fix
 
 = 1.1.1 =

solvemedia/trunk/solvemedia.admin.inc

@@ -88 +88 @@
     // Create a dropdown of the types of users who are allowed to bypass the
     // human verification check
-    function sm_dropdown_capabilities() {
+    function sm_dropdown_capabilities($selected) {
         $capability_choices = array (
             'All registered users' => 'read',
@@ -98 +98 @@
 
         create_select('re_bypasslevel', $capability_choices,
-            $adcopy_opt['re_bypasslevel']);
+           $selected); 
     }
 
@@ -114 +114 @@
 
     // Create a dropdown of the languages
-    function sm_dropdown_languages() {
+    function sm_dropdown_languages($selected) {
         $lang_choices = array (
             'English'    => 'en',
@@ -133 +133 @@
         );
 
-        create_select('re_lang', $lang_choices, $adcopy_opt['re_lang']);
+        create_select('re_lang', $lang_choices, $selected);
     }
 ?>
@@ -207 +207 @@
                                puzzles for <strong>registered</strong> users who can:
                            </label>
-                           <?php sm_dropdown_capabilities() ?>
+                           <?php sm_dropdown_capabilities($adcopy_opt['re_bypasslevel']) ?>
                       </div>
 
@@ -302 +302 @@
                     <div class="lang-select">
                         <label for="re_lang">Language:</label>
-                        <?php sm_dropdown_languages() ?>
+                        <?php sm_dropdown_languages($adcopy_opt['re_lang']) ?>
                     </div>
 

solvemedia/trunk/solvemedia.comment.inc

@@ -90 +90 @@
         return $comment_data;
 
-    if ( $comment_data['comment_type'] == '' ) { // Do not check trackbacks/pingbacks
+    if ( !is_null($comment_data['comment_type']) && $comment_data['comment_type'] == '' ) { // Do not check trackbacks/pingbacks
     $response = solvemedia_wp_check_answer();
 

solvemedia/trunk/solvemedia.php

@@ -205 +205 @@
 
     $html  = $options;
-    $html  = '<p>' . $adcopy_opt['sm_instr'] . '</p>';
+    $html .= '<p>' . $adcopy_opt['sm_instr'] . '</p>';
     $html .= solvemedia_get_html($adcopy_opt['pubkey'], $error, $use_ssl, $adcopy_opt['re_xhtml']);
 

solvemedia/trunk/solvemedia.reg.inc

@@ -102 +102 @@
     global $adcopy_opt, $errors, $bp;
 
-    if ($_POST['adcopy_challenge']) {
-        if (empty($_POST['adcopy_response'])) {
+    if (!isset($_POST['adcopy_response']) || empty($_POST['adcopy_response'])) {
+        if (version_compare(get_bloginfo('version'), '2.5' ) < 0)
+            $errors['blank_captcha'] = $adcopy_opt['error_blank'];
+        elseif ($bp)
+            $bp->signup->errors['captcha'] = $adcopy_opt['error_blank'];
+        else
+            $result->add('blank_captcha', $adcopy_opt['error_blank']);
+    }
+    else {
+        $response = solvemedia_wp_check_answer();
+
+        if (!$response->is_valid) {
             if (version_compare(get_bloginfo('version'), '2.5' ) < 0)
-                $errors['blank_captcha'] = $adcopy_opt['error_blank'];
+                $errors['captcha_wrong'] = $adcopy_opt['error_incorrect'];
             elseif ($bp)
-                $bp->signup->errors['captcha'] = $adcopy_opt['error_blank'];
+                $bp->signup->errors['captcha'] = $adcopy_opt['error_incorrect'];
             else
-                $result->add('blank_captcha', $adcopy_opt['error_blank']);
-        }
-        else {
-            $response = solvemedia_wp_check_answer();
-
-            if (!$response->is_valid) {
-                if (version_compare(get_bloginfo('version'), '2.5' ) < 0)
-                    $errors['captcha_wrong'] = $adcopy_opt['error_incorrect'];
-                elseif ($bp)
-                    $bp->signup->errors['captcha'] = $adcopy_opt['error_incorrect'];
-                else
-                    $result->add('captcha_wrong', $adcopy_opt['error_incorrect']);
-            }
+                $result->add('captcha_wrong', $adcopy_opt['error_incorrect']);
         }
     }
@@ -144 +142 @@
             if ($bp) 
                 $bp->signup->errors['captcha'] = $adcopy_opt['error_blank'];
-            else
+        else
                 $result['errors']->add('captcha', $adcopy_opt['error_blank']);
             return $result;