some fixes for delete messages

Author: Fasse

adm_program/modules/messages/messages.php

@@ -33,7 +33,7 @@
     $delMessage = new TableMessage($gDb, $getMsgId);
 
     //Function to delete message
-    $delete = $delMessage->delete($gCurrentUser->getValue('usr_id'), $gL10n->get('MSG_DELETE_PM'));
+    $delete = $delMessage->delete();
     echo $delete;
     exit();    
 }
@@ -128,7 +128,7 @@
         $message = new TableMessage($gDb, $row['msg_id']);
         $key++;
 
-        $messageAdministration = $part1 . $key . '&name=' . $message->getValue('msg_subject') . '&database_id=' . $message->getValue('msg_id') . $part2;
+        $messageAdministration = $part1 . $key . '&name='.urlencode($message->getValue('msg_subject')).'&database_id=' . $message->getValue('msg_id') . $part2;
 
         $table->addRowByArray(array( '<a class="admidio-icon-link" '. $href . $message->getValue('msg_id') .'">
                 <img class="admidio-icon-info" src="'. THEME_PATH. '/icons/email.png" alt="'.$gL10n->get('SYS_EMAIL').'" title="'.$gL10n->get('SYS_EMAIL').'" />' , 

adm_program/system/classes/tablemessage.php

@@ -92,11 +92,15 @@ public function getConversationPartner($usr_id)
 
     /** Deletes the selected message with all associated fields. 
      *  After that the class will be initialize.
-     *  @return @b 'done' if message is deleted or message with additional information if it is marked for other user to delete. On error it is "delete not OK"
+     *  @return @b 'done' if message is deleted or message with additional information if it is marked 
+                for other user to delete. On error it is "delete not OK"
      */
-    public function delete($usr_id, $PM_info)
+    public function delete()
     {
+        global $gCurrentUser;
+        
         $return = 'delete not OK';
+        
         if($this->getValue('msg_read') == 2 || $this->getValue('msg_type') == 'EMAIL')
         {
             $sql = "DELETE FROM ".TBL_MESSAGES_CONTENT."
@@ -106,20 +110,22 @@ public function delete($usr_id, $PM_info)
             $sql = "DELETE FROM ".TBL_MESSAGES."
              WHERE msg_id = ". $this->getValue('msg_id');
             $this->db->query($sql);
+            
             $return = 'done';
         }
         else
         {
             $other = $this->getValue('msg_usr_id_sender');
-            if($other == $usr_id)
+            if($other == $gCurrentUser->getValue('usr_id'))
             {
                 $other = $this->getValue('msg_usr_id_receiver');
             }
 
-            $sql = "UPDATE ". TBL_MESSAGES. " SET  msg_read = 2, msg_timestamp = CURRENT_TIMESTAMP, msg_usr_id_sender = ".$usr_id.", msg_usr_id_receiver = '".$other."'
+            $sql = "UPDATE ". TBL_MESSAGES. " SET msg_read = 2, msg_timestamp = CURRENT_TIMESTAMP
+                                                , msg_usr_id_sender = ".$gCurrentUser->getValue('usr_id').", msg_usr_id_receiver = '".$other."'
              WHERE msg_id = ".$this->getValue('msg_id');
             $this->db->query($sql);
-            //$return = $PM_info;
+
             $return = 'done';
         }