FCLT#66362: Accessibility score verbeteren

svn path=/Website/trunk/; revision=51025

APPL/API/phonebook_js.asp

@@ -127,7 +127,7 @@ function L(p_lcl)
         var trs = "";
         if (window.facilitor.phonebook_options.toonFoto && data.photopath)
         {
-            trs += "<tr><td></td><td></td><td rowspan='50'><img alt='<%=L("lcl_menu_prs_phonebook")%>' src='<%=safe.jsstring(sitenoroot)%>" + data.photopaththumb.replace(/\'/g,'&#39;').replace(/\"/g,'&quot;') +"'></td></tr>";
+            trs += "<tr><td></td><td></td><td rowspan='50'><img alt='<%=safe.htmlattr(L("lcl_menu_prs_phonebook"))%>' src='<%=safe.jsstring(sitenoroot)%>" + data.photopaththumb.replace(/\'/g,'&#39;').replace(/\"/g,'&quot;') +"'></td></tr>";
         }
         var fld;
         for (fld in window.facilitor.phonebook_options.fields)

APPL/BES/bes_edit_bestelling.asp

@@ -990,7 +990,7 @@ else // nieuwe bestelling. Defaults bepalen
                          src="../Pictures/no_photo.gif"
                          id="photo"
                          onload="FcltMgr.resized()"
-                         alt="<%=L("lcl_res_article")%>"
+                         alt="<%=safe.htmlattr(L("lcl_res_article"))%>"
                          onClick="">
                   </span>
                 </label>

APPL/BES/bes_fe_menu.asp

@@ -166,7 +166,7 @@ while (!oRs.Eof)
       }
       else
       {
-      %> <img theSrc='<%=safe.htmlattr(url)%>' alt='<%=L("lcl_bes_bestelling")%>'> <%
+      %> <img theSrc='<%=safe.htmlattr(url)%>' alt='<%=safe.htmlattr(L("lcl_bes_bestelling"))%>'> <%
       }
     }
     else

APPL/BES/sel_items_tab.js

@@ -770,12 +770,12 @@ function showStaffelKortingResult( json)
         if (grenswaardetot == "null")
         { // Als er geen grenswaarde tot is dan "Korting boven <20>500,00 ....."
           var textstring = (opdrachtkortingbedrag > 0? L("lcl_bes_st_discount_above") : L("lcl_bes_st_excharge_above")) + num2curr(grenswaardevanaf) + ": " + opdrachtkorting + "%"
-                         + "&nbsp;<img alt='" + (opdrachtkortingbedrag > 0? L("lcl_bes_st_discount_above") : L("lcl_bes_st_excharge_above")) + "' src=../Pictures/order_info.gif OnClick=PrsStaffelListResult('" + prs_bedrijf_key + "') style=cursor:pointer>";
+                         + "&nbsp;<img alt='" + (opdrachtkortingbedrag > 0? safe.htmlattr(L("lcl_bes_st_discount_above")) : safe.htmlattr(L("lcl_bes_st_excharge_above"))) + "' src=../Pictures/order_info.gif OnClick=PrsStaffelListResult('" + prs_bedrijf_key + "') style=cursor:pointer>";
         }
         else
         { // Als er een grenswaarde tot is dan "Korting tot <20>1000,00 ....."
           var textstring = (opdrachtkortingbedrag > 0? L("lcl_bes_st_discount_under") : L("lcl_bes_st_excharge_under")) + num2curr(grenswaardetot) + ": " + opdrachtkorting + "%"
-                         + "&nbsp;<img alt='" + (opdrachtkortingbedrag > 0? L("lcl_bes_st_discount_under") : L("lcl_bes_st_excharge_under")) + "' src=../Pictures/order_info.gif OnClick=PrsStaffelListResult('" + prs_bedrijf_key + "') style=cursor:pointer>";
+                         + "&nbsp;<img alt='" + (opdrachtkortingbedrag > 0? safe.htmlattr(L("lcl_bes_st_discount_under")) : safe.htmlattr(L("lcl_bes_st_excharge_under"))) + "' src=../Pictures/order_info.gif OnClick=PrsStaffelListResult('" + prs_bedrijf_key + "') style=cursor:pointer>";
         }
         tabeltext += getTrText(textstring, "", "", addColor(num2curr(opdrachtkortingbedrag * -1)), num2curr(opdrachtkortingbedrag), "okb");
       }

