#32 - Votes remake.

inc/classes/BxDolVote.php

@@ -314,14 +314,14 @@ class BxDolVote extends BxDol
 		$iAuthorId = $this->_getAuthorId();
 		$iAuthorIp = $this->_getAuthorIp();
 
-		$bUndo = $this->isUndo() && $this->_oQuery->isVoted($iObjectId, $iAuthorId, $iAuthorIp) ? true : false;
+		$bUndo = $this->isUndo() && $this->_oQuery->isVoted($iObjectId, $iAuthorId) ? true : false;
 
 		if(!$bUndo && !$this->isAllowedVote()) {
 			$this->_echoResultJson(array('code' => 2, 'msg' => $this->msgErrAllowedVote()));
         	return;
 		}
 
-    	if(!$bUndo && !$this->_oQuery->isPostTimeoutEnded($iObjectId, $iAuthorIp)) {
+    	if(!$this->isLikeMode() && !$this->_oQuery->isPostTimeoutEnded($iObjectId, $iAuthorIp)) {
 			$this->_echoResultJson(array('code' => 3, 'msg' => _t('_vote_err_duplicate_vote')));
         	return;
 		}

inc/classes/BxDolVoteQuery.php

@@ -47,7 +47,8 @@ class BxDolVoteQuery extends BxDolDb
     	if($this->_iPostTimeout == 0) 
     		return true;
 
-		$sQuery = $this->prepare("SELECT `object_id` FROM `{$this->_sTableTrack}` WHERE `object_id` = ? AND `author_nip` = ? AND `date` > (UNIX_TIMESTAMP() - ?)", $iObjectId, ip2long($sAuthorIp), $this->_iPostTimeout);
+		$iAuthorNip = ip2long($sAuthorIp);
+		$sQuery = $this->prepare("SELECT `object_id` FROM `{$this->_sTableTrack}` WHERE `object_id` = ? AND `author_nip` = ? AND `date` > (UNIX_TIMESTAMP() - ?)", $iObjectId, $iAuthorNip, $this->_iPostTimeout);
 		return (int)$this->getOne($sQuery) == 0;
     }
 
@@ -62,11 +63,9 @@ class BxDolVoteQuery extends BxDolDb
 		return $aResult;
     }
 
-    public function isVoted($iObjectId, $iAuthorId, $sAuthorIp)
+    public function isVoted($iObjectId, $iAuthorId)
     {
-    	$iAuthorNip = ip2long($sAuthorIp);
-
-		$sQuery = $this->prepare("SELECT `object_id` FROM `{$this->_sTableTrack}` WHERE `object_id` = ? AND `author_nip` = ? LIMIT 1", $iObjectId, $iAuthorNip);
+		$sQuery = $this->prepare("SELECT `object_id` FROM `{$this->_sTableTrack}` WHERE `object_id` = ? AND `author_id` = ? LIMIT 1", $iObjectId, $iAuthorId);
 		return (int)$this->getOne($sQuery) != 0;
     }
 
@@ -85,11 +84,12 @@ class BxDolVoteQuery extends BxDolDb
         if((int)$this->query($sQuery) == 0) 
         	return false;
 
-		$iAuthorNip = ip2long($sAuthorIp);
         if($bUndo)
-        	$sQuery = $this->prepare("DELETE FROM `{$this->_sTableTrack}` WHERE `object_id` = ? AND `author_nip` = ? LIMIT 1", $iObjectId, $iAuthorNip);
-        else
+        	$sQuery = $this->prepare("DELETE FROM `{$this->_sTableTrack}` WHERE `object_id` = ? AND `author_id` = ? LIMIT 1", $iObjectId, $iAuthorId);
+        else {
+        	$iAuthorNip = ip2long($sAuthorIp);
         	$sQuery = $this->prepare("INSERT INTO `{$this->_sTableTrack}` SET `object_id` = ?, `author_id` = ?, `author_nip` = ?, `value` = ?, `date` = UNIX_TIMESTAMP()", $iObjectId, $iAuthorId, $iAuthorNip, $iValue);
+        }
 
         return (int)$this->query($sQuery) > 0;
     }

install/sql/v70.sql

@@ -2947,7 +2947,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- comment actions menu
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
 ('sys_cmts_item_actions', 'system', 'item-vote', '_sys_menu_item_title_system_cmts_item_vote', '_sys_menu_item_title_cmts_item_vote', 'javascript:void(0)', 'javascript:{vote_onclick}', '_self', 'plus', '', 2147483647, 1, 0, 1),
-('sys_cmts_item_actions', 'system', 'item-reply', '_sys_menu_item_title_system_cmts_item_reply', '_sys_menu_item_title_cmts_item_reply', 'javascript:void(0)', 'javascript:{js_object}.toggleReply(this, {content_id})', '_self', 'reply', '', 2147483647, 1, 0, 2),
+('sys_cmts_item_actions', 'system', 'item-reply', '_sys_menu_item_title_system_cmts_item_reply', '_sys_menu_item_title_cmts_item_reply', 'javascript:void(0)', 'javascript:{js_object}.toggleReply(this, {content_id})', '_self', 'reply', '', 2147483647, 1, 0, 2);
 
 -- --------------------------------------------------------
 

modules/boonex/notes/install/sql/enable.sql

@@ -253,7 +253,7 @@ INSERT INTO `sys_acl_matrix` (`IDLevel`, `IDAction`) VALUES
 
 -- COMMENTS
 INSERT INTO `sys_objects_cmts` (`Name`, `Table`, `CharsPostMin`, `CharsPostMax`, `CharsDisplayMax`, `Nl2br`, `PerView`, `PerViewReplies`, `BrowseType`, `IsBrowseSwitch`, `PostFormPosition`, `NumberOfLevels`, `IsDisplaySwitch`, `IsRatable`, `ViewingThreshold`, `IsOn`, `RootStylePrefix`, `BaseUrl`, `ObjectVote`, `TriggerTable`, `TriggerFieldId`, `TriggerFieldTitle`, `TriggerFieldComments`, `ClassName`, `ClassFile`) VALUES
-('bx_notes', 'bx_notes_cmts', 1, 5000, 1000, 1, 5, 3, 'tail', 1, 'bottom', 1, 1, 1, -3, 1, 'cmt', 'page/view-note&id={object_id}', '', 'bx_notes_posts', 'id', 'title', 'comments', '', '');
+('bx_notes', 'bx_notes_cmts', 1, 5000, 1000, 1, 5, 3, 'tail', 1, 'bottom', 1, 1, 0, -3, 1, 'cmt', 'page/view-note&id={object_id}', '', 'bx_notes_posts', 'id', 'title', 'comments', '', '');
 
 
 -- VOTES

template/css/menu.css

@@ -30,6 +30,11 @@ ul.bx-menu-hor {
     color:#000;
 }
 
+.bx-menu-hor li img,
+.bx-menu-hor li .sys-icon {
+	display:inline-block;
+}
+
 /* --------------- vertical menu */
 
 ul.bx-menu-ver {