From 876c60271082c2f701882db6108934a66ab1e104 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Wed, 11 Jun 2014 12:29:31 +0200
Subject: [PATCH] Code cleanup

---
 couchpotato/__init__.py                       |  2 +-
 couchpotato/core/_base/downloader/main.py     |  3 +++
 .../_base/downloader/static/downloaders.js    |  5 +++--
 couchpotato/core/_base/updater/main.py        |  2 +-
 couchpotato/core/downloaders/nzbvortex.py     |  4 ++--
 couchpotato/core/downloaders/sabnzbd.py       |  2 +-
 couchpotato/core/downloaders/synology.py      |  1 +
 couchpotato/core/downloaders/utorrent.py      |  2 +-
 couchpotato/core/media/__init__.py            |  2 +-
 couchpotato/core/media/_base/media/main.py    |  1 -
 .../core/media/_base/providers/base.py        |  3 +++
 .../core/media/_base/providers/nzb/newznab.py |  2 +-
 .../_base/providers/torrent/ilovetorrents.py  |  1 +
 .../_base/providers/torrent/torrentday.py     |  1 -
 .../core/media/_base/search/static/search.css |  1 -
 couchpotato/core/media/movie/charts/main.py   |  1 +
 .../core/media/movie/charts/static/charts.css |  1 -
 .../media/movie/providers/info/fanarttv.py    | 17 +++++---------
 .../media/movie/providers/info/themoviedb.py  |  2 +-
 .../movie/providers/torrent/sceneaccess.py    |  1 -
 .../media/movie/providers/trailer/base.py     |  3 +++
 .../core/media/movie/suggestion/main.py       |  1 -
 couchpotato/core/plugins/base.py              |  2 +-
 couchpotato/core/plugins/file.py              |  4 ++--
 couchpotato/core/plugins/log/main.py          |  4 ++--
 couchpotato/core/plugins/log/static/log.css   |  2 +-
 couchpotato/core/plugins/renamer.py           |  2 +-
 .../core/plugins/wizard/static/wizard.js      |  4 ++--
 couchpotato/core/settings.py                  |  1 -
 couchpotato/static/scripts/api.js             |  4 ++--
 .../static/scripts/library/question.js        | 22 +++++++++----------
 couchpotato/static/scripts/page/settings.js   |  4 ++--
 couchpotato/static/style/main.css             |  2 ++
 33 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/couchpotato/__init__.py b/couchpotato/__init__.py
index 092bd406..fb6b4dc3 100644
--- a/couchpotato/__init__.py
+++ b/couchpotato/__init__.py
@@ -45,7 +45,7 @@ class WebHandler(BaseHandler):
             self.write({'success': False, 'error': 'Failed returning results'})
 
 
-def addView(route, func, static = False):
+def addView(route, func):
     views[route] = func
 
 
diff --git a/couchpotato/core/_base/downloader/main.py b/couchpotato/core/_base/downloader/main.py
index 80890e4a..70e5cc9c 100644
--- a/couchpotato/core/_base/downloader/main.py
+++ b/couchpotato/core/_base/downloader/main.py
@@ -72,6 +72,9 @@ class DownloaderBase(Provider):
             return
         return self.download(data = data, media = media, filedata = filedata)
 
+    def download(self, *args, **kwargs):
+        return False
+
     def _getAllDownloadStatus(self, download_ids):
         if self.isDisabled(manual = True, data = {}):
             return
