From 47ecc7023035b09bbf55830b9ac179851022d2ba Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Fri, 5 Jun 2009 20:31:09 +0000 Subject: [PATCH] Fix header() parsing --- webmin_search.cgi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webmin_search.cgi b/webmin_search.cgi index 43c50fea1..177c3b09a 100644 --- a/webmin_search.cgi +++ b/webmin_search.cgi @@ -317,7 +317,14 @@ sub cgi_page_title local ($m, $cgi) = @_; local $data = &read_file_contents(&module_root_directory($m)."/".$cgi); local $rv; -if ($data =~ /(header|ui_print_header|ui_print_unbuffered_header)\([^,]+,[^,]*(\$text{'([^']+)'|\$text{"([^"]+)"|\&text\('([^']+)'|\&text\("([^"]+)")/) { +if ($data =~ /(ui_print_header|ui_print_unbuffered_header)\([^,]+,[^,]*(\$text{'([^']+)'|\$text{"([^"]+)"|\&text\('([^']+)'|\&text\("([^"]+)")/) { + # New header function, with arg before title + local $msg = $3 || $4 || $5 || $6; + local %mtext = &load_language($m); + $rv = $mtext{$msg}; + } +elsif ($data =~ /(^|\s)header\(\s*(\$text{'([^']+)'|\$text{"([^"]+)"|\&text\('([^']+)'|\&text\("([^"]+)")/) { + # Old header function local $msg = $3 || $4 || $5 || $6; local %mtext = &load_language($m); $rv = $mtext{$msg};