From 56937bb518e28bf602cb4fcd94cb105cc495c3a4 Mon Sep 17 00:00:00 2001
From: Evie Embrechts <eembrech@vub.ac.be>
Date: Mon, 30 Oct 2006 13:52:12 +0100
Subject: [PATCH] [svn r9847] improved database table - added title field -
 made all field names english and eaiser to understand

---
 plugin/messages/functions.inc.php | 10 +++++-----
 plugin/messages/index.php         | 14 ++++++++++++--
 plugin/messages/new_message.php   |  4 ++--
 plugin/messages/view_message.php  |  6 +++---
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/plugin/messages/functions.inc.php b/plugin/messages/functions.inc.php
index 8ddbb10d9d..4d8ed6ea1b 100755
--- a/plugin/messages/functions.inc.php
+++ b/plugin/messages/functions.inc.php
@@ -1,4 +1,4 @@
-<?php // $Id: functions.inc.php 9680 2006-10-24 13:23:45Z evie_em $
+<?php // $Id: functions.inc.php 9847 2006-10-30 12:52:12Z evie_em $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -114,7 +114,7 @@ function get_new_messages()
 {
 	if (! isset($_SESSION['_uid'])) return false;
 	$i=0;
-	$query = "SELECT * FROM `".MESSAGES_DATABASE."` WHERE id_reciv=".$_SESSION['_uid']." AND status=1;";
+	$query = "SELECT * FROM `".MESSAGES_DATABASE."` WHERE id_receiver=".$_SESSION['_uid']." AND status=1;";
 	$result = api_sql_query($query,__FILE__,__LINE__);
 	while ($result_row = mysql_fetch_array($result)) $i++;
 	return $i;
@@ -140,7 +140,7 @@ function users_connected_by_id()
  */
 function get_number_of_messages()
 {
-	$sql_query = "SELECT COUNT(*) as number_messages FROM `".MESSAGES_DATABASE."` WHERE id_reciv=".$_SESSION['_uid'];
+	$sql_query = "SELECT COUNT(*) as number_messages FROM `".MESSAGES_DATABASE."` WHERE id_receiver=".$_SESSION['_uid'];
 	$sql_result = api_sql_query($sql_query,__FILE__,__LINE__);
 	$result = mysql_fetch_array($sql_result);
 	return $result['number_messages'];
@@ -154,7 +154,7 @@ function get_number_of_messages()
  */
 function get_message_data($from, $number_of_items, $column, $direction)
 {
-	$sql_query = "SELECT id as col0, id_rem as col1, fecha as col2 FROM `".MESSAGES_DATABASE."` WHERE id_reciv=".$_SESSION['_uid']." ORDER BY col$column $direction LIMIT $from,$number_of_items";
+	$sql_query = "SELECT id as col0, id_sender as col1, date as col2 FROM `".MESSAGES_DATABASE."` WHERE id_receiver=".$_SESSION['_uid']." ORDER BY col$column $direction LIMIT $from,$number_of_items";
 	$sql_result = api_sql_query($sql_query,__FILE__,__LINE__);
 	$i = 0;
 	$message_list = array ();
@@ -186,7 +186,7 @@ function inbox_display()
 				$number_of_selected_messages = count($_POST['id']);
 				foreach ($_POST['id'] as $index => $message_id)
 				{
-					$query = "DELETE FROM ".MESSAGES_DATABASE." WHERE id_reciv=".$_SESSION['_uid']." AND id='$message_id'";
+					$query = "DELETE FROM ".MESSAGES_DATABASE." WHERE id_receiver=".$_SESSION['_uid']." AND id='$message_id'";
 					api_sql_query($query,__FILE__,__LINE__);
 				}
 				Display :: display_normal_message(get_lang('SelectedMessagesDeleted'));
diff --git a/plugin/messages/index.php b/plugin/messages/index.php
index 081f98ee03..a8752c73c3 100755
--- a/plugin/messages/index.php
+++ b/plugin/messages/index.php
@@ -1,4 +1,4 @@
-<?php // $Id: index.php 9495 2006-10-13 11:05:56Z evie_em $
+<?php // $Id: index.php 9847 2006-10-30 12:52:12Z evie_em $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -27,7 +27,7 @@ $inb = get_lang("Inbox");
 $newm = get_lang("ComposeMessage");
 if(api_get_user_id())
 {
-	$query = "CREATE TABLE IF NOT EXISTS `".MESSAGES_DATABASE."` (".
+	/*$query = "CREATE TABLE IF NOT EXISTS `".MESSAGES_DATABASE."` (".
 		"`id` VARCHAR(150) NOT NULL,".
 		"`id_rem` INT( 10 ) NOT NULL ,".
 		"`id_reciv` INT( 10 ) NOT NULL ,".
@@ -35,6 +35,16 @@ if(api_get_user_id())
 		"`fecha` DATETIME NOT NULL ,".
 		"`contenido` TEXT NOT NULL,".
 		"INDEX ( `id`,`id_reciv` )". 
+		") TYPE = MYISAM ;";*/
+	$query = "CREATE TABLE IF NOT EXISTS `".MESSAGES_DATABASE."` (".
+		"`id` VARCHAR(150) NOT NULL,".
+		"`id_sender` INT( 10 ) NOT NULL ,".
+		"`id_receiver` INT( 10 ) NOT NULL ,".
+		"`status` BOOL NOT NULL,".
+		"`date` DATETIME NOT NULL ,".
+		"`title` VARCHAR(255) NOT NULL,".
+		"`content` TEXT NOT NULL,".
+		"INDEX ( `id`,`id_receiver` )". 
 		") TYPE = MYISAM ;";
 	@api_sql_query($query,__FILE__,__LINE__);
 	?>
diff --git a/plugin/messages/new_message.php b/plugin/messages/new_message.php
index 46e7b0f7e2..be9c738caa 100755
--- a/plugin/messages/new_message.php
+++ b/plugin/messages/new_message.php
@@ -1,4 +1,4 @@
-<?php // $Id: new_message.php 9769 2006-10-25 14:12:00Z evie_em $
+<?php // $Id: new_message.php 9847 2006-10-30 12:52:12Z evie_em $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -191,7 +191,7 @@ else
 		$id_tmp = $_SESSION['_uid'].$_POST['user_list'].date('d-D-w-m-Y-H-s').
 					microtime().rand();
 		$id_msg = md5($id_tmp);
-		$query = "INSERT INTO `".MESSAGES_DATABASE."` ( `id` , `id_rem` , `id_reciv` , `status` , `fecha` ,`contenido` ) ".
+		$query = "INSERT INTO `".MESSAGES_DATABASE."` ( `id` , `id_sender` , `id_receiver` , `status` , `date` ,`content` ) ".
 				 " VALUES (".
 		 		 "' ".$id_msg ."' , '".$_SESSION['_uid']."', '".$_POST['user_list']."', '1', '".date('Y-m-d H:i:s')."','".$_POST['content']."'".
 		 		 ");";
diff --git a/plugin/messages/view_message.php b/plugin/messages/view_message.php
index 73d5d13aea..25093232f5 100755
--- a/plugin/messages/view_message.php
+++ b/plugin/messages/view_message.php
@@ -1,4 +1,4 @@
-<?php // $Id: view_message.php 9584 2006-10-19 13:07:05Z evie_em $
+<?php // $Id: view_message.php 9847 2006-10-30 12:52:12Z evie_em $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -34,10 +34,10 @@ $nameTools = get_lang("Messages");
 $interbredcrump[]=array("url" => "inbox.php","name" => get_lang("Inbox"));
 Display::display_header($nameTools,"messages");
 
-$query = "UPDATE `".MESSAGES_DATABASE."` SET `status` = '0' WHERE `id_reciv`=".$_SESSION['_uid']." AND `id`='".mysql_real_escape_string($_GET['id'])."';";
+$query = "UPDATE `".MESSAGES_DATABASE."` SET `status` = '0' WHERE `id_receiver`=".$_SESSION['_uid']." AND `id`='".mysql_real_escape_string($_GET['id'])."';";
 $result = api_sql_query($query,__FILE__,__LINE__);
 
-$query = "SELECT * FROM `".MESSAGES_DATABASE."` WHERE id_reciv=".$_SESSION['_uid']." AND id='".mysql_real_escape_string($_GET['id'])."';";
+$query = "SELECT * FROM `".MESSAGES_DATABASE."` WHERE id_receiver=".$_SESSION['_uid']." AND id='".mysql_real_escape_string($_GET['id'])."';";
 $result = api_sql_query($query,__FILE__,__LINE__);
 $row = mysql_fetch_array($result);