APPL/CAD/LoadInsLegenda.asp

@@ -98,7 +98,7 @@ var lastDisc = -1; // Tussen/title regeltjes
 <%    } %>
       <tr>
         <td>
-          <img alt="<%=L("ctr_discipline_omschrijving")%>" class="legins" style="width:24px;height:24px;border:1px solid black;" src="mysymbol.asp?paperColor=0&sizeX=24&sizeY=24&srtdeel=<%=oRs("ins_srtdeel_key").value%>">
+          <img alt="<%=safe.htmlattr(L("ctr_discipline_omschrijving"))%>" class="legins" style="width:24px;height:24px;border:1px solid black;" src="mysymbol.asp?paperColor=0&sizeX=24&sizeY=24&srtdeel=<%=oRs("ins_srtdeel_key").value%>">
         </td>
         <td valign="center" title="<%=oRs("ins_srtgroep_omschrijving").value%>">
           <%=oRs("ins_srtdeel_omschrijving").value + " (" + oRs("aantal").value + "x)"%>

APPL/CAD/LoadInsNew.asp

@@ -56,7 +56,7 @@ var lastDisc = -1; // Tussen/title regeltjes
             }
         %>    <tr>
                 <td style="cursor:pointer;" onmousedown='mydragstartINS(event, "<%=oRs("ins_srtdeel_key").Value%>");'>
-                    <img class="legins" alt="<%=L("lcl_descr")%>"
+                    <img class="legins" alt="<%=safe.htmlattr(L("lcl_descr"))%>"
                          src="mysymbol.asp?paperColor=0&sizeX=24&sizeY=24&srtdeel=<%=oRs("ins_srtdeel_key").value%>"
                             onmousedown='(function(evt){evt.preventDefault && evt.preventDefault()})(event)'>
                 </td>

APPL/CAD/cad_verify_report.js

@@ -244,7 +244,7 @@ function stream2base64(str)
     return b64text;
 }
 Response.Write("<h2>Original drawing</h2>");
-Response.Write("<img alt='" + L("lcl_prj_tekeningen") + "' class='dwf' src='data:image/png;base64, {0}' />".format(stream2base64(xc.GetAsPNG())));
+Response.Write("<img alt='" + safe.htmlattr(L("lcl_prj_tekeningen")) + "' class='dwf' src='data:image/png;base64, {0}' />".format(stream2base64(xc.GetAsPNG())));
 
 Response.Write("<h2>Processed drawing (recognized rooms only)</h2>");
 
@@ -275,7 +275,7 @@ xc2.Maximize=true;
 xc2.PaperColor=(0); //' Anders zien we de label zo slecht...
 xc2.PaperColor = 0xFFFFFF;
 xc2.SetDimensions(800,600, 0, 0, 1);
-Response.Write("<img alt='" + L("lcl_prj_tekeningen") + "' class='dwf'  src='data:image/png;base64, {0}' />".format(stream2base64(xc2.GetAsPNG())));
+Response.Write("<img alt='" + safe.htmlattr(L("lcl_prj_tekeningen")) + "' class='dwf'  src='data:image/png;base64, {0}' />".format(stream2base64(xc2.GetAsPNG())));
 fso.DeleteFile(tempW2D);
 
 Response.Write("<h2>Detected {0} layers</h2>".format(xc.layercount));

APPL/CAD/fullscreen.asp

@@ -69,7 +69,7 @@ function init()
 </script>
 
 <body onload="init();" style="border:0;padding:0;margin:0;overflow: hidden">
-<div id='log' style='position:absolute;left: -10px'><img alt="<%=L("lcl_photos")%>" src="<%=custpath%>/<%=S("fac_logo_file")%>"></div>
+<div id='log' style='position:absolute;left: -10px'><img alt="<%=safe.htmlattr(L("lcl_photos"))%>" src="<%=custpath%>/<%=S("fac_logo_file")%>"></div>
 <iframe id=MMap name=MMap src='../SlnkDWF/ToonIMG.asp'
         frameborder='0' framespacing='0' scrolling='no' width='100%' height='100%' valign='center'>
 </iframe>

