admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FCLT#55911 Uitfaseren eval()

Browse Source 
svn path=/Website/trunk/; revision=44942
This commit is contained in:
Erik Groener
2019-11-18 09:08:00 +00:00
parent 0dd957cd50
commit b1aa20fe4a
14 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API/phonebook_js.asp
View File

@@ -102,7 +102,7 @@ function L(p_lcl)
for (opt in API.apidata.options)
{
Response.Write("\nwindow.facilitor.phonebook_options['"+opt+"'] = "
+ " eval('(" + safe.jsstring(JSON.stringify(API.apidata.options[opt])) + ")')");
+ "JSON.parse('"+ safe.jsstring(JSON.stringify(API.apidata.options[opt])) +"')");
}
%>

2
APPL/BES/fav_items_list.asp
View File

@@ -250,7 +250,7 @@
<script language=JavaScript>
AddItem('<%=recent?"":safe.jsstring(fav_name)%>',
eval("(<%=safe.jsstring(JSON.stringify(bes_item_info))%>)"),
JSON.parse("<%=safe.jsstring(JSON.stringify(bes_item_info))%>"),
'<%=toDateString(oRs("recent_date").value)%>',
<%=recent? 1 : 0%>==1,
<%=recent? -1 : oRs.fields("fav_key").value%>)

2
APPL/BEZ/bez_import_bezoeker.asp
View File

@@ -53,7 +53,7 @@ while (!oRs.eof)
%>
<script type="text/javascript">
var flexk = <%Response.Write("eval('(" + safe.jsstring(JSON.stringify(flexk)) + ")')"); %>;
var flexk = <%Response.Write("JSON.parse('" + safe.jsstring(JSON.stringify(flexk)) + "')"); %>;
$(function()
{
FcltMgr.fixActiveelementError();

10
APPL/FAC/fac_report.asp
View File

@@ -286,13 +286,13 @@ function fac_usrrap_list_graph (model, scf_params)
<% FCLTHeader.Generate(); %>
<script>
var JSONdata = '<%=safe.jsstring(JSON.stringify(graphInit))%>';
var l_init = eval('(' + JSONdata + ')');
var l_init = JSON.parse(JSONdata);
var JSONdata = '<%=safe.jsstring(JSON.stringify(graphAxes))%>';
var l_axes = eval('(' + JSONdata + ')');
var l_axes = JSON.parse(JSONdata);
var JSONdata = '<%=safe.jsstring(JSON.stringify(graphData))%>';
var l_data = eval('(' + JSONdata + ')');
var l_data = JSON.parse(JSONdata);
var l_arr_x = [];
for (x=0; x<l_data.arr_x.length; x++)
@@ -314,9 +314,9 @@ function fac_usrrap_list_graph (model, scf_params)
l_labels.push(l_axes.yas[y].naam || "&nbsp;");
}
var default_options = eval('(' + l_init.default_options + ')');
var default_options = JSON.parse(l_init.default_options);
var report_options = $.extend(default_options,
eval('(' + l_init.report_options + ')'));
JSON.parse(l_init.report_options));
<%
switch (graphInit.graph_type)

8
APPL/FAC/fac_usrgraph.inc
View File

@@ -287,16 +287,16 @@ function fac_graph_generate (usrgraph_key, fclt_key, params)
{
%>
var JSONdata = '<%=safe.jsstring(JSON.stringify(graphInit))%>';
var l_init = eval('(' + JSONdata + ')');
var fac_options = eval('(' + l_init.fac_options + ')');
var l_init = JSON.parse(JSONdata);
var fac_options = JSON.parse(l_init.fac_options);
var l_userColors = <%=(graphColors? graphColors : 'false')%>;
var JSONdata = '<%=safe.jsstring(JSON.stringify(graphAxes))%>';
var l_axes = eval('(' + JSONdata + ')');
var l_axes = JSON.parse(JSONdata);
var JSONdata = '<%=safe.jsstring(JSON.stringify(graphData))%>';
var l_data = eval('(' + JSONdata + ')');
var l_data = JSON.parse(JSONdata);
<%
// Onderstaande variabelen worden gebruikt in fac-options.
%>

4
APPL/FAC/prodsearch.asp
View File

@@ -408,8 +408,8 @@ function suggest_box_resruimte (titel, histograms, kolom, params)
FcltMgr.setTitle("<%=L("lcl_search_result") + " " + safe.jsstring(filter.s.val)%>");
<%}%>
var JSONdata = '(<%=safe.jsstring(JSON.stringify(filter))%>)';
var filter = eval(JSONdata);
var JSONdata = "<%=safe.jsstring(JSON.stringify(filter))%>";
var filter = JSON.parse(JSONdata);
function prod_edit(row)
{

4
APPL/FIN/fin_edit_factuur.asp
View File

@@ -268,8 +268,8 @@ oRs.Close();
serversidebtwtabel = fin.btwtabel_info(fin_btwtabel_key); // default tabel hadden we al
}
%>
var JSONdata = '(<%=safe.jsstring(JSON.stringify(serversidebtwtabel))%>)';
window.btwtabel = eval('(' + JSONdata + ')');
var JSONdata = "<%=safe.jsstring(JSON.stringify(serversidebtwtabel))%>";
window.btwtabel = JSON.parse(JSONdata);
window.btwtabel_key = <%= ref_info.btwtabel_key? ref_info.btwtabel_key : fin_btwtabel_key %>;
var fin_materiaal;
</script>

8
APPL/MLD/mld_edit_melding.asp
View File

