diff -r TwitterMidgetspy/data/interfaces/default/config_notifications.tmpl TwitterGood/data/interfaces/default/config_notifications.tmpl
33,35c33,38
<     \$.get("$sbRoot/home/twitterStep1", function (data){window.open(data)});
<     return false;
<
---
>     \$.get("$sbRoot/home/twitterStep1", {});
>     document.getElementById('twitterStep1').disabled = true;
>     document.getElementById('twitterStep2').disabled = true;
>     document.getElementById('testTwitter').disabled = true;
>     document.getElementById('form').submit();
>
136,138c139
< Click the "Request Authorization" button. This will<br />
< open a new page containing an auth key.<br />
< Note: if nothing happens check your popup blocker.<br />
---
> Click the "Request Authorization" button.  Copy the twitter URL from the <a href=$sbRoot/errorlogs/viewlog>log</a> into your browser.<br />
diff -r TwitterMidgetspy/data/interfaces/default/config_providers.tmpl TwitterGood/data/interfaces/default/config_providers.tmpl
90,94d89
< <strong>SAB UID:</strong><br />
< SAB UID (only required if sending NZBs directly to SAB)<br />
< <input type="text" name="tvbinz_sabuid" value="$sickbeard.TVBINZ_SABUID" size="6"><br />
< <br />
<
Only in TwitterMidgetspy/data/interfaces/default: config_timezones.tmpl
Only in TwitterGood/: .git
Only in TwitterGood/: Logs
diff -r TwitterMidgetspy/sickbeard/classes.py TwitterGood/sickbeard/classes.py
31c31
<     version = 'Sick Beard/alpha2'
---
>     version = USER_AGENT
diff -r TwitterMidgetspy/sickbeard/common.py TwitterGood/sickbeard/common.py
263c263,265
<                    168161: ['Law & Order: Los Angeles', 'Law & Order: LA']
---
>                    168161: ['Law & Order: Los Angeles', 'Law & Order: LA'],
>                    77526: ['Star Trek: TOS'],
>                    72194: ['The Ellen Degeneres Show', 'Ellen Degeneres']
diff -r TwitterMidgetspy/sickbeard/__init__.py TwitterGood/sickbeard/__init__.py
129d128
< TVBINZ_SABUID = None
165c164
< USE_TWITTER = False
---
> USE_TITTER = False
268c267
<                 MIN_BACKLOG_SEARCH_FREQUENCY, TVBINZ_AUTH, TVBINZ_SABUID, showQueueScheduler, \
---
>                 MIN_BACKLOG_SEARCH_FREQUENCY, TVBINZ_AUTH, showQueueScheduler, \
367d365
<         TVBINZ_SABUID = check_setting_str(CFG, 'TVBinz', 'tvbinz_sabuid', '')
636d633
<     CFG['TVBinz']['tvbinz_sabuid'] = TVBINZ_SABUID
diff -r TwitterMidgetspy/sickbeard/notifiers/__init__.py TwitterGood/sickbeard/notifiers/__init__.py
17c17
<     return tweet.get_authorization()
---
>     tweet.get_authorization()
diff -r TwitterMidgetspy/sickbeard/notifiers/tweet.py TwitterGood/sickbeard/notifiers/tweet.py
17,18c17,18
< consumer_key = "vHHtcB6WzpWDG6KYlBMr8g"
< consumer_secret = "zMqq5CB3f8cWKiRO2KzWPTlBanYmV0VYxSXZ0Pxds0E"
---
> consumer_key = "sBD0atiSA1TY5tv4ru3Cyw"
> consumer_secret = "eWeyr7uyVJZpr2AnBW4s4NKRm2WjyHDV2omyq88CeFc"
36c36
<         logger.log('Invalid respond from Twitter requesting temp token: %s' % resp['status'])
---
>   logger.log('Invalid respond from Twitter requesting temp token: %s' % resp['status'])
38c38
<         request_token = dict(parse_qsl(content))
---
>   request_token = dict(parse_qsl(content))
40,43c40,44
<         sickbeard.TWITTER_USERNAME = request_token['oauth_token']
<         sickbeard.TWITTER_PASSWORD = request_token['oauth_token_secret']
<
<         return AUTHORIZATION_URL+"?oath_token="+ request_token['oauth_token']
---
>     sickbeard.TWITTER_USERNAME = request_token['oauth_token']
>     sickbeard.TWITTER_PASSWORD = request_token['oauth_token_secret']
>
>     logger.log('%s?oauth_token=%s' % (AUTHORIZATION_URL, request_token['oauth_token']))
>     logger.log('Please visit this Twitter page and retrieve the key to be used in the next step to obtaining an Authentication Token:')
64,65c65,66
<         logger.log('The request for a Token did not succeed: %s' % resp['status'])
<         logger.log(access_token)
---
>   logger.log('The request for a Token did not succeed: %s' % resp['status'])
>   logger.log(access_token)
67,70c68,71
<         logger.log('Your Twitter Access Token key: %s' % access_token['oauth_token'])
<         logger.log('Access Token secret: %s' % access_token['oauth_token_secret'])
<         sickbeard.TWITTER_USERNAME = access_token['oauth_token']
<         sickbeard.TWITTER_PASSWORD = access_token['oauth_token_secret']
---
>   logger.log('Your Twitter Access Token key: %s' % access_token['oauth_token'])
>   logger.log('Access Token secret: %s' % access_token['oauth_token_secret'])
>   sickbeard.TWITTER_USERNAME = access_token['oauth_token']
>   sickbeard.TWITTER_PASSWORD = access_token['oauth_token_secret']
82c83
<         status = api.PostUpdate(message)
---
>   status = api.PostUpdate(message)
84,85c85,86
<         logger.log("Error Sending Tweet")
<         return False;
---
>   logger.log("Error Sending Tweet")
>   return False;
92,93c93,94
<     if not sickbeard.USE_TWITTER:
<         return False
---
>   if not sickbeard.USE_TWITTER:
>       return False
95c96
<     opts = {}
---
>   opts = {}
97,100c98,101
<     if password == None:
<         opts['password'] = sickbeard.TWITTER_PASSWORD
<     else:
<         opts['password'] = password
---
>   if password == None:
>       opts['password'] = sickbeard.TWITTER_PASSWORD
>   else:
>       opts['password'] = password
102,105c103,106
<     if username == None:
<         opts['tname'] = sickbeard.TWITTER_USERNAME
<     else:
<         opts['tname'] = username
---
>         if username == None:
>                 opts['tname'] = sickbeard.TWITTER_USERNAME
>         else:
>                 opts['tname'] = username
107c108,111
<     message = "DVR is recording: " + message
---
>         if message == "This is a test notification from Sick Beard":
>                 prefix = ""
>         else:
>                 prefix = "DVR is recording: "
109c113
<     logger.log("Sending tweet from "+opts['tname']+" Password "+str(opts['password'])+": "+message)
---
>   logger.log("Sending tweet from "+opts['tname']+" Password "+str(opts['password'])+": "+prefix+message)
111c115
<     send_tweet(opts, message)
---
>   send_tweet(opts, prefix+message)
diff -r TwitterMidgetspy/sickbeard/providers/tvbinz.py TwitterGood/sickbeard/providers/tvbinz.py
59,69d58
<   def findEpisode (self, episode, forceQuality=None, manualSearch=False):
<
<       nzbResults = generic.NZBProvider.findEpisode(self, episode, forceQuality, manualSearch)
<
<       # append auth
<       urlParams = {'i': sickbeard.TVBINZ_SABUID, 'h': sickbeard.TVBINZ_HASH}
<       for curResult in nzbResults:
<           curResult.url += "&" + urllib.urlencode(urlParams)
<
<       return nzbResults
<
90c79,80
<                  'sets': 'none'}
---
>                  'sets': 'none',
>                    'addauth': '1'}
diff -r TwitterMidgetspy/sickbeard/version.py TwitterGood/sickbeard/version.py
1c1
< SICKBEARD_VERSION = "alpha2 chaosloth mod"
\ No newline at end of file
---
> SICKBEARD_VERSION = "alpha2"
\ No newline at end of file
diff -r TwitterMidgetspy/sickbeard/webserve.py TwitterGood/sickbeard/webserve.py
783c783
<                       tvbinz_auth=None, tvbinz_sabuid=None, provider_order=None,
---
>                       tvbinz_auth=None, provider_order=None,
850,851d849
<         if tvbinz_sabuid:
<             sickbeard.TVBINZ_SABUID = tvbinz_sabuid.strip()
1249c1247,1248
<         return notifiers.testTwitter1()
---
>         notifiers.testTwitter1()
>         return "Getting Twitter Authorization"