Module: check_mk
Branch: master
Commit: 1d19d05582e0238dc19eb14981b390e9757acb6b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d19d05582e023…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu May 12 15:06:30 2011 +0200
WATO: fix problem with umlauts in file names
---
web/htdocs/wato.py | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index cf47298..4805038 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -330,8 +330,7 @@ def mode_editfolder(phase, what, new):
g_files[newpath] = new_thing
g_folder[what + "s"][name] = new_thing
- log_audit(new_thing, "new-" + what, u"Created new %s %s"
%
- (what, title))
+ log_audit(new_thing, "new-" + what, u"Created new %s %s"
% (what, title))
else:
the_thing["title"] = title
@@ -426,11 +425,19 @@ def create_wato_filename(title, what):
def convert_title_to_filename(title):
converted = ""
for c in title.lower():
- if c.isalnum() or c in "-_":
+ if c == u'ä':
+ converted += 'ae'
+ elif c == u'ö':
+ converted += 'oe'
+ elif c == u'ü':
+ converted += 'ue'
+ elif c == u'ß':
+ converted += 'ss'
+ elif c in "abcdefghijklmnopqrstuvwxyz0123456789-_":
converted += c
else:
converted += "_"
- return converted
+ return str(converted)
# +----------------------------------------------------------------------+
# | ____ _ _ _ |
@@ -1101,6 +1108,8 @@ def mode_changelog(phase):
html.write("<p>Logfile is empty. No host has been created or
changed yet.</p>")
def log_entry(linkinfo, action, message, logfilename):
+ if type(message) == unicode:
+ message = message.encode("utf-8")
make_nagios_directory(conf_dir)
if linkinfo in g_files.values():
link = file_os_path(linkinfo)
@@ -1112,13 +1121,11 @@ def log_entry(linkinfo, action, message, logfilename):
link = file_os_path(g_file) + ":" + linkinfo
else:
link = linkinfo
-
-
log_file = conf_dir + "/" + logfilename
f = create_user_file(log_file, "ab")
f.write("%d %s %s %s " % (int(time.time()), link, html.req.user, action))
- f.write(message.encode("utf-8"))
+ f.write(message)
f.write("\n")