登录居中 · 个人 slogan · 三种生日 · 称呼视角化 · 附件统一走代理
按九点反馈一次性改造： 1. 登录页「图标 + 用手机号登录你的家书」包进 .auth-head 并真正居中 （以前只加了个 class 名，没有样式，看着像做了其实没做）。 2. slogan 改成两段式：系统级 slogan 作兜底，每个人可在自己的资料里写一个， 填了就显示自己的、留空就回落到系统那句。settings 里「家庭名称」字段去掉 （只在安装时归档，不参与展示）。 3. 三个生日：身份证生日（从证件号截取，永不改动）／真实阳历／农历。 同一人填了其一即自动推出另一个（靠 birthday_source 指明填的是哪一侧， 不依赖 JS）。三者落在同一天时合并成一条提醒，否则分别提醒。 农历表不是照抄流传的那份 lunarInfo（它在 5 个年份上是错的）—— 用五个独立实现按 7.3 万天多数表决重新推导，再要求 100% 重现。 4. 称呼改成「视角属性」：nicknames(family_id, viewer_id, target_id, nickname)。 「小明」不是某个人的属性——同一个人被不同人叫法不同，所以是「谁看」的属性。 旧的 persons.nickname 由 Nickname::migrateLegacy() 搬到新表，只搬一次。 5. 点自己的头像/名字直接进「我的资料」，不必再绕 「名册 → 找到自己 → 编辑资料」三步。 6. 附件（头像与其它上传）一律走 media.php 代理，不再直连 uploads/ 或云端地址： 可读性由登录态决定而不是「知道文件名」，Content-Type/缓存/下载头由服务端统一给。 uploads/ 整个目录 deny（含历史遗留备份文件），并有真实探针验证。 7. OSS 设置页加「连通性测试」（本地 / 云端两个按钮），逐步给出结论与耗时。 8. 生日输入改用「原生日期框 + 24 小时制时:分:秒 三个下拉」： datetime-local 的格式由浏览器 UI 语言决定（中文环境渲染成「下午 03:30」， 没有秒、还容易把上下午填反）。点输入框任意一处都能弹出选择器（showPicker）。 9. 结构版本号收敛成 Schema::VERSION 一处，安装时即盖章，避免首次请求白跑升级。 验证（全部为「先注入 bug 证伪、再跑通过」）： php -l 42 个文件；e2e 149 条；老库升级专测 37 条；反向验证 23 个注入全被抓； 桌面几何 108 条（768/1280/1920/2560）；移动端真机几何 212 条（360/375/390/414）； 交互检查 49 条（生日整框可点、登录居中）。
This commit is contained in:
+137
-58
@@ -1,9 +1,14 @@
|
||||
<?php
|
||||
/**
|
||||
* 家庭名册（家庭成员 + 将来的外部联系人共用一张表）。
|
||||
* 家庭名册（家庭成员 + 外部联系人共用一张表）。
|
||||
*
|
||||
* 之所以不拆成两张表：两者字段几乎一样；而且需要互相转换 ——
|
||||
* 一个「认识的人」随时可能变成家庭成员，一个家庭成员也可能只作为联系人存在。
|
||||
*
|
||||
* 三处刻意的设计（都是被纠正过的）：
|
||||
* · **小名不在这里**。称呼是"谁在叫"的属性，存在 nicknames 表（见 Nickname 类）。
|
||||
* · 生日不是一个字段，是三个（身份证 / 阳历 / 农历），见 Birthday 类。
|
||||
* · 姓名与称呼的读取都要过 `Nickname::display()`，页面不要直接 echo name。
|
||||
*/
|
||||
|
||||
declare(strict_types=1);
|
||||
@@ -12,17 +17,25 @@ namespace App;
|
||||
|
||||
final class Person
|
||||
{
|
||||
/** 名册列表（连带账号信息，用于显示「是否已开通登录」） */
|
||||
public static function all(int $familyId, string $q = '', string $kind = 'member'): array
|
||||
/**
|
||||
* 名册列表（连带账号信息与「我叫他什么」）。
|
||||
*
|
||||
* `my_nickname` 是**当前登录者**给这个人起的称呼 —— 同一份名册，
|
||||
* 爸爸看到的是"儿子"，妈妈看到的是"小宝"，靠的就是这个字段。
|
||||
*/
|
||||
public static function all(int $familyId, string $q = '', string $kind = 'member', int $viewerId = 0): array
|
||||
{
|
||||
$sql = 'SELECT p.*, a.id AS account_id, a.role AS account_role, a.status AS account_status,
|
||||
a.last_login_at
|
||||
a.last_login_at, n.nickname AS my_nickname
|
||||
FROM persons p
|
||||
LEFT JOIN accounts a ON a.person_id = p.id
|
||||
WHERE p.family_id = ? AND p.kind = ?';
|
||||
$args = [$familyId, $kind];
|
||||
LEFT JOIN nicknames n ON n.target_id = p.id AND n.viewer_id = ?';
|
||||
$args = [$viewerId];
|
||||
$sql .= ' WHERE p.family_id = ? AND p.kind = ?';
|
||||
$args[] = $familyId;
|
||||
$args[] = $kind;
|
||||
if ($q !== '') {
|
||||
$sql .= ' AND (p.name LIKE ? OR p.nickname LIKE ? OR p.email LIKE ?)';
|
||||
$sql .= ' AND (p.name LIKE ? OR p.email LIKE ? OR n.nickname LIKE ?)';
|
||||
$like = '%' . $q . '%';
|
||||
$args[] = $like;
|
||||
$args[] = $like;
|
||||
@@ -42,16 +55,18 @@ final class Person
|
||||
return $row ?: null;
|
||||
}
|
||||
|
||||
/** 带账号信息的详情（详情页用） */
|
||||
public static function findWithAccount(int $id): ?array
|
||||
/** 带账号信息的详情（详情页用；$viewerId 用来取「我叫他什么」） */
|
||||
public static function findWithAccount(int $id, int $viewerId = 0): ?array
|
||||
{
|
||||
$st = Database::get()->prepare(
|
||||
'SELECT p.*, a.id AS account_id, a.role AS account_role,
|
||||
a.status AS account_status, a.last_login_at
|
||||
FROM persons p LEFT JOIN accounts a ON a.person_id = p.id
|
||||
a.status AS account_status, a.last_login_at, n.nickname AS my_nickname
|
||||
FROM persons p
|
||||
LEFT JOIN accounts a ON a.person_id = p.id
|
||||
LEFT JOIN nicknames n ON n.target_id = p.id AND n.viewer_id = ?
|
||||
WHERE p.id = ?'
|
||||
);
|
||||
$st->execute([$id]);
|
||||
$st->execute([$viewerId, $id]);
|
||||
$row = $st->fetch();
|
||||
return $row ?: null;
|
||||
}
|
||||
@@ -65,33 +80,38 @@ final class Person
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增。手机号是敏感字段，进来就加密 + 哈希。
|
||||
* 新增。手机号是敏感字段，进来就加密 + 哈希；三个生日由 Birthday 规范化。
|
||||
* @return int 新 id
|
||||
*/
|
||||
public static function create(int $familyId, array $d): int
|
||||
{
|
||||
$phone = $d['phone'] ?? '';
|
||||
$phone = (string)($d['phone'] ?? '');
|
||||
$bd = Birthday::normalize($d);
|
||||
$sql = 'INSERT INTO persons
|
||||
(family_id, kind, name, nickname, gender, birth_rank, birthday, avatar,
|
||||
(family_id, kind, name, gender, birth_rank, birthday,
|
||||
birthday_id_card, birthday_lunar, birthday_lunar_leap, slogan, avatar,
|
||||
phone_hash, phone_encrypted, id_card_encrypted, email, address, note,
|
||||
is_placeholder, sort_order)
|
||||
VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)';
|
||||
VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)';
|
||||
$st = Database::get()->prepare($sql);
|
||||
$st->execute([
|
||||
$familyId,
|
||||
$d['kind'] ?? 'member',
|
||||
$d['name'],
|
||||
$d['nickname'] !== '' ? $d['nickname'] : null,
|
||||
$d['gender'] !== '' ? $d['gender'] : null,
|
||||
($d['gender'] ?? '') !== '' ? $d['gender'] : null,
|
||||
!empty($d['birth_rank']) ? (int)$d['birth_rank'] : null,
|
||||
$d['birthday'] !== '' ? $d['birthday'] : null,
|
||||
$d['avatar'] !== '' ? $d['avatar'] : null,
|
||||
$bd['solar'],
|
||||
$bd['id_birthday'],
|
||||
$bd['lunar'],
|
||||
$bd['lunar_leap'],
|
||||
($d['slogan'] ?? '') !== '' ? $d['slogan'] : null,
|
||||
($d['avatar'] ?? '') !== '' ? $d['avatar'] : null,
|
||||
$phone !== '' ? Crypto::hash($phone) : null,
|
||||
$phone !== '' ? Crypto::encrypt($phone) : null,
|
||||
($d['id_card'] ?? '') !== '' ? Crypto::encrypt($d['id_card']) : null,
|
||||
$d['email'] !== '' ? $d['email'] : null,
|
||||
$d['address'] !== '' ? $d['address'] : null,
|
||||
$d['note'] !== '' ? $d['note'] : null,
|
||||
($d['email'] ?? '') !== '' ? $d['email'] : null,
|
||||
($d['address'] ?? '') !== '' ? $d['address'] : null,
|
||||
($d['note'] ?? '') !== '' ? $d['note'] : null,
|
||||
!empty($d['is_placeholder']) ? 1 : 0,
|
||||
(int)($d['sort_order'] ?? 1000),
|
||||
]);
|
||||
@@ -100,31 +120,68 @@ final class Person
|
||||
|
||||
public static function update(int $id, array $d): void
|
||||
{
|
||||
$phone = $d['phone'] ?? '';
|
||||
$phone = (string)($d['phone'] ?? '');
|
||||
$bd = Birthday::normalize($d);
|
||||
$sql = 'UPDATE persons SET
|
||||
name = ?, nickname = ?, gender = ?, birth_rank = ?, birthday = ?, avatar = ?,
|
||||
name = ?, gender = ?, birth_rank = ?, birthday = ?,
|
||||
birthday_id_card = ?, birthday_lunar = ?, birthday_lunar_leap = ?, slogan = ?, avatar = ?,
|
||||
phone_hash = ?, phone_encrypted = ?, id_card_encrypted = ?,
|
||||
email = ?, address = ?, note = ?, is_placeholder = ?, sort_order = ?
|
||||
WHERE id = ?';
|
||||
Database::get()->prepare($sql)->execute([
|
||||
$d['name'],
|
||||
$d['nickname'] !== '' ? $d['nickname'] : null,
|
||||
$d['gender'] !== '' ? $d['gender'] : null,
|
||||
($d['gender'] ?? '') !== '' ? $d['gender'] : null,
|
||||
!empty($d['birth_rank']) ? (int)$d['birth_rank'] : null,
|
||||
$d['birthday'] !== '' ? $d['birthday'] : null,
|
||||
$d['avatar'] !== '' ? $d['avatar'] : null,
|
||||
$bd['solar'],
|
||||
$bd['id_birthday'],
|
||||
$bd['lunar'],
|
||||
$bd['lunar_leap'],
|
||||
($d['slogan'] ?? '') !== '' ? $d['slogan'] : null,
|
||||
($d['avatar'] ?? '') !== '' ? $d['avatar'] : null,
|
||||
$phone !== '' ? Crypto::hash($phone) : null,
|
||||
$phone !== '' ? Crypto::encrypt($phone) : null,
|
||||
($d['id_card'] ?? '') !== '' ? Crypto::encrypt($d['id_card']) : null,
|
||||
$d['email'] !== '' ? $d['email'] : null,
|
||||
$d['address'] !== '' ? $d['address'] : null,
|
||||
$d['note'] !== '' ? $d['note'] : null,
|
||||
($d['email'] ?? '') !== '' ? $d['email'] : null,
|
||||
($d['address'] ?? '') !== '' ? $d['address'] : null,
|
||||
($d['note'] ?? '') !== '' ? $d['note'] : null,
|
||||
!empty($d['is_placeholder']) ? 1 : 0,
|
||||
(int)($d['sort_order'] ?? 1000),
|
||||
$id,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 自助改自己的资料（个人信息页用）。
|
||||
*
|
||||
* 与上面的 update() 分开是有意的：那个是"管理员编名册"，字段全、权限高；
|
||||
* 这个只允许改**属于自己的**东西 —— 姓名、性别、三个生日、一句话、头像、联系方式。
|
||||
* 排行、排序号、虚拟人物标记、以及身份证号（会牵动身份证生日）都只能由管理员改名册时动。
|
||||
*/
|
||||
public static function updateSelf(int $id, array $d): void
|
||||
{
|
||||
$bd = Birthday::normalize($d);
|
||||
Database::get()->prepare(
|
||||
'UPDATE persons SET
|
||||
name = ?, gender = ?, birthday = ?,
|
||||
birthday_id_card = ?, birthday_lunar = ?, birthday_lunar_leap = ?, slogan = ?, avatar = ?,
|
||||
email = ?, address = ?, note = ?
|
||||
WHERE id = ?'
|
||||
)->execute([
|
||||
$d['name'],
|
||||
($d['gender'] ?? '') !== '' ? $d['gender'] : null,
|
||||
$bd['solar'],
|
||||
$bd['id_birthday'],
|
||||
$bd['lunar'],
|
||||
$bd['lunar_leap'],
|
||||
($d['slogan'] ?? '') !== '' ? $d['slogan'] : null,
|
||||
($d['avatar'] ?? '') !== '' ? $d['avatar'] : null,
|
||||
($d['email'] ?? '') !== '' ? $d['email'] : null,
|
||||
($d['address'] ?? '') !== '' ? $d['address'] : null,
|
||||
($d['note'] ?? '') !== '' ? $d['note'] : null,
|
||||
$id,
|
||||
]);
|
||||
}
|
||||
|
||||
/** 只改头像（上传后单独调用，避免整条记录被表单覆盖） */
|
||||
public static function setAvatar(int $id, ?string $avatar): void
|
||||
{
|
||||
@@ -149,42 +206,49 @@ final class Person
|
||||
return $out;
|
||||
}
|
||||
|
||||
/** 只给「选人」用的精简列表（下拉框、关系选择器） */
|
||||
public static function options(int $familyId, int $exceptId = 0): array
|
||||
/** 只给「选人」用的精简列表（下拉框、关系选择器），带「我叫他什么」 */
|
||||
public static function options(int $familyId, int $exceptId = 0, int $viewerId = 0): array
|
||||
{
|
||||
$st = Database::get()->prepare(
|
||||
'SELECT id, name, nickname, gender, is_placeholder FROM persons
|
||||
WHERE family_id = ? AND kind = "member" AND id <> ?
|
||||
ORDER BY sort_order ASC, id ASC'
|
||||
'SELECT p.id, p.name, p.gender, p.avatar, p.is_placeholder, n.nickname AS my_nickname
|
||||
FROM persons p
|
||||
LEFT JOIN nicknames n ON n.target_id = p.id AND n.viewer_id = ?
|
||||
WHERE p.family_id = ? AND p.kind = "member" AND p.id <> ?
|
||||
ORDER BY p.sort_order ASC, p.id ASC'
|
||||
);
|
||||
$st->execute([$familyId, $exceptId]);
|
||||
$st->execute([$viewerId, $familyId, $exceptId]);
|
||||
return $st->fetchAll();
|
||||
}
|
||||
|
||||
/**
|
||||
* 最近要过生日的人（首页用）。
|
||||
* 直接算「今天是今年的第几天」与生日的差值，跨年自动处理。
|
||||
*
|
||||
* ⚠️ 这里返回的是「**一个生日事件**」而不是「一个人」：
|
||||
* 一个人可能同时有身份证生日与农历生日两条（不重合时），
|
||||
* 也可能它们正好落在同一天（那就是 1 条，kinds 里有两个）。
|
||||
* 早先按"人"来算，于是农历生日完全不会被提醒 —— 而家里老人过的正是农历。
|
||||
*/
|
||||
public static function upcomingBirthdays(int $familyId, int $withinDays = 60): array
|
||||
{
|
||||
$st = Database::get()->prepare(
|
||||
"SELECT id, name, avatar, birthday FROM persons
|
||||
WHERE family_id = ? AND kind = 'member' AND birthday IS NOT NULL
|
||||
ORDER BY DAYOFYEAR(birthday)"
|
||||
);
|
||||
$st->execute([$familyId]);
|
||||
$rows = $st->fetchAll();
|
||||
|
||||
$today = date('Y-m-d');
|
||||
$out = [];
|
||||
foreach ($rows as $r) {
|
||||
$days = days_until_birthday($r['birthday']);
|
||||
if ($days !== null && $days <= $withinDays) {
|
||||
$r['days_left'] = $days;
|
||||
$out[] = $r;
|
||||
foreach (self::map($familyId) as $p) {
|
||||
foreach (Birthday::nextOccurrences($p, $today, $withinDays) as $occ) {
|
||||
$out[] = [
|
||||
'id' => (int)$p['id'],
|
||||
'name' => (string)$p['name'],
|
||||
'avatar' => $p['avatar'],
|
||||
'date' => $occ['date'],
|
||||
'days_left' => $occ['days'],
|
||||
'kinds' => $occ['kinds'],
|
||||
'kind_words' => array_map(fn($k) => Birthday::KINDS[$k] ?? $k, $occ['kinds']),
|
||||
'lunar_label' => $occ['lunar_label'],
|
||||
'age' => $occ['age'],
|
||||
];
|
||||
}
|
||||
}
|
||||
usort($out, function ($a, $b) {
|
||||
return $a['days_left'] <=> $b['days_left'];
|
||||
return $a['days_left'] <=> $b['days_left'] ?: strcmp($a['date'], $b['date']);
|
||||
});
|
||||
return $out;
|
||||
}
|
||||
@@ -204,19 +268,34 @@ final class Person
|
||||
if ($email !== '' && !filter_var($email, FILTER_VALIDATE_EMAIL)) {
|
||||
$err['email'] = '邮箱格式看起来不对';
|
||||
}
|
||||
$b = trim((string)($d['birthday'] ?? ''));
|
||||
if ($b !== '' && !preg_match('/^\d{4}-\d{2}-\d{2}$/', $b)) {
|
||||
$err['birthday'] = '生日请按 年-月-日 填写';
|
||||
// 生日现在是「日期 + 时分秒」，但要宽松：只填日期也必须收下
|
||||
foreach (['birthday_solar' => '阳历生日', 'birthday_lunar' => '农历生日'] as $key => $word) {
|
||||
$v = trim((string)($d[$key] ?? ''));
|
||||
if ($v === '') {
|
||||
continue;
|
||||
}
|
||||
if (!preg_match('/^\d{4}-\d{2}-\d{2}([ ]\d{2}:\d{2}(:\d{2})?)?$/', $v)) {
|
||||
$err[$key] = $word . '格式不对';
|
||||
continue;
|
||||
}
|
||||
[$yy, $mm, $dd] = array_map('intval', explode('-', substr($v, 0, 10)));
|
||||
if (!checkdate($mm, $dd, $yy) || $yy < Lunar::MIN_YEAR || $yy > Lunar::MAX_YEAR) {
|
||||
$err[$key] = $word . '看起来不是一个真实的日子';
|
||||
}
|
||||
}
|
||||
// 身份证号只做很松的校验：家庭场景里要不要存它，本来就值得三思
|
||||
$idc = trim((string)($d['id_card'] ?? ''));
|
||||
if ($idc !== '' && !preg_match('/^[0-9Xx]{15,18}$/', $idc)) {
|
||||
$err['id_card'] = '身份证号应为 15 或 18 位';
|
||||
if ($idc !== '' && !preg_match('/^\d{17}[\dXx]$|^\d{15}$/', $idc)) {
|
||||
$err['id_card'] = '身份证号应为 18 位（或 15 位老证）';
|
||||
}
|
||||
$rank = $d['birth_rank'] ?? '';
|
||||
if ($rank !== '' && $rank !== null && (!ctype_digit((string)$rank) || (int)$rank < 1 || (int)$rank > 99)) {
|
||||
$err['birth_rank'] = '排行请填 1-99 的整数（老大填 1）';
|
||||
}
|
||||
$slogan = trim((string)($d['slogan'] ?? ''));
|
||||
if (mb_strlen($slogan, 'UTF-8') > 200) {
|
||||
$err['slogan'] = '一句话请控制在 200 字以内';
|
||||
}
|
||||
return $err;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user