APPL/CHAT/Chatter.asp

@@ -71,7 +71,7 @@
         }
         else
         {
-            return userphotoResult.format(onclick, '<img alt="' + L("fac_profiel") + " " + L("lcl_photos") + '" src="' + safe.htmlattr(src) + '">');
+            return userphotoResult.format(onclick, '<img alt="' + safe.htmlattr(L("fac_profiel")) + " " + safe.htmlattr(L("lcl_photos")) + '" src="' + safe.htmlattr(src) + '">');
         }
 
     }

APPL/FAC/fac_header.inc

@@ -101,7 +101,7 @@ function avatar()
   }
   else
   {
-    Response.write("<div class='userphoto' title='" + L("lcl_avatardetails") + "'><img id='photo' alt='" + L("fac_profiel") + " " + L("lcl_photos") + "' class='profile' src='" + safe.htmlattr(info.photopaththumb) + "'></div>");
+    Response.write("<div class='userphoto' title='" + L("lcl_avatardetails") + "'><img id='photo' alt='" + safe.htmlattr(L("fac_profiel")) + " " + safe.htmlattr(L("lcl_photos")) + "' class='profile' src='" + safe.htmlattr(info.photopaththumb) + "'></div>");
   }
 }
 

APPL/FAC/fac_report.asp

@@ -920,7 +920,7 @@ function fac_usrrap_list_graph (model, scf_params)
       {
         $("#myGraph").find("table.jqplot-table-legend").remove();
         var imgData = $("#myGraph").jqplotToImageStr({});
-        document.getElementById("myGraph").innerHTML = "<img alt='<%=L("lcl_menu_fac_graphs")%>' src=" + imgData + ">";
+        document.getElementById("myGraph").innerHTML = "<img alt='<%=safe.htmlattr(L("lcl_menu_fac_graphs"))%>' src=" + imgData + ">";
         $("#toImgButton").hide(); //untested
         FcltMgr.alert(L("lcl_viewimagealert"));
       }

APPL/FAC/fac_user_info.asp

@@ -237,7 +237,7 @@ prs.checkAutorisation(prs_key);
         BLOCK_START("prsNaw", L("lcl_prs_basisblok"), {buttons: btns, icon: "fa-address-card"});
         Response.write("<tr><td style='text-align: right'>");
         
-        Response.write("</td><td class='profile' style='display: flex;align-items: flex-end;'><span class='wrapper-span'><img id='photo' alt='" + L("fac_profiel") + " " + L("lcl_photos") + "' " 
+        Response.write("</td><td class='profile' style='display: flex;align-items: flex-end;'><span class='wrapper-span'><img id='photo' alt='" + safe.htmlattr(L("fac_profiel")) + " " + safe.htmlattr(L("lcl_photos")) + "' " 
         + ((S("prs_use_edit_photo") && canChange) ? "onclick='edit_photo(this)'" : "") + " style='cursor: pointer;' class='profile' src='" 
         + safe.htmlattr(thisUser.photoinfo().photopaththumb) + "'>" + ((S("prs_use_edit_photo") && canChange) ? "<span id='editAnim' class='pencilEdit pencilEditAlignBottom' title='" + L("lcl_change") + "' onclick='edit_photo(this)'>" 
         + I("fa-pencil-alt") + "</span>" : "") + "</span></td></tr>");

APPL/FAC/fac_user_info_phone.asp

@@ -97,7 +97,7 @@ IFRAMER_HEADER("Facilitor Vinder", buttons);
         {
     	    %><span class='button' title='<%=L("lcl_change")%>' onclick='edit_photo(this)'><%=I("fa-pencil-alt")%></span><%
         }
-        Response.write("</td><td class='profile'><img id='photo' alt='" + ("fac_profiel") + " " + L("lcl_photos") + "' class='profile' src='" + safe.htmlattr(thisUser.photopath) + "'></td></tr>");
+        Response.write("</td><td class='profile'><img id='photo' alt='" + safe.htmlattr(L("fac_profiel")) + " " + safe.htmlattr(L("lcl_photos")) + "' class='profile' src='" + safe.htmlattr(thisUser.photopath) + "'></td></tr>");
 
         ROFIELDTR("fld", L("lcl_prs_person_email"), thisUser.prs_perslid_email, { suppressEmpty: true, type: "email" });
         ROFIELDTR("fld", L("lcl_prs_person_dept_name"), thisUser.prs_afdeling_naam);

APPL/INS/ins_edit_deel.asp

@@ -773,13 +773,13 @@ var ins_deel_aantal = 1;
               if (fso.FileExists(Server.MapPath(imageFile)))
               { %>
             <div id="divinsphoto">
-                <img id="insphoto" alt="<%=L("lcl_ins_image")%>" src="<%=safe.htmlattr(imageFile)%>">
+                <img id="insphoto" alt="<%=safe.htmlattr(L("lcl_ins_image"))%>" src="<%=safe.htmlattr(imageFile)%>">
 <%            }
             }
             else
             { %>
             <div id="divinsphoto" style='display:none'>
-              <img id="insphoto" alt="<%=L("lcl_ins_image")%>" src="">
+              <img id="insphoto" alt="<%=safe.htmlattr(L("lcl_ins_image"))%>" src="">
 <%          } %>
             </div>
           </td>

