diff --git a/APPL/FAC/fac_bookmark_list.asp b/APPL/FAC/fac_bookmark_list.asp index 1ccbcd3ff1..a97f8c5a72 100644 --- a/APPL/FAC/fac_bookmark_list.asp +++ b/APPL/FAC/fac_bookmark_list.asp @@ -74,11 +74,16 @@ var showall = getQParamInt("showall", 0) == 1; buttons = []; buttons.push({ icon: "page_refresh.png", title: L("lcl_refresh"), action: "FcltMgr.reload()" }); - if (authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9) + var authparamsPRSSYS = user.checkAutorisation("WEB_PRSSYS", true); + var hasPRSSYS = authparamsPRSSYS && authparamsPRSSYS.PRSwritelevel < 9 && authparamsPRSSYS.ALGwritelevel < 9; + if (hasPRSSYS) { var addurl = "appl/fac/fac_bookmark.asp"; buttons.push({ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" }); } + var flags = 2; // Zichtbaar voor FE + if (hasPRSSYS) + flags += 1; // of zichbaar PRSSSY var sql = "SELECT fac_bookmark_id" + " , fac_bookmark_path" @@ -88,6 +93,7 @@ var showall = getQParamInt("showall", 0) == 1; + " FROM fac_bookmark" + " WHERE (fac_bookmark_expire IS NULL OR fac_bookmark_expire > SYSDATE)" + " AND (fac_bookmark_query NOT LIKE 'session=%' OR fac_bookmark_query IS NULL)" + + " AND BITAND(fac_bookmark_flags, " + flags + ") <> 0" + " AND fac_bookmark_xmlnode IS NULL" // die zijn van ons zelf en worden niet geacht beheerd te worden. + " ORDER BY fac_bookmark_naam"; @@ -110,7 +116,8 @@ var showall = getQParamInt("showall", 0) == 1; if (has_report_api) // dan is een deeplink mogelijk rst.addColumn(new Column({caption: L("lcl_fac_bookmarkdeep"), content: fncolDeep})); - rst.addAction({ action: "bmk_show", caption: L("lcl_edit"), isDefault: true } ); + if (authparamsPRSSYS && authparamsPRSSYS.PRSwritelevel < 9 && authparamsPRSSYS.ALGwritelevel < 9) + rst.addAction({ action: "bmk_show", caption: L("lcl_edit"), isDefault: true } ); var cnt = rst.processResultset(); %> diff --git a/APPL/FAC/fac_edit_bookmark.asp b/APPL/FAC/fac_edit_bookmark.asp index 37d69e5cd4..fbd5975929 100644 --- a/APPL/FAC/fac_edit_bookmark.asp +++ b/APPL/FAC/fac_edit_bookmark.asp @@ -21,8 +21,7 @@ FCLTHeader.Requires({ plugins: ["jQuery"] }) // Autorisatie -var authparamsPRSSYS = user.checkAutorisation("WEB_PRSSYS", true); -user.auth_required_or_abort(authparamsPRSSYS.PRSwritelevel < 9 && authparamsPRSSYS.ALGwritelevel < 9); +var authparamsPRSSYS = user.checkAutorisation("WEB_PRSSYS"); var bkm_id = getQParam("bkm_id", ""); var bkm_path ; diff --git a/APPL/FAC/fac_edit_bookmark_save.asp b/APPL/FAC/fac_edit_bookmark_save.asp index 451039ccf2..b70e7b8d40 100644 --- a/APPL/FAC/fac_edit_bookmark_save.asp +++ b/APPL/FAC/fac_edit_bookmark_save.asp @@ -20,8 +20,7 @@ FCLTHeader.Requires({ plugins:["jQuery"] }); // Autorisatie -var authparamsPRSSYS = user.checkAutorisation("WEB_PRSSYS", true); -user.auth_required_or_abort(authparamsPRSSYS.PRSwritelevel < 9 && authparamsPRSSYS.ALGwritelevel < 9); +var authparamsPRSSYS = user.checkAutorisation("WEB_PRSSYS"); var bkm_id = getFParam("bkm_id", ""); var path = getFParam("path"); @@ -35,7 +34,8 @@ var fields = [ { dbs: "fac_bookmark_naam", typ: "varchar", frm: "naam", { dbs: "fac_bookmark_query", typ: "varchar", frm: "query", len: 1000 }, { dbs: "prs_perslid_key_auth", typ: "key", frm: "prskey_auth" }, { dbs: "fac_bookmark_unauth_url", typ: "varchar", frm: "unauth_url", len: 1000 }, - { dbs: "fac_bookmark_refreshtime", typ: "number", frm: "refresh"} + { dbs: "fac_bookmark_refreshtime", typ: "number", frm: "refresh"}, + { dbs: "fac_bookmark_flags", typ: "number", val: 1+4} // Zichtbaar/wijzigbaar PRSSYS ]; var warning = ""; diff --git a/APPL/FAC/fac_make_qrcode.asp b/APPL/FAC/fac_make_qrcode.asp index 0dce730b2d..e936d5464f 100644 --- a/APPL/FAC/fac_make_qrcode.asp +++ b/APPL/FAC/fac_make_qrcode.asp @@ -9,6 +9,8 @@ Context: Handmatig? Note: Welbeschouwd is dit gewoon een url-shortener http://sgf12/Facilitor5iWork/?bm=J448UIrR43 + + JGL: volgens mij is dit bestand anno maart 2015 niet in gebruik? */ %> @@ -41,13 +43,15 @@ } var bookmark_id = shared.random(16); var sql = "INSERT INTO fac_bookmark" - + " (fac_bookmark_id, fac_bookmark_path, fac_bookmark_query, fac_bookmark_naam, prs_perslid_key)" + + " (fac_bookmark_id, fac_bookmark_path, fac_bookmark_query, fac_bookmark_naam, prs_perslid_key, fac_bookmark_flags)" + " VALUES ("+safe.quoted_sql(bookmark_id) +", "+safe.quoted_sql(path)+", " +safe.quoted_sql(query) +", " +safe.quoted_sql(naam) - +", " + user_key + ")"; + +", " + user_key + +", 1+4" // zichtbaar en wijzigbaar PRSSYS + + ")"; Oracle.Execute(sql); } %> @@ -56,7 +60,6 @@