diff --git a/APPL/FAC/fac_user_info.asp b/APPL/FAC/fac_user_info.asp index 0d87b07c04..621086950c 100644 --- a/APPL/FAC/fac_user_info.asp +++ b/APPL/FAC/fac_user_info.asp @@ -448,16 +448,16 @@ oRs.Close(); var anyOverrule = oRs(0).Value > 0; oRs.Close(); - if (itsme && anyOverrule) + if (itsme && anyOverrule && S("prs_personal_noti_options")>0) { BLOCK_START("prsNoti", L("lcl_noti_prsvoorkeur")); if (thisUser.noti_niks() == 1 || thisUser.noti_portal() == 1 || thisUser.noti_email() == 1 || thisUser.noti_sms() == 1 || thisUser.noti_popup() == 1) { CHECKBOXTR(L("lcl_noti_niks"), "fldfacnoti", "noti0", thisUser.noti_niks(), { html: " disabled" }); - CHECKBOXTR(L("lcl_noti_portal"), "fldfacnoti", "noti1", thisUser.noti_portal(), { html: " disabled" }); - CHECKBOXTR(L("lcl_noti_email"), "fldfacnoti", "noti2", thisUser.noti_email(), { html: " disabled" }); - CHECKBOXTR(L("lcl_noti_sms"), "fldfacnoti", "noti4", thisUser.noti_sms(), { html: " disabled" }); - CHECKBOXTR(L("lcl_noti_popup"), "fldfacnoti", "noti8", thisUser.noti_popup(), { html: " disabled" }); + if (S("prs_personal_noti_options")&1) CHECKBOXTR(L("lcl_noti_portal"), "fldfacnoti", "noti1", thisUser.noti_portal(), { html: " disabled" }); + if (S("prs_personal_noti_options")&2) CHECKBOXTR(L("lcl_noti_email"), "fldfacnoti", "noti2", thisUser.noti_email(), { html: " disabled" }); + if (S("prs_personal_noti_options")&4) CHECKBOXTR(L("lcl_noti_sms"), "fldfacnoti", "noti4", thisUser.noti_sms(), { html: " disabled" }); + if (S("prs_personal_noti_options")&8) CHECKBOXTR(L("lcl_noti_popup"), "fldfacnoti", "noti8", thisUser.noti_popup(), { html: " disabled" }); } else {%> diff --git a/APPL/PRS/prs_edit_perslid.asp b/APPL/PRS/prs_edit_perslid.asp index 70ce25906c..da9e51282b 100644 --- a/APPL/PRS/prs_edit_perslid.asp +++ b/APPL/PRS/prs_edit_perslid.asp @@ -194,8 +194,8 @@ if (prs_key > 0) // Fotoblokje alleen bij bestaande records { Response.write(""); if (prsauthparams.writeuse) - { - %><% + { + %><% } Response.write(""); } @@ -344,14 +344,14 @@ var oRs = Oracle.Execute(sql); var anyOverrule = oRs(0).Value > 0; oRs.Close(); -if (prs_key > 0 && (prs_key == user_key || prsauthparams.writesys || prsauthparams.writeman) && anyOverrule) +if (prs_key > 0 && (prs_key == user_key || prsauthparams.writesys || prsauthparams.writeman) && anyOverrule && S("prs_personal_noti_options") > 0 ) { BLOCK_START("prsNoti", L("lcl_noti_prsvoorkeur")); CHECKBOXTR(L("lcl_noti_niks"), "fldfacnoti", "noti0", thisUser.noti_niks()); - CHECKBOXTR(L("lcl_noti_portal"), "fldfacnoti", "noti1", thisUser.noti_portal()); - CHECKBOXTR(L("lcl_noti_email"), "fldfacnoti", "noti2", thisUser.noti_email()); - CHECKBOXTR(L("lcl_noti_sms"), "fldfacnoti", "noti4", thisUser.noti_sms()); - CHECKBOXTR(L("lcl_noti_popup"), "fldfacnoti", "noti8", thisUser.noti_popup()); + if (S("prs_personal_noti_options")&1) CHECKBOXTR(L("lcl_noti_portal"), "fldfacnoti", "noti1", thisUser.noti_portal()); + if (S("prs_personal_noti_options")&2) CHECKBOXTR(L("lcl_noti_email"), "fldfacnoti", "noti2", thisUser.noti_email()); + if (S("prs_personal_noti_options")&4) CHECKBOXTR(L("lcl_noti_sms"), "fldfacnoti", "noti4", thisUser.noti_sms()); + if (S("prs_personal_noti_options")&8) CHECKBOXTR(L("lcl_noti_popup"), "fldfacnoti", "noti8", thisUser.noti_popup()); BLOCK_END(); } diff --git a/APPL/PRS/prs_show_perslid.asp b/APPL/PRS/prs_show_perslid.asp index f2d8e43633..e3c557fdd4 100644 --- a/APPL/PRS/prs_show_perslid.asp +++ b/APPL/PRS/prs_show_perslid.asp @@ -374,16 +374,16 @@ var prs_user = new Perslid(prs_key); var anyOverrule = oRs(0).Value > 0; oRs.Close(); - if ((prs_key == user_key || prsauthparams.writesys || prsauthparams.writeman) && anyOverrule) + if ((prs_key == user_key || prsauthparams.writesys || prsauthparams.writeman) && anyOverrule && S("prs_personal_noti_options") > 0) { BLOCK_START("prsNoti", L("lcl_noti_prsvoorkeur")); if (prs_user.noti_niks() == 1 || prs_user.noti_portal() == 1 || prs_user.noti_email() == 1 || prs_user.noti_sms() == 1 || prs_user.noti_popup() == 1) { CHECKBOXTR(L("lcl_noti_niks"), "fldfacnoti", "noti0", prs_user.noti_niks(), { html: " disabled" }); - CHECKBOXTR(L("lcl_noti_portal"), "fldfacnoti", "noti1", prs_user.noti_portal(), { html: " disabled" }); - CHECKBOXTR(L("lcl_noti_email"), "fldfacnoti", "noti2", prs_user.noti_email(), { html: " disabled" }); - CHECKBOXTR(L("lcl_noti_sms"), "fldfacnoti", "noti4", prs_user.noti_sms(), { html: " disabled" }); - CHECKBOXTR(L("lcl_noti_popup"), "fldfacnoti", "noti8", prs_user.noti_popup(), { html: " disabled" }); + if (S("prs_personal_noti_options")&1) CHECKBOXTR(L("lcl_noti_portal"), "fldfacnoti", "noti1", prs_user.noti_portal(), { html: " disabled" }); + if (S("prs_personal_noti_options")&2) CHECKBOXTR(L("lcl_noti_email"), "fldfacnoti", "noti2", prs_user.noti_email(), { html: " disabled" }); + if (S("prs_personal_noti_options")&4) CHECKBOXTR(L("lcl_noti_sms"), "fldfacnoti", "noti4", prs_user.noti_sms(), { html: " disabled" }); + if (S("prs_personal_noti_options")&8) CHECKBOXTR(L("lcl_noti_popup"), "fldfacnoti", "noti8", prs_user.noti_popup(), { html: " disabled" }); } else {%>