X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=2042aec24221cac7111c26a02dbc34b3414680a9;hb=dd8ea26db05952301b2f52c10f5cf0c17338fca3;hp=20e6e3a82f62f04003193892b4f735adeb15a125;hpb=abbf134a4f6bcf2ce006011f263148b0ea073bf5;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 20e6e3a..2042aec 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -395,10 +395,9 @@ function eschtml($s)
 
 function esclfhtml($s)
 {
-    return str_replace("\n", "<br>\n", htmlentities($s));
+    return str_replace("\n", "<br>", htmlspecialchars($s));
 }
 
-
 function langtolng($lang)
 {
   GLOBAL $G_lang;
@@ -814,7 +813,7 @@ class Client_prefs {
             $user->rec->supp_comp_set($this->supp_comp);
         }
         if ($is_save)
-            $user->store_set();
+            $user->prefs_store();
     }
 }
 
@@ -2881,7 +2880,7 @@ function show_notify_ex($text, $tout, $butt, $w, $h, $is_opaque, $block_time)
   return sprintf('var noti = new notify_ex(gst,"%s",%d,"%s",%d,%d, %s, %d);', $text, $tout, $butt, $w, $h, ($is_opaque ? "true" : "false"), $block_time);
 }
 
-function show_notify_document($text, $tout, $butt_arr, $w, $h, $is_opaque, $block_time)
+function show_notify_document($text, $tout, $butt_arr, $confirm_func, $w, $h, $is_opaque, $block_time)
 {
   log_main("SHOW_NOTIFY OPAQUE: ".$text);
 
@@ -2890,8 +2889,8 @@ function show_notify_document($text, $tout, $butt_arr, $w, $h, $is_opaque, $bloc
       $butts .= sprintf("%s'%s'", ($i == 0 ? "" : ","), $butt_arr[$i]);
   }
 
-  return sprintf('g_nd = new notify_document(gst, "%s", %d, [ %s ], %d, %d, %s, %d);|',
-                 escpush($text), $tout, $butts, $w, $h, ($is_opaque ? "true" : "false"), $block_time);
+  return sprintf('g_nd = new notify_document(gst, "%s", %d, [ %s ], %s, %d, %d, %s, %d);|',
+                 escpush($text), $tout, $butts, ($confirm_func == NULL ? "null" : $confirm_func), $w, $h, ($is_opaque ? "true" : "false"), $block_time);
 }