diff --git a/content/messages.xul.php b/content/messages.xul.php
index 1450ee52f..1ba680af0 100644
--- a/content/messages.xul.php
+++ b/content/messages.xul.php
@@ -118,6 +118,10 @@ echo ']>
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/messages/rdf#recipient_id"/>
+
+
@@ -132,6 +136,7 @@ echo ']>
+
diff --git a/rdf/messages.rdf.php b/rdf/messages.rdf.php
index 951cd7cc8..ac05f0268 100644
--- a/rdf/messages.rdf.php
+++ b/rdf/messages.rdf.php
@@ -45,36 +45,57 @@ SELECT
(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id=m.person_id) as sender,
(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id=r.person_id) as recipient,
m.person_id as sender_id,
- r.person_id as recipient_id
+ r.person_id as recipient_id,
+ s.status as status
FROM
public.tbl_msg_message m
JOIN public.tbl_msg_recipient r USING(message_id)
+ JOIN public.tbl_msg_status s USING(message_id)
WHERE
r.person_id=".$db->db_add_param($person_id, FHC_INTEGER)."
OR m.person_id=".$db->db_add_param($person_id, FHC_INTEGER)."
+ AND s.person_id=".$db->db_add_param($person_id, FHC_INTEGER)."
ORDER BY
- message_id";
+ message_id, status";
if($db->db_query($qry))
{
$oRdf->sendHeader();
while($row = $db->db_fetch_object())
{
- $i=$oRdf->newObjekt($row->message_id);
- $oRdf->obj[$i]->setAttribut('subject',$row->subject,true);
- $oRdf->obj[$i]->setAttribut('body',$row->body,true);
- $oRdf->obj[$i]->setAttribut('message_id',$row->message_id,true);
- $oRdf->obj[$i]->setAttribut('insertamum',$row->insertamum,true);
- $oRdf->obj[$i]->setAttribut('status',$row->insertamum,true);
- $oRdf->obj[$i]->setAttribut('sender',$row->sender,true);
- $oRdf->obj[$i]->setAttribut('recipient',$row->recipient,true);
- $oRdf->obj[$i]->setAttribut('sender_id',$row->sender_id,true);
- $oRdf->obj[$i]->setAttribut('recipient_id',$row->recipient_id,true);
+ $status = '';
+ if ($row->status == 0)
+ {
+ $status = 'Unread';
+ }
+ else if ($row->status == 1)
+ {
+ $status = 'Read';
+ }
+ else if ($row->status == 2)
+ {
+ $status = 'Archived';
+ }
+ else if ($row->status == 2)
+ {
+ $status = 'Deleted';
+ }
+
+ $i=$oRdf->newObjekt($row->message_id);
+ $oRdf->obj[$i]->setAttribut('subject',$row->subject,true);
+ $oRdf->obj[$i]->setAttribut('body',$row->body,true);
+ $oRdf->obj[$i]->setAttribut('message_id',$row->message_id,true);
+ $oRdf->obj[$i]->setAttribut('insertamum',$row->insertamum,true);
+ $oRdf->obj[$i]->setAttribut('status',$status,true);
+ $oRdf->obj[$i]->setAttribut('sender',$row->sender,true);
+ $oRdf->obj[$i]->setAttribut('recipient',$row->recipient,true);
+ $oRdf->obj[$i]->setAttribut('sender_id',$row->sender_id,true);
+ $oRdf->obj[$i]->setAttribut('recipient_id',$row->recipient_id,true);
- if($row->relationmessage_id!='')
- $oRdf->addSequence($row->message_id, $row->relationmessage_id);
- else
- $oRdf->addSequence($row->message_id);
+ if($row->relationmessage_id!='')
+ $oRdf->addSequence($row->message_id, $row->relationmessage_id);
+ else
+ $oRdf->addSequence($row->message_id);
}
}
$oRdf->sendRdfText();