#2875 Core changes

inc/classes/BxDolFavoriteQuery.php

@@ -51,9 +51,23 @@ class BxDolFavoriteQuery extends BxDolObjectQuery
         return (int)$this->query($sQuery) > 0;
     }
     
-    public function doFavorite($iObjectId, $iAuthorId, $iListId)
+    public function doFavorite($iObjectId, $iAuthorId, $iListId = false)
     {
-        $sQuery = $this->prepare("INSERT IGNORE INTO `{$this->_sTableTrack}` SET `object_id` = ?, `author_id` = ?, `date` = ?, `list_id` = ?", $iObjectId, $iAuthorId, time(), $iListId);
+        $sQuery = '';
+        if ($iListId === false)
+            $sQuery = $this->prepare("INSERT IGNORE INTO `{$this->_sTableTrack}` SET `object_id` = ?, `author_id` = ?, `date` = ?", $iObjectId, $iAuthorId, time());
+        else
+            $sQuery = $this->prepare("INSERT IGNORE INTO `{$this->_sTableTrack}` SET `object_id` = ?, `author_id` = ?, `date` = ?, `list_id` = ?", $iObjectId, $iAuthorId, time(), $iListId);
+        return (int)$this->query($sQuery) > 0;
+    }
+    
+    public function undoFavorite($iObjectId, $iAuthorId)
+    {
+        $sQuery = $this->prepare("SELECT `date` FROM `{$this->_sTableTrack}` WHERE `object_id` = ? AND `author_id` = ? LIMIT 1", $iObjectId, $iAuthorId);
+        if((int)$this->getOne($sQuery) == 0)
+        	return true;
+
+        $sQuery = $this->prepare("DELETE FROM `{$this->_sTableTrack}` WHERE `object_id` = ? AND `author_id` = ? LIMIT 1", $iObjectId, $iAuthorId);
         return (int)$this->query($sQuery) > 0;
     }
     

template/scripts/BxBaseFavorite.php

@@ -217,6 +217,41 @@ class BxBaseFavorite extends BxDolFavorite
         $iObjectId = $this->getId();
         $iObjectAuthorId = $this->_oQuery->getObjectAuthorId($iObjectId);
         
+        
+        if (!isset($this->_aSystem['table_lists']) || $this->_aSystem['table_lists'] == ''){
+            $bUndo = $this->isUndo();
+            $bPerformed = $this->isPerformed($iObjectId, $iAuthorId);
+            $bPerformUndo = $bPerformed && $bUndo ? true : false;
+
+            if(!$bPerformUndo && !$this->isAllowedFavorite())
+                return array('code' => 2, 'message' => $this->msgErrAllowedFavorite());
+
+            if($bPerformed && !$bUndo)
+        	    return array('code' => 3, 'message' => _t('_favorite_err_duplicate_favorite'));
+
+            if(!$this->_oQuery->{($bPerformUndo ? 'un' : '') . 'doFavorite'}($iObjectId, $iAuthorId))
+                return array('code' => 4, 'message' => _t('_favorite_err_cannot_perform_action'));
+
+            if(!$bPerformUndo)
+                $this->isAllowedFavorite(true);
+
+            $this->_triggerValue($bPerformUndo ? -1 : 1);
+
+            bx_alert($this->_sSystem, ($bPerformUndo ? 'un' : '') . 'favorite', $iObjectId, $iAuthorId, array('favorite_author_id' => $iAuthorId, 'object_author_id' => $iObjectAuthorId));
+            bx_alert('favorite', ($bPerformUndo ? 'un' : '') . 'do', 0, $iAuthorId, array('object_system' => $this->_sSystem, 'object_id' => $iObjectId, 'object_author_id' => $iObjectAuthorId));
+
+            $aFavorite = $this->_oQuery->getFavorite($iObjectId);
+            return array(
+        	    'eval' => $this->getJsObjectName() . '.onFavorite(oData, oElement)',
+        	    'code' => 0, 
+        	    'count' => $aFavorite['count'],
+        	    'countf' => (int)$aFavorite['count'] > 0 ? $this->_getCounterLabel($aFavorite['count']) : '',
+                'label_icon' => $this->_getIconDoFavorite(!$bPerformed),
+                'label_title' => _t($this->_getTitleDoFavorite(!$bPerformed)),
+                'disabled' => !$bPerformed && !$bUndo
+            );
+        }
+        
         $oForm = $this->_getFormObject($this->_sFormDisplayAdd);
         $oForm->setId($this->_aHtmlIds['do_form']);
         $oForm->setName($this->_aHtmlIds['do_form']);