Implemented 'unread replies' counter of a thread

Builder/IISMainHandler/build.txt

@@ -1 +1 @@
-353
+358

Builder/IISUploadHandler/build.txt

@@ -1 +1 @@
-85
+90

Common/UploadManager.cs

@@ -59,7 +59,7 @@ namespace FLocal.Common {
 			int? uploadId = null;
 
 			try {
-				if(Config.instance.mainConnection.GetCountByConditions(Upload.TableSpec.instance, condition, new JoinSpec[0]) > 0) {
+				if(Config.instance.mainConnection.GetCountByConditions(Upload.TableSpec.instance, condition) > 0) {
 					throw new _AlreadyUploadedException();
 				}
 				Config.Transactional(transaction => {

Common/dataobjects/Thread.cs

@@ -179,7 +179,29 @@ namespace FLocal.Common.dataobjects {
 				result.Add(new XElement("firstPost", this.firstPost.exportToXmlWithoutThread(context, false)));
 			}
 			if(context.account != null) {
-				result.Add(new XElement("afterLastRead", this.getLastReadId(context.account) + 1));
+				int lastReadId = this.getLastReadId(context.account);
+				result.Add(
+					new XElement("afterLastRead", lastReadId + 1),
+					new XElement(
+						"totalNewPosts",
+						Config.instance.mainConnection.GetCountByConditions(
+							Post.TableSpec.instance,
+							new ComplexCondition(
+								ConditionsJoinType.AND,
+								new ComparisonCondition(
+									Post.TableSpec.instance.getColumnSpec(Post.TableSpec.FIELD_THREADID),
+									ComparisonType.EQUAL,
+									this.id.ToString()
+								),
+								new ComparisonCondition(
+									Post.TableSpec.instance.getIdSpec(),
+									ComparisonType.GREATERTHAN,
+									lastReadId.ToString()
+								)
+							)
+						)
+					)
+				);
 			}
 			if(additional.Length > 0) {
 				result.Add(additional);
@@ -307,8 +329,7 @@ namespace FLocal.Common.dataobjects {
 												ComparisonType.LESSTHAN,
 												minPost.id.ToString()
 											)
-										),
-										new JoinSpec[0]
+										)
 									);
 									if(count > 0) {
 										return (s == "0") ? null : s; //if there are some unread posts earlier than minPost

Core/DB/IDBConnection.cs

@@ -10,7 +10,7 @@ namespace FLocal.Core.DB {
 
 		List<string> LoadIdsByConditions(ITableSpec table, conditions.AbstractCondition conditions, Diapasone diapasone, JoinSpec[] joins, SortSpec[] sorts, bool allowHugeLists);
 
-		long GetCountByConditions(ITableSpec table, conditions.AbstractCondition conditions, JoinSpec[] joins);
+		long GetCountByConditions(ITableSpec table, conditions.AbstractCondition conditions, params JoinSpec[] joins);
 
 		Transaction beginTransaction(System.Data.IsolationLevel iso);
 

IISMainHandler/handlers/BoardsHandler.cs

@@ -23,7 +23,7 @@ namespace FLocal.IISHandler.handlers {
 		override protected XElement[] getSpecificData(WebContext context) {
 			return new XElement[] {
 				new XElement("categories", from category in Category.allCategories select category.exportToXmlForMainPage(context)),
-				new XElement("totalRegistered", Config.instance.mainConnection.GetCountByConditions(User.TableSpec.instance, new EmptyCondition(), new JoinSpec[0])),
+				new XElement("totalRegistered", Config.instance.mainConnection.GetCountByConditions(User.TableSpec.instance, new EmptyCondition())),
 				new XElement("activity",
 					new XElement("threshold", Config.instance.ActivityThreshold.ToString()),
 					new XElement("sessions", Config.instance.mainConnection.GetCountByConditions(
@@ -32,8 +32,7 @@ namespace FLocal.IISHandler.handlers {
 							Session.TableSpec.instance.getColumnSpec(Session.TableSpec.FIELD_LASTACTIVITY),
 							ComparisonType.GREATEROREQUAL,
 							DateTime.Now.Subtract(Config.instance.ActivityThreshold).ToUTCString()
-						),
-						new JoinSpec[0]
+						)
 					))
 				),
 				new XElement("currentDate", DateTime.Now.ToXml()),

IISMainHandler/handlers/ThreadHandler.cs

@@ -42,8 +42,7 @@ namespace FLocal.IISHandler.handlers {
 									ComparisonType.LESSTHAN,
 									int.Parse(context.requestParts[2].PHPSubstring(1)).ToString()
 								)
-							),
-							new JoinSpec[0]
+							)
 						)
 					}
 				},

MySQLConnector/Connection.cs

@@ -157,7 +157,7 @@ namespace FLocal.MySQLConnector {
 			}
 		}
 
-		public long GetCountByConditions(ITableSpec table, FLocal.Core.DB.conditions.AbstractCondition conditions, JoinSpec[] joins) {
+		public long GetCountByConditions(ITableSpec table, FLocal.Core.DB.conditions.AbstractCondition conditions, params JoinSpec[] joins) {
 			using(DbConnection connection = this.createConnection()) {
 				using(DbCommand command = connection.CreateCommand()) {
 

templates/Full/Board.xslt

@@ -106,8 +106,8 @@
 						<tr>
 							<td align="left" width="55%" class="tdheader">Òåìà</td>
 							<td align="left" nowrap="nowrap" width="15%" class="tdheader">Àâòîð</td>
-							<td nowrap="nowrap" width="5%" class="tdheader" align="center">Ïðîñìîòðû</td>
-							<td nowrap="nowrap" width="5%" class="tdheader" align="center">Îòâåòû</td>
+							<td nowrap="nowrap" width="5%" class="tdheader" align="center">Ïðîñìîòðîâ</td>
+							<td nowrap="nowrap" width="5%" class="tdheader" align="center">Ïîñòîâ</td>
 							<td nowrap="nowrap" width="20%" class="tdheader" align="center">Ïîñëåäíåå</td>
 						</tr>
 						<!-- BEGIN POST LOOP DO NOT DELETE -->

templates/Full/elems/ThreadInfo.xslt

@@ -58,12 +58,11 @@
 			</td>
 			<td align="center" nowrap="nowrap" class="lighttable">
 				<span class="separate"><xsl:value-of select="totalPosts"/></span>
-				<a class="cup separate" href="/postlist.php?Cat=&amp;Board=Common&amp;page=0&amp;fullview=&amp;src=&amp;sb=5&amp;o=&amp;cupthread=479355&amp;cupmaxnumber=9559703&amp;showlite=" >
-					<font class="new"><i>(10)</i></font>
-				</a>
-				<a class="cup separate" href="/postlist.php?Cat=&amp;Board=Common&amp;page=0&amp;fullview=&amp;src=&amp;sb=5&amp;o=&amp;cupthread=479355&amp;cupdisc=1&amp;showlite=" >
-					<font class="new2"><i>(41)</i></font>
+				<xsl:if test="totalNewPosts and totalNewPosts!='0'">
+					<a class="cup separate">
+						<font class="new"><i>(<xsl:value-of select="totalNewPosts"/>)</i></font>
 					</a>
+				</xsl:if>
 			</td>
 			<td nowrap="nowrap" align="center">
 				<xsl:apply-templates select="lastPostDate/date" mode="dateTime"/>