@@ -964,14 +964,14 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
<script type="text/javascript">
$(function()
{
var JSONdataStdm = '(<%=safe.jsstring(JSON.stringify(stdm_info))%>)';
var JSONdataFaq = '(<%=safe.jsstring(JSON.stringify(faq_info?faq_info.fixed_faq:null))%>)';
var JSONdataStdm = "<%=safe.jsstring(JSON.stringify(stdm_info))%>";
var JSONdataFaq = "<%=safe.jsstring(JSON.stringify(faq_info?faq_info.fixed_faq:null))%>";
// FSN#20381: Moet gedefinieerd worden na definitie FCLTkostenplaatsselector zodat sgAccount (ook $() ) gedefinieerd is
if (mld_key > 0) // Alleen voor bestaande meldingen uitvoeren. Voor nieuwe meldingen zorgt initOnChange van de stdmeldingselector voor de aanroep.
{
process_stdm_info(eval('(' + JSONdataStdm + ')'), false); // Tweede parameter stdmChanged voorkomt einddatum aanpassing bij bestaande meldingen
show_fixed_faq(-1, eval('(' + JSONdataFaq + ')'));
process_stdm_info(JSON.parse(JSONdataStdm), false); // Tweede parameter stdmChanged voorkomt einddatum aanpassing bij bestaande meldingen
show_fixed_faq(-1, JSON.parse(JSONdataFaq));
}
// Set correct values onLoad (setTimeout so that sgObject has been initiated)

2
APPL/MLD/mld_edit_meldracht_save.asp
View File

@@ -46,7 +46,7 @@ var doneParams = { mld_key : mld_key, autoprint: false,
<head>
<% FCLTHeader.Generate() %>
<script>
var doneParams = eval('(<%=safe.jsstring(JSON.stringify(doneParams))%>)')
var doneParams = JSON.parse("<%=safe.jsstring(JSON.stringify(doneParams))%>");
$(function() { FcltMgr.closeDetail(window, doneParams) } );
</script>
</head>

4
APPL/MLD/mld_edit_opdr.asp
View File

@@ -1079,8 +1079,8 @@ oRs.Close();
<input type="hidden" name="matbtwstr" id="matbtwstr" value="<%=matbtwarr.join(",")%>">
<% /* De materiaalkosten (mat_kosten) is readonly in beeld (kostenvelden hieronder gedefinieerd). */ %>
<script type='text/javascript'>
var JSONdata = '(<%=safe.jsstring(JSON.stringify(matdescriptarr))%>)';
var matdescriptarr = eval('(' + JSONdata + ')')
var JSONdata = "<%=safe.jsstring(JSON.stringify(matdescriptarr))%>";
var matdescriptarr = JSON.parse(JSONdata);
</script>
</td>
</tr>

4
APPL/MLD/mld_show_melding.asp
View File

@@ -715,8 +715,8 @@ function parentButton()
<script type="text/javascript">
$(function()
{
var JSONdata = '(<%=safe.jsstring(JSON.stringify(faq_info))%>)';
mld_show_kennisbank(eval('(' + JSONdata + ')'));
var JSONdata = "<%=safe.jsstring(JSON.stringify(faq_info))%>";
mld_show_kennisbank(JSON.parse(JSONdata));
});
</script>
<%

4
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -1430,8 +1430,8 @@ var timeFrom = getQParamFloat("timefrom", S("res_t1"));
<script type="text/javascript">
$(function()
{
var JSONdata = '(<%=safe.jsstring(JSON.stringify(rri))%>)';
process_res_ruimte_info(eval('(' + JSONdata + ')'));
var JSONdata = "<%=safe.jsstring(JSON.stringify(rri))%>";
process_res_ruimte_info(JSON.parse(JSONdata));
});
</script>
<% }

2
APPL/Shared/UploadForm_save.asp
View File

@@ -279,7 +279,7 @@ var oorzaak_bekend = false;
parent.FcltMgr.alert("<%=safe.jsstring(result.message)%>");
<% } %>
var JSONdata = "<%=safe.jsstring(JSON.stringify(result.safefilename))%>";
var filename_arr = eval('(' + JSONdata + ')');
var filename_arr = JSON.parse(JSONdata);
parent.uploadDone(filename_arr); // Zoo fout....
</script>

10
APPL/Shared/graph.inc
View File

@@ -111,13 +111,13 @@ rapport = { graph_type: {id: 4} }
<% FCLTHeader.Generate(); %>
<script>
var JSONdata = '<%=safe.jsstring(JSON.stringify(graphInit))%>';
var l_init = eval('(' + JSONdata + ')');
var l_init = JSON.parse(JSONdata);
var JSONdata = '<%=safe.jsstring(JSON.stringify(graphAxes))%>';
var l_axes = eval('(' + JSONdata + ')');
var l_axes = JSON.parse(JSONdata);
var JSONdata = '<%=safe.jsstring(JSON.stringify(graphData))%>';
var l_data = eval('(' + JSONdata + ')');
var l_data = JSON.parse(JSONdata);
var l_arr_x = [];
for (x=0; x<l_data.arr_x.length; x++)
@@ -139,9 +139,9 @@ rapport = { graph_type: {id: 4} }
l_labels.push(l_axes.yas[y].naam || "&nbsp;");
}
var default_options = eval('(' + l_init.default_options + ')');
var default_options = JSON.parse(l_init.default_options);
var report_options = $.extend(default_options,
eval('(' + l_init.report_options + ')'));
JSON.parse(l_init.report_options));
<%
switch (graphInit.graph_type)