[checkmk-commits] Check_MK Git: check_mk: untabified paint_check_manpage function.

Module: check_mk Branch: master Commit: 4f333a817732dece720f0f5038e31f4d76fa6905 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f333a817732de… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Thu Feb 27 15:04:04 2014 +0100 untabified paint_check_manpage function. also replaced < and > in the manpage description with its html pendants. --- web/plugins/views/painters.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 60ebbcd..83d774b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -712,7 +712,7 @@ multisite_painters["svc_pnpgraph" ] = { def paint_check_manpage(row): command = row["service_check_command"] if not command.startswith("check_mk-"): - return "", "" + return "", "" checktype = command[9:] # Honor man-pages in OMD's local structure p = None @@ -723,23 +723,23 @@ def paint_check_manpage(row): if not p: p = defaults.check_manpages_dir + "/" + checktype if os.path.isfile(p): - description = None - for line in file(p): - line = line.rstrip() - if line == "description:": - description = "" - elif line.strip() == "" and description != None: - description += "<p>" - elif not line.startswith(' ') and line[-1] == ':': - break - elif description != None: - description += " " + line - if not description: - return "", "" - else: - return "", description.replace("{", "<b>").replace("}", "</b>") + description = None + for line in file(p): + line = line.rstrip() + if line == "description:": + description = "" + elif line.strip() == "" and description != None: + description += "<p>" + elif not line.startswith(' ') and line[-1] == ':': + break + elif description != None: + description += " " + line.replace("<", "&lt;").replace(">", "&gt;") + if not description: + return "", "" + else: + return "", description.replace("{", "<b>").replace("}", "</b>") else: - return "", _("Man-Page: %s not found.") % p + return "", _("Man-Page: %s not found.") % p multisite_painters["check_manpage"] = { "title" : _("Check manual (for Check_MK based checks)"),