diff --git a/couchpotato/core/_base/downloader/static/downloaders.js b/couchpotato/core/_base/downloader/static/downloaders.js
index ec85ce3d..45215158 100644
--- a/couchpotato/core/_base/downloader/static/downloaders.js
+++ b/couchpotato/core/_base/downloader/static/downloaders.js
@@ -40,15 +40,16 @@ var DownloadersBase = new Class({
 
 								button.set('text', button_name);
 
+								var message;
 								if(json.success){
-									var message = new Element('span.success', {
+									message = new Element('span.success', {
 										'text': 'Connection successful'
 									}).inject(button, 'after')
 								}
 								else {
 									var msg_text = 'Connection failed. Check logs for details.';
 									if(json.hasOwnProperty('msg')) msg_text = json.msg;
-									var message = new Element('span.failed', {
+									message = new Element('span.failed', {
 										'text': msg_text
 									}).inject(button, 'after')
 								}
diff --git a/couchpotato/core/_base/updater/main.py b/couchpotato/core/_base/updater/main.py
index 5a47fc06..27f9917a 100644
--- a/couchpotato/core/_base/updater/main.py
+++ b/couchpotato/core/_base/updater/main.py
@@ -10,7 +10,7 @@ from threading import RLock
 
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
-from couchpotato.core.helpers.encoding import ss, sp
+from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
diff --git a/couchpotato/core/downloaders/nzbvortex.py b/couchpotato/core/downloaders/nzbvortex.py
index 92ece6d6..9094055f 100644
--- a/couchpotato/core/downloaders/nzbvortex.py
+++ b/couchpotato/core/downloaders/nzbvortex.py
@@ -130,7 +130,7 @@ class NZBVortex(DownloaderBase):
         url = cleanHost(self.conf('host'), ssl = self.conf('ssl')) + 'api/' + call
 
         try:
-            data = self.urlopen('%s?%s' % (url, params), *args, verify_ssl = False, **kwargs)
+            data = self.urlopen('%s?%s' % (url, params), *args, **kwargs)
 
             if data:
                 return json.loads(data)
@@ -154,7 +154,7 @@ class NZBVortex(DownloaderBase):
             url = cleanHost(self.conf('host')) + 'api/app/apilevel'
 
             try:
-                data = self.urlopen(url, show_error = False, verify_ssl = False)
+                data = self.urlopen(url, show_error = False)
                 self.api_level = float(json.loads(data).get('apilevel'))
             except URLError as e:
                 if hasattr(e, 'code') and e.code == 403:
diff --git a/couchpotato/core/downloaders/sabnzbd.py b/couchpotato/core/downloaders/sabnzbd.py
index 57e1dca5..cd51cb87 100644
--- a/couchpotato/core/downloaders/sabnzbd.py
+++ b/couchpotato/core/downloaders/sabnzbd.py
@@ -194,7 +194,7 @@ class Sabnzbd(DownloaderBase):
             'output': 'json'
         }))
 
-        data = self.urlopen(url, timeout = 60, show_error = False, verify_ssl = False, headers = {'User-Agent': Env.getIdentifier()}, **kwargs)
+        data = self.urlopen(url, timeout = 60, show_error = False, headers = {'User-Agent': Env.getIdentifier()}, **kwargs)
         if use_json:
             d = json.loads(data)
             if d.get('error'):
diff --git a/couchpotato/core/downloaders/synology.py b/couchpotato/core/downloaders/synology.py
index 125d750a..2c12536f 100644
--- a/couchpotato/core/downloaders/synology.py
+++ b/couchpotato/core/downloaders/synology.py
@@ -90,6 +90,7 @@ class SynologyRPC(object):
 
         self.download_url = 'http://%s:%s/webapi/DownloadStation/task.cgi' % (host, port)
         self.auth_url = 'http://%s:%s/webapi/auth.cgi' % (host, port)
+        self.sid = None
         self.username = username
         self.password = password
         self.destination = destination
diff --git a/couchpotato/core/downloaders/utorrent.py b/couchpotato/core/downloaders/utorrent.py
index 7ff5930d..3164681c 100644
--- a/couchpotato/core/downloaders/utorrent.py
+++ b/couchpotato/core/downloaders/utorrent.py
@@ -168,7 +168,7 @@ class uTorrent(DownloaderBase):
                 status = 'busy'
                 if (torrent[1] & self.status_flags['STARTED'] or torrent[1] & self.status_flags['QUEUED']) and torrent[4] == 1000:
                     status = 'seeding'
-                elif (torrent[1] & self.status_flags['ERROR']):
+                elif torrent[1] & self.status_flags['ERROR']:
                     status = 'failed'
                 elif torrent[4] == 1000:
                     status = 'completed'
diff --git a/couchpotato/core/media/__init__.py b/couchpotato/core/media/__init__.py
index f0abd28c..6c17e6db 100644
--- a/couchpotato/core/media/__init__.py
+++ b/couchpotato/core/media/__init__.py
@@ -1,7 +1,7 @@
 import os
 import traceback
 
-from couchpotato import get_db, CPLog
+from couchpotato import CPLog
 from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
 from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.plugins.base import Plugin
diff --git a/couchpotato/core/media/_base/media/main.py b/couchpotato/core/media/_base/media/main.py
index c1fdd92b..3c1bf694 100644
--- a/couchpotato/core/media/_base/media/main.py
+++ b/couchpotato/core/media/_base/media/main.py
@@ -125,7 +125,6 @@ class MediaPlugin(MediaBase):
 
             imdb_id = getImdb(str(media_id))
 
-            media = None
             if imdb_id:
                 media = db.get('media', 'imdb-%s' % imdb_id, with_doc = True)['doc']
             else:
diff --git a/couchpotato/core/media/_base/providers/base.py b/couchpotato/core/media/_base/providers/base.py
index 6bcf3332..587545c8 100644
--- a/couchpotato/core/media/_base/providers/base.py
+++ b/couchpotato/core/media/_base/providers/base.py
@@ -129,6 +129,9 @@ class YarrProvider(Provider):
         else:
             return []
 
+    def buildUrl(self, *args, **kwargs):
+        pass
+
     def login(self):
 
         # Check if we are still logged in every hour
diff --git a/couchpotato/core/media/_base/providers/nzb/newznab.py b/couchpotato/core/media/_base/providers/nzb/newznab.py
index 13655eed..628a55f2 100644
--- a/couchpotato/core/media/_base/providers/nzb/newznab.py
+++ b/couchpotato/core/media/_base/providers/nzb/newznab.py
@@ -91,7 +91,7 @@ class Base(NZBProvider, RSS):
                     # Extract a password from the description
                     password = re.search('(?:' + self.passwords_regex + ')(?: *)(?:\:|\=)(?: *)(.*?)\<br\>|\n|$', description, flags = re.I).group(1)
                     if password:
-                        name = name + ' {{%s}}' % password.strip()
+                        name += ' {{%s}}' % password.strip()
                 except:
                     log.debug('Error getting details of "%s": %s', (name, traceback.format_exc()))
 
diff --git a/couchpotato/core/media/_base/providers/torrent/ilovetorrents.py b/couchpotato/core/media/_base/providers/torrent/ilovetorrents.py
index eac2c476..33edff7f 100644
--- a/couchpotato/core/media/_base/providers/torrent/ilovetorrents.py
+++ b/couchpotato/core/media/_base/providers/torrent/ilovetorrents.py
@@ -51,6 +51,7 @@ class Base(TorrentProvider):
                     results_table = None
 
                     data_split = splitString(data, '<table')
+                    soup = None
                     for x in data_split:
                         soup = BeautifulSoup(x)
                         results_table = soup.find('table', attrs = {'class': 'koptekst'})
diff --git a/couchpotato/core/media/_base/providers/torrent/torrentday.py b/couchpotato/core/media/_base/providers/torrent/torrentday.py
index a4eb3899..e6909259 100644
--- a/couchpotato/core/media/_base/providers/torrent/torrentday.py
+++ b/couchpotato/core/media/_base/providers/torrent/torrentday.py
@@ -1,4 +1,3 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
diff --git a/couchpotato/core/media/_base/search/static/search.css b/couchpotato/core/media/_base/search/static/search.css
index 2defe24d..4f7b77bf 100644
--- a/couchpotato/core/media/_base/search/static/search.css
+++ b/couchpotato/core/media/_base/search/static/search.css
@@ -7,7 +7,6 @@
 	text-align: right;
 	height: 100%;
 	transition: all .4s cubic-bezier(0.9,0,0.1,1);
-	position: absolute;
 	z-index: 20;
 	border: 0 solid transparent;
 	border-bottom-width: 4px;
diff --git a/couchpotato/core/media/movie/charts/main.py b/couchpotato/core/media/movie/charts/main.py
index 58133d83..fe6ddc0f 100644
--- a/couchpotato/core/media/movie/charts/main.py
+++ b/couchpotato/core/media/movie/charts/main.py
@@ -45,6 +45,7 @@ class Charts(Plugin):
             if catched_charts:
                 return catched_charts
 
+        charts = []
         try:
             self.update_in_progress = True
             charts = fireEvent('automation.get_chart_list', merge = True)
diff --git a/couchpotato/core/media/movie/charts/static/charts.css b/couchpotato/core/media/movie/charts/static/charts.css
index ce8ff0ab..7ac372e2 100644
--- a/couchpotato/core/media/movie/charts/static/charts.css
+++ b/couchpotato/core/media/movie/charts/static/charts.css
@@ -148,7 +148,6 @@
 		padding: 0 3px 10px 0;
 	}
 		.charts .chart .media_result .data:before {
-			bottom: 0;
 			content: '';
 			display: block;
 			height: 10px;
diff --git a/couchpotato/core/media/movie/providers/info/fanarttv.py b/couchpotato/core/media/movie/providers/info/fanarttv.py
index 2aeaad65..8bfa92c8 100644
--- a/couchpotato/core/media/movie/providers/info/fanarttv.py
+++ b/couchpotato/core/media/movie/providers/info/fanarttv.py
@@ -51,19 +51,14 @@ class FanartTV(MovieProvider):
 
     def _parseMovie(self, movie):
         images = {
-            'landscape': [],
+            'landscape': self._getMultImages(movie.get('moviethumb', []), 1),
             'logo': [],
-            'disc_art': [],
-            'clear_art': [],
-            'banner': [],
+            'disc_art': self._getMultImages(self._trimDiscs(movie.get('moviedisc', [])), 1),
+            'clear_art': self._getMultImages(movie.get('hdmovieart', []), 1),
+            'banner': self._getMultImages(movie.get('moviebanner', []), 1),
             'extra_fanart': [],
         }
 
-        images['landscape'] = self._getMultImages(movie.get('moviethumb', []), 1)
-        images['banner'] = self._getMultImages(movie.get('moviebanner', []), 1)
-        images['disc_art'] = self._getMultImages(self._trimDiscs(movie.get('moviedisc', [])), 1)
-
-        images['clear_art'] = self._getMultImages(movie.get('hdmovieart', []), 1)
         if len(images['clear_art']) == 0:
             images['clear_art'] = self._getMultImages(movie.get('movieart', []), 1)
 
@@ -105,10 +100,10 @@ class FanartTV(MovieProvider):
         return image_url
 
     def _getMultImages(self, images, n):
-        '''
+        """
         Chooses the best n images and returns them as a list.
         If n<0, all images will be returned.
-        '''
+        """
         image_urls = []
         pool = []
         for image in images:
diff --git a/couchpotato/core/media/movie/providers/info/themoviedb.py b/couchpotato/core/media/movie/providers/info/themoviedb.py
index 45b7701c..16299f2e 100644
--- a/couchpotato/core/media/movie/providers/info/themoviedb.py
+++ b/couchpotato/core/media/movie/providers/info/themoviedb.py
@@ -1,6 +1,6 @@
 import traceback
 
-from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import simplifyString, toUnicode, ss
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
diff --git a/couchpotato/core/media/movie/providers/torrent/sceneaccess.py b/couchpotato/core/media/movie/providers/torrent/sceneaccess.py
index 99157d73..579103af 100644
--- a/couchpotato/core/media/movie/providers/torrent/sceneaccess.py
+++ b/couchpotato/core/media/movie/providers/torrent/sceneaccess.py
@@ -1,5 +1,4 @@
 from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.event import fireEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media._base.providers.torrent.sceneaccess import Base
 from couchpotato.core.media.movie.providers.base import MovieProvider
diff --git a/couchpotato/core/media/movie/providers/trailer/base.py b/couchpotato/core/media/movie/providers/trailer/base.py
index c1a6f71d..9cd1dbe6 100644
--- a/couchpotato/core/media/movie/providers/trailer/base.py
+++ b/couchpotato/core/media/movie/providers/trailer/base.py
@@ -11,3 +11,6 @@ class TrailerProvider(Provider):
 
     def __init__(self):
         addEvent('trailer.search', self.search)
+
+    def search(self, *args, **kwargs):
+        pass
diff --git a/couchpotato/core/media/movie/suggestion/main.py b/couchpotato/core/media/movie/suggestion/main.py
index 5db403f6..c2cc9071 100644
--- a/couchpotato/core/media/movie/suggestion/main.py
+++ b/couchpotato/core/media/movie/suggestion/main.py
@@ -84,7 +84,6 @@ class Suggestion(Plugin):
 
         # Get new results and add them
         if len(new_suggestions) - 1 < limit:
-            db = get_db()
             active_movies = fireEvent('media.with_status', ['active', 'done'], single = True)
             movies = [getIdentifier(x) for x in active_movies]
             movies.extend(seen)
diff --git a/couchpotato/core/plugins/base.py b/couchpotato/core/plugins/base.py
index 234302df..ac5ca87e 100644
--- a/couchpotato/core/plugins/base.py
+++ b/couchpotato/core/plugins/base.py
@@ -166,7 +166,7 @@ class Plugin(object):
                 log.error('Couldn\'t remove empty directory %s: %s', (folder, traceback.format_exc()))
 
     # http request
-    def urlopen(self, url, timeout = 30, data = None, headers = None, files = None, show_error = True, verify_ssl = True):
+    def urlopen(self, url, timeout = 30, data = None, headers = None, files = None, show_error = True):
         url = quote(ss(url), safe = "%/:=&?~#+!$,;'@()*[]")
 
         if not headers: headers = {}
diff --git a/couchpotato/core/plugins/file.py b/couchpotato/core/plugins/file.py
index 0d6483bb..51adf8c9 100644
--- a/couchpotato/core/plugins/file.py
+++ b/couchpotato/core/plugins/file.py
@@ -49,8 +49,8 @@ class FileManager(Plugin):
                     files.extend(file_dict[x])
 
             for f in os.listdir(cache_dir):
-                if os.path.splitext(f.name)[1] in ['.png', '.jpg', '.jpeg']:
-                    file_path = os.path.join(cache_dir, f.name)
+                if os.path.splitext(f)[1] in ['.png', '.jpg', '.jpeg']:
+                    file_path = os.path.join(cache_dir, f)
                     if toUnicode(file_path) not in files:
                         os.remove(file_path)
         except:
diff --git a/couchpotato/core/plugins/log/main.py b/couchpotato/core/plugins/log/main.py
index 5206acd6..003529b1 100644
--- a/couchpotato/core/plugins/log/main.py
+++ b/couchpotato/core/plugins/log/main.py
@@ -134,8 +134,8 @@ class Logging(Plugin):
         logs_raw = toUnicode(log_content).split('[0m\n')
 
         logs = []
-        for log in logs_raw:
-            split = splitString(log, '\x1b')
+        for log_line in logs_raw:
+            split = splitString(log_line, '\x1b')
             if split:
                 try:
                     date, time, log_type = splitString(split[0], ' ')
diff --git a/couchpotato/core/plugins/log/static/log.css b/couchpotato/core/plugins/log/static/log.css
index 8a809e32..c7aace61 100644
--- a/couchpotato/core/plugins/log/static/log.css
+++ b/couchpotato/core/plugins/log/static/log.css
@@ -23,7 +23,7 @@
 		cursor: pointer;
 	}
 
-		.page.log .nav li:hover:not(.active, .filter) {
+		.page.log .nav li:hover:not(.active):not(.filter) {
 			background: rgba(255, 255, 255, 0.1);
 		}
 
diff --git a/couchpotato/core/plugins/renamer.py b/couchpotato/core/plugins/renamer.py
index 4ba07a26..2da985fa 100644
--- a/couchpotato/core/plugins/renamer.py
+++ b/couchpotato/core/plugins/renamer.py
@@ -456,7 +456,7 @@ class Renamer(Plugin):
                             mdia['last_edit'] = int(time.time())
                             db.update(mdia)
 
-                except Exception as e:
+                except:
                     log.error('Failed marking movie finished: %s', (traceback.format_exc()))
 
                 # Go over current movie releases
diff --git a/couchpotato/core/plugins/wizard/static/wizard.js b/couchpotato/core/plugins/wizard/static/wizard.js
index fdd7b743..f215dbf4 100644
--- a/couchpotato/core/plugins/wizard/static/wizard.js
+++ b/couchpotato/core/plugins/wizard/static/wizard.js
@@ -90,7 +90,7 @@ Page.Wizard = new Class({
 			self.parent(action, params);
 
 			self.addEvent('create', function(){
-				self.order();
+				self.orderGroups();
 			});
 
 			self.initialized = true;
@@ -106,7 +106,7 @@ Page.Wizard = new Class({
 			}).delay(1)
 	},
 
-	order: function(){
+	orderGroups: function(){
 		var self = this;
 
 		var form = self.el.getElement('.uniForm');
diff --git a/couchpotato/core/settings.py b/couchpotato/core/settings.py
index f7d3d63e..c6de952b 100644
--- a/couchpotato/core/settings.py
+++ b/couchpotato/core/settings.py
@@ -1,5 +1,4 @@
 from __future__ import with_statement
-import traceback
 import ConfigParser
 from hashlib import md5
 
diff --git a/couchpotato/static/scripts/api.js b/couchpotato/static/scripts/api.js
index 38d18740..410b4886 100644
--- a/couchpotato/static/scripts/api.js
+++ b/couchpotato/static/scripts/api.js
@@ -7,9 +7,9 @@ var ApiClass = new Class({
 	},
 
 	request: function(type, options){
-		var self = this;
+		var self = this,
+			r_type = self.options.is_remote ? 'JSONP' : 'JSON';
 
-		var r_type = self.options.is_remote ? 'JSONP' : 'JSON';
 		return new Request[r_type](Object.merge({
 			'callbackKey': 'callback_func',
 			'method': 'get',
diff --git a/couchpotato/static/scripts/library/question.js b/couchpotato/static/scripts/library/question.js
index ed53b391..64feadbf 100644
--- a/couchpotato/static/scripts/library/question.js
+++ b/couchpotato/static/scripts/library/question.js
@@ -1,15 +1,15 @@
 var Question = new Class( {
 
 	initialize : function(question, hint, answers) {
-		var self = this
+		var self = this;
 
-		self.question = question
-		self.hint = hint
-		self.answers = answers
+		self.question = question;
+		self.hint = hint;
+		self.answers = answers;
 
 		self.createQuestion();
 		self.answers.each(function(answer) {
-			self.createAnswer(answer)
+			self.createAnswer(answer);
 		})
 
 	},
@@ -29,14 +29,14 @@ var Question = new Class( {
 	},
 
 	createAnswer : function(options) {
-		var self = this
+		var self = this;
 
 		var answer = new Element('a', Object.merge(options, {
 			'class' : 'answer button '+(options['class'] || '')+(options['cancel'] ? ' cancel' : '')
-		})).inject(this.container)
+		})).inject(this.container);
 
 		if (options.cancel) {
-			answer.addEvent('click', self.close.bind(self))
+			answer.addEvent('click', self.close.bind(self));
 		}
 		else if (options.request) {
 			answer.addEvent('click', function(e){
@@ -44,7 +44,7 @@ var Question = new Class( {
 				new Request(Object.merge(options, {
 					'url': options.href,
 					'onComplete': function() {
-						(options.onComplete || function(){})()
+						(options.onComplete || function(){})();
 						self.close();
 					}
 				})).send();
@@ -59,7 +59,7 @@ var Question = new Class( {
 	},
 
 	toElement : function() {
-		return this.container
+		return this.container;
 	}
 
-})
+});
diff --git a/couchpotato/static/scripts/page/settings.js b/couchpotato/static/scripts/page/settings.js
index de5ffcbc..054f5319 100644
--- a/couchpotato/static/scripts/page/settings.js
+++ b/couchpotato/static/scripts/page/settings.js
@@ -27,8 +27,8 @@ Page.Settings = new Class({
 	},
 
 	openTab: function(action){
-		var self = this;
-		var action = (action == 'index' ? 'about' : action) || self.action;
+		var self = this,
+			action = (action == 'index' ? 'about' : action) || self.action;
 
 		if(self.current)
 			self.toggleTab(self.current, true);
diff --git a/couchpotato/static/style/main.css b/couchpotato/static/style/main.css
index 5d2ed6b0..84f933b5 100644
--- a/couchpotato/static/style/main.css
+++ b/couchpotato/static/style/main.css
@@ -8,6 +8,7 @@ body, html {
 	padding: 0;
 	background: #4e5969;
 	-webkit-font-smoothing: subpixel-antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
 	body { overflow-y: scroll; }
 	body.noscroll { overflow: hidden; }
@@ -166,6 +167,7 @@ body > .spinner, .mask{
 	text-transform: none;
 	line-height: 1;
 	-webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 	font-size: 15px;
 	color: #FFF;
 }