APPL/MLD/opdr_plan.inc

@@ -691,7 +691,7 @@ function opdr_plan(params)
                                { // Toegewezen.
                                  var thisUser = new Perslid(prs_key); // geeft ook handige informatie
 %>                               <tr>
-                                   <td rowspan="2" class='profile'><img id='photo' alt='<%=L("fac_profiel") + " " + L("lcl_photos")%>' class='profile' src='<%=safe.htmlattr(thisUser.photoinfo().photopaththumb) %>'></td>
+                                   <td rowspan="2" class='profile'><img id='photo' alt='<%=safe.htmlattr(L("fac_profiel")) + " " + safe.htmlattr(L("lcl_photos"))%>' class='profile' src='<%=safe.htmlattr(thisUser.photoinfo().photopaththumb) %>'></td>
                                    <td><span class="cardname"><%=safe.html(uitv_naam)%><br><%=safe.html(behandelaar)%></span></td>
                                  </tr>
                                  <tr>
@@ -705,7 +705,7 @@ function opdr_plan(params)
                                break;
                     case "PI": var thisUser = new Perslid(uitv_key); // geeft ook handige informatie
 %>                             <tr>
-                                 <td rowspan="2" class='profile'><img id='photo' alt='<%=L("fac_profiel") + " " + L("lcl_photos")%>' class='profile' src='<%=safe.htmlattr(thisUser.photoinfo().photopaththumb) %>'></td>
+                                 <td rowspan="2" class='profile'><img id='photo' alt='<%=safe.htmlattr(L("fac_profiel")) + " " + safe.htmlattr(L("lcl_photos"))%>' class='profile' src='<%=safe.htmlattr(thisUser.photoinfo().photopaththumb) %>'></td>
                                  <td><span class="cardname"><%=safe.html(thisUser.naam())%></span></td>
                                </tr>
                                <tr>

APPL/PDA/iface.inc

@@ -126,7 +126,7 @@ function FOOTER(params)
       if (params.thisuser)
       {
 %>      <a href="<%=rooturl%>/appl/pda/user_info.asp" data-ajax="false">
-          <img alt="<%=L("fac_profiel") + " " + L("lcl_photos")%>" id="photo" src="<%=safe.htmlattr(params.thisuser.photopaththumb)%>" class="footerphoto">
+          <img alt="<%=safe.htmlattr(L("fac_profiel")) + " " + safe.htmlattr(L("lcl_photos"))%>" id="photo" src="<%=safe.htmlattr(params.thisuser.photopaththumb)%>" class="footerphoto">
         </a>
 <%    }
 %>    </div> <%
@@ -457,7 +457,7 @@ function CATLIST_ARTIKEL(p_cat_id, params)
         var vlabel = "<label class='ed' for='inpb_g_"+p_cat_id + "'> " + L("lcl_res_daglijst_geleverd") + ":</label>";
 %>
     <li class="ui-field-contain">
-            <img alt="<%=L("lcl_res_article")%>" src="<%=params.image%>"/>
+            <img alt="<%=safe.htmlattr(L("lcl_res_article"))%>" src="<%=params.image%>"/>
             <h3 class="c1"><%=safe.html(params.omschrijving)%></h3>
             <div style="display: inline-block">
                 <div class="subheader">
@@ -478,7 +478,7 @@ function CATLIST_ARTIKEL(p_cat_id, params)
     {   // toevoegen/wijzigen catering
 %>
     <li class="ui-field-contain">
-        <img alt="<%=L("lcl_res_article")%>" src="<%=params.image%>">
+        <img alt="<%=safe.htmlattr(L("lcl_res_article"))%>" src="<%=params.image%>">
         <div>
             <h3 class="c1"><%=safe.html(params.omschrijving)%></h3>
             <div data-role="fieldcontain">
@@ -527,7 +527,7 @@ function I(icon, params)
         else
         {
             // an image
-            return "<img alt='" + L("mgt_kenmerk_icon") + "' src='{0}/appl/pictures/{1}'>".format(rooturl, icon);
+            return "<img alt='" + safe.htmlattr(L("mgt_kenmerk_icon")) + "' src='{0}/appl/pictures/{1}'>".format(rooturl, icon);
         }
     }
 }

