added alert classes and supporting functions

classes/Subscriptions.php

@@ -577,9 +577,11 @@ class Subscriptions extends Base {
     public function userSubscriptions() {
 
         $subscriptions = $this->getUsersActiveSubscriptions($this->current_user_serial);
+        $alerts = (new Alerts())->getActiveAlerts();
         $popovers = (new Popovers())->getPopovers();
 
         $XML = $this->mergeXML($subscriptions, "<XML/>");
+        $XML = $this->mergeXML($alerts, $XML);
         $XML = $this->mergeXML($popovers, $XML);
 
         $content = $this->applyXSL($XML, $this->getXSL("userSubscriptions"));
@@ -602,7 +604,7 @@ class Subscriptions extends Base {
 
         return $this->getTable("usersubscriptions", $SQL);
     }
-    
+
     // ============================
     // Return a Users Subscriptions
     // ============================