A few fixes and bugfixes

3 files changed, 12 insertions, 21 deletions

diff --git a/beinc_server.json b/beinc_server.json
index a6c5e0d..4c50fff 100644
--- a/beinc_server.json
+++ b/beinc_server.json
@@ -44,15 +44,5 @@
             }
         ]
     },
-    "poller": {
-        "target_url": "https://10.0.0.2:9898/pull/secondtest",
-        "target_password": "changeme",
-        "target_cert_file": "",
-        "polling_interval": 5,
-        "osd_system": "pynotify",
-        "osd_timeout": 5000,
-        "daemonize": 1,
-        "debug": 1,
-    },
     "config_version": 1
 }
diff --git a/beinc_server.py b/beinc_server.py
index 1ed5563..64e21f5 100755
--- a/beinc_server.py
+++ b/beinc_server.py
@@ -275,12 +275,13 @@ def main():
         sys.stderr.write('Unable to parse {0}: {1}'.format(args.config_file,
                                                            e))
         sys.exit(errno.EIO)
+    ssl_module = config_dict['server']['general']['ssl_module'].encode('utf-8')
     ssl_certificate = config_dict['server']['general']['ssl_certificate']
     ssl_private_key = config_dict['server']['general']['ssl_private_key']
     cherrypy.config.update({
         'server.socket_host': args.hostname,
         'server.socket_port': args.port,
-        'server.ssl_module': config_dict['server']['general']['ssl_module'],
+        'server.ssl_module': ssl_module,
         'server.ssl_certificate': ssl_certificate,
         'server.ssl_private_key': ssl_private_key,
         'tools.encode.on': True,
diff --git a/beinc_weechat.py b/beinc_weechat.py
index 8462b76..b0a7cdc 100644
--- a/beinc_weechat.py
+++ b/beinc_weechat.py
@@ -194,7 +194,7 @@ class WeechatTarget(object):
                            'message': message_str,
                            'password': self.__password}
             data = urllib.urlencode(post_values)
-            if self.__send_beinc_message(data) and self.__debug:
+            if not self.__send_beinc_message(data) and self.__debug:
                 beinc_prnt(
                     'BEINC DEBUG: send_private_message_notification-ERROR '
                     'for "{0}": __send_beinc_message -> False'.format(
@@ -218,7 +218,7 @@ class WeechatTarget(object):
                            'message': message_str,
                            'password': self.__password}
             data = urllib.urlencode(post_values)
-            if self.__send_beinc_message(data) and self.__debug:
+            if not self.__send_beinc_message(data) and self.__debug:
                 beinc_prnt(
                     'BEINC DEBUG: send_channel_message_notification-ERROR '
                     'for "{0}": __send_beinc_message -> False'.format(
@@ -242,7 +242,7 @@ class WeechatTarget(object):
                            'message': message_str,
                            'password': self.__password}
             data = urllib.urlencode(post_values)
-            if self.__send_beinc_message(data) and self.__debug:
+            if not self.__send_beinc_message(data) and self.__debug:
                 beinc_prnt(
                     'BEINC DEBUG: send_notify_message_notification-ERROR '
                     'for "{0}": __send_beinc_message -> False'.format(
@@ -387,7 +387,7 @@ def beinc_privmsg_handler(data, signal, signal_data):
         if not global_values['global_private_messages_policy']:
             return weechat.WEECHAT_RC_OK
         p_messages_policy = global_values['global_private_messages_policy']
-        if p_messages_policy == BEINC_POLICY_LIST_ONLY and
+        if p_messages_policy == BEINC_POLICY_LIST_ONLY and \
         '{0}.{1}'.format(
             ph_values['server'],
             ph_values['source_nick'].lower()
@@ -396,9 +396,9 @@ def beinc_privmsg_handler(data, signal, signal_data):
         for target in target_list:
             if not target.enabled:
                 continue
-            if target.private_messages_policy == BEINC_POLICY_ALL or
+            if target.private_messages_policy == BEINC_POLICY_ALL or \
             (
-                target.private_messages_policy == BEINC_POLICY_LIST_ONLY and
+                target.private_messages_policy == BEINC_POLICY_LIST_ONLY and \
                 '{0}.{1}'.format(
                     ph_values['server'],
                     ph_values['source_nick'].lower()) in target.nicks
@@ -409,7 +409,7 @@ def beinc_privmsg_handler(data, signal, signal_data):
         if not global_values['global_notifications_policy']:
             return weechat.WEECHAT_RC_OK
         notifications_policy = global_values['global_notifications_policy']
-        if notifications_policy == BEINC_POLICY_LIST_ONLY and
+        if notifications_policy == BEINC_POLICY_LIST_ONLY and \
         (
             '{0}.{1}'.format(
                 ph_values['server'],
@@ -432,7 +432,7 @@ def beinc_privmsg_handler(data, signal, signal_data):
         if not global_values['global_notifications_policy']:
             return weechat.WEECHAT_RC_OK
         c_messages_policy = global_values['global_channel_messages_policy']
-        if c_messages_policy == BEINC_POLICY_LIST_ONLY and
+        if c_messages_policy == BEINC_POLICY_LIST_ONLY and \
         (
             '{0}.{1}'.format(
                 ph_values['server'],
@@ -443,9 +443,9 @@ def beinc_privmsg_handler(data, signal, signal_data):
         for target in target_list:
             if not target.enabled:
                 continue
-            if target.channel_messages_policy == BEINC_POLICY_ALL or
+            if target.channel_messages_policy == BEINC_POLICY_ALL or \
             (
-                target.channel_messages_policy == BEINC_POLICY_LIST_ONLY and
+                target.channel_messages_policy == BEINC_POLICY_LIST_ONLY and \
                 '{0}.{1}'.format(
                     ph_values['server'],
                     ph_values['channel'].lower()) in target.chans