Changeset 28913
- Timestamp:
- 2014-03-18T20:22:59+13:00 (10 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/macros/gti.dm
r28888 r28913 98 98 # Content of the GTI "find text fragments" page 99 99 _gtifind_ { 100 <h2><a href="_gwcgi_?a=gti&p=lang&e=_compressedoptions_">_gtitargetlanguagename_</a> -- <a href="_gwcgi_?a=gti&p=core&e=_compressedoptions_">_gtitranslationfiledesc _</a></h2>100 <h2><a href="_gwcgi_?a=gti&p=lang&e=_compressedoptions_">_gtitargetlanguagename_</a> -- <a href="_gwcgi_?a=gti&p=core&e=_compressedoptions_">_gtitranslationfiledescHtmlsafe_</a></h2> 101 101 <p> 102 102 _textgtienterquery_: … … 111 111 # Content of the GTI "offline" page 112 112 _gtioffline_ { 113 <h2><a href="_gwcgi_?a=gti&p=lang&e=_compressedoptions_">_gtitargetlanguagename_</a> -- _gtitranslationfiledesc _</h2>113 <h2><a href="_gwcgi_?a=gti&p=lang&e=_compressedoptions_">_gtitargetlanguagename_</a> -- _gtitranslationfiledescHtmlsafe_</h2> 114 114 <p> 115 115 _textgtiofflinetranslation_ … … 118 118 # Content of the GTI "core" page (with text areas for entering and updating translations) 119 119 _gticore_ { 120 <h2><a href="_gwcgi_?a=gti&p=lang&e=_compressedoptions_">_gtitargetlanguagename_</a> -- _gtitranslationfiledesc _</h2>120 <h2><a href="_gwcgi_?a=gti&p=lang&e=_compressedoptions_">_gtitargetlanguagename_</a> -- _gtitranslationfiledescHtmlsafe_</h2> 121 121 <p> 122 122 <center> … … 133 133 # Content of the GTI "done" page, thanking the translator for completing the file 134 134 _gtidone_ { 135 <h2><a href="_gwcgi_?a=gti&p=lang&e=_compressedoptions_">_gtitargetlanguagename_</a> -- _gtitranslationfiledesc _</h2>135 <h2><a href="_gwcgi_?a=gti&p=lang&e=_compressedoptions_">_gtitargetlanguagename_</a> -- _gtitranslationfiledescHtmlsafe_</h2> 136 136 <p> 137 137 <center> … … 169 169 # -------------------------------------------------------------------------------- 170 170 171 # _If_(_gtiglihelpzipfilepath_ ne "", <a href="_httpprefix_/_gtiglihelpzipfilepath _">_textgtiglihelpzipfile_</a>,)<br>171 # _If_(_gtiglihelpzipfilepath_ ne "", <a href="_httpprefix_/_gtiglihelpzipfilepathUrlsafe_">_textgtiglihelpzipfile_</a>,)<br> 172 172 # <a href="_gwcgi_?a=gti&p=glihelp&e=_compressedoptions_">_textgtiglihelpzipfile_</a> 173 173 … … 180 180 _If_("_4_" eq "_gtidownloadglihelp_", <a href="_4_">, <a href="_httpprefix_/_4_">)_textgtidownloadtargetfile_</a> 181 181 182 _If_(_gtiglihelpzipfilepath_, <a href="_httpprefix_/_gtiglihelpzipfilepath _">_textgtiglihelpzipfile_</a>,)<br>182 _If_(_gtiglihelpzipfilepath_, <a href="_httpprefix_/_gtiglihelpzipfilepathUrlsafe_">_textgtiglihelpzipfile_</a>,)<br> 183 183 184 184 <a href="_gwcgi_?a=gti&p=offline&e=_compressedoptions_">_textgtitranslatefileoffline_</a><br> 185 _gtiviewtranslationfileinaction _185 _gtiviewtranslationfileinactionHtmlsafe_ 186 186 </td></tr>) 187 187 </table> -
main/trunk/greenstone2/macros/users.dm
r28898 r28913 62 62 63 63 <table border=0> 64 <tr><td>_authen:textusername_</td><td><input type="text" name="umun" value="_users:usersargun _" size=15></td>64 <tr><td>_authen:textusername_</td><td><input type="text" name="umun" value="_users:usersargunAttrsafe_" size=15></td> 65 65 <td><font color=gray>_textaboutusername_</font></td> 66 66 </tr> 67 <tr><td>_authen:textpassword_</td><td><input type="text" name="umpw" value="_users:usersargpw _" size=9></td>67 <tr><td>_authen:textpassword_</td><td><input type="text" name="umpw" value="_users:usersargpwAttrsafe_" size=9></td> 68 68 <td><font color=gray>_textaboutpassword_ 69 69 _If_("_cgiarguma_" eq "edituser",_textoldpass_) … … 75 75 </select> 76 76 </td></tr> 77 <tr><td>_userslistusers:textgroups_</td><td colspan=2><input type="text" name="umug" value="_users:usersargug _" size=50></td></tr>77 <tr><td>_userslistusers:textgroups_</td><td colspan=2><input type="text" name="umug" value="_users:usersargugAttrsafe_" size=50></td></tr> 78 78 <tr><td></td><td></td> 79 79 <td><font color=gray>_textaboutgroups_</font><br/><font color=gray>_textavailablegroups_</font></td></tr> 80 <tr><td>_userslistusers:textcomment_</td><td colspan=2><input type="text" name="umc" value="_users:usersargc _" size=50></td></tr>80 <tr><td>_userslistusers:textcomment_</td><td colspan=2><input type="text" name="umc" value="_users:usersargcAttrsafe_" size=50></td></tr> 81 81 <tr><td></td><td colspan=2><input type="submit" name=beu value="submit"> 82 82 <input type="submit" name=uma value="cancel"></td></tr> -
main/trunk/greenstone2/runtime-src/src/recpt/dynamicclassifieraction.cpp
r28899 r28913 102 102 text_t dynamic_classifier_id = (*dynamic_classifier_iterator).first; 103 103 navigation_bar_entries += "_navbarspacer_"; 104 navigation_bar_entries += "_navtab_(_gwcgi_?c=" + args["c"]+ "&a=dc&dcl=" + dynamic_classifier_id + "," + dynamic_classifier_id;104 navigation_bar_entries += "_navtab_(_gwcgi_?c=" + encodeForURL(args["c"]) + "&a=dc&dcl=" + dynamic_classifier_id + "," + dynamic_classifier_id; 105 105 if (args["a"] == "dc" && args["dcl"] == dynamic_classifier_id) 106 106 { -
main/trunk/greenstone2/runtime-src/src/recpt/extlinkaction.cpp
r22984 r28913 124 124 // problem in whist, above line changed. Perhaps decode_cgi_arg ?? 125 125 // see also HTML plugin 126 disp.setmacro("nexturl", "extlink", args["href"]); 126 127 text_t nexturl_macro = args["href"]; 128 if(!isValidURLProtocol(nexturl_macro)) { 129 nexturl_macro = encodeForURL(nexturl_macro); // URL has invalid protocol like javascript:, so URL encode it 130 } else { 131 nexturl_macro = encodeForHTMLAttr(nexturl_macro); 132 } 133 134 disp.setmacro("nexturl", "extlink", nexturl_macro); // goes into a full-url context 127 135 disp.setmacro("prevdoc", "extlink", args["d"]); 128 136 } -
main/trunk/greenstone2/runtime-src/src/recpt/gtiaction.cpp
r28899 r28913 386 386 languageinfo_tmap loaded_languages = recpt->get_configinfo().languages; 387 387 disp.setmacro("gtitargetlanguagename", "gti", loaded_languages[target_language_code].longname); 388 disp.setmacro("gtitranslationfiledesc", "gti", "_gti:textgti" + encodeForHTML(translation_file_key) + "_"); 388 disp.setmacro("gtitranslationfiledesc", "gti", "_gti:textgti" + translation_file_key + "_"); 389 disp.setmacro("gtitranslationfiledescHtmlsafe", "gti", "_gti:textgti" + encodeForHTML(translation_file_key) + "_"); 389 390 390 391 if (query_string == "") { … … 457 458 disp.setmacro("gtitargetlanguagename", "gti", loaded_languages[target_language_code].longname); 458 459 disp.setmacro("gtitranslationfiledesc", "gti", "_gti:textgti" + translation_file_key + "_"); 460 disp.setmacro("gtitranslationfiledescHtmlsafe", "gti", "_gti:textgti" + encodeForHTML(translation_file_key) + "_"); 459 461 } 460 462 … … 496 498 disp.setmacro("gtitargetfilepath", "gti", gti_response.translation_files_key_to_target_file_path_mapping[translation_file_key]); 497 499 } 498 disp.setmacro("gtitranslationfiledesc", "gti", "_gti:textgti" + encodeForHTML(translation_file_key) + "_"); 499 disp.setmacro("gtiviewtranslationfileinaction", "gti", "_gti:gtiview" + encodeForHTML(translation_file_key) + "inaction_"); 500 disp.setmacro("gtitranslationfiledesc", "gti", "_gti:textgti" + translation_file_key + "_"); 501 disp.setmacro("gtitranslationfiledescHtmlsafe", "gti", "_gti:textgti" + encodeForHTML(translation_file_key) + "_"); 502 disp.setmacro("gtiviewtranslationfileinaction", "gti", "_gti:gtiview" + translation_file_key + "inaction_"); 503 disp.setmacro("gtiviewtranslationfileinactionHtmlsafe", "gti", "_gti:gtiview" + encodeForHTML(translation_file_key) + "inaction_"); 500 504 501 505 disp.setmacro("gtinumchunkstranslated", "gti", gti_response.translation_files_key_to_num_chunks_translated_mapping[translation_file_key]); … … 660 664 do_gti_request(gti_arguments, logout); 661 665 662 disp.setmacro("gtiglihelpzipfilepath", "gti", encodeForURL(target_language_code) + "_GLIHelp.zip"); 666 disp.setmacro("gtiglihelpzipfilepath", "gti", target_language_code + "_GLIHelp.zip"); 667 disp.setmacro("gtiglihelpzipfilepathUrlsafe", "gti", encodeForURL(target_language_code) + "_GLIHelp.zip"); 663 668 664 669 return true; -
main/trunk/greenstone2/runtime-src/src/recpt/pagedbrowserclass.cpp
r28912 r28913 32 32 #include "OIDtools.h" 33 33 #include "gsdltools.h" 34 #include "securitytools.h" 34 35 35 36 pagedbrowserclass::pagedbrowserclass () { -
main/trunk/greenstone2/runtime-src/src/recpt/rssaction.cpp
r28911 r28913 131 131 text_t default_domain = "http://localhost:8282"; 132 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));133 disp.setmacro("httpdomainHtmlsafe", "Global", encodeForHTML(default_domain)); 134 134 } 135 135 } -
main/trunk/greenstone2/runtime-src/src/recpt/usersaction.cpp
r28899 r28913 268 268 disp.setmacro ("usersargug", "users", args["umug"]); 269 269 disp.setmacro ("usersargc", "users", args["umc"]); 270 271 disp.setmacro ("usersargunAttrsafe", "users", encodeForHTMLAttr(args["umun"])); 272 disp.setmacro ("usersargpwAttrsafe", "users", encodeForHTMLAttr(args["umpw"])); 273 disp.setmacro ("usersargusAttrsafe", "users", encodeForHTMLAttr(args["umus"])); // unused in users.dm or other macro files, but setting this attrsafe'd macro in parallel with the other usersarg* values here. 274 disp.setmacro ("usersargugAttrsafe", "users", encodeForHTMLAttr(args["umug"])); 275 disp.setmacro ("usersargcAttrsafe", "users", encodeForHTMLAttr(args["umc"])); 276 270 277 } 271 278
Note:
See TracChangeset
for help on using the changeset viewer.