From aa3ac66a25aa503cbbbed71da56e51f61bba817d Mon Sep 17 00:00:00 2001
From: franzz <francois@lutran.fr>
Date: Thu, 3 Jul 2014 08:10:02 +0200
Subject: [PATCH] fix status in news + max nb of news

---
 inc/databap.php | 11 +++++++++--
 todo            |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/inc/databap.php b/inc/databap.php
index b420b63..3b86b40 100644
--- a/inc/databap.php
+++ b/inc/databap.php
@@ -1836,9 +1836,10 @@ class Databap extends PhpObject
 	public function getNews()
 	{
 		$sMsgIdCol = MySqlManager::getId(self::MSG_TABLE);
+		$sMsgTxtCol = MySqlManager::getText(self::MSG_TABLE);
 		
 		//News
-		$asInfo['select']		= array($sMsgIdCol, 'nickname', MySqlManager::getText(self::MSG_TABLE), 'led');
+		$asInfo['select']		= array($sMsgIdCol, 'nickname', $sMsgTxtCol, 'type', 'led');
 		$asInfo['from']			= self::MSG_TABLE;
 		$asInfo['constraint']	= array('type'=>self::MESSAGE_NEWS);
 		$asInfo['orderBy']		= array('led'=>'DESC');
@@ -1846,6 +1847,7 @@ class Databap extends PhpObject
 		$asNews = $this->oMySql->selectRows($asInfo);
 		
 		//Status
+		//$asInfo['select']		= array($sMsgIdCol, 'nickname', "CONCAT(nickname, SPACE(1), ".$sMsgTxtCol." AS ".$sMsgTxtCol, 'led');
 		$asInfo['constraint']	= array('type'=>self::MESSAGE_STATUS);
 		$asStatus = $this->oMySql->selectRows($asInfo);
 		
@@ -1854,7 +1856,12 @@ class Databap extends PhpObject
 		$asNews = array_merge($asNews, $asStatus);
 		foreach($asNews as $iKey=>$asNewsInfo) $asNewsSort[$iKey] = strtotime($asNewsInfo['led']);
 		arsort($asNewsSort);
-		foreach($asNewsSort as $iKey=>$iTimestamp) $asNews2[] = $asNews[$iKey];
+		foreach($asNewsSort as $iKey=>$iTimestamp)
+		{
+			if($asNews[$iKey]['type']==self::MESSAGE_STATUS) $asNews[$iKey][$sMsgTxtCol] = $asNews[$iKey]['nickname'].' '.$asNews[$iKey][$sMsgTxtCol];
+			$asNews2[] = $asNews[$iKey];
+			if(count($asNews2)==3) break;
+		}
 		
 		$asFormatNews = array();
 		foreach($asNews2 as $asNew)
diff --git a/todo b/todo
index 0b57aaf..dae8ddd 100644
--- a/todo
+++ b/todo
@@ -14,6 +14,7 @@ Bug fix:
 - Fix les "xxx se déconnecte" intempestives
 
 Améliorations
+- Son pour les nouveaux messages
 - liste complète : ajouter des tabs pour sélectionner soit code, soit article, soit table...
 - [1.1.0] Chat : compatibilité mobile (utiliser la fonctionnalité ff)
 - [1.1.0] search : add tagname, like code:blabla to search blabla in codes only