Manual merge of v1.4.21 into v2

This commit is contained in:
JonnyWong16 2017-08-02 21:37:59 -07:00
commit 68072d8340
13 changed files with 120 additions and 16 deletions

View file

@ -455,7 +455,7 @@ General optional parameters:
data = None
apikey = hashlib.sha224(str(random.getrandbits(256))).hexdigest()[0:32]
if plexpy.CONFIG.HTTP_USERNAME and plexpy.CONFIG.HTTP_PASSWORD:
if username == plexpy.HTTP_USERNAME and password == plexpy.CONFIG.HTTP_PASSWORD:
if username == plexpy.CONFIG.HTTP_USERNAME and password == plexpy.CONFIG.HTTP_PASSWORD:
if plexpy.CONFIG.API_KEY:
data = plexpy.CONFIG.API_KEY
else: