Changeset 28911 for main/trunk/greenstone2/runtime-src
- Timestamp:
- 2014-03-17T21:36:16+13:00 (10 years ago)
- Location:
- main/trunk/greenstone2/runtime-src/src/recpt
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/src/recpt/basequeryaction.cpp
r28899 r28911 606 606 histvalue += i; 607 607 disp.setmacro(histvalue, "query", escquery); 608 disp.setmacro(histvalue+"Jssafe", "query", encodeForJavascript(escquery)); 608 609 format_user_info(cgiargs, userinfo, args, protos, logout); 609 610 -
main/trunk/greenstone2/runtime-src/src/recpt/queryaction.cpp
r28899 r28911 743 743 << "<form name=\"QueryForm\" method=\"get\" action=\"_gwcgi_\">\n" 744 744 << "<input type=\"hidden\" name=\"a\" value=\"q\">\n" 745 << "<input type=\"hidden\" name=\"site\" value=\"_cgiargsite _\"\n"745 << "<input type=\"hidden\" name=\"site\" value=\"_cgiargsiteAttrsafe_\"\n" 746 746 << "<input type=\"hidden\" name=\"e\" value=\"_compressedoptions_\">\n" 747 747 << "<input type=\"hidden\" name=\"ccp\" value=\"1\">\n" … … 1390 1390 decode_cgi_arg (compressedoptions); 1391 1391 if (args["w"] == "utf-8") { // if the encoding was utf-8, then compressed options was utf-8, and we need unicode. 1392 // if encoding wasn't utf-8, then compressed op otions may be screwed up, but seems to work for 8 bit encodings?1392 // if encoding wasn't utf-8, then compressed options may be screwed up, but seems to work for 8 bit encodings? 1393 1393 compressedoptions = to_uni(compressedoptions); 1394 1394 } -
main/trunk/greenstone2/runtime-src/src/recpt/rssaction.cpp
r28899 r28911 68 68 << "<channel>\n" 69 69 << " <title>_collectionname_</title>\n" 70 << " <link>_httpdomain __httppageabout_</link>\n"70 << " <link>_httpdomainHtmlsafe__httppageabout_</link>\n" 71 71 << " <description>_collectionextra_</description>\n" 72 72 << " <language>_cgiarglHtmlsafe_</language>\n" … … 79 79 << " <title>_collectionname_</title>\n" 80 80 << " <url>_iconcollection_</url>\n" 81 << " <link>_httpdomain __httppageabout_</link>\n"81 << " <link>_httpdomainHtmlsafe__httppageabout_</link>\n" 82 82 << " <description>_collectionextra_</description>\n" 83 83 << "</image>\n"; … … 125 125 126 126 if(!args["hostname"].empty()) { 127 disp.setmacro("httpdomain", "Global", "http://" + encodeForURL(args["hostname"])); 127 disp.setmacro("httpdomain", "Global", "http://" + args["hostname"]); 128 disp.setmacro("httpdomainHtmlsafe", "Global", "http://" + encodeForHTML(args["hostname"])); 128 129 } 129 130 else { // we shouldn't have to get here 130 disp.setmacro("httpdomain", "Global", "http://localhost:8282"); // the default used in zextra.dm. (Could perhaps default this to localhost too) 131 text_t default_domain = "http://localhost:8282"; 132 disp.setmacro("httpdomain", "Global", default_domain); // the default used in zextra.dm. (Could perhaps default this to localhost too) 133 disp.setmacro("httpdomain", "Global", encodeForHTML(default_domain)); 131 134 } 132 135 } -
main/trunk/greenstone2/runtime-src/src/recpt/statusaction.cpp
r28899 r28911 786 786 << "<pre>\n"; 787 787 788 text_t logcontent = file_tail (logfilename, 100, 1500); 789 788 790 // note that we're expecting lines to be no more than 1500 characters on 789 791 // average - should fix this file_tail() thing sometime 790 textout << outconvert << file_tail (logfilename, 100, 1500);792 textout << outconvert << encodeForHTML(logcontent); 791 793 792 794 textout << outconvert << disp << "</pre>\n"
Note:
See TracChangeset
for help on using the changeset viewer.