UWVA#26373 Bookmarks zichtbaarheid aansturen

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

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();
 %>

APPL/FAC/fac_edit_bookmark.asp

@@ -21,8 +21,7 @@
 FCLTHeader.Requires({ plugins: ["jQuery"] })
 
 // Autorisatie
-var authparamsPRSSYS = user.checkAutorisation("WEB_PRSSYS", true);
+var authparamsPRSSYS = user.checkAutorisation("WEB_PRSSYS");
-user.auth_required_or_abort(authparamsPRSSYS.PRSwritelevel < 9 && authparamsPRSSYS.ALGwritelevel < 9);
 
 var bkm_id = getQParam("bkm_id", "");
 var bkm_path ;

APPL/FAC/fac_edit_bookmark_save.asp

@@ -20,8 +20,7 @@
 FCLTHeader.Requires({ plugins:["jQuery"] });
 
 // Autorisatie
-var authparamsPRSSYS = user.checkAutorisation("WEB_PRSSYS", true);
+var authparamsPRSSYS = user.checkAutorisation("WEB_PRSSYS");
-user.auth_required_or_abort(authparamsPRSSYS.PRSwritelevel < 9 && authparamsPRSSYS.ALGwritelevel < 9);
 
 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 = "";

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 @@
 <script language="javascript">
     function bm_submit()
     {
-        document.activeElement.blur(); // trigger laatste onChanges
         if (!validateForm("u2"))
             return false;
         document.forms.u2.submit();

APPL/PRS/prs_perslid_qr.asp

@@ -32,6 +32,7 @@
         + "   fac_bookmark_naam, "
         + "   fac_bookmark_path, "
         + "   fac_bookmark_query, "
+        + "   fac_bookmark_flags, "
         + "   fac_bookmark_expire ) "
         + " VALUES ( "
         +     safe.quoted_sql(bookmarkId) + ", "
@@ -39,6 +40,7 @@
         + "   'PRS QR code indentificatie', "
         + "   'appl/prs/prs_perslid_qr_confirm.asp', " // via de root
         +     safe.quoted_sql("user_key=" + user_key) + ", " // is straks beschermd met HMAC
+        +     "0," // Zelfs onzichtbaar voor PRSSYS
         + "   sysdate+("+S("qr_auth_expire")+"/24/60) )"
     Oracle.Execute(sql);
 

APPL/PRS/self_register_save.asp

@@ -110,6 +110,7 @@ sql = "INSERT INTO fac_bookmark ( "
     + "   fac_bookmark_naam, "
     + "   fac_bookmark_path, "
     + "   fac_bookmark_query, "
+    + "   fac_bookmark_flags, "
     + "   fac_bookmark_expire ) "
     + " VALUES ( "
     +     safe.quoted_sql(bookmarkId) + ", "
@@ -117,6 +118,7 @@ sql = "INSERT INTO fac_bookmark ( "
     + "   'Self-registration', "
     + "   'appl/prs/self_register_confirm.asp', "
     +     safe.quoted_sql("user_key=" + prs_key) + ", " // is straks beschermd met HMAC
+    +     "0," // Zelfs onzichtbaar voor PRSSYS
     + "   sysdate+("+S("self_register_expire")+"/24/60) )"
 Oracle.Execute(sql);
 

APPL/Shared/create_bookmark.asp

@@ -37,6 +37,7 @@ var sql = "INSERT INTO fac_bookmark"
                      +safe.quoted_sql(query)
                      +", "
                      +safe.quoted_sql(naam)
+                     + "1+2," // Zichtbaar voor PRSSYS en gewone gebruikers
                      +", " + user_key + ")";
 Oracle.Execute(sql);
 

APPL/Shared/pass2mail_save.asp

@@ -74,6 +74,7 @@ else
         + "   fac_bookmark_naam, "
         + "   fac_bookmark_path, "
         + "   fac_bookmark_query, "
+        + "   fac_bookmark_flags, "
         + "   fac_bookmark_expire ) "
         + " VALUES ( "
         +     safe.quoted_sql(bookmarkId) + ", "
@@ -81,6 +82,7 @@ else
         + "   'PRS password reset', "
         +     safe.quoted_sql(url) + ","
         +     safe.quoted_sql("user_key=" + perslid_key) + ", " // is straks beschermd met HMAC
+        +     "0," // Zelfs onzichtbaar voor PRSSYS
         +     expire + " )" // Tot middernacht
     Oracle.Execute(sql);