Merge branch 'master' of git.task-on.com:ktask/task-on.com

common/components/UnisenderAPI.php

 <?php
 namespace common\components;
+use yii\helpers\Json;
+
 /**
  * API UniSender
  *
@@ -32,6 +34,11 @@ class UnisenderAPI {
 	 */
 	protected $Compression = false;
 
+    /**
+     * @var array
+     */
+    protected $visitedLinks = [];
+
     /**
      * @param string $ApiKey
      * @param string $Encoding
@@ -88,12 +95,24 @@ class UnisenderAPI {
     }
 
     public function getVisitedLinks($campaign_id){
-        return $this->callMethod(
+        $this->visitedLinks = $this->callMethod(
             'getVisitedLinks',
             [
                 'campaign_id' => $campaign_id
             ]
         );
+        $this->visitedLinks = Json::decode($this->visitedLinks);
+        return $this->visitedLinks;
+    }
+
+    public function linkIsVisited($email, $link) {
+        if (array_key_exists('result', $this->visitedLinks) && array_key_exists('data', $this->visitedLinks['result'])) {
+            foreach($this->visitedLinks['result']['data'] as $transition) {
+                if ($transition[0]==$email && $transition[1]==$link)
+                    return true;
+            }
+        }
+        return false;
     }
 
     public function createCampaign($message_id){

common/modules/triggers/controllers/TriggerAdminController.php

@@ -55,7 +55,7 @@ class TriggerAdminController extends AdminController {
     public function actionGetresult($id){
         $obj = new UnisenderAPI();
         $result = $obj->getVisitedLinks($id);
-        var_dump($result);
+        $visited = $obj->linkIsVisited('bystrov@kupitsite.ru', 'http://www.google.com/');
     }
 
     /**