From 0398a614b07988ff982be9a147f84d2dcccc6f4b Mon Sep 17 00:00:00 2001
From: tonio <devnull@localhost>
Date: Tue, 13 Jul 2010 17:18:04 +0200
Subject: [PATCH] fix: again renaming, the last one, I promise!

---
 extensions/__init__.py        | 2 +-
 lib/email_listing.py          | 2 +-
 lib/templatetags/libextras.py | 8 ++++----
 scripts/extension.py          | 2 +-
 settings_sample.py            | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extensions/__init__.py b/extensions/__init__.py
index 3efccdbb7..49eba9bf7 100644
--- a/extensions/__init__.py
+++ b/extensions/__init__.py
@@ -4,7 +4,7 @@ import re
 from django.conf import settings
 
 def loadextensions():
-    basedir = "%s/extensions" % settings.MAILNG_DIR
+    basedir = "%s/extensions" % settings.MODOBOA_DIR
     result = []
     for f in os.listdir(basedir):
 	if not os.path.isdir("%s/%s" % (basedir, f)):
diff --git a/lib/email_listing.py b/lib/email_listing.py
index a89ded9f5..75e15086d 100644
--- a/lib/email_listing.py
+++ b/lib/email_listing.py
@@ -203,7 +203,7 @@ class Email(object):
         if re.search("\.\.", fname):
             return None
         path = "/static/tmp/" + fname
-        fp = open(settings.MAILNG_DIR + path, "wb")
+        fp = open(settings.MODOBOA_DIR + path, "wb")
         fp.write(part.get_payload(decode=True))
         fp.close()
         return path
diff --git a/lib/templatetags/libextras.py b/lib/templatetags/libextras.py
index e1fc1f630..f490af740 100644
--- a/lib/templatetags/libextras.py
+++ b/lib/templatetags/libextras.py
@@ -7,13 +7,13 @@ register = template.Library()
 
 @register.simple_tag
 def get_version():
-    if os.path.isdir("%s/.hg" % settings.MAILNG_DIR):
+    if os.path.isdir("%s/.hg" % settings.MODOBOA_DIR):
         version = "dev-"
-        code, output = exec_cmd("hg id -i", cwd=settings.MAILNG_DIR)
+        code, output = exec_cmd("hg id -i", cwd=settings.MODOBOA_DIR)
         version += output.rstrip()
         return version
-    elif os.path.exists("%s/VERSION" % settings.MAILNG_DIR):
-        code, output = exec_cmd("cat %s/VERSION" % settings.MAILNG_DIR)
+    elif os.path.exists("%s/VERSION" % settings.MODOBOA_DIR):
+        code, output = exec_cmd("cat %s/VERSION" % settings.MODOBOA_DIR)
         return output.rstrip()
     else:
         return "Unknown"
diff --git a/scripts/extension.py b/scripts/extension.py
index ec113c84b..849b2af37 100755
--- a/scripts/extension.py
+++ b/scripts/extension.py
@@ -32,7 +32,7 @@ def update_extension(name, extdir, state):
 if __name__ == "__main__":
     if len(sys.argv) != 3:
 	usage()
-    extdir = "%s/extensions/%s" % (settings.MAILNG_DIR, sys.argv[1])
+    extdir = "%s/extensions/%s" % (settings.MODOBOA_DIR, sys.argv[1])
     if not os.path.isdir(extdir):
 	print "Extension not found"
 	sys.exit(1)
diff --git a/settings_sample.py b/settings_sample.py
index ab2b0d8af..bb0a93af3 100644
--- a/settings_sample.py
+++ b/settings_sample.py
@@ -68,8 +68,8 @@ MIDDLEWARE_CLASSES = (
 
 ROOT_URLCONF = 'modoboa.urls'
 
-MAILNG_DIR = os.path.dirname(__file__)
-STATIC_ROOTDIR = os.path.join(MAILNG_DIR, 'static')
+MODOBOA_DIR = os.path.dirname(__file__)
+STATIC_ROOTDIR = os.path.join(MODOBOA_DIR, 'static')
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.