APPL/PDA/user_info.asp

@@ -150,7 +150,7 @@ var photoMap  = thisUser.photomap;   // map waarin de foto wordt opgeslagen
         <div style="text-align:center;">
         <form name="u2Photo" id="u2photo" method="post" enctype="multipart/form-data">
           <input type="hidden" name="noresize" id="noresize" value="0">
-          <img id="photo" alt="<%=L("fac_profiel") + " " + L("lcl_photos")%>" class="selfie" src="<%=safe.htmlattr(photoFile) %>"
+          <img id="photo" alt="<%=safe.htmlattr(L("fac_profiel")) + " " + safe.htmlattr(L("lcl_photos"))%>" class="selfie" src="<%=safe.htmlattr(photoFile) %>"
 
 <%
         if (S("prs_use_edit_photo") && canChange)

APPL/PRS/prs_edit_perslid.asp

@@ -223,7 +223,7 @@ BLOCK_START("prsPerslid", L("lcl_prs_basisblok"), {buttons: btns, icon: "fa-id-c
 if (prs_key > 0) // Fotoblokje alleen bij bestaande records
 {
     Response.write("<tr><td style='text-align: right'>");
-    Response.write("</td><td class='profile' style='display: flex;align-items: flex-end;'><span class='wrapper-span'><img id='photo' alt='" + L("fac_profiel") + " " + L("lcl_photos") + "' style='cursor: pointer' class='profile' " + (prsauthparams.writeuse ? "onclick='edit_photo(this)'" : "") + " src='" + safe.htmlattr(thisUser.photoinfo().photopaththumb) + "'>" + (prsauthparams.writeuse ? "<span class='pencilEdit pencilEditAlignBottom' title='" + L("lcl_change") + "' onclick='edit_photo(this)'>" + I("fa-pencil-alt") + "</span>" : "") + "</span></td></tr>");
+    Response.write("</td><td class='profile' style='display: flex;align-items: flex-end;'><span class='wrapper-span'><img id='photo' alt='" + safe.htmlattr(L("fac_profiel")) + " " + safe.htmlattr(L("lcl_photos")) + "' style='cursor: pointer' class='profile' " + (prsauthparams.writeuse ? "onclick='edit_photo(this)'" : "") + " src='" + safe.htmlattr(thisUser.photoinfo().photopaththumb) + "'>" + (prsauthparams.writeuse ? "<span class='pencilEdit pencilEditAlignBottom' title='" + L("lcl_change") + "' onclick='edit_photo(this)'>" + I("fa-pencil-alt") + "</span>" : "") + "</span></td></tr>");
 }
     manRWFIELD("prs_naam",  "fld",          L("lcl_prs_person_name"),        prs_naam, {required: true, maxlength: 60});
     var sql = "SELECT  0, "+safe.quoted_sql(L("lcl_prs_person_geslachtV"))+" FROM DUAL UNION ALL"

APPL/PRS/prs_phonebook_list.asp

@@ -404,7 +404,7 @@ var met_foto = getQParam("pb_photo","off")=="on";
           { // Photo link als we geen andere details mogen zien
             if ( oRs("fotopubliek").Value==S("prs_photo_kenmerk_showval"))
                 if (outputmode == 0)
-                    return "<img alt='" + L("prs_kenmerk") + "' class='fa fa-camera details' OnClick='doPhoto("+oRs("prs_perslid_key").Value+")'></TD>";
+                    return "<img alt='" + safe.htmlattr(L("prs_kenmerk")) + "' class='fa fa-camera details' OnClick='doPhoto("+oRs("prs_perslid_key").Value+")'></TD>";
                 else
                     return "[P]";  // niet erg zinvol, maar alla
             else

APPL/PRS/prs_show_perslid.asp

@@ -270,7 +270,7 @@ var prs_user = new Perslid(prs_key);
 %>
       <form name=u2>
 <%      BLOCK_START("prsPerslid", L("lcl_prs_basisblok"), {icon: "fa-id-card-alt"});
-        Response.write("<tr><td></td><td class='profile'><img id='photo' alt='" + L("fac_profiel") + " " + L("lcl_photos") + "' class='profile' src='" + safe.htmlattr(thisPrs.photopaththumb) + "'></td></tr>");
+        Response.write("<tr><td></td><td class='profile'><img id='photo' alt='" + safe.htmlattr(L("fac_profiel")) + " " + safe.htmlattr(L("lcl_photos")) + "' class='profile' src='" + safe.htmlattr(thisPrs.photopaththumb) + "'></td></tr>");
 
         ROFIELDTR("fld", L("lcl_prs_person_name"), prs_naam);
         ROFIELDTR("fld", L("lcl_prs_person_geslacht"), { 0: L("lcl_prs_person_geslachtV"), 1: L("lcl_prs_person_geslachtM") }[prs_geslacht] , {suppressEmpty: true});

APPL/RES/res_cat.inc

@@ -262,7 +262,7 @@ function make_cat(discipline_key, rsv_ruimte_key, existing_only, res_artikel_key
         if (oRs("res_artikel_image").Value)
         {
             var image_url = S("res_image_path") + "artikel/" + oRs("res_artikel_image").Value;
-            safe_tooltip += "<img class='resartikelfoto' alt='" + L("lcl_res_article") + "' style='height:100px' theSrc='"+safe.htmlattr(image_url)+"'><br>"
+            safe_tooltip += "<img class='resartikelfoto' alt='" + safe.htmlattr(L("lcl_res_article")) + "' style='height:100px' theSrc='"+safe.htmlattr(image_url)+"'><br>"
         }
 
         // Over de opmerking doen we geen safe.html zodat HTML code gebruikt kan worden

APPL/RES/res_plan_obj.inc

@@ -374,7 +374,7 @@ function make_plan_obj(disc_key, res_van, res_tot, params)
         var safe_tooltip = safe.html(res_deel_omschrijving);
         if (res_deel_image)
         {
-            safe_tooltip += "<br><br><img alt='" + L("lcl_reservation") + "' class='resdeelfoto' style='height:100px' theSrc='"+safe.htmlattr(S("res_image_path") + "deel/" + res_deel_image)+"'>"
+            safe_tooltip += "<br><br><img alt='" + safe.htmlattr(L("lcl_reservation")) + "' class='resdeelfoto' style='height:100px' theSrc='"+safe.htmlattr(S("res_image_path") + "deel/" + res_deel_image)+"'>"
         }
         if (res_deel_opm2)
             safe_tooltip += "<br>" + safe.html(res_deel_opm2);

APPL/RES/res_plan_room.inc

@@ -500,7 +500,7 @@ __Log("start make_plan_room");
     {
         if (!room.image_url)
             room.image_url = S("res_image_path") + room.image;
-        safe_tooltip += "<br><br><img alt='" + L("lcl_room") + "' class='resplanfoto' style='height:100px' theSrc='"+safe.htmlattr(room.image_url)+"'>"
+        safe_tooltip += "<br><br><img alt='" + safe.htmlattr(L("lcl_room")) + "' class='resplanfoto' style='height:100px' theSrc='"+safe.htmlattr(room.image_url)+"'>"
     }
 %>
         <label><%=safe.html(room.res_ruimte_nr)%></label></nobr>