keyword captcha -2

application/controllers/keyworlds.php

@@ -399,6 +399,9 @@ class Keyworlds extends CI_Controller {
                 } else if ($engines == 'yandex') {//俄语站的yangdex
                     $rank = $this->get_search_content_by_yandex($client_flag,$v->kw_keyworlds, $site_url, $i - 1);
                 }
+                if ( $rank[$rank_flag] < 0 ) {
+                    break;
+                }
                 $orignal[] = $rank['orignal'];
                 if ($client_flag === 'm') {
                     $rank['rank']   = isset($last_rank_today[0]) ? $last_rank_today[0]->kwr_rank : null;
@@ -418,9 +421,6 @@ class Keyworlds extends CI_Controller {
                     break;
                 }
             }
-            if ( $rank[$rank_flag] < 0 ) {
-                break;
-            }
             if (isset($last_rank_today[0]) && ! empty($last_rank_today[0])) {
                 $this->Keywordsrank_model->update_rank($last_rank_today[0]->kwr_id, $rank['rank'], $rank['rank_m'], $rank['source'], $rank['source_m'], $rank['engines']);
             } else {
@@ -493,7 +493,7 @@ class Keyworlds extends CI_Controller {
         if ($response) {
             //分析google搜索结果，计算排名
             if (false !== stripos($response, '<h1>302 Moved</h1>')  ||
-                false !== stripos($response, 'recaptcha')) {
+                false !== stripos($response, 'recaptcha') || false !== stripos($response, 'CAPTCHA')) {
                 $rank['rank'] = -2;
                 $rank["orignal"] = $response;
             } elseif (false !== stripos($response, $site_url)) {