projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/together-for-fun' into nginx
[brisk.git]
/
web
/
Obj
/
user.phh
diff --git
a/web/Obj/user.phh
b/web/Obj/user.phh
index
99952e4
..
305dd34
100644
(file)
--- a/
web/Obj/user.phh
+++ b/
web/Obj/user.phh
@@
-707,7
+707,8
@@
class User {
}
}
}
}
}
}
- if ($G_with_splash &&
+ // if ($G_with_splash &&
+ if ($this->is_auth() && (! $this->is_appr()) && $G_with_splash &&
($splashdate < $curtime - $G_splash_interval ||
$splashdate > $curtime)) {
$is_super = $this->flags & USER_FLAG_TY_SUPER;
($splashdate < $curtime - $G_splash_interval ||
$splashdate > $curtime)) {
$is_super = $this->flags & USER_FLAG_TY_SUPER;
@@
-830,7
+831,7
@@
function stream_init($init_string, $enc, $header, &$header_out, &$body, $get, $p
$this->rd_data_set($curtime, $transp, $enc, $stat, $subst, $step, $from);
$this->rd_data_set($curtime, $transp, $enc, $stat, $subst, $step, $from);
- $ret = $this->rd_transp->init($enc, $header,
&
$header_out, $init_string, self::base_get(), $this->rd_scristp);
+ $ret = $this->rd_transp->init($enc, $header, $header_out, $init_string, self::base_get(), $this->rd_scristp);
if ($ret === FALSE) {
return FALSE;
if ($ret === FALSE) {
return FALSE;
@@
-923,6
+924,12
@@
function chunked_fini()
} // end class User
} // end class User
+define('USERSNET_FRIEND_BLACK', 1);
+define('USERSNET_FRIEND_UNKNOWN', 2);
+define('USERSNET_FRIEND_TEST', 3);
+define('USERSNET_FRIEND_FRIEND', 4);
+define('USERSNET_FRIEND_BFF', 5);
+
if (!isset($__usersnet_friend_map)) {
$__usersnet_friend_map = array("black", "unknown", "test", "friend", "bff");
}
if (!isset($__usersnet_friend_map)) {
$__usersnet_friend_map = array("black", "unknown", "test", "friend", "bff");
}
@@
-933,9
+940,23
@@
function usersnet_friend_getlabel($id)
$id_i = intval($id);
$id_i = intval($id);
- if ($id_i <
0 || $id_i >=
count($__usersnet_friend_map)) {
+ if ($id_i <
1 || $id_i >
count($__usersnet_friend_map)) {
return FALSE;
}
return FALSE;
}
- return ($__usersnet_friend_map[$id_i]);
+ return ($__usersnet_friend_map[$id_i - 1]);
+}
+
+/* return index + 1 of friend label */
+function usersnet_friend_getid($label_in)
+{
+ GLOBAL $__usersnet_friend_map;
+
+ foreach ($__usersnet_friend_map as $id => $label) {
+ if ($label == $label_in) {
+ return ($id + 1);
+ }
+ }
+
+ return FALSE;
}
?>
}
?>