helper_sql #467

Merged
Atheros1 merged 19 commits from master into master 2013-09-03 05:20:20 +02:00
Showing only changes of commit 8a6d1d9cd5 - Show all commits

View File

@ -160,7 +160,7 @@ def isAddressInMyAddressBook(address):
#At this point we should really just have a isAddressInMy(book, address)... #At this point we should really just have a isAddressInMy(book, address)...
def isAddressInMySubscriptionsList(address): def isAddressInMySubscriptionsList(address):
queryreturn = ( queryreturn = sqlQuery(
'''select * from subscriptions where address=?''', '''select * from subscriptions where address=?''',
str(address)) str(address))
return queryreturn != [] return queryreturn != []
@ -173,7 +173,7 @@ def isAddressInMyAddressBookSubscriptionsListOrWhitelist(address):
if queryreturn <> []: if queryreturn <> []:
return True return True
queryreturn = ( queryreturn = sqlQuery(
'''select address from subscriptions where address=? and enabled = '1' ''', '''select address from subscriptions where address=? and enabled = '1' ''',
address) address)
if queryreturn <> []: if queryreturn <> []: