X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/blobdiff_plain/4616221a15368b6c6628904c2ee2ed923a8825ad..13afa38f496f9a58f5445f82d4de8ee6a51cd7ae:/bin/optionsgen.py

diff --git a/bin/optionsgen.py b/bin/optionsgen.py
index 52a8d37..d8e85a6 100644
--- a/bin/optionsgen.py
+++ b/bin/optionsgen.py
@@ -1,5 +1,33 @@
-import config, simplejson
+import config
+import qwebirc.util.qjson as json
 
 def get_options():
-  options = dict(networkName=config.NETWORK_NAME, networkServices=[config.AUTH_SERVICE], loginRegex=config.  AUTH_OK_REGEX, appTitle=config.APP_TITLE, baseURL=config.BASE_URL)
-  return simplejson.dumps(options)
+  options = dict(
+    networkName=config.NETWORK_NAME,
+    networkServices=[config.AUTH_SERVICE],
+    loginRegex=config.AUTH_OK_REGEX,
+    appTitle=config.APP_TITLE,
+    baseURL=config.BASE_URL,
+    staticBaseURL=config.STATIC_BASE_URL,
+    dynamicBaseURL=config.DYNAMIC_BASE_URL,
+    validateNickname=False
+  )
+  
+  if hasattr(config, "NICKNAME_VALIDATE") and config.NICKNAME_VALIDATE:
+    options["nickValidation"] = dict(
+      minLen=config.NICKNAME_MINIMUM_LENGTH,
+      maxLen=config.NICKNAME_MAXIMUM_LENGTH,
+      validFirstChar=config.NICKNAME_VALID_FIRST_CHAR,
+      validSubChars=config.NICKNAME_VALID_SUBSEQUENT_CHARS
+    )
+
+  if hasattr(config, "HELP_URL") and config.HELP_URL:
+    options["helpURL"] = config.HELP_URL
+
+  if hasattr(config, "LOGO_URL") and config.LOGO_URL:
+    options["logoURL"] = config.LOGO_URL
+
+  if hasattr(config, "ACCOUNT_WHOIS_COMMAND") and config.ACCOUNT_WHOIS_COMMAND:
+    options["accountWhoisCommand"] = config.ACCOUNT_WHOIS_COMMAND
+
+  return json.dumps(options)