Hope this fixes the crappy merge...

Conflicts:

	couchpotato/core/_base/_core/main.py
	couchpotato/core/_base/desktop/main.py

couchpotato/core/plugins/base.py

@@ -93,6 +93,12 @@ class Plugin(object):
 
         socket.setdefaulttimeout(timeout)
 
+        # Fill in some headers
+        if not headers.get('Referer'):
+            headers['Referer'] = urlparse(url).hostname
+        if not headers.get('User-Agent'):
+            headers['User-Agent'] = ''
+
         host = urlparse(url).hostname
         self.wait(host)
 

couchpotato/core/plugins/log/main.py

@@ -1,5 +1,5 @@
 from couchpotato.api import addApiView
-from couchpotato.core.helpers.request import jsonified, getParam
+from couchpotato.core.helpers.request import jsonified, getParam, getParams
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
@@ -14,6 +14,7 @@ class Logging(Plugin):
     def __init__(self):
         addApiView('logging.get', self.get)
         addApiView('logging.clear', self.clear)
+        addApiView('logging.log', self.log)
 
     def get(self):
 
@@ -67,3 +68,21 @@ class Logging(Plugin):
         return jsonified({
             'success': True
         })
+
+    def log(self):
+
+        params = getParams()
+
+        try:
+            log_message = 'API log: %s' % params
+            try:
+                getattr(log, params.get('type', 'error'))(log_message)
+            except:
+                log.error(log_message)
+        except:
+            log.error('Couldn\'t log via API: %s' % params)
+
+
+        return jsonified({
+            'success': True
+        })