*NEXT/*DIE

Subscription.h

@@ -1,8 +1,9 @@
 #ifndef __Subscription_h__
 #define __Subscription_h__
 
-#include "SubscriptionHandler.h"
+#include "MString.h"
 #include "SessionFilter.h"
+#include "SubscriptionHandler.h"
 #include "ZString.h"
 #include <string>
 #include <vector>
@@ -12,12 +13,13 @@ namespace core
 
    class TCPSession;
 
-   class Subscription {
+   class Subscription
+   {
 
-    public:
+   public:
       Subscription(std::string id, std::string mode = "*AUTHOR");
-      Subscription(std::string id, TCPSession &session, std::string mode);
-      Subscription(std::string id, TCPSession &session, std::string mode, SubscriptionHandler *handler);
+      Subscription(std::string id, coreutils::MString *alias, std::string mode);
+      Subscription(std::string id, coreutils::MString *alias, std::string ownership, std::string mode, SubscriptionHandler *handler, std::string selection, std::string time);
       virtual ~Subscription();
 
       int subscribe(TCPSession &session);
@@ -28,7 +30,7 @@ namespace core
       virtual int onSubscribe(TCPSession &session);
 
       int event(std::stringstream &out);
-
+      bool subscriptionOwner(coreutils::MString *alias, std::string selection);
       bool ifSubscriber(TCPSession &session);
 
       bool subInvite(TCPSession &session);
@@ -38,8 +40,11 @@ namespace core
 
       std::string id;
       std::string mode;
-      TCPSession *owner;
-
+      coreutils::MString *owner;
+      
+      std::string will;
+      std::string ownership;
+      std::string timer;
       SubscriptionHandler *handler;
 
       std::vector<TCPSession *> subscribers;