X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2FObj%2Fbrisk.phh;h=5fb98fbbe5296d32d1993ef5e65dc7861f6d670e;hb=8bd0ea95b1b1df4fbb7e9cd0b599ec6869c87f0e;hp=7fa2f3621be5b1a27e4604b9e3ac5bb10c65002a;hpb=eb65f5518b0cacc60e1dd265ab966290e7cc0c54;p=brisk.git
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 7fa2f36..5fb98fb 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", "
\n", htmlentities($s));
+ return str_replace(" ", " ", str_replace("\n", "
", htmlspecialchars($s)));
}
-
function langtolng($lang)
{
GLOBAL $G_lang;
@@ -759,7 +758,7 @@ class Client_prefs {
fprintf(STDERR, "QQ %s: %x\n", __FUNCTION__, $user->flags);
$this->listen = ($user->flags & USER_FLAG_MAP_AUTH) >> 2;
if ($user->rec != FALSE) {
- $this->supp_comp = $user->rec->supp_comp;
+ $this->supp_comp = $user->rec->supp_comp_get();
}
else {
$this->supp_comp = "000000000000";
@@ -811,10 +810,10 @@ class Client_prefs {
fprintf(STDERR, "QQ %s::%s %x\n", __CLASS__, __FUNCTION__,
$user->flags);
if ($user->is_supp_custom()) {
- $user->rec->supp_comp = $this->supp_comp;
+ $user->rec->supp_comp_set($this->supp_comp);
}
if ($is_save)
- $user->store_set();
+ $user->prefs_store();
}
}
@@ -2262,7 +2261,7 @@ class Room
// sql record exists AND last donate > 2013-01-01
if ($this->user[$i]->is_supp_custom()) {
- $supp_comp_s = sprintf(', "%s"', $this->user[$i]->rec->supp_comp);
+ $supp_comp_s = sprintf(', "%s"', $this->user[$i]->rec->supp_comp_get());
}
else {
$supp_comp_s = '';
@@ -2310,7 +2309,7 @@ class Room
log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx));
if ($user_cur->is_supp_custom())
- $supp_comp_s = sprintf(', "%s"', $user_cur->rec->supp_comp);
+ $supp_comp_s = sprintf(', "%s"', $user_cur->rec->supp_comp_get());
else
$supp_comp_s = '';
@@ -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);
}