Parsed subject line, removed HTML from subject line

@@ -188,34 +188,27 @@ function remove_notice($notification_id = -1) {
  @trigger   = notification unique slug name
  @trigger   = notification unique slug name
 */
 */
 function send_triggered_notification($uid,$trigger="NO_TRIGGER",$args = array(),$send_override = false) {
 function send_triggered_notification($uid,$trigger="NO_TRIGGER",$args = array(),$send_override = false) {
-    
-    
     $notification = get_notification_by_trigger($trigger);
     $notification = get_notification_by_trigger($trigger);
-    
-    
+
     if($notification) {
     if($notification) {
-        
-        
         // get the notification and notificatio details....
         // get the notification and notificatio details....
         $nid                    = $notification->ID;
         $nid                    = $notification->ID;
         $details                = get_post_meta($nid,'details',true);
         $details                = get_post_meta($nid,'details',true);
         $email                  = get_post_meta($nid,'email',true);
         $email                  = get_post_meta($nid,'email',true);
         $system                 = get_post_meta($nid,'system',true);
         $system                 = get_post_meta($nid,'system',true);
-        
-        
+
         $notification->trigger         = $details['trigger'];
         $notification->trigger         = $details['trigger'];
         $notification->status          = isset($details['status']) ? $details['status'] : "active";
         $notification->status          = isset($details['status']) ? $details['status'] : "active";
         $notification->type            = $details['type'];
         $notification->type            = $details['type'];
         $notification->sendto          = $details['sendto'];
         $notification->sendto          = $details['sendto'];
         $notification->is_email        = (($email['text'] != "" || $email['html'] != "") && $email['subject'] != "") ? true : false;
         $notification->is_email        = (($email['text'] != "" || $email['html'] != "") && $email['subject'] != "") ? true : false;
         $notification->is_system       = (isset($system['message']) && $system['message'] != "") ? true : false;
         $notification->is_system       = (isset($system['message']) && $system['message'] != "") ? true : false;
-        
-        
+
         // if is_system ==========================================
         // if is_system ==========================================
         if ($notification->is_system && $uid != 0) {
         if ($notification->is_system && $uid != 0) {
             get_user_notices($uid);
             get_user_notices($uid);
             $notices = Vars::$notices;
             $notices = Vars::$notices;
-            
+
             $insert = array(
             $insert = array(
                 'notification_id'   => $nid
                 'notification_id'   => $nid
               , 'status'            => 'unread'
               , 'status'            => 'unread'
@@ -234,22 +227,17 @@ function send_triggered_notification($uid,$trigger="NO_TRIGGER",$args = array(),
             update_user_meta($uid,'notices',$notices);
             update_user_meta($uid,'notices',$notices);
         }
         }
         
         
-        
         // if is_email ===========================================
         // if is_email ===========================================
         if ($notification->is_email) {
         if ($notification->is_email) {
             send_email($uid,$email,$args, true);
             send_email($uid,$email,$args, true);
         } 
         } 
-        
-    
     } 
     } 
     // if the system notification has set current user than get current user otherwise loop through the users needed.
     // if the system notification has set current user than get current user otherwise loop through the users needed.
 }
 }
 
 
 function send_email($uid = 0, $contents,$args, $override = false) {
 function send_email($uid = 0, $contents,$args, $override = false) {
-
     if ( $uid == 0 && !isset($args['email'])) { return; }
     if ( $uid == 0 && !isset($args['email'])) { return; }
-    
-    
+
     if ( isset($args['email'])) {
     if ( isset($args['email'])) {
         $to_email = $args['email'];
         $to_email = $args['email'];
     } else {
     } else {
@@ -272,10 +260,9 @@ function send_email($uid = 0, $contents,$args, $override = false) {
     
     
     $from_address       = get_bloginfo('admin_email');
     $from_address       = get_bloginfo('admin_email');
 
 
-    
-    $subject            = $contents['subject'];
-    $html               = $contents['html'];
-    $alttext            = $contents['text'];
+    $subject = strip_tags($contents['subject']);
+    $html    = $contents['html'];
+    $alttext = $contents['text'];
     
     
     $headers            = "";
     $headers            = "";
     
     
@@ -296,11 +283,11 @@ function send_email($uid = 0, $contents,$args, $override = false) {
         if ( (filter_var($val, FILTER_VALIDATE_URL) !== false) && !empty($html)) {
         if ( (filter_var($val, FILTER_VALIDATE_URL) !== false) && !empty($html)) {
             $message = str_replace("{".$key."}","<a href='".$val."'>".$val."</a>",$message);
             $message = str_replace("{".$key."}","<a href='".$val."'>".$val."</a>",$message);
         } else {
         } else {
-            $message = str_replace("{".$key."}",$val,$message);
+            $message = str_replace("{".$key."}", $val, $message);
+            $subject = str_replace("{".$key."}", $val, $subject);
         }
         }
-        
     }
     }
-    
+
     // Additional headers
     // Additional headers
     //$headers .= 'To: '.$to_email.' <'.$to_email.'>' . "\r\n";
     //$headers .= 'To: '.$to_email.' <'.$to_email.'>' . "\r\n";
     $headers .= 'From: CICBV <'.$from_address.'>' . "\r\n";
     $headers .= 'From: CICBV <'.$from_address.'>' . "\r\n";