6 files changed, 4 insertions, 25 deletions
diff --git a/module/plugins/Addon.py b/module/plugins/Addon.py
index 60223dd28..8b4430672 100644
--- a/module/plugins/Addon.py
+++ b/module/plugins/Addon.py
@@ -97,8 +97,8 @@ class Addon(Base):
     #: periodic call interval in seconds
     interval = 60
 
-    def __init__(self, core, manager):
-        Base.__init__(self, core)
+    def __init__(self, core, manager, user=None):
+        Base.__init__(self, core, user)
 
         #: Provide information in dict here, usable by API `getInfo`
         self.info = None
diff --git a/module/plugins/Base.py b/module/plugins/Base.py
index 2b9e12653..9bfeaba4b 100644
--- a/module/plugins/Base.py
+++ b/module/plugins/Base.py
@@ -47,6 +47,8 @@ class Base(object):
     __pattern__ = r""
     #: Internal addon plugin which is always loaded
     __internal__ = False
+    #: When True this addon can be enabled by every user
+    __user_context__ = False
     #: Config definition: list of  (name, type, label, default_value) or
     #: (name, type, label, short_description, default_value)
     __config__ = list()
diff --git a/module/plugins/UserAddon.py b/module/plugins/UserAddon.py
deleted file mode 100644
index 25f6bd841..000000000
--- a/module/plugins/UserAddon.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-
-###############################################################################
-#   Copyright(c) 2008-2013 pyLoad Team
-#   http://www.pyload.org
-#
-#   This file is part of pyLoad.
-#   pyLoad is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU Affero General Public License as
-#   published by the Free Software Foundation, either version 3 of the
-#   License, or (at your option) any later version.
-#
-#   Subjected to the terms and conditions in LICENSE
-#
-#   @author: RaNaN
-###############################################################################
-
-from Addon import Addon
-
-class UserAddon(Addon):
-    """
-    Special type of an addon that only works a specific user. Has a configuration for every user who added it .
-    """
-\ No newline at end of file
diff --git a/module/plugins/container/__init__.py b/module/plugins/container/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/module/plugins/container/__init__.py
+++ /dev/null
diff --git a/module/plugins/container/CCF.py b/module/plugins/crypter/CCF.py
index ab7ff1099..ab7ff1099 100644
--- a/module/plugins/container/CCF.py
+++ b/module/plugins/crypter/CCF.py
diff --git a/module/plugins/container/RSDF.py b/module/plugins/crypter/RSDF.py
index cbc9864b1..cbc9864b1 100644
--- a/module/plugins/container/RSDF.py
+++ b/module/plugins/crypter/RSDF.py