feat: add plain-text announcements and user drawer

dev
admin 2 months ago
parent 5f5f89c68b
commit 6902215b2f

@ -56,6 +56,8 @@ php xcat createAdmin
`cloudInit` 新建云业务/指标表、生成独立签名和加密密钥及 `runtime/engine.json`,不连接宿主机。按 CLI 提示创建管理员,邮箱应真实可用;核对 `super_admin` UID 包含有宿主机管理权限的管理员。
公告纯文本升级也由 `cloudInit` 显式执行:为当前空的 `announcement` 旧表添加标题、类型、正文和发布状态,移除旧 `date` / `content` / `markdown` 字段,不包含历史富文本转换。若检测到旧表仍有记录,会在修改公告表结构前停止并提示,不自动删除旧记录。迁移可重复运行,不会覆盖新结构中的公告或重新发布已撤下的公告;HTTP 请求不执行数据库结构变更。手动升级须在维护窗口备份数据库、停止 PHP-FPM 等旧版本公告写入入口,拉取代码并执行 `php xcat cloudInit` 成功后再恢复服务,避免空表检查期间出现并发写入;在线更新器会自动停服务并执行该步骤。用户改从顶栏公告按钮查看已发布内容,原 `/user/announcement` 页面和旧管理端删除/AJAX 接口已移除;后台“撤下”不删除记录。
数据库或内省 URL 修改后重新导出并重启引擎(保留现有密钥):
```bash

@ -4,6 +4,7 @@ namespace App\Command;
use App\Models\User;
use App\Services\Config;
use App\Services\AnnouncementSchema;
/** Explicit local initialization; never connects to or changes a hypervisor. */
final class CloudSetup
@ -20,6 +21,7 @@ final class CloudSetup
if (!$connection->getSchemaBuilder()->hasTable('user') || !$connection->getSchemaBuilder()->hasTable('shop')) {
throw new \RuntimeException('请先在全新业务数据库导入 web/sql/ss.sql');
}
AnnouncementSchema::upgrade($connection);
self::retireLegacyBought($connection);
$connection->unprepared(self::schema('cloud.sql'));
$column = $connection->selectOne(

@ -2,137 +2,114 @@
namespace App\Controllers\Admin;
use App\Models\Ann;
use App\Controllers\AdminController;
use App\Services\AdminPermission;
use App\Utils\SafeDatatables as Datatables;
use App\Utils\DatatablesHelper;
use App\Services\AnnouncementService;
use App\Services\Cloud\CloudAccess;
use App\Services\Cloud\CloudError;
class AnnController extends AdminController
{
public function index($request, $response, $args)
{
$table_config['total_column'] = array("op" => "操作", "id" => "ID",
"date" => "日期", "content" => "内容");
$table_config['default_show_column'] = array("op", "id",
"date", "content");
$table_config['ajax_url'] = 'announcement/ajax';
return $this->view()->assign('table_config', $table_config)->display('admin/announcement/index.tpl');
try {
$actor = CloudAccess::actor(false);
AnnouncementService::authorize($actor);
} catch (CloudError $exception) {
return $response->withStatus($exception->httpStatus)->withHeader('Cache-Control', 'private, no-store');
}
$page = null;
$error = '';
$status = 200;
try {
$page = AnnouncementService::page($actor, $request->getQueryParams());
} catch (CloudError $exception) {
$error = $exception->getMessage();
$status = $exception->httpStatus;
} catch (\Throwable $exception) {
error_log('Announcement list failed: ' . get_class($exception));
$error = '公告暂时无法读取,请确认已执行 cloudInit 后重试。';
$status = 503;
}
return $this->render($response, 'admin/announcement/index.tpl', [
'announcements_page' => $page, 'announcements_error' => $error,
'announcement_can_manage' => (bool) ($actor['is_super_admin'] && $actor['can_manage']),
], $status);
}
public function create($request, $response, $args)
{
return $this->view()->display('admin/announcement/create.tpl');
try {
AnnouncementService::authorize(CloudAccess::actor(false), true);
} catch (CloudError $exception) {
return $response->withStatus($exception->httpStatus)->withHeader('Cache-Control', 'private, no-store');
}
return $this->render($response, 'admin/announcement/create.tpl', [
'announcement' => ['id' => '', 'title' => '', 'type' => 'notice', 'type_label' => '通知',
'body' => '', 'status' => 'published', 'published_at' => null, 'updated_at' => ''],
'announcement_can_manage' => true,
]);
}
public function add($request, $response, $args)
{
if (AdminPermission::isSuperAdmin()) {
$ann = new Ann();
$ann->date = date("Y-m-d H:i:s");
$ann->content = $request->getParam('content');
$ann->markdown = $request->getParam('markdown');
if (!$ann->save()) {
$rs['ret'] = 0;
$rs['msg'] = "添加失败";
return $response->getBody()->write(json_encode($rs));
}
$rs['ret'] = 1;
$rs['msg'] = "公告添加成功";
return $response->getBody()->write(json_encode($rs));
} else {
$rs['ret'] = 0;
$rs['msg'] = "你没有添加公告权限";
return $response->getBody()->write(json_encode($rs));
}
return $this->write($request, $response, null, false);
}
public function edit($request, $response, $args)
{
$id = $args['id'];
$ann = Ann::find($id);
if ($ann == null) {
try {
$actor = CloudAccess::actor(false);
AnnouncementService::authorize($actor, true);
$announcement = AnnouncementService::detail($actor, (string) ($args['id'] ?? ''));
} catch (CloudError $exception) {
return $response->withStatus($exception->httpStatus)->withHeader('Cache-Control', 'private, no-store');
} catch (\Throwable $exception) {
error_log('Announcement detail failed: ' . get_class($exception));
return $response->withStatus(503)->withHeader('Cache-Control', 'private, no-store');
}
return $this->view()->assign('ann', $ann)->display('admin/announcement/edit.tpl');
return $this->render($response, 'admin/announcement/edit.tpl', [
'announcement' => $announcement, 'announcement_can_manage' => true,
]);
}
public function update($request, $response, $args)
{
if (AdminPermission::isSuperAdmin()) {
$id = $args['id'];
$ann = Ann::find($id);
$ann->content = $request->getParam('content');
$ann->markdown = $request->getParam('markdown');
$ann->date = date("Y-m-d H:i:s");
if (!$ann->save()) {
$rs['ret'] = 0;
$rs['msg'] = "修改失败";
return $response->getBody()->write(json_encode($rs));
}
$rs['ret'] = 1;
$rs['msg'] = "修改成功";
return $response->getBody()->write(json_encode($rs));
} else {
$rs['ret'] = 0;
$rs['msg'] = "你没有修改公告权限";
return $response->getBody()->write(json_encode($rs));
}
return $this->write($request, $response, (string) ($args['id'] ?? ''), false);
}
public function delete($request, $response, $args)
public function status($request, $response, $args)
{
if (AdminPermission::isSuperAdmin()) {
$id = $request->getParam('id');
$ann = Ann::find($id);
if (!$ann->delete()) {
$rs['ret'] = 0;
$rs['msg'] = "删除失败";
return $response->getBody()->write(json_encode($rs));
}
$rs['ret'] = 1;
$rs['msg'] = "删除成功";
return $response->getBody()->write(json_encode($rs));
} else {
$rs['ret'] = 0;
$rs['msg'] = "你没有删除公告权限";
return $response->getBody()->write(json_encode($rs));
}
return $this->write($request, $response, (string) ($args['id'] ?? ''), true);
}
public function ajax($request, $response, $args)
private function write($request, $response, ?string $id, bool $statusOnly)
{
$datatables = new Datatables(new DatatablesHelper());
$datatables->query('Select id as op,id,date,content from announcement');
$datatables->edit('op', function ($data) {
if (!AdminPermission::isSuperAdmin()) {
return '<span class="text-muted">只读</span>';
try {
$actor = CloudAccess::actor(false);
AnnouncementService::authorize($actor, true);
$input = $request->getParsedBody();
if (!is_array($input)) {
throw new CloudError('公告请求格式不正确', 400);
}
return '<a class="btn btn-brand" href="/admin/announcement/'.$data['id'].'/edit">编辑</a>
<a class="btn btn-brand-accent" id="delete" value="'.$data['id'].'" href="javascript:void(0);" onClick="delete_modal_show(\''.$data['id'].'\')">删除</a>';
});
$datatables->edit('DT_RowId', function ($data) {
return 'row_1_'.$data['id'];
});
$announcement = $statusOnly
? AnnouncementService::setStatus($actor, $id, $input)
: AnnouncementService::save($actor, $input, $id);
$message = $statusOnly ? ($announcement['status'] === 'published' ? '公告已发布' : '公告已撤下') : '公告已保存';
return $response->withJson(['ret' => 1, 'msg' => $message, 'announcement' => $announcement])
->withHeader('Cache-Control', 'private, no-store');
} catch (CloudError $exception) {
return $response->withJson(['ret' => 0, 'msg' => $exception->getMessage()], $exception->httpStatus)
->withHeader('Cache-Control', 'private, no-store');
} catch (\Throwable $exception) {
error_log('Announcement write failed: ' . get_class($exception));
return $response->withJson(['ret' => 0, 'msg' => '公告保存失败,请稍后重试。'], 500)
->withHeader('Cache-Control', 'private, no-store');
}
}
$body = $response->getBody();
$body->write($datatables->generate());
private function render($response, string $template, array $data, int $status = 200)
{
$response->getBody()->write($this->view()->assign($data)->fetch($template));
return $response->withStatus($status)->withHeader('Cache-Control', 'private, no-store');
}
}

@ -0,0 +1,17 @@
<?php
namespace App\Controllers;
use App\Services\AnnouncementService;
use App\Services\Cloud\CloudAccess;
/** Authenticated database-only notice feed; no engine session is needed. */
final class AnnouncementController
{
public function index($request, $response)
{
return $response->withJson(AnnouncementService::published(
$request->getAttribute('cloud_actor') ?? CloudAccess::actor(false), $request->getQueryParams()
))->withHeader('Cache-Control', 'private, no-store');
}
}

@ -4,7 +4,6 @@ namespace App\Controllers;
use App\Services\Auth;
use App\Models\InviteCode;
use App\Models\Ann;
use App\Models\Shop;
use App\Models\Coupon;
use App\Models\CloudInvoice;
@ -304,22 +303,6 @@ class UserController extends BaseController
}
}
public function announcement($request, $response, $args)
{
$twoMonthsAgo = date('Y-m-d H:i:s', strtotime('-2 months'));
$Anns = Ann::where('date', '>=', $twoMonthsAgo)
->orderBy('date', 'desc')
->get();
return $this->view()
->assign("anns", $Anns)
->assign("latestAnn", $Anns->first())
->assign("cdn", $this->cdn)
->assign("backup_cdn", $this->backup_cdn)
->display('user/announcement.tpl');
}
public function edit($request, $response, $args)
{
$enabled = $this->hasGoogleAuthenticator($this->user);

@ -20,6 +20,7 @@ final class CloudApi
|| preg_match('#^/api/v1/admin/instances(?:/|$)#D', $path) === 1
|| preg_match('#^/api/v1/admin/operations(?:/|$)#D', $path) === 1
|| preg_match('#^/api/v1/ssh-keys(?:/|$)#D', $path) === 1
|| $path === '/api/v1/announcements'
|| $path === '/api/v1/vms/page';
$actor = CloudAccess::actor(!$databaseOnly);
if (AdminCsrf::requiresProtection($request->getMethod())) {

@ -33,7 +33,7 @@ class SuperAdmin
$response->getBody()->write($payload);
return $response
->withStatus(419)
->withStatus(419, 'Authentication Timeout')
->withHeader('Content-Type', 'application/json; charset=utf-8');
}

@ -2,12 +2,6 @@
namespace App\Models;
/**
* Ann Model
*/
use App\Utils\Tools;
class Ann extends Model
{
protected $connection = "default";

@ -0,0 +1,55 @@
<?php
namespace App\Services;
/** Explicit cloudInit migration only. Never called by HTTP request handlers. */
final class AnnouncementSchema
{
public static function upgrade($connection): void
{
$schema = $connection->getSchemaBuilder();
if (!$schema->hasTable('announcement')) {
throw new \RuntimeException('缺少 announcement 表,请先导入 web/sql/ss.sql');
}
$legacy = array_values(array_filter(['date', 'content', 'markdown'],
static fn (string $column): bool => $schema->hasColumn('announcement', $column)));
// Check before any DDL: this rollout only retires an EMPTY legacy table.
if ($legacy !== [] && $connection->table('announcement')->exists()) {
throw new \RuntimeException('旧公告表仍有数据,已停止升级且未修改公告表;请先备份并明确处理旧公告后重试');
}
$mysql = $connection->getDriverName() === 'mysql';
$columns = ['title', 'type', 'status', 'body', 'published_at', 'updated_at'];
foreach ($columns as $column) {
if ($schema->hasColumn('announcement', $column)) {
continue;
}
$schema->table('announcement', static function ($table) use ($column, $mysql): void {
if ($column === 'title') {
$field = $table->string('title', 120)->default('');
if ($mysql) $field->charset('utf8mb4')->collation('utf8mb4_unicode_ci');
} elseif ($column === 'type') {
$table->string('type', 20)->default('notice');
} elseif ($column === 'status') {
$table->string('status', 20)->default('withdrawn');
} elseif ($column === 'body') {
$field = $table->longText('body');
if ($mysql) $field->charset('utf8mb4')->collation('utf8mb4_unicode_ci');
} elseif ($column === 'published_at') {
$table->dateTime($column)->nullable();
} else {
$table->dateTime($column);
}
});
}
if (!$schema->hasIndex('announcement', 'announcement_published')) {
$schema->table('announcement', static function ($table): void {
$table->index(['status', 'published_at', 'id'], 'announcement_published');
});
}
if ($legacy !== []) {
$schema->table('announcement', static function ($table) use ($legacy): void {
$table->dropColumn($legacy);
});
}
}
}

@ -0,0 +1,199 @@
<?php
namespace App\Services;
use App\Models\Ann;
use App\Services\Cloud\CloudError;
/** Plain-text publication; only explicit status actions publish existing records. */
final class AnnouncementService
{
private const TYPES = ['notice' => '通知', 'maintenance' => '维护', 'incident' => '故障'];
private const COLUMNS = ['id', 'title', 'type', 'body', 'status', 'published_at', 'updated_at'];
public static function page(array $actor, array $input = []): array
{
self::authorize($actor);
$filters = self::filters($input, true);
$query = Ann::query();
if ($filters['type'] !== 'all') {
$query->where('type', $filters['type']);
}
if ($filters['status'] !== 'all') {
$query->where('status', $filters['status']);
}
if ($filters['q'] !== '') {
$pattern = '%' . str_replace(['!', '%', '_'], ['!!', '!%', '!_'], $filters['q']) . '%';
$query->where(static function ($query) use ($pattern): void {
$query->whereRaw("title LIKE ? ESCAPE '!'", [$pattern])
->orWhereRaw("body LIKE ? ESCAPE '!'", [$pattern]);
});
}
return self::listing($query, $filters) + ['filters' => $filters];
}
public static function published(array $actor, array $input = []): array
{
self::authorize($actor, false, false);
$filters = self::filters($input, false);
return self::listing(Ann::query()->where('status', 'published'), $filters);
}
public static function detail(array $actor, string $id): array
{
self::authorize($actor);
return self::dto(self::find($id));
}
public static function save(array $actor, array $input, ?string $id = null): array
{
self::authorize($actor, true);
$values = self::validate($input);
return (new Ann())->getConnection()->transaction(static function () use ($id, $values): array {
$ann = $id === null ? new Ann() : self::find($id, true);
$now = date('Y-m-d H:i:s');
if ($id === null) {
$ann->published_at = null;
} else {
// A stale editor must not republish an announcement withdrawn by
// another administrator. Existing status changes are explicit.
$values['status'] = (string) $ann->status;
}
if ($values['status'] === 'published' && ($id === null || $ann->status !== 'published')) {
$ann->published_at = $now;
}
foreach ($values as $field => $value) {
$ann->$field = $value;
}
$ann->updated_at = $now;
$ann->save();
return self::dto($ann);
});
}
public static function setStatus(array $actor, string $id, array $input): array
{
self::authorize($actor, true);
$status = self::choice($input, 'status', ['published', 'withdrawn']);
return (new Ann())->getConnection()->transaction(static function () use ($id, $status): array {
$ann = self::find($id, true);
if ($ann->status !== $status) {
if ($status === 'published' && (trim((string) $ann->title) === '' || trim((string) $ann->body) === '')) {
throw new CloudError('请先填写公告标题和正文', 400);
}
$ann->status = $status;
$ann->updated_at = date('Y-m-d H:i:s');
if ($status === 'published') {
$ann->published_at = $ann->updated_at;
}
$ann->save();
}
return self::dto($ann);
});
}
public static function authorize(array $actor, bool $write = false, bool $admin = true): void
{
if ((int) ($actor['user_id'] ?? 0) < 1) {
throw new CloudError('请先登录', 401);
}
if (($admin && !($actor['is_admin'] ?? false))
|| ($write && (!($actor['is_super_admin'] ?? false) || !($actor['can_manage'] ?? false)))) {
throw new CloudError($write ? '只有超级管理员可以管理公告' : '需要管理员权限', 403);
}
}
private static function listing($query, array &$filters): array
{
$total = (clone $query)->count();
$totalPages = max(1, (int) ceil($total / $filters['per_page']));
$filters['page'] = min($filters['page'], $totalPages);
$items = $query->orderByDesc('published_at')->orderByDesc('id')
->offset(($filters['page'] - 1) * $filters['per_page'])->limit($filters['per_page'])
->get(self::COLUMNS)->map(static fn ($row): array => self::dto($row))->all();
return ['items' => $items, 'pagination' => ['page' => $filters['page'], 'per_page' => $filters['per_page'],
'total' => $total, 'total_pages' => $totalPages], 'generated_at' => time()];
}
private static function filters(array $input, bool $admin): array
{
$page = self::integer($input['page'] ?? 1, '页码', 1, 1000000);
$perPage = self::integer($input['per_page'] ?? ($admin ? 20 : 10), '每页条数', 1, 100);
if (!in_array($perPage, $admin ? [20, 50, 100] : [10, 20, 50], true)) {
throw new CloudError('每页条数不受支持', 400);
}
if (!$admin) {
return ['page' => $page, 'per_page' => $perPage];
}
return ['q' => self::text($input['q'] ?? '', '关键词', 80, false),
'type' => self::choice($input, 'type', ['all', 'notice', 'maintenance', 'incident'], 'all'),
'status' => self::choice($input, 'status', ['all', 'published', 'withdrawn'], 'all'),
'page' => $page, 'per_page' => $perPage];
}
private static function validate(array $input): array
{
return ['title' => self::text($input['title'] ?? null, '标题', 120),
'type' => self::choice($input, 'type', array_keys(self::TYPES)),
'body' => self::text($input['body'] ?? null, '正文', 20000),
'status' => self::choice($input, 'status', ['published', 'withdrawn'])];
}
private static function text($value, string $label, int $limit, bool $required = true): string
{
if (!is_string($value) || !mb_check_encoding($value, 'UTF-8')
|| preg_match('/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/', $value)) {
throw new CloudError($label . '格式不正确', 400);
}
$value = trim(str_replace(["\r\n", "\r"], "\n", $value));
if (($required && $value === '') || mb_strlen($value, 'UTF-8') > $limit
|| ($label === '标题' && str_contains($value, "\n"))) {
throw new CloudError($label . '不能为空且最多 ' . $limit . ' 个字符', 400);
}
return $value;
}
private static function choice(array $input, string $key, array $allowed, ?string $default = null): string
{
$value = $input[$key] ?? $default;
if (!is_string($value) || !in_array($value, $allowed, true)) {
throw new CloudError('公告' . ($key === 'type' ? '类型' : '状态') . '不正确', 400);
}
return $value;
}
private static function integer($value, string $label, int $min, int $max): int
{
if ((!is_int($value) && !is_string($value)) || !preg_match('/^[0-9]+$/D', (string) $value)
|| strlen((string) $value) > 9 || (int) $value < $min || (int) $value > $max) {
throw new CloudError($label . '不正确', 400);
}
return (int) $value;
}
private static function find(string $id, bool $lock = false): Ann
{
if (!preg_match('/^[1-9][0-9]{0,9}$/D', $id) || (int) $id > 2147483647) {
throw new CloudError('公告编号不正确', 400);
}
$query = Ann::query()->where('id', $id);
if ($lock) {
$query->lockForUpdate();
}
$ann = $query->first(self::COLUMNS);
if ($ann === null) {
throw new CloudError('公告不存在', 404);
}
return $ann;
}
private static function dto(Ann $ann): array
{
$type = (string) $ann->type;
return ['id' => (string) $ann->id, 'title' => (string) $ann->title,
'type' => $type, 'type_label' => self::TYPES[$type] ?? '通知', 'body' => (string) $ann->body,
'status' => (string) $ann->status,
'published_at' => $ann->published_at === null ? null : (string) $ann->published_at,
'updated_at' => (string) $ann->updated_at];
}
}

@ -100,7 +100,6 @@ $app->group('/user', function () {
$this->get('/cloud/ssh-keys', 'App\Controllers\CloudPageController:sshKeys');
$this->get('/cloud/invoices', 'App\Controllers\CloudPageController:invoices');
$this->get('/cloud/invoices/{id:[0-9]+}', 'App\Controllers\CloudPageController:invoiceDetail');
$this->get('/announcement', 'App\Controllers\UserController:announcement');
$this->get('/invite', 'App\Controllers\UserController:invite');
$this->get('/shop', 'App\Controllers\CloudPageController:legacyShop');
$this->post('/coupon_check', 'App\Controllers\UserController:CouponCheck');
@ -196,8 +195,7 @@ $app->group('/admin', function () {
$this->post('/announcement', 'App\Controllers\Admin\AnnController:add')->add(new SuperAdmin());
$this->get('/announcement/{id}/edit', 'App\Controllers\Admin\AnnController:edit')->add(new SuperAdmin());
$this->put('/announcement/{id}', 'App\Controllers\Admin\AnnController:update')->add(new SuperAdmin());
$this->delete('/announcement', 'App\Controllers\Admin\AnnController:delete')->add(new SuperAdmin());
$this->post('/announcement/ajax', 'App\Controllers\Admin\AnnController:ajax');
$this->post('/announcement/{id}/status', 'App\Controllers\Admin\AnnController:status')->add(new SuperAdmin());
// Survey Manage
$this->get('/survey', 'App\Controllers\Admin\SurveyController:index');

@ -3,6 +3,7 @@
$app->get('/api/v1/session', 'App\Controllers\CloudApiController:session');
$app->post('/api/internal/cloud/session-introspection', 'App\Controllers\CloudInternalController:introspection');
$app->group('/api/v1', function () {
$this->get('/announcements', 'App\Controllers\AnnouncementController:index');
$this->get('/plans', 'App\Controllers\CloudApiController:plans');
$this->map(['GET', 'POST'], '/orders', 'App\Controllers\CloudApiController:orders');
$this->get('/orders/by-request/{key:[A-Za-z0-9_.-]+}',

@ -185,9 +185,9 @@ body.vu-body .vu-theme-toggle:hover {
}
/* Cards, summaries and responsive grids */
body.vu-body :where(.vu-card, .vu-hero-main, .vu-announcement-hero-main,
body.vu-body :where(.vu-card, .vu-hero-main,
.vu-edit-hero-main, .vu-invite-hero-main, .vu-pay-hero-main,
.vu-profile-hero-main, .vu-support-hero-main, .vu-announcement-summary,
.vu-profile-hero-main, .vu-support-hero-main,
.vu-edit-summary, .vu-support-summary, .vu-stat, .vu-pay-balance,
.vu-profile-account, .vu-invite-balance) {
min-width: 0;
@ -199,7 +199,7 @@ body.vu-body :where(.vu-card, .vu-hero-main, .vu-announcement-hero-main,
box-shadow: var(--vu-shadow);
}
body.vu-body :where(.vu-hero, .vu-announcement-hero, .vu-edit-hero,
body.vu-body :where(.vu-hero, .vu-edit-hero,
.vu-invite-hero, .vu-pay-hero, .vu-profile-hero, .vu-support-hero) {
display: grid;
grid-template-columns: minmax(0, 1.75fr) minmax(270px, .8fr);
@ -207,7 +207,7 @@ body.vu-body :where(.vu-hero, .vu-announcement-hero, .vu-edit-hero,
margin-bottom: 22px;
}
body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-main,
body.vu-body :where(.vu-hero-main, .vu-edit-hero-main,
.vu-invite-hero-main, .vu-pay-hero-main, .vu-profile-hero-main,
.vu-support-hero-main) {
position: relative;
@ -216,7 +216,7 @@ body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-mai
background: var(--vu-panel);
}
body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-main,
body.vu-body :where(.vu-hero-main, .vu-edit-hero-main,
.vu-invite-hero-main, .vu-pay-hero-main, .vu-profile-hero-main,
.vu-support-hero-main)::after {
position: absolute;
@ -230,10 +230,10 @@ body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-mai
box-shadow: 0 0 0 34px rgba(21, 157, 169, .045);
pointer-events: none;
}
body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-main,
body.vu-body :where(.vu-hero-main, .vu-edit-hero-main,
.vu-invite-hero-main, .vu-pay-hero-main, .vu-profile-hero-main,
.vu-support-hero-main) > * { position: relative; z-index: 1; }
body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-main,
body.vu-body :where(.vu-hero-main, .vu-edit-hero-main,
.vu-invite-hero-main, .vu-pay-hero-main, .vu-profile-hero-main,
.vu-support-hero-main) h2 {
margin: 17px 0 10px;
@ -241,7 +241,7 @@ body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-mai
line-height: 1.24;
letter-spacing: -.7px;
}
body.vu-body :where(.vu-hero-main, .vu-announcement-hero-main, .vu-edit-hero-main,
body.vu-body :where(.vu-hero-main, .vu-edit-hero-main,
.vu-invite-hero-main, .vu-pay-hero-main, .vu-profile-hero-main,
.vu-support-hero-main) p {
max-width: 720px;
@ -291,7 +291,7 @@ body.vu-body :where(.vu-content-grid, .vu-shop-grid) {
grid-template-columns: repeat(auto-fit, minmax(290px, 1fr));
gap: 20px;
}
body.vu-body :where(.vu-announcement-layout, .vu-edit-layout, .vu-invite-layout,
body.vu-body :where(.vu-edit-layout, .vu-invite-layout,
.vu-pay-layout, .vu-profile-layout, .vu-support-detail-layout,
.vu-support-editor-layout) {
display: grid;
@ -300,7 +300,7 @@ body.vu-body :where(.vu-announcement-layout, .vu-edit-layout, .vu-invite-layout,
gap: 20px;
margin-bottom: 22px;
}
body.vu-body :where(.vu-content-stack, .vu-announcement-list, .vu-announcement-side,
body.vu-body :where(.vu-content-stack,
.vu-edit-main, .vu-edit-side, .vu-invite-main, .vu-invite-side, .vu-pay-main,
.vu-pay-side, .vu-profile-main, .vu-support-thread) { min-width: 0; }
body.vu-body :where(.vu-edit-main, .vu-invite-main, .vu-pay-main, .vu-profile-main) > .vu-card + .vu-card { margin-top: 20px; }
@ -339,12 +339,6 @@ body.vu-body :where(.vu-muted, .vu-form-message, .vu-inline-message, .vu-profile
font-size: 13px;
}
body.vu-body .vu-date { font-weight: 700; }
body.vu-body :where(.vu-ann-content, .vu-announcement-content) {
color: var(--vu-text-soft);
line-height: 1.8;
overflow-wrap: anywhere;
}
/* Forms: checkbox/radio are deliberately excluded from text-input sizing. */
body.vu-body :where(.vu-form, .vu-support-form) { display: grid; gap: 18px; }
body.vu-body :where(.vu-form-row, .vu-form-grid, .vu-invite-wallet-grid) {
@ -1188,9 +1182,9 @@ body.venix-auth .auth-modal-actions {
}
@media (max-width: 900px) {
body.vu-body :where(.vu-hero, .vu-announcement-hero, .vu-edit-hero,
body.vu-body :where(.vu-hero, .vu-edit-hero,
.vu-invite-hero, .vu-pay-hero, .vu-profile-hero, .vu-support-hero),
body.vu-body :where(.vu-announcement-layout, .vu-edit-layout, .vu-invite-layout,
body.vu-body :where(.vu-edit-layout, .vu-invite-layout,
.vu-pay-layout, .vu-profile-layout, .vu-support-detail-layout,
.vu-support-editor-layout) { grid-template-columns: 1fr; }
}
@ -1204,9 +1198,9 @@ body.venix-auth .auth-modal-actions {
}
body.vu-body .vu-top-actions { width: 100%; }
body.vu-body .vu-top-actions > :where(.vu-btn, .vu-theme-toggle) { flex: 1 1 auto; }
body.vu-body :where(.vu-card, .vu-hero-main, .vu-announcement-hero-main,
body.vu-body :where(.vu-card, .vu-hero-main,
.vu-edit-hero-main, .vu-invite-hero-main, .vu-pay-hero-main,
.vu-profile-hero-main, .vu-support-hero-main, .vu-announcement-summary,
.vu-profile-hero-main, .vu-support-hero-main,
.vu-edit-summary, .vu-support-summary, .vu-stat, .vu-pay-balance,
.vu-profile-account, .vu-invite-balance) { padding: 21px; border-radius: 12px; }
body.vu-body :where(.vu-form-row, .vu-form-grid, .vu-invite-wallet-grid,

@ -0,0 +1,194 @@
// User announcements are independent of the VM session and engine bootstrap.
const dialog = document.getElementById('panel-announcements-drawer');
const byId = id => document.getElementById(id);
const state = {
items: [], pagination: null, request: null, serial: 0, loading: false,
stale: false, receivedAt: '', opener: null, scroll: null,
};
function element(tag, className = '', value) {
const node = document.createElement(tag);
node.className = className;
if (value !== undefined) node.textContent = String(value);
return node;
}
function setMessage(message, tone = '') {
const node = byId('panel-announcements-state');
node.textContent = message;
node.className = `panel-announcements-state${tone ? ` is-${tone}` : ''}`;
node.setAttribute('role', tone === 'error' ? 'alert' : 'status');
}
function dateText(value) {
// The API supplies the publication time in the site's timezone. Do not parse
// an unzoned SQL date as UTC or substitute a browser-generated publication time.
return typeof value === 'string' && /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(value) ? value : '时间未记录';
}
function renderItems() {
const list = byId('panel-announcements-list');
list.replaceChildren();
for (const item of state.items) {
const article = element('article', 'panel-announcements-item');
article.dataset.announcementId = String(item.id);
const meta = element('div', 'panel-announcements-meta');
const type = ['notice', 'maintenance', 'incident'].includes(item.type) ? item.type : 'notice';
const fallback = { notice: '通知', maintenance: '维护', incident: '故障' }[type];
meta.append(element('span', `panel-announcements-type is-${type}`, item.type_label || fallback));
const published = element('time', '', `发布于 ${dateText(item.published_at)}`);
if (dateText(item.published_at) !== '时间未记录') published.dateTime = item.published_at.replace(' ', 'T');
meta.append(published);
if (item.updated_at && item.updated_at !== item.published_at) {
meta.append(element('span', '', `更新于 ${dateText(item.updated_at)}`));
}
article.append(meta, element('h3', '', item.title || '站点公告'), element('p', 'panel-announcements-body', item.body ?? ''));
list.append(article);
}
if (!state.items.length) list.append(element('p', 'panel-announcements-empty', '暂无已发布的公告。'));
}
function renderControls() {
byId('panel-announcements-refresh').disabled = state.loading;
const more = byId('panel-announcements-more');
more.hidden = !state.pagination || state.pagination.page >= state.pagination.total_pages;
more.disabled = state.loading || state.stale;
byId('panel-announcements-count').textContent = state.pagination
? `已加载 ${state.items.length} / ${state.pagination.total} 条${state.stale ? '(旧内容)' : ''}` : '';
byId('panel-announcements-list').setAttribute('aria-busy', String(state.loading));
}
async function requestPage(page, controller) {
const timeout = setTimeout(() => controller.abort('timeout'), 15000);
try {
const response = await fetch(`/api/v1/announcements?page=${page}&per_page=10`, {
headers: { Accept: 'application/json' }, credentials: 'same-origin',
cache: 'no-store', signal: controller.signal,
});
if (response.status === 401) throw new Error('登录已过期,请重新登录后查看公告。');
if (response.status === 403) throw new Error('当前账号无法读取公告。');
let payload;
try { payload = await response.json(); }
catch { throw new Error('公告服务返回异常,请稍后重试。'); }
if (!response.ok || payload?.ret === 0) {
throw new Error(typeof payload?.detail === 'string' ? payload.detail : `公告读取失败 (${response.status})。`);
}
const pagination = payload?.pagination;
if (!Array.isArray(payload?.items) || !pagination
|| ![pagination.page, pagination.per_page, pagination.total, pagination.total_pages].every(Number.isInteger)
|| pagination.page < 1 || pagination.per_page !== 10 || pagination.total < 0 || pagination.total_pages < 1) {
throw new Error('公告数据格式无效,请稍后重试。');
}
return payload;
} catch (error) {
if (controller.signal.reason === 'timeout') throw new Error('公告读取超时,请稍后重试。');
throw error;
} finally { clearTimeout(timeout); }
}
async function load(page = 1) {
if (!dialog?.open) return;
if (page !== 1 && (state.loading || state.stale || !state.pagination)) return;
state.request?.abort();
const controller = new AbortController(); state.request = controller;
const serial = ++state.serial;
state.loading = true;
if (page === 1 && state.pagination) state.stale = true;
setMessage(page === 1
? (state.pagination ? `正在刷新;下方暂显示 ${state.receivedAt} 读取的旧内容。` : '正在读取最新公告…')
: '正在加载更多公告…', state.stale ? 'stale' : '');
renderControls();
try {
const payload = await requestPage(page, controller);
if (controller.signal.aborted || serial !== state.serial || !dialog.open) return;
const published = payload.items.filter(item => item && item.status === 'published');
// Offset pagination can repeat an item if a new notice is published between
// requests. Keep one record per ID without changing server publication order.
const replaces = page === 1 || payload.pagination.page === 1;
const combined = replaces ? published : [...state.items, ...published];
const seen = new Set();
state.items = combined.filter(item => {
const id = String(item.id);
if (seen.has(id)) return false;
seen.add(id); return true;
});
state.pagination = payload.pagination; state.stale = false;
state.receivedAt = new Date().toLocaleTimeString('zh-CN', { hour12: false });
renderItems();
setMessage(`读取于 ${state.receivedAt};按发布时间倒序显示。`);
if (replaces) byId('panel-announcements-scroll').scrollTop = 0;
} catch (error) {
if (serial !== state.serial || (controller.signal.aborted && controller.signal.reason !== 'timeout')) return;
state.stale = Boolean(state.pagination);
setMessage(`${error.message}${state.pagination ? ` 下方保留 ${state.receivedAt} 读取的旧内容,请刷新确认最新公告。` : ''}`, 'error');
} finally {
if (serial === state.serial) { state.request = null; state.loading = false; renderControls(); }
}
}
function historyData(changes = {}) {
return { ...(history.state && typeof history.state === 'object' ? history.state : {}), ...changes };
}
function close() {
state.request?.abort(); state.request = null; state.serial += 1; state.loading = false;
if (dialog.open) dialog.close();
document.documentElement.classList.remove('panel-announcements-open');
document.body.style.removeProperty('--panel-announcements-scroll-top');
if (state.scroll) { window.scrollTo({ left: state.scroll.x, top: state.scroll.y, behavior: 'instant' }); state.scroll = null; }
document.querySelectorAll('[data-announcements-open]').forEach(button => button.setAttribute('aria-expanded', 'false'));
if (state.opener?.isConnected) state.opener.focus({ preventScroll: true });
state.opener = null;
if (history.state?.panelAnnouncementsScroll) history.replaceState(historyData({ panelAnnouncementsScroll: undefined }), '', location.href);
renderControls();
}
function open(opener) {
if (dialog.open) return;
state.opener = opener || document.querySelector('[data-announcements-open]');
state.scroll = { x: window.scrollX, y: window.scrollY };
document.body.style.setProperty('--panel-announcements-scroll-top', `${-state.scroll.y}px`);
document.documentElement.classList.add('panel-announcements-open');
dialog.showModal();
byId('panel-announcements-close').focus({ preventScroll: true });
document.querySelectorAll('[data-announcements-open]').forEach(button => button.setAttribute('aria-expanded', 'true'));
// Always refresh page one on reopening: a previously published notice may
// have been withdrawn. Do not treat the old in-memory list as current data.
void load(1);
}
if (dialog) {
document.addEventListener('click', event => {
const trigger = event.target.closest('[data-announcements-open]');
if (!trigger || event.defaultPrevented || event.button !== 0 || event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) return;
event.preventDefault(); open(trigger);
});
byId('panel-announcements-close').addEventListener('click', close);
byId('panel-announcements-refresh').addEventListener('click', () => { void load(1); });
byId('panel-announcements-more').addEventListener('click', () => { void load(state.pagination.page + 1); });
dialog.addEventListener('cancel', event => { event.preventDefault(); close(); });
dialog.addEventListener('click', event => {
if (event.target !== dialog) return;
const rect = dialog.getBoundingClientRect();
if (event.clientX < rect.left || event.clientX > rect.right || event.clientY < rect.top || event.clientY > rect.bottom) close();
});
window.addEventListener('popstate', () => { if (dialog.open) close(); });
window.addEventListener('pagehide', () => {
state.request?.abort(); state.serial += 1; state.loading = false;
if (state.scroll) history.replaceState(historyData({ panelAnnouncementsScroll: state.scroll }), '', location.href);
});
window.addEventListener('pageshow', event => { if (event.persisted && dialog.open) close(); });
const stored = history.state?.panelAnnouncementsScroll;
if (stored && Number.isFinite(stored.x) && Number.isFinite(stored.y)) {
requestAnimationFrame(() => {
window.scrollTo({ left: stored.x, top: stored.y, behavior: 'instant' });
history.replaceState(historyData({ panelAnnouncementsScroll: undefined }), '', location.href);
});
}
const url = new URL(location.href);
if (url.searchParams.get('announcements') === '1') {
url.searchParams.delete('announcements');
history.replaceState(historyData(), '', url);
open();
}
}

@ -28,6 +28,49 @@
.panel-admin-link { margin-bottom: 2px; }
.panel-logout-link:hover { color: #ffc1c8 !important; background: rgba(208, 66, 80, .1) !important; }
.panel-topbar-logout { text-decoration: none; }
/* Announcements share the user shell without loading administrator styles. */
.panel-announcements-close.button { flex: 0 0 44px; width: 44px; height: 44px; min-height: 44px; padding: 0; font-size: 22px; }
.panel-announcements-trigger.button { position: relative; flex: 0 0 30px; width: 30px; height: 30px; min-height: 30px; padding: 0; border: 0; border-radius: 50%; background: transparent; box-shadow: none; color: #597386; font-size: 18px; line-height: 1; }
.panel-announcements-trigger.button:not(:disabled):hover { background: #e9f8f7; color: #118e9a; transform: none; }
.panel-announcements-trigger.button:focus-visible { outline: 2px solid #16a6ad; outline-offset: 2px; }
@media (pointer: coarse) {
/* Keep the icon as compact as the avatar; only the invisible hit area grows. */
.panel-announcements-trigger.button::after { content: ""; position: absolute; inset: -7px; border-radius: 50%; }
}
.panel-announcements-link { display: inline-block; width: fit-content; padding: 0; border: 0; background: transparent; color: #0f8f9a; font: inherit; font-size: 12px; font-weight: 700; text-align: left; cursor: pointer; }
.panel-announcements-link:hover { text-decoration: underline; }
html.panel-announcements-open { overflow: hidden; overscroll-behavior: none; scroll-behavior: auto !important; }
html.panel-announcements-open body { position: fixed; top: var(--panel-announcements-scroll-top, 0px); left: 0; right: 0; width: 100%; overflow: hidden; }
.panel-announcements-drawer { position: fixed; inset: 0 0 0 auto; width: min(540px, 100%); max-width: 100%; height: 100vh; height: 100dvh; max-height: none; margin: 0; padding: 0; border: 0; background: #fff; color: #25384e; box-shadow: -12px 0 48px rgba(19,42,65,.16); overflow: hidden; }
.panel-announcements-drawer[open] { display: flex; flex-direction: column; }
.panel-announcements-drawer::backdrop { background: rgba(16,29,44,.46); }
.panel-announcements-header { display: flex; flex: 0 0 auto; align-items: flex-start; justify-content: space-between; gap: 14px; padding: 22px 24px 18px; border-bottom: 1px solid #e5edf2; }
.panel-announcements-header > div { min-width: 0; }
.panel-announcements-header h2 { margin: 0 0 7px; font-size: 19px; line-height: 1.5; font-weight: 800; }
.panel-announcements-header p { margin: 0; color: #7a8c9d; font-size: 12px; line-height: 1.7; }
.panel-announcements-toolbar { display: flex; flex: 0 0 auto; align-items: flex-start; justify-content: space-between; gap: 12px; padding: 14px 24px; border-bottom: 1px solid #e5edf2; background: #f8fbfc; }
.panel-announcements-toolbar .button { flex: 0 0 auto; min-height: 44px; }
.panel-announcements-state { margin: 0; color: #647d90; font-size: 12px; line-height: 1.8; overflow-wrap: anywhere; }
.panel-announcements-state.is-stale { color: #91601e; }
.panel-announcements-state.is-error { color: #ba4350; }
.panel-announcements-scroll { min-height: 0; flex: 1 1 auto; overflow-y: auto; overscroll-behavior-y: contain; padding: 0 24px max(20px, env(safe-area-inset-bottom)); }
.panel-announcements-item { padding: 22px 0; border-bottom: 1px solid #e5edf2; }
.panel-announcements-item h3 { margin: 9px 0 8px; color: #2b4358; font-size: 16px; font-weight: 800; line-height: 1.6; overflow-wrap: anywhere; }
.panel-announcements-meta { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; color: #8495a4; font-size: 11px; line-height: 1.7; }
.panel-announcements-type { display: inline-flex; align-items: center; padding: 2px 8px; border-radius: 5px; background: #e8f7f7; color: #148c98; font-size: 11px; font-weight: 700; }
.panel-announcements-type.is-maintenance { background: #fff4e5; color: #946421; }
.panel-announcements-type.is-incident { background: #fff0f1; color: #b94b57; }
.panel-announcements-body { margin: 12px 0 0; white-space: pre-wrap; overflow-wrap: anywhere; color: #4d6375; font-size: 13px; line-height: 1.9; }
.panel-announcements-empty { padding: 32px 0; margin: 0; color: #8495a4; font-size: 13px; text-align: center; }
.panel-announcements-pagination { display: grid; justify-items: center; gap: 10px; padding-top: 20px; }
.panel-announcements-pagination p { margin: 0; color: #8495a4; font-size: 12px; }
.panel-announcements-pagination .button { min-height: 44px; }
@media (max-width: 600px) {
.panel-announcements-drawer { width: 100%; }
.panel-announcements-header { padding: 18px 16px 16px; }
.panel-announcements-toolbar { padding: 12px 16px; }
.panel-announcements-scroll { padding-inline: 16px; }
}
.admin-menu-options { max-height: min(70vh, 520px); overflow-y: auto; }
.admin-menu-options a { min-height: 34px; display: flex; align-items: center; padding: 7px 10px; border-radius: 7px; color: #536b7e; font-size: 12px; font-weight: 700; text-decoration: none; }
.admin-menu-options a:hover { background: #edf6f6; color: #117f88; }

@ -1021,6 +1021,12 @@ html.admin-instance-detail-open body {
background: #c81e28;
}
.admin-ann-body {
white-space: pre-wrap;
overflow-wrap: anywhere;
font: inherit;
}
#editormd.admin-editor,
#editormd.admin-editor.editormd,
.admin-editor .editormd {

@ -0,0 +1,172 @@
(function () {
'use strict';
var root = document.querySelector('[data-admin-announcements]');
if (!root) return;
var canManage = window.ADMIN_CAN_MANAGE === true && root.dataset.annCanManage === '1';
var form = document.getElementById('announcement-form');
var feedback = document.getElementById('announcement-feedback');
var busy = false;
var unconfirmed = false;
var controller = null;
var leaving = false;
function inform(message, state) {
if (!feedback) return;
feedback.textContent = message;
feedback.className = 'admin-config-status' + (state ? ' is-' + state : '');
}
function controls() {
var locked = !canManage || busy || unconfirmed;
root.querySelectorAll('[data-ann-write], [data-ann-status-button]').forEach(function (button) {
button.disabled = locked;
});
if (form) {
form.elements.namedItem('title').readOnly = locked;
form.elements.namedItem('body').readOnly = locked;
form.elements.namedItem('type').disabled = locked;
}
}
function formValue() {
if (!form) return '';
return JSON.stringify(['title', 'type', 'body'].map(function (name) {
return form.elements.namedItem(name).value;
}));
}
var savedValue = formValue();
function countCharacters() {
root.querySelectorAll('[data-ann-counter]').forEach(function (field) {
var counter = document.getElementById(field.dataset.annCounter);
if (counter) counter.textContent = field.value.length + ' / ' + field.maxLength + ' 字';
});
}
function uncertainResult() {
unconfirmed = true;
inform('请求结果未确认,请刷新页面核对后再操作;不要重复提交。', 'error');
}
async function write(url, method, payload) {
// admin-csrf.js adds the existing X-Admin-CSRF-Token header.
controller = new AbortController();
var timeout = window.setTimeout(function () { controller.abort(); }, 30000);
try {
var response = await window.fetch(url, {
method: method,
credentials: 'same-origin',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'X-Requested-With': 'XMLHttpRequest'
},
body: payload,
signal: controller.signal
});
var result = await response.json();
if (!response.ok || !result || result.ret !== 1) {
if (response.status >= 500 || !result || result.ret !== 0) {
uncertainResult();
} else {
inform(typeof result.msg === 'string' ? result.msg : '操作未完成,请检查输入与权限。', 'error');
}
return null;
}
if (!result.announcement || !/^[1-9][0-9]*$/.test(String(result.announcement.id))
|| ['published', 'withdrawn'].indexOf(result.announcement.status) === -1) {
uncertainResult();
return null;
}
return result;
} catch (error) {
uncertainResult();
return null;
} finally {
window.clearTimeout(timeout);
controller = null;
}
}
if (form) {
form.addEventListener('input', function () {
countCharacters();
if (canManage && !busy && !unconfirmed) inform(formValue() === savedValue ? '尚未修改' : '有未保存的修改');
});
form.addEventListener('change', function () {
if (canManage && !busy && !unconfirmed) inform(formValue() === savedValue ? '尚未修改' : '有未保存的修改');
});
form.addEventListener('submit', async function (event) {
event.preventDefault();
if (!canManage || busy || unconfirmed || !form.reportValidity()) return;
var title = form.elements.namedItem('title').value;
var body = form.elements.namedItem('body').value;
if (!title.trim() || !body.trim()) {
inform('标题和正文不能为空或只有空格。', 'error');
return;
}
var payload = new URLSearchParams();
payload.set('title', title);
payload.set('type', form.elements.namedItem('type').value);
payload.set('body', body);
payload.set('status', form.elements.namedItem('status').value);
busy = true;
controls();
inform('正在保存…');
var result = await write(form.getAttribute('action'), form.dataset.method, payload);
if (result && !leaving) {
savedValue = formValue();
inform(result.msg || '公告已保存', 'success');
window.location.assign('/admin/announcement');
return;
}
busy = false;
controls();
});
}
root.addEventListener('click', async function (event) {
var button = event.target.closest('[data-ann-status-button]');
if (!button || !root.contains(button)) return;
event.preventDefault();
if (!canManage || busy || unconfirmed || button.disabled) return;
var id = button.dataset.annId;
var next = button.dataset.annNextStatus;
if (!/^[1-9][0-9]*$/.test(id) || ['published', 'withdrawn'].indexOf(next) === -1) return;
if (form && formValue() !== savedValue) {
inform('请先保存修改,再发布或撤下公告。', 'error');
return;
}
var prompt = next === 'published' ? '确认发布此公告?发布后用户可见。'
: '确认撤下此公告?用户将不再看到它,后台仍保留内容。';
if (!window.confirm(prompt)) return;
busy = true;
controls();
inform(next === 'published' ? '正在发布…' : '正在撤下…');
var payload = new URLSearchParams();
payload.set('status', next);
var result = await write('/admin/announcement/' + id + '/status', 'POST', payload);
if (result && !leaving) {
inform(result.msg || '公告状态已更新', 'success');
window.location.reload();
return;
}
busy = false;
controls();
});
window.addEventListener('pagehide', function () {
leaving = true;
if (controller) controller.abort();
});
window.addEventListener('pageshow', function (event) {
leaving = false;
if (event.persisted && busy) uncertainResult();
controls();
countCharacters();
});
countCharacters();
controls();
})();

@ -1,116 +1,6 @@
{assign var=admin_title value='添加公告'}
{assign var=admin_title value='发布公告'}
{assign var=admin_active value='announcement'}
{assign var=admin_extra_css value='<link rel="stylesheet" href="/theme/venix/editor/css/editormd.min.css" />'}
{assign var=announcement_mode value='create'}
{include file='admin/static_header.tpl'}
<div class="py-3 d-flex align-items-sm-center flex-sm-row flex-column">
<div class="flex-grow-1">
<h4 class="fs-20 fw-semibold mb-1">添加公告</h4>
<p class="text-muted mb-0">使用 Markdown 编写公告,提交后会同步通知。</p>
</div>
<div class="text-sm-end mt-3 mt-sm-0">
<a class="btn btn-light" href="/admin/announcement"><i class="mdi mdi-arrow-left me-1"></i>返回列表</a>
</div>
</div>
<div class="card">
<div class="card-header">
<h5 class="card-title mb-0">公告内容</h5>
</div>
<div class="card-body">
<div id="editormd" class="admin-editor">
<textarea style="display:none;" id="content"></textarea>
</div>
<div class="admin-form-actions">
<button id="submit" type="button" class="btn btn-primary">
<i class="mdi mdi-content-save-outline me-1"></i>添加公告
</button>
<a class="btn btn-light" href="/admin/announcement">取消</a>
</div>
</div>
</div>
<div class="admin-toast" id="annToast"></div>
<script src="/theme/venix/js/jquery.js?v={$venix_asset_version}"></script>
<script>
window.__venixDefine = window.define;
window.define = undefined;
</script>
<script src="/theme/venix/editor/editormd.min.js?v={$venix_asset_version}"></script>
<script>
window.define = window.__venixDefine;
</script>
{literal}
<script>
(function () {
var editor = null;
var submit = document.getElementById('submit');
var toast = document.getElementById('annToast');
function showToast(text, type) {
toast.textContent = text;
toast.className = 'admin-toast is-show ' + (type || '');
window.setTimeout(function () {
toast.className = 'admin-toast';
}, 2200);
}
function initEditor() {
if (!window.jQuery || !window.editormd) {
showToast('编辑器资源加载失败,请刷新页面', 'is-error');
return;
}
editor = editormd('editormd', {
path: '/theme/venix/editor/lib/',
width: '100%',
height: 720,
saveHTMLToTextarea: true
});
}
$(function () {
initEditor();
$('#submit').on('click', function () {
if (!editor || typeof editor.getHTML !== 'function' || typeof editor.getMarkdown !== 'function') {
showToast('编辑器未加载完成,请稍后再试', 'is-error');
return;
}
submit.disabled = true;
$.ajax({
type: 'POST',
url: '/admin/announcement',
dataType: 'json',
data: {
content: editor.getHTML(),
markdown: editor.getMarkdown()
},
success: function (data) {
showToast(data.msg || '操作完成', data.ret ? 'is-success' : 'is-error');
if (data.ret) {
window.setTimeout(function () {
location.href = '/admin/announcement';
}, 800);
}
},
error: function (jqXHR) {
showToast('发生错误:' + jqXHR.status, 'is-error');
},
complete: function () {
submit.disabled = false;
}
});
});
});
window.addEventListener('pageshow', function () {
submit.disabled = false;
});
})();
</script>
{/literal}
{include file='admin/announcement/form.tpl'}
{include file='admin/static_footer.tpl'}

@ -1,117 +1,6 @@
{assign var=admin_title value='编辑公告'}
{assign var=admin_active value='announcement'}
{assign var=admin_extra_css value='<link rel="stylesheet" href="/theme/venix/editor/css/editormd.min.css" />'}
{assign var=announcement_mode value='edit'}
{include file='admin/static_header.tpl'}
<div class="py-3 d-flex align-items-sm-center flex-sm-row flex-column">
<div class="flex-grow-1">
<h4 class="fs-20 fw-semibold mb-1">编辑公告 #{$ann->id}</h4>
<p class="text-muted mb-0">修改公告后会重新推送更新通知。</p>
</div>
<div class="text-sm-end mt-3 mt-sm-0">
<a class="btn btn-light" href="/admin/announcement"><i class="mdi mdi-arrow-left me-1"></i>返回列表</a>
</div>
</div>
<div class="card">
<div class="card-header">
<h5 class="card-title mb-0">公告内容</h5>
</div>
<div class="card-body">
<div id="editormd" class="admin-editor">
<textarea style="display:none;" id="content">{$ann->markdown|escape:'html'}</textarea>
</div>
<div class="admin-form-actions">
<button id="submit" type="button" class="btn btn-primary">
<i class="mdi mdi-content-save-outline me-1"></i>保存修改
</button>
<a class="btn btn-light" href="/admin/announcement">取消</a>
</div>
</div>
</div>
<div class="admin-toast" id="annToast"></div>
<script src="/theme/venix/js/jquery.js?v={$venix_asset_version}"></script>
<script>
window.__venixDefine = window.define;
window.define = undefined;
</script>
<script src="/theme/venix/editor/editormd.min.js?v={$venix_asset_version}"></script>
<script>
window.define = window.__venixDefine;
var announcementUrl = '/admin/announcement/{$ann->id}';
</script>
{literal}
<script>
(function () {
var editor = null;
var submit = document.getElementById('submit');
var toast = document.getElementById('annToast');
function showToast(text, type) {
toast.textContent = text;
toast.className = 'admin-toast is-show ' + (type || '');
window.setTimeout(function () {
toast.className = 'admin-toast';
}, 2200);
}
function initEditor() {
if (!window.jQuery || !window.editormd) {
showToast('编辑器资源加载失败,请刷新页面', 'is-error');
return;
}
editor = editormd('editormd', {
path: '/theme/venix/editor/lib/',
width: '100%',
height: 720,
saveHTMLToTextarea: true
});
}
$(function () {
initEditor();
$('#submit').on('click', function () {
if (!editor || typeof editor.getHTML !== 'function' || typeof editor.getMarkdown !== 'function') {
showToast('编辑器未加载完成,请稍后再试', 'is-error');
return;
}
submit.disabled = true;
$.ajax({
type: 'PUT',
url: announcementUrl,
dataType: 'json',
data: {
content: editor.getHTML(),
markdown: editor.getMarkdown()
},
success: function (data) {
showToast(data.msg || '操作完成', data.ret ? 'is-success' : 'is-error');
if (data.ret) {
window.setTimeout(function () {
location.href = '/admin/announcement';
}, 800);
}
},
error: function (jqXHR) {
showToast('发生错误:' + jqXHR.status, 'is-error');
},
complete: function () {
submit.disabled = false;
}
});
});
});
window.addEventListener('pageshow', function () {
submit.disabled = false;
});
})();
</script>
{/literal}
{include file='admin/announcement/form.tpl'}
{include file='admin/static_footer.tpl'}

@ -0,0 +1,53 @@
{assign var=ann_can_manage value=$admin_can_manage|default:false}
{if isset($announcement_can_manage) && !$announcement_can_manage}{assign var=ann_can_manage value=false}{/if}
{assign var=ann_is_create value=($announcement_mode == 'create')}
{assign var=ann_types value=['notice'=>'通知','maintenance'=>'维护','incident'=>'故障']}
<main data-admin-announcements data-ann-can-manage="{if $ann_can_manage}1{else}0{/if}">
<div class="py-3 d-flex align-items-xl-center flex-xl-row flex-column gap-3">
<div class="flex-grow-1">
<h1 class="fs-20 fw-semibold mb-1">{if $ann_is_create}发布公告{else}编辑公告{/if}</h1>
<p class="text-muted mb-0">{if $ann_is_create}填写标题与正文,发布后将在用户公告中显示。{else}正文按纯文本显示;保存修改不会改变当前发布状态。{/if}</p>
</div>
<div class="admin-config-actions flex-shrink-0">
<span class="admin-config-status" id="announcement-feedback" role="status" aria-live="polite">{if !$ann_can_manage}只读模式{else}尚未修改{/if}</span>
<a class="btn btn-light" href="/admin/announcement">返回公告列表</a>
{if !$ann_is_create}
<button class="btn btn-light" type="button" data-ann-status-button data-ann-id="{$announcement.id|escape}" data-ann-next-status="{if $announcement.status == 'published'}withdrawn{else}published{/if}" {if !$ann_can_manage}disabled{/if}>{if $announcement.status == 'published'}撤下公告{else}发布公告{/if}</button>
{/if}
<button class="btn btn-primary" id="announcement-submit" type="submit" form="announcement-form" data-ann-write {if !$ann_can_manage}disabled{/if}>{if $ann_is_create}发布公告{else}保存修改{/if}</button>
</div>
</div>
{if !$ann_can_manage}<p class="alert alert-light border">当前为只读模式,仅超级管理员可以发布、修改或撤下公告。</p>{/if}
<form class="card" id="announcement-form" method="post" action="/admin/announcement{if !$ann_is_create}/{$announcement.id|escape}{/if}" data-method="{if $ann_is_create}POST{else}PUT{/if}" data-ann-id="{if !$ann_is_create}{$announcement.id|escape}{/if}">
<div class="card-body">
{if !$ann_is_create}
<div class="d-flex flex-wrap align-items-center gap-3 mb-4 text-muted fs-13">
<span>公告 #{$announcement.id|escape}</span>
<span class="badge {if $announcement.status == 'published'}text-bg-success{else}text-bg-light{/if}" id="announcement-current-status">{if $announcement.status == 'published'}已发布{else}已撤下{/if}</span>
<span>发布时间:<span id="announcement-published-at">{$announcement.published_at|default:'未发布'|escape}</span></span>
<span>最近更新:<span id="announcement-updated-at">{$announcement.updated_at|default:'—'|escape}</span></span>
</div>
{/if}
<input type="hidden" name="status" id="announcement-status" value="{if $ann_is_create}published{else}{$announcement.status|escape}{/if}">
<div class="row g-3">
<div class="col-md-8">
<div class="d-flex align-items-center justify-content-between gap-2"><label class="form-label" for="announcement-title">公告标题</label><span class="text-muted fs-12" id="announcement-title-count">最多 120 字</span></div>
<input class="form-control" id="announcement-title" name="title" type="text" maxlength="120" required value="{$announcement.title|default:''|escape}" aria-describedby="announcement-title-count" data-ann-counter="announcement-title-count" {if !$ann_can_manage}readonly{/if}>
</div>
<div class="col-md-4">
<label class="form-label" for="announcement-type">公告类型</label>
<select class="form-select" id="announcement-type" name="type" required {if !$ann_can_manage}disabled{/if}>
{foreach $ann_types as $value=>$label}<option value="{$value}" {if $announcement.type|default:'notice' == $value}selected{/if}>{$label}</option>{/foreach}
</select>
</div>
<div class="col-12">
<div class="d-flex align-items-center justify-content-between gap-2"><label class="form-label" for="announcement-body">公告正文</label><span class="text-muted fs-12" id="announcement-body-count">最多 20000 字</span></div>
<textarea class="form-control" id="announcement-body" name="body" rows="14" maxlength="20000" required aria-describedby="announcement-body-help announcement-body-count" data-ann-counter="announcement-body-count" {if !$ann_can_manage}readonly{/if}>{$announcement.body|default:''|escape}</textarea>
<p class="form-text mb-0" id="announcement-body-help">仅保存纯文本,保留换行。撤下后用户不可见,内容仍保留在后台。</p>
</div>
</div>
</div>
</form>
<noscript><p class="alert alert-info">请启用 JavaScript 后再保存或切换公告状态。</p></noscript>
</main>
<script src="/theme/venix/js/admin-announcements.js?v={$venix_asset_version}" defer></script>

@ -1,291 +1,66 @@
{assign var=admin_title value='公告管理'}
{assign var=admin_active value='announcement'}
{include file='admin/static_header.tpl'}
<div class="py-3 d-flex align-items-sm-center flex-sm-row flex-column">
<div class="flex-grow-1">
<h4 class="fs-20 fw-semibold mb-1">公告管理</h4>
<p class="text-muted mb-0">管理用户中心展示的系统公告,支持编辑、删除和快速搜索。</p>
</div>
<div class="text-sm-end mt-3 mt-sm-0">
<a class="btn btn-primary" href="/admin/announcement/create">
<i class="mdi mdi-plus-circle-outline me-1"></i>新增公告
</a>
</div>
</div>
<div class="row g-3">
<div class="col-xl-8">
<div class="card h-100">
<div class="card-header d-flex align-items-center justify-content-between">
<div>
<h5 class="card-title mb-0">公告列表</h5>
<span class="text-muted fs-13">数据来自原有公告接口</span>
</div>
<span class="badge text-bg-light" id="annTotal">读取中</span>
</div>
<div class="card-body">
<div class="admin-ann-toolbar">
<div class="position-relative flex-grow-1">
<i class="mdi mdi-magnify admin-ann-search-icon"></i>
<input id="annSearch" class="form-control admin-ann-search" type="text" placeholder="搜索公告内容或 ID">
</div>
<button id="annReload" class="btn btn-light" type="button">
<i class="mdi mdi-refresh me-1"></i>刷新
</button>
</div>
<div class="table-responsive mt-3">
<table class="table table-hover align-middle mb-0 admin-ann-table">
<thead>
<tr>
<th style="width: 90px;">ID</th>
<th style="width: 190px;">时间</th>
<th>内容</th>
<th style="width: 160px;" class="text-end">操作</th>
</tr>
</thead>
<tbody id="annRows">
<tr>
<td colspan="4" class="text-center text-muted py-4">公告加载中</td>
</tr>
</tbody>
</table>
</div>
</div>
{assign var=ann_can_manage value=$admin_can_manage|default:false}
{if isset($announcement_can_manage) && !$announcement_can_manage}{assign var=ann_can_manage value=false}{/if}
{assign var=ann_filters value=$announcements_page.filters|default:[]}
{assign var=ann_types value=['notice'=>'通知','maintenance'=>'维护','incident'=>'故障']}
<main data-admin-announcements data-ann-can-manage="{if $ann_can_manage}1{else}0{/if}">
<div class="py-3 d-flex align-items-sm-center flex-sm-row flex-column gap-3">
<div class="flex-grow-1"><h1 class="fs-20 fw-semibold mb-1">公告管理</h1><p class="text-muted mb-0">发布通知、维护与故障公告;撤下后保留记录,不再向用户展示。</p></div>
<div class="admin-config-actions flex-shrink-0">
<span class="admin-config-status {if $announcements_error|default:''}is-error{/if}" id="announcement-feedback" role="status" aria-live="polite">{if $announcements_error|default:''}{$announcements_error|escape}{elseif !$ann_can_manage}只读模式{else}仅已发布的公告对用户可见{/if}</span>
{if $ann_can_manage}<a class="btn btn-primary" href="/admin/announcement/create"><i class="mdi mdi-plus me-1" aria-hidden="true"></i>发布公告</a>{else}<button class="btn btn-primary" type="button" disabled>发布公告</button>{/if}
</div>
</div>
<div class="col-xl-4">
<div class="card h-100">
<div class="card-header">
<h5 class="card-title mb-0">操作说明</h5>
</div>
<div class="card-body">
<div class="admin-ann-guide">
<div>
<i class="mdi mdi-bullhorn-outline"></i>
<span>公告内容会展示在用户中心公告页面。</span>
</div>
<div>
<i class="mdi mdi-language-markdown-outline"></i>
<span>新增和编辑页面支持 Markdown 编辑器。</span>
</div>
<div>
<i class="mdi mdi-delete-outline"></i>
<span>删除前会二次确认,避免误删。</span>
</div>
</div>
</div>
<section class="card mb-3" aria-labelledby="announcement-filter-title">
<div class="card-header"><h2 class="h5 card-title mb-0" id="announcement-filter-title">查找公告</h2></div>
<div class="card-body">
<form class="row g-2 align-items-end" method="get" action="/admin/announcement" id="announcement-filter">
<div class="col-lg-5"><label class="form-label" for="announcement-query">关键词</label><input class="form-control" type="search" id="announcement-query" name="q" maxlength="80" value="{$ann_filters.q|default:''|escape}" placeholder="搜索标题或正文"></div>
<div class="col-lg-2 col-6"><label class="form-label" for="announcement-filter-type">公告类型</label><select class="form-select" name="type" id="announcement-filter-type"><option value="all" {if $ann_filters.type|default:'all' == 'all'}selected{/if}>全部类型</option>{foreach $ann_types as $value=>$label}<option value="{$value}" {if $ann_filters.type|default:'all' == $value}selected{/if}>{$label}</option>{/foreach}</select></div>
<div class="col-lg-2 col-6"><label class="form-label" for="announcement-filter-status">发布状态</label><select class="form-select" name="status" id="announcement-filter-status"><option value="all" {if $ann_filters.status|default:'all' == 'all'}selected{/if}>全部状态</option><option value="published" {if $ann_filters.status|default:'all' == 'published'}selected{/if}>已发布</option><option value="withdrawn" {if $ann_filters.status|default:'all' == 'withdrawn'}selected{/if}>已撤下</option></select></div>
<div class="col-lg-3 col-12"><label class="form-label" for="announcement-per-page">每页显示</label><select class="form-select" name="per_page" id="announcement-per-page">{foreach [20,50,100] as $size}<option value="{$size}" {if $announcements_page.pagination.per_page|default:20 == $size}selected{/if}>{$size} 条</option>{/foreach}</select></div>
<div class="col-12 admin-form-actions mt-3"><a class="btn btn-light" href="/admin/announcement">重置筛选</a><button class="btn btn-primary" type="submit">查询公告</button></div>
</form>
</div>
</div>
</div>
<div class="admin-modal" id="deleteModal" aria-hidden="true">
<div class="admin-modal-panel">
<button class="admin-modal-close" type="button" data-ann-cancel aria-label="关闭">
<i class="mdi mdi-close"></i>
</button>
<div class="admin-modal-icon"><i class="mdi mdi-delete-outline"></i></div>
<p class="admin-eyebrow mb-1">Delete</p>
<h3>确认删除公告?</h3>
<p class="text-muted mb-0">删除后无法在公告列表中恢复。</p>
<div class="admin-modal-actions">
<button class="btn btn-light" type="button" data-ann-cancel>取消</button>
<button class="btn btn-danger" id="annDeleteConfirm" type="button">确认删除</button>
</section>
<section class="card" aria-labelledby="announcement-list-title">
<div class="card-header d-flex align-items-center justify-content-between gap-2 flex-wrap"><h2 class="h5 card-title mb-0" id="announcement-list-title">公告列表</h2><span class="badge text-bg-light" id="announcement-total">{if $announcements_page}共 {$announcements_page.pagination.total|escape} 条{else}数据未获取{/if}</span></div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-hover align-middle mb-0 admin-ann-table">
<caption class="visually-hidden">管理员公告列表</caption>
<thead><tr><th scope="col">公告</th><th scope="col">类型</th><th scope="col">状态</th><th scope="col">发布时间</th><th scope="col">最近更新</th><th scope="col" class="text-end">操作</th></tr></thead>
<tbody id="announcement-rows">
{if !$announcements_page}
<tr><td colspan="6" class="text-center text-muted py-4">公告暂不可用,请刷新重试。</td></tr>
{else}
{foreach $announcements_page.items as $item}
<tr data-ann-row="{$item.id|escape}">
<td><div class="admin-ann-content text-break">{$item.title|escape}</div><div class="text-muted fs-13 text-break">{$item.body|truncate:110:'…'|escape}</div><span class="text-muted fs-12">#{$item.id|escape}</span><details class="mt-2"><summary class="text-primary fs-13">查看正文</summary><p class="admin-ann-body text-muted fs-13 mt-2 mb-0">{$item.body|escape}</p></details></td>
<td><span class="badge {if $item.type == 'incident'}text-bg-danger{elseif $item.type == 'maintenance'}text-bg-warning{else}text-bg-light{/if}">{$item.type_label|escape}</span></td>
<td><span class="badge {if $item.status == 'published'}text-bg-success{else}text-bg-light{/if}">{if $item.status == 'published'}已发布{else}已撤下{/if}</span></td>
<td class="text-muted fs-13">{$item.published_at|default:'未发布'|escape}</td>
<td class="text-muted fs-13">{$item.updated_at|default:'—'|escape}</td>
<td>{if $ann_can_manage}<div class="d-flex justify-content-end gap-2 flex-wrap"><a class="btn btn-sm btn-light" href="/admin/announcement/{$item.id|escape}/edit">编辑</a><button class="btn btn-sm btn-light" type="button" data-ann-status-button data-ann-id="{$item.id|escape}" data-ann-next-status="{if $item.status == 'published'}withdrawn{else}published{/if}">{if $item.status == 'published'}撤下{else}发布{/if}</button></div>{else}<span class="text-muted fs-13">只读</span>{/if}</td>
</tr>
{foreachelse}
<tr><td colspan="6" class="text-center text-muted py-4">没有符合条件的公告。</td></tr>
{/foreach}
{/if}
</tbody>
</table>
</div>
{if $announcements_page && $announcements_page.pagination.total > 0}
<nav class="admin-user-pagination" aria-label="公告列表分页">
{if $announcements_page.pagination.page > 1}<a class="btn btn-light" rel="prev" href="/admin/announcement?q={$ann_filters.q|default:''|escape:'url'}&amp;type={$ann_filters.type|default:'all'|escape:'url'}&amp;status={$ann_filters.status|default:'all'|escape:'url'}&amp;per_page={$announcements_page.pagination.per_page|escape}&amp;page={$announcements_page.pagination.page - 1}">上一页</a>{else}<span class="btn btn-light disabled" aria-disabled="true">上一页</span>{/if}
<span>第 {$announcements_page.pagination.page|escape} / {$announcements_page.pagination.total_pages|escape} 页 · 共 {$announcements_page.pagination.total|escape} 条</span>
{if $announcements_page.pagination.page < $announcements_page.pagination.total_pages}<a class="btn btn-light" rel="next" href="/admin/announcement?q={$ann_filters.q|default:''|escape:'url'}&amp;type={$ann_filters.type|default:'all'|escape:'url'}&amp;status={$ann_filters.status|default:'all'|escape:'url'}&amp;per_page={$announcements_page.pagination.per_page|escape}&amp;page={$announcements_page.pagination.page + 1}">下一页</a>{else}<span class="btn btn-light disabled" aria-disabled="true">下一页</span>{/if}
</nav>
{/if}
</div>
</div>
</div>
<div class="admin-toast" id="annToast"></div>
{literal}
<script>
(function () {
var rows = document.getElementById('annRows');
var total = document.getElementById('annTotal');
var search = document.getElementById('annSearch');
var reload = document.getElementById('annReload');
var modal = document.getElementById('deleteModal');
var confirmButton = document.getElementById('annDeleteConfirm');
var toast = document.getElementById('annToast');
var deleteId = null;
var allRows = [];
if (window.VenixAdminSearchState) {
window.VenixAdminSearchState.bind(search);
}
function showToast(text, type) {
toast.textContent = text;
toast.className = 'admin-toast is-show ' + (type || '');
window.setTimeout(function () {
toast.className = 'admin-toast';
}, 2200);
}
function textFromHtml(html) {
var holder = document.createElement('div');
holder.innerHTML = html || '';
return holder.textContent.replace(/\s+/g, ' ').trim();
}
function openDelete(id) {
deleteId = id;
modal.classList.add('is-open');
modal.setAttribute('aria-hidden', 'false');
}
function closeDelete() {
deleteId = null;
modal.classList.remove('is-open');
modal.setAttribute('aria-hidden', 'true');
}
function render(data) {
var keyword = (search.value || '').toLowerCase().trim();
var filtered = data.map(function (item) {
return {
id: item.id || item[1] || '',
date: item.date || item[2] || '',
content: item.content || item[3] || ''
};
}).filter(function (item) {
var content = textFromHtml(item.content);
return !keyword || String(item.id).indexOf(keyword) !== -1 || content.toLowerCase().indexOf(keyword) !== -1;
});
total.textContent = '共 ' + filtered.length + ' 条';
if (!filtered.length) {
rows.innerHTML = '<tr><td colspan="4" class="text-center text-muted py-4">暂无公告</td></tr>';
return;
}
rows.innerHTML = '';
filtered.forEach(function (item) {
var tr = document.createElement('tr');
var content = textFromHtml(item.content);
if (content.length > 120) {
content = content.slice(0, 120) + '...';
}
tr.innerHTML =
'<td><span class="badge text-bg-light">#' + item.id + '</span></td>' +
'<td class="text-muted">' + (item.date || '-') + '</td>' +
'<td><div class="admin-ann-content"></div></td>' +
'<td class="text-end">' +
'<a class="btn btn-sm btn-primary me-1" href="/admin/announcement/' + item.id + '/edit">编辑</a>' +
'<button class="btn btn-sm btn-light" type="button" data-delete="' + item.id + '">删除</button>' +
'</td>';
tr.querySelector('.admin-ann-content').textContent = content || '-';
rows.appendChild(tr);
});
}
function buildParams() {
var params = new URLSearchParams();
params.set('draw', '1');
params.set('start', '0');
params.set('length', '500');
params.set('search[value]', '');
params.set('order[0][column]', '1');
params.set('order[0][dir]', 'desc');
['op', 'id', 'date', 'content'].forEach(function (column, index) {
params.set('columns[' + index + '][data]', column);
params.set('columns[' + index + '][name]', '');
params.set('columns[' + index + '][searchable]', 'true');
params.set('columns[' + index + '][orderable]', 'true');
params.set('columns[' + index + '][search][value]', '');
params.set('columns[' + index + '][search][regex]', 'false');
});
return params;
}
function loadAnnouncements() {
rows.innerHTML = '<tr><td colspan="4" class="text-center text-muted py-4">公告加载中</td></tr>';
total.textContent = '读取中';
fetch('/admin/announcement/ajax', {
method: 'POST',
credentials: 'same-origin',
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Requested-With': 'XMLHttpRequest'
},
body: buildParams()
}).then(function (response) {
if (!response.ok) {
throw new Error('request failed');
}
return response.json();
}).then(function (json) {
allRows = json.data || [];
render(allRows);
}).catch(function () {
rows.innerHTML = '<tr><td colspan="4" class="text-center text-danger py-4">公告读取失败</td></tr>';
total.textContent = '读取失败';
});
}
function deleteAnnouncement() {
if (!deleteId) {
return;
}
var params = new URLSearchParams();
params.set('id', deleteId);
confirmButton.disabled = true;
fetch('/admin/announcement', {
method: 'DELETE',
credentials: 'same-origin',
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Requested-With': 'XMLHttpRequest'
},
body: params
}).then(function (response) {
return response.json();
}).then(function (json) {
showToast(json.msg || '操作完成', json.ret ? 'is-success' : 'is-error');
closeDelete();
if (json.ret) {
loadAnnouncements();
}
}).catch(function () {
showToast('删除失败,请稍后重试', 'is-error');
}).finally(function () {
confirmButton.disabled = false;
});
}
rows.addEventListener('click', function (event) {
var button = event.target.closest('[data-delete]');
if (button) {
openDelete(button.getAttribute('data-delete'));
}
});
document.querySelectorAll('[data-ann-cancel]').forEach(function (button) {
button.addEventListener('click', closeDelete);
});
modal.addEventListener('click', function (event) {
if (event.target === modal) {
closeDelete();
}
});
confirmButton.addEventListener('click', deleteAnnouncement);
reload.addEventListener('click', loadAnnouncements);
search.addEventListener('input', function () {
render(allRows);
});
loadAnnouncements();
})();
</script>
{/literal}
</section>
</main>
<script src="/theme/venix/js/admin-announcements.js?v={$venix_asset_version}" defer></script>
{include file='admin/static_footer.tpl'}

@ -1,2 +1,2 @@
{* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *}
{assign var=venix_asset_version value='2026093007' scope='global'}
{assign var=venix_asset_version value='2026093008' scope='global'}

@ -1,84 +0,0 @@
{include file='user/layout_header.tpl' vu_title='公告' vu_active='announcement'}
<header class="vu-topbar">
<div>
<p class="vu-kicker">用户中心</p>
<h1>公告</h1>
</div>
<div class="vu-top-actions">
<a class="vu-btn vu-btn-ghost" href="/user/cloud/instances"><i class="mdi mdi-arrow-left"></i><span>返回实例</span></a>
{if !empty($ticket_navigation_enabled)}
<a class="vu-btn" href="/user/ticket"><i class="mdi mdi-lifebuoy"></i><span>提交工单</span></a>
{/if}
</div>
</header>
<section class="vu-announcement-hero">
<article class="vu-announcement-hero-main">
<span class="vu-status is-live">最近两个月</span>
<h2>服务公告与使用提醒</h2>
<p>这里汇总近期公告、维护安排和重要变更。使用前建议先查看最新公告,避免错过服务相关调整。</p>
</article>
<aside class="vu-announcement-summary">
<div>
<span>公告数量</span>
<strong>{count($anns)}</strong>
</div>
<div>
<span>最新公告</span>
<strong>{if $latestAnn == null}暂无{else}{$latestAnn->date|escape:"html"}{/if}</strong>
</div>
</aside>
</section>
<section class="vu-announcement-layout">
<div class="vu-announcement-list">
{if $anns->isEmpty()}
<article class="vu-card vu-announcement-card">
<div class="vu-empty-state">
<i class="mdi mdi-bullhorn-outline"></i>
<strong>暂无公告</strong>
<span>最近两个月没有新的公告内容。</span>
</div>
</article>
{else}
{foreach $anns as $ann}
<article class="vu-card vu-announcement-card">
<div class="vu-card-head">
<div>
<p class="vu-kicker">Announcement</p>
<h2>公告日期:{$ann->date|escape:"html"}</h2>
</div>
<i class="mdi mdi-bullhorn-outline vu-card-icon"></i>
</div>
{if $ann != null}
<div class="vu-announcement-content">{$ann->content}</div>
{/if}
</article>
{/foreach}
{/if}
</div>
<aside class="vu-announcement-side">
<article class="vu-card vu-announcement-card">
<div class="vu-card-head">
<div>
<p class="vu-kicker">Notice</p>
<h2>阅读建议</h2>
</div>
<i class="mdi mdi-information-outline vu-card-icon"></i>
</div>
<div class="vu-profile-tips">
<div><i class="mdi mdi-clock-outline"></i><span>维护公告通常会包含具体时间,请留意服务可用性变化。</span></div>
<div><i class="mdi mdi-cart-outline"></i><span>套餐、价格和续费规则调整会优先在公告中说明。</span></div>
<div><i class="mdi mdi-lifebuoy"></i><span>公告说明无法解决的问题,可以提交工单继续确认。</span></div>
</div>
</article>
</aside>
</section>
{include file='user/layout_footer.tpl'}
{include file='user/layout_modal.tpl'}
{include file='user/layout_scripts.tpl'}
</body>
</html>

@ -0,0 +1,12 @@
<dialog class="panel-announcements-drawer" id="panel-announcements-drawer" aria-labelledby="panel-announcements-title" aria-describedby="panel-announcements-description">
<header class="panel-announcements-header">
<div><h2 id="panel-announcements-title">公告与维护信息</h2><p id="panel-announcements-description">按发布时间查看站点通知、维护安排与故障说明。</p></div>
<button class="button button-ghost panel-announcements-close" id="panel-announcements-close" type="button" aria-label="关闭公告" autofocus><i class="mdi mdi-close" aria-hidden="true"></i></button>
</header>
<div class="panel-announcements-toolbar"><p id="panel-announcements-state" class="panel-announcements-state" role="status" aria-live="polite">打开后读取最新公告。</p><button class="button button-outline small" id="panel-announcements-refresh" type="button">刷新</button></div>
<div class="panel-announcements-scroll" id="panel-announcements-scroll" tabindex="0" aria-label="公告内容">
<div class="panel-announcements-list" id="panel-announcements-list" aria-busy="false"></div>
<div class="panel-announcements-pagination"><p id="panel-announcements-count"></p><button class="button button-outline" id="panel-announcements-more" type="button" hidden>加载更多</button></div>
</div>
</dialog>
<script type="module" src="/cloud/announcements.js?v={$venix_asset_version|escape:'html'}"></script>

@ -65,7 +65,7 @@
<article class="vu-stat">
<span>返利比例</span>
<strong>{$user->aff_rate}%</strong>
<a href="/user/announcement">查看规则</a>
<button class="panel-announcements-link" type="button" data-announcements-open aria-haspopup="dialog" aria-controls="panel-announcements-drawer" aria-expanded="false">查看规则</button>
</article>
<article class="vu-stat">
<span>返利余额</span>

@ -47,9 +47,6 @@
<i class="mdi mdi-lifebuoy nav-icon" aria-hidden="true"></i><span>工单支持</span>
</a>
{/if}
<a class="sidebar-link{if $panel_active_key == 'announcement'} active{/if}" href="/user/announcement">
<i class="mdi mdi-bullhorn-outline nav-icon" aria-hidden="true"></i><span>站点公告</span>
</a>
</nav>
<div class="sidebar-bottom panel-sidebar-bottom">

@ -2,6 +2,7 @@
<header class="topbar panel-topbar">
<div class="breadcrumb">用户中心 <span>/</span><strong{if $panel_cloud_mode} id="breadcrumb-current"{/if}>{$panel_title|default:'账户'|escape:"html"}</strong></div>
<div class="topbar-right">
<button class="button button-ghost panel-announcements-trigger" type="button" data-announcements-open aria-haspopup="dialog" aria-controls="panel-announcements-drawer" aria-expanded="false" aria-label="查看公告与维护信息" title="公告与维护信息"><i class="mdi mdi-bullhorn-outline" aria-hidden="true"></i></button>
<span class="topbar-user"><span class="avatar">U</span><span{if $panel_cloud_mode} id="current-username"{/if}>{$user->user_name|default:'账户'|escape:"html"}</span></span>
{if $panel_cloud_mode}
<button id="logout-button" class="button button-ghost small" type="button">退出登录</button>
@ -10,3 +11,4 @@
{/if}
</div>
</header>
{include file='user/announcement_drawer.tpl'}

@ -5,10 +5,14 @@ SET NAMES utf8mb4;
CREATE TABLE `announcement` (
`id` int(11) NOT NULL,
`date` datetime NOT NULL,
`content` longtext NOT NULL,
`markdown` longtext NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
`title` varchar(120) NOT NULL DEFAULT '',
`type` varchar(20) NOT NULL DEFAULT 'notice',
`status` varchar(20) NOT NULL DEFAULT 'withdrawn',
`body` longtext NOT NULL,
`published_at` datetime DEFAULT NULL,
`updated_at` datetime NOT NULL,
KEY `announcement_published` (`status`,`published_at`,`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
CREATE TABLE `checkout_apply` (
`id` int(11) NOT NULL,

@ -0,0 +1,206 @@
<?php
require dirname(__DIR__) . '/vendor/autoload.php';
set_error_handler(static function (int $severity, string $message, string $file, int $line): bool {
if ((error_reporting() & $severity) && ($severity & (E_WARNING | E_USER_WARNING | E_DEPRECATED))) {
throw new ErrorException($message, 0, $severity, $file, $line);
}
return false;
});
// Synthetic DTOs only; template fixtures never bootstrap the application or query a database.
$announcement = ['id' => '41', 'title' => '香港区域网络维护通知', 'type' => 'maintenance',
'type_label' => '维护', 'body' => "维护时间:2026 年 10 月 2 日 02:00—03:00。\n期间网络可能短暂中断。\n维护完成后将更新本公告。",
'status' => 'published', 'published_at' => '2026-09-30 09:30:00', 'updated_at' => '2026-09-30 10:15:00'];
$withdrawn = array_replace($announcement, ['id' => '42', 'title' => '故障处理进展',
'type' => 'incident', 'type_label' => '故障', 'body' => "当前服务已恢复。\n此公告已撤下,仅后台保留。", 'status' => 'withdrawn']);
$notice = array_replace($announcement, ['id' => '43', 'title' => '控制面板功能更新',
'type' => 'notice', 'type_label' => '通知', 'body' => '账单和任务记录现已支持筛选与分页。']);
$newAnnouncement = ['id' => '', 'title' => '', 'type' => 'notice', 'type_label' => '通知',
'body' => '', 'status' => 'published', 'published_at' => null, 'updated_at' => ''];
$page = ['items' => [$announcement, $withdrawn, $notice],
'pagination' => ['page' => 2, 'per_page' => 20, 'total' => 65, 'total_pages' => 4],
'filters' => ['q' => '', 'type' => 'all', 'status' => 'all', 'page' => 2, 'per_page' => 20]];
$smarty = new Smarty();
$compileDir = sys_get_temp_dir() . '/admin-announcements-view-' . bin2hex(random_bytes(6));
mkdir($compileDir);
$smarty->setCompileDir($compileDir);
$smarty->setTemplateDir(dirname(__DIR__) . '/resources/views/venix');
$smarty->assign('config', ['appName' => 'Venix Test']);
$smarty->assign('cdn', '');
$smarty->assign('user', (object) ['isLogin' => false]);
$smarty->assign('admin_csrf_token', str_repeat('a', 64));
$render = static function (string $view, ?array $data, ?bool $manage = true,
string $error = '', ?bool $announcementManage = null) use ($smarty): string {
if ($manage === null) {
$smarty->clearAssign('admin_can_manage');
} else {
$smarty->assign('admin_can_manage', $manage);
}
if ($announcementManage === null) {
$smarty->clearAssign('announcement_can_manage');
} else {
$smarty->assign('announcement_can_manage', $announcementManage);
}
$smarty->assign('announcements_page', $view === 'index' ? $data : null);
$smarty->assign('announcements_error', $error);
$smarty->assign('announcement', $view === 'index' ? null : $data);
return $smarty->fetch('admin/announcement/' . $view . '.tpl');
};
$html = $render('index', $page);
$createHtml = $render('create', $newAnnouncement);
$editHtml = $render('edit', $announcement);
$withdrawnHtml = $render('edit', $withdrawn);
$readOnlyHtml = $render('index', $page, false);
$failedHtml = $render('index', null, true, '公告数据暂不可用,请稍后重试');
$empty = $page;
$empty['items'] = [];
$empty['pagination'] = ['page' => 1, 'per_page' => 20, 'total' => 0, 'total_pages' => 1];
$emptyHtml = $render('index', $empty);
if (in_array('--fixture', $argv ?? [], true)) {
echo json_encode(['html' => $html, 'create_html' => $createHtml, 'edit_html' => $editHtml,
'readonly_html' => $readOnlyHtml, 'withdrawn_html' => $withdrawnHtml,
'failed_html' => $failedHtml, 'empty_html' => $emptyHtml,
'page' => $page, 'announcement' => $announcement],
JSON_UNESCAPED_UNICODE | JSON_INVALID_UTF8_SUBSTITUTE | JSON_THROW_ON_ERROR);
exit;
}
$assert = static function (bool $condition, string $message): void {
if (!$condition) throw new RuntimeException($message);
};
$parse = static function (string $html): DOMXPath {
$dom = new DOMDocument();
libxml_use_internal_errors(true);
$dom->loadHTML('<?xml encoding="UTF-8">' . $html);
return new DOMXPath($dom);
};
$one = static function (DOMXPath $xpath, string $query) use ($assert): DOMElement {
$matches = $xpath->query($query);
$assert($matches->length === 1 && $matches->item(0) instanceof DOMElement,
'Expected one element matching ' . $query);
return $matches->item(0);
};
foreach ([$html, $createHtml, $editHtml, $readOnlyHtml, $failedHtml, $emptyHtml] as $rendered) {
$xpath = $parse($rendered);
$assert($xpath->query('//script[contains(@src,"admin-announcements.js")]')->length === 1
&& $xpath->query('//script[contains(@src,"admin-csrf.js")]')->length === 1,
'Announcements must load the shared interaction and existing CSRF scripts once.');
$assert($xpath->query('//script[contains(@src,"editor/")] | //link[contains(@href,"editor/")]')->length === 0
&& !str_contains($rendered, 'editormd')
&& $xpath->query('//*[@name="content" or @name="markdown"]')->length === 0,
'A retired editor dependency or generated HTML/Markdown field survived.');
$assert($xpath->query('//*[@data-delete or @id="deleteModal" or @id="annDeleteConfirm"]')->length === 0,
'A hard-delete control survived the withdraw-only workflow.');
}
$index = $parse($html);
$assert($index->query('//tbody[@id="announcement-rows"]/tr[@data-ann-row]')->length === 3
&& $index->query('//tbody//details')->length === 3,
'Announcements and complete expandable bodies must render on the server.');
$assert($one($index, '//tr[@data-ann-row="41"]//details/p')->textContent === $announcement['body']
&& $one($index, '//tr[@data-ann-row="42"]//button[@data-ann-status-button]')->getAttribute('data-ann-next-status') === 'published'
&& $one($index, '//tr[@data-ann-row="41"]//button[@data-ann-status-button]')->getAttribute('data-ann-next-status') === 'withdrawn',
'Body content or publish/withdraw targets diverged from the server DTO.');
$assert($one($index, '//form[@id="announcement-filter"]')->getAttribute('method') === 'get'
&& $one($index, '//form[@id="announcement-filter"]')->getAttribute('action') === '/admin/announcement',
'Filters must remain real server-side GET navigation.');
foreach (['prev' => '1', 'next' => '3'] as $relation => $number) {
$link = $one($index, '//nav[@aria-label="公告列表分页"]/a[@rel="' . $relation . '"]');
parse_str(parse_url($link->getAttribute('href'), PHP_URL_QUERY), $query);
$assert($query === ['q' => '', 'type' => 'all', 'status' => 'all', 'per_page' => '20', 'page' => $number],
'SSR pagination dropped filters or linked to the wrong page.');
}
$filtered = $page;
$filtered['filters'] = ['q' => '维护 & "引号"', 'type' => 'maintenance', 'status' => 'withdrawn', 'page' => 2, 'per_page' => 50];
$filtered['pagination']['per_page'] = 50;
$filteredDom = $parse($render('index', $filtered));
foreach (['type' => 'maintenance', 'status' => 'withdrawn', 'per_page' => '50'] as $name => $value) {
$assert($one($filteredDom, '//select[@name="' . $name . '"]/option[@selected]')->getAttribute('value') === $value,
'SSR selected filter did not match normalized input: ' . $name);
}
parse_str(parse_url($one($filteredDom, '//a[@rel="next"]')->getAttribute('href'), PHP_URL_QUERY), $query);
$assert($query['q'] === $filtered['filters']['q'] && $query['type'] === 'maintenance'
&& $query['status'] === 'withdrawn' && $query['per_page'] === '50',
'Quoted search text or filters did not round-trip through the pagination URL.');
foreach ([[$createHtml, 'POST', '/admin/announcement', $newAnnouncement],
[$editHtml, 'PUT', '/admin/announcement/41', $announcement],
[$withdrawnHtml, 'PUT', '/admin/announcement/42', $withdrawn]] as [$rendered, $method, $url, $dto]) {
$xpath = $parse($rendered);
$form = $one($xpath, '//form[@id="announcement-form"]');
$assert($form->getAttribute('action') === $url && $form->getAttribute('data-method') === $method,
'Announcement save method or resource URL changed.');
$names = [];
foreach ($xpath->query('//form[@id="announcement-form"]//*[@name]') as $input) $names[] = $input->getAttribute('name');
sort($names);
$assert($names === ['body', 'status', 'title', 'type'], 'Form submits fields outside the plain-text contract.');
foreach (['title' => '120', 'body' => '20000'] as $name => $maximum) {
$input = $one($xpath, '//*[@id="announcement-' . $name . '"]');
$assert($input->hasAttribute('required') && $input->getAttribute('maxlength') === $maximum,
'Missing required field or length limit: ' . $name);
$assert($one($xpath, '//label[@for="announcement-' . $name . '"]')->textContent !== '',
'An announcement control lost its label.');
}
$assert($one($xpath, '//input[@name="title"]')->getAttribute('value') === $dto['title']
&& $one($xpath, '//textarea[@name="body"]')->textContent === $dto['body']
&& $one($xpath, '//input[@name="status"]')->getAttribute('value') === $dto['status'],
'Initial title/body or the original publication state was lost.');
$types = [];
foreach ($xpath->query('//select[@name="type"]/option') as $option) $types[] = $option->getAttribute('value');
$assert($types === ['notice', 'maintenance', 'incident']
&& $one($xpath, '//select[@name="type"]/option[@selected]')->getAttribute('value') === $dto['type'],
'Announcement types or the selected value do not match the backend enum.');
$submit = $one($xpath, '//button[@id="announcement-submit"]');
$assert($submit->getAttribute('form') === 'announcement-form' && !$submit->hasAttribute('disabled')
&& $submit->getAttribute('type') === 'submit', 'External save button lost its form ownership.');
}
foreach ([false, null] as $permission) {
$restricted = $parse($render('index', $page, $permission));
$assert($restricted->query('//main//a[contains(@href,"/edit") or contains(@href,"/create")]')->length === 0
&& $restricted->query('//main//*[@data-ann-status-button]')->length === 0
&& $restricted->query('//main//details')->length === 3,
'Read-only administrators must read full bodies without edit/create/status controls.');
$restrictedForm = $parse($render('edit', $announcement, $permission));
$assert($one($restrictedForm, '//button[@id="announcement-submit"]')->hasAttribute('disabled')
&& $one($restrictedForm, '//button[@data-ann-status-button]')->hasAttribute('disabled')
&& $one($restrictedForm, '//textarea[@name="body"]')->hasAttribute('readonly')
&& $one($restrictedForm, '//select[@name="type"]')->hasAttribute('disabled'),
'Missing or read-only management permission unexpectedly enabled editing.');
}
$restrictedOverride = $parse($render('edit', $announcement, true, '', false));
$assert($one($restrictedOverride, '//button[@id="announcement-submit"]')->hasAttribute('disabled'),
'Explicit announcement permission denial was overridden by the general administrator flag.');
$unsafeText = '</textarea><img src=x onerror=alert(1)><script>window.__announcementUnsafe=1</script> & "公告"';
$unsafeDto = array_replace($announcement, ['title' => $unsafeText, 'body' => $unsafeText . "\n下一行", 'type_label' => $unsafeText]);
$unsafeForm = $parse($render('edit', $unsafeDto));
$assert($one($unsafeForm, '//textarea[@name="body"]')->textContent === $unsafeDto['body']
&& $one($unsafeForm, '//input[@name="title"]')->getAttribute('value') === $unsafeText
&& $unsafeForm->query('//*[@onerror]')->length === 0,
'Plain announcement text escaped its form control and became executable markup.');
$unsafePage = $page;
$unsafePage['items'] = [$unsafeDto];
$unsafePage['filters']['q'] = '\" autofocus onfocus=alert(2)';
$unsafeListHtml = $render('index', $unsafePage);
$unsafeList = $parse($unsafeListHtml);
$assert($unsafeList->query('//*[@onerror or @onfocus]')->length === 0
&& $one($unsafeList, '//tbody//details/p')->textContent === $unsafeDto['body']
&& !str_contains($unsafeListHtml, '<script>window.__announcementUnsafe=1</script>'),
'List summaries, labels, search or expanded bodies were not escaped.');
$assert(str_contains($emptyHtml, '没有符合条件的公告。') && !str_contains($emptyHtml, '香港区域网络维护通知')
&& $parse($emptyHtml)->query('//nav[@aria-label="公告列表分页"]')->length === 0,
'Empty results show stale announcements or invalid pagination.');
$assert(str_contains($failedHtml, '公告数据暂不可用,请稍后重试')
&& $one($parse($failedHtml), '//*[@id="announcement-total"]')->textContent === '数据未获取'
&& !str_contains($failedHtml, '共 0 条'), 'An unavailable list was falsely rendered as successful empty data.');
$script = file_get_contents(dirname(__DIR__) . '/public/theme/venix/js/admin-announcements.js');
$assert(str_contains($script, "window.ADMIN_CAN_MANAGE === true")
&& str_contains($script, "payload.set('title', title)")
&& str_contains($script, "payload.set('body', body)")
&& str_contains($script, "'/admin/announcement/' + id + '/status'")
&& !str_contains($script, 'innerHTML') && !str_contains($script, "'DELETE'")
&& !str_contains($script, 'getHTML') && !str_contains($script, 'getMarkdown')
&& !str_contains($script, '/announcement/ajax'),
'Client regressed permissions, plain-text writes, status endpoint or server-side pagination.');
echo "Administrator announcements real Smarty plain-text forms, SSR pagination, publication states, read-only controls and escaping passed.\n";

@ -0,0 +1,284 @@
<?php
namespace App\Services {
final class Auth
{
public static $user = null;
public static function getUser() { return self::$user; }
}
final class AdminPermission
{
public static bool $superAdmin = false;
public static function isSuperAdmin(): bool { return self::$superAdmin; }
}
}
namespace App\Services\Cloud {
final class CloudSessionService
{
public static int $calls = 0;
public static function current($user): string
{
self::$calls++;
throw new \RuntimeException('Announcement requested an engine session');
}
}
final class CloudEngineClient
{
public static int $calls = 0;
public function __construct()
{
self::$calls++;
throw new \RuntimeException('Announcement contacted the engine');
}
}
}
namespace {
require dirname(__DIR__) . '/vendor/autoload.php';
use App\Controllers\Admin\AnnController;
use App\Controllers\AnnouncementController;
use App\Models\Ann;
use App\Models\User;
use App\Services\AdminCsrf;
use App\Services\AdminPermission;
use App\Services\AnnouncementSchema;
use App\Services\AnnouncementService as Announcements;
use App\Services\Auth;
use App\Services\Cloud\CloudError;
use App\Services\Cloud\CloudEngineClient;
use App\Services\Cloud\CloudSessionService;
use Illuminate\Database\Capsule\Manager as Capsule;
use Illuminate\Database\Schema\Blueprint;
use Slim\Http\Environment;
use Slim\Http\Request;
use Slim\Http\Response;
$System_Config = ['cookie_secure' => 'false'];
$assert = static function (bool $ok, string $message): void {
if (!$ok) throw new RuntimeException($message);
};
$reject = static function (callable $call, int $status) use ($assert): void {
try { $call(); } catch (CloudError $error) {
$assert($error->httpStatus === $status, 'Unexpected rejection status: ' . $error->httpStatus);
return;
}
throw new RuntimeException('Expected rejection was accepted.');
};
$capsule = new Capsule();
$capsule->addConnection(['driver' => 'sqlite', 'database' => ':memory:'], 'default');
$capsule->setAsGlobal();
$capsule->bootEloquent();
$connection = $capsule->getConnection();
$schema = $connection->getSchemaBuilder();
$schema->create('announcement', static function (Blueprint $table): void {
$table->increments('id'); $table->dateTime('date');
$table->longText('content'); $table->longText('markdown');
});
// This rollout intentionally supports empty legacy tables only. Existing
// records must stop it before the very first DDL statement, not be converted.
$connection->table('announcement')->insert(['id' => 1, 'date' => '2020-01-02 03:04:05',
'content' => '<p>do not delete this record</p>', 'markdown' => '**archive**']);
$originalColumns = $schema->getColumnListing('announcement');
$originalData = $connection->table('announcement')->get()->toJson();
$connection->enableQueryLog(); $connection->flushQueryLog();
try {
AnnouncementSchema::upgrade($connection);
throw new LogicException('Nonempty legacy schema was silently changed.');
} catch (RuntimeException $error) {
$assert(str_contains($error->getMessage(), '旧公告表仍有数据'), 'Unsafe legacy migration had no clear error.');
}
foreach ($connection->getQueryLog() as $query) {
$assert(!preg_match('/^(?:alter|create|drop|update|delete|insert)\b/i', $query['query']),
'Legacy data guard ran after a schema/data mutation.');
}
$assert($schema->getColumnListing('announcement') === $originalColumns
&& $connection->table('announcement')->get()->toJson() === $originalData, 'Rejected migration changed legacy structure/data.');
// Remove only the test fixture, then exercise an interrupted empty migration.
$connection->table('announcement')->where('id', 1)->delete();
$schema->table('announcement', static function (Blueprint $table): void { $table->string('title', 120)->default(''); });
AnnouncementSchema::upgrade($connection);
$assert($schema->hasIndex('announcement', 'announcement_published')
&& !$schema->hasColumn('announcement', 'content') && !$schema->hasColumn('announcement', 'markdown')
&& !$schema->hasColumn('announcement', 'date') && $connection->table('announcement')->count() === 0,
'Empty legacy migration left rich-text fields or created content.');
AnnouncementSchema::upgrade($connection);
for ($id = 1; $id <= 205; $id++) {
$connection->table('announcement')->insert(['id' => $id, 'title' => '通知 ' . $id,
'body' => $id === 1 ? "第一段\n\n第二段 链接文字" : '纯文本通知 ' . $id,
'type' => 'notice', 'status' => 'published', 'published_at' => '2020-01-02 03:04:05',
'updated_at' => '2020-01-02 03:04:05']);
}
$snapshot = static fn (): string => $connection->table('announcement')->orderBy('id')->get()->toJson();
$migrated = $snapshot();
AnnouncementSchema::upgrade($connection);
$assert($snapshot() === $migrated, 'Repeated migration was not idempotent.');
$customer = ['user_id' => 1, 'is_admin' => false, 'is_super_admin' => false, 'can_manage' => false];
$admin = ['user_id' => 2, 'is_admin' => true, 'is_super_admin' => false, 'can_manage' => false];
$super = ['user_id' => 3, 'is_admin' => true, 'is_super_admin' => true, 'can_manage' => true];
$page = Announcements::page($admin);
$assert($page['pagination']['total'] === 205 && count($page['items']) === 20
&& $page['filters']['status'] === 'all', 'Admin pagination lost historical announcements.');
$seen = [];
for ($pageNo = 1; $pageNo <= 21; $pageNo++) {
$published = Announcements::published($customer, ['page' => $pageNo]);
foreach ($published['items'] as $item) {
$assert($item['status'] === 'published' && is_string($item['id'])
&& !array_key_exists('content', $item) && !array_key_exists('markdown', $item), 'Public DTO exposed archives or unpublished records.');
$seen[] = $item['id'];
}
}
$assert(count(array_unique($seen)) === 205 && in_array('1', $seen, true), 'Public pagination clipped old records at two months or 200 rows.');
$lastPage = Announcements::published($customer, ['page' => 999]);
$assert($lastPage['pagination']['page'] === 21 && count($lastPage['items']) === 5,
'User out-of-range page was not clamped to the final page.');
$lastAdminPage = Announcements::page($admin, ['page' => 999]);
$assert($lastAdminPage['pagination']['page'] === 11 && $lastAdminPage['filters']['page'] === 11
&& count($lastAdminPage['items']) === 5, 'Admin filters and pagination disagree after clamping.');
$assert(Announcements::page($admin, ['q' => '链接文字'])['pagination']['total'] === 1, 'Plain-text search failed.');
$input = ['title' => '维护通知 🛠', 'type' => 'maintenance', 'body' => "第一行\r\n第二行 <script>只是文本</script>", 'status' => 'published'];
$new = Announcements::save($super, $input);
$assert($new['type_label'] === '维护' && $new['status'] === 'published' && $new['published_at'] !== null
&& $new['body'] === "第一行\n第二行 <script>只是文本</script>", 'New announcement was not stored as literal plain text.');
$stored = $connection->table('announcement')->where('id', $new['id'])->first();
$assert(!property_exists($stored, 'content') && !property_exists($stored, 'markdown'), 'New schema retained legacy rich-text fields.');
$connection->table('announcement')->where('id', $new['id'])->update(['published_at' => '2021-01-01 00:00:00']);
$withdrawn = Announcements::setStatus($super, $new['id'], ['status' => 'withdrawn']);
$assert($withdrawn['status'] === 'withdrawn' && $withdrawn['published_at'] === '2021-01-01 00:00:00'
&& Announcements::published($customer)['pagination']['total'] === 205, 'Withdraw did not hide the announcement or destroyed publication history.');
// The old edit form still says published; only an explicit status action may republish.
$staleEdit = Announcements::save($super, array_replace($input, ['title' => '陈旧表单更新']), $new['id']);
$assert($staleEdit['status'] === 'withdrawn' && $staleEdit['published_at'] === '2021-01-01 00:00:00',
'A stale edit form republished a concurrently withdrawn announcement.');
$republished = Announcements::setStatus($super, $new['id'], ['status' => 'published']);
$assert($republished['status'] === 'published' && $republished['published_at'] > '2021-01-01 00:00:00',
'Explicit republish did not record a real publication time.');
$connection->table('announcement')->where('id', $new['id'])->update(['updated_at' => '2021-02-03 00:00:00']);
$same = Announcements::setStatus($super, $new['id'], ['status' => 'published']);
$assert($same['updated_at'] === '2021-02-03 00:00:00', 'Idempotent status request forged an update event.');
Announcements::save($super, array_replace($input, ['title' => '50%_! literal', 'type' => 'incident', 'status' => 'withdrawn']));
$assert(Announcements::page($admin, ['q' => '%_!'])['pagination']['total'] === 1
&& Announcements::page($admin, ['q' => "' OR 1=1 --"])['pagination']['total'] === 0
&& Announcements::page($admin, ['type' => 'incident', 'status' => 'withdrawn'])['pagination']['total'] === 1,
'Filters did not bind literal keywords, type and status safely.');
$saved = $snapshot();
AnnouncementSchema::upgrade($connection);
$assert($snapshot() === $saved, 'Repeated upgrade changed published or withdrawn records.');
foreach (['title', 'body', 'type', 'status'] as $key) {
$reject(static fn () => Announcements::save($super, array_replace($input, [$key => ['bad']])), 400);
}
foreach ([['title' => ''], ['body' => ' '], ['title' => str_repeat('字', 121)], ['body' => str_repeat('字', 20001)],
['title' => "multi\nline"], ['body' => "nul\0byte"], ['type' => 'html'], ['status' => 'deleted']] as $invalid) {
$reject(static fn () => Announcements::save($super, array_replace($input, $invalid)), 400);
}
$withoutStatus = $input; unset($withoutStatus['status']);
$reject(static fn () => Announcements::save($super, $withoutStatus), 400);
foreach (['page', 'per_page', 'q', 'type', 'status'] as $key) {
$reject(static fn () => Announcements::page($admin, [$key => ['bad']]), 400);
}
foreach ([['page' => 0], ['page' => '1.1'], ['per_page' => 500], ['q' => str_repeat('a', 81)],
['type' => 'wrong'], ['status' => 'deleted']] as $invalid) {
$reject(static fn () => Announcements::page($admin, $invalid), 400);
}
$reject(static fn () => Announcements::published($customer, ['per_page' => 100]), 400);
$reject(static fn () => Announcements::published([], []), 401);
$reject(static fn () => Announcements::page($customer), 403);
$reject(static fn () => Announcements::save($admin, $input), 403);
$reject(static fn () => Announcements::setStatus($admin, '1', ['status' => 'withdrawn']), 403);
$reject(static fn () => Announcements::detail($admin, '0'), 400);
$reject(static fn () => Announcements::detail($admin, '999999'), 404);
$reject(static fn () => Announcements::save($super, $input, '999999'), 404);
$reject(static fn () => Announcements::setStatus($super, '999999', ['status' => 'withdrawn']), 404);
$assert(!method_exists(AnnController::class, 'delete') && !method_exists(AnnController::class, 'ajax'), 'Legacy rich-text deletion/list endpoints remain.');
$connection->enableQueryLog();
$counts = [];
foreach ([20, 100] as $size) {
$connection->flushQueryLog();
Announcements::page($admin, ['per_page' => $size]);
$log = $connection->getQueryLog(); $counts[] = count($log);
foreach ($log as $query) {
$sql = strtolower($query['query']);
$assert(str_starts_with($sql, 'select ') && !str_contains($sql, 'content')
&& !str_contains($sql, 'markdown'), 'Read path performs DDL/writes or reads archived rich text.');
}
}
$assert($counts === [2, 2], 'Announcement pagination has per-row queries.');
$beforeReads = $snapshot();
$login = static function (bool $isAdmin, bool $isSuper = false, bool $enabled = true): void {
$user = new User(); $user->id = $isSuper ? 3 : ($isAdmin ? 2 : 1);
$user->enable = $enabled ? 1 : 0; $user->is_admin = $isAdmin; $user->isLogin = true;
Auth::$user = $user; AdminPermission::$superAdmin = $isSuper;
};
$app = new \Slim\App(['settings' => ['displayErrorDetails' => true]]);
require dirname(__DIR__) . '/config/routes_cloud.php';
$request = static function (string $method, string $path, ?array $body = null, array $query = []): Request {
$request = Request::createFromEnvironment(Environment::mock(['REQUEST_METHOD' => $method, 'REQUEST_URI' => $path]));
return $request->withQueryParams($query)->withParsedBody($body);
};
$login(false);
$response = $app->process($request('GET', '/api/v1/announcements'), new Response());
$public = json_decode((string) $response->getBody(), true);
$assert($response->getStatusCode() === 200 && $response->getHeaderLine('Cache-Control') === 'private, no-store'
&& count($public['items']) === 10 && $public['pagination']['total'] === 206, 'Registered user API contract failed.');
$response = $app->process($request('GET', '/api/v1/announcements', null, ['page' => ['bad']]), new Response());
$assert($response->getStatusCode() === 400, 'User API did not reject array parameters.');
$login(false, false, false);
$response = $app->process($request('GET', '/api/v1/announcements'), new Response());
$assert($response->getStatusCode() === 401 && str_contains($response->getHeaderLine('Cache-Control'), 'no-store'),
'Disabled user reached the notice feed.');
Auth::$user = null;
$response = $app->process($request('GET', '/api/v1/announcements'), new Response());
$assert($response->getStatusCode() === 401, 'Anonymous user reached the notice feed.');
$login(false);
$response = (new AnnouncementController())->index($request('GET', '/api/v1/announcements'), new Response());
$assert($response->getStatusCode() === 200 && $snapshot() === $beforeReads, 'Direct API fallback wrote business state.');
$controller = (new ReflectionClass(AnnController::class))->newInstanceWithoutConstructor();
foreach (['anonymous' => 401, 'disabled' => 401, 'customer' => 403] as $identity => $status) {
$login($identity !== 'customer', true, $identity !== 'disabled');
if ($identity === 'anonymous') Auth::$user = null;
$response = $controller->index($request('GET', '/admin/announcement'), new Response(), []);
$assert($response->getStatusCode() === $status && (string) $response->getBody() === ''
&& $response->getHeaderLine('Cache-Control') === 'private, no-store', 'Unauthorized SSR rendered an admin shell.');
}
$login(true);
foreach (['create', 'edit'] as $method) {
$response = $controller->$method($request('GET', '/admin/announcement/1/edit'), new Response(), ['id' => '1']);
$assert($response->getStatusCode() === 403, 'Read-only administrator gained an edit form.');
}
$response = $controller->add($request('POST', '/admin/announcement', $input), new Response(), []);
$assert($response->getStatusCode() === 403 && json_decode((string) $response->getBody(), true)['ret'] === 0,
'Controller accepted a read-only administrator write.');
$login(true, true);
$response = $controller->add($request('POST', '/admin/announcement', array_replace($input, ['title' => 'Controller created'])), new Response(), []);
$created = json_decode((string) $response->getBody(), true);
$assert($response->getStatusCode() === 200 && $created['ret'] === 1
&& $created['announcement']['title'] === 'Controller created'
&& $response->getHeaderLine('Cache-Control') === 'private, no-store', 'Admin JSON create contract failed.');
$response = $controller->update($request('PUT', '/admin/announcement/999999', $input), new Response(), ['id' => '999999']);
$assert($response->getStatusCode() === 404 && json_decode((string) $response->getBody(), true)['ret'] === 0,
'Missing update did not return JSON 404.');
$response = $controller->add($request('POST', '/admin/announcement'), new Response(), []);
$assert($response->getStatusCode() === 400, 'Malformed request body did not return 400.');
// Exercise the existing CSRF and super-admin middleware around the actual status handler.
$protected = new \Slim\App(['settings' => ['displayErrorDetails' => true]]);
$protected->post('/admin/announcement/{id}/status', [$controller, 'status'])->add(new \App\Middleware\SuperAdmin());
$path = '/admin/announcement/' . $created['announcement']['id'] . '/status';
$response = $protected->process($request('POST', $path, ['status' => 'withdrawn']), new Response());
$assert($response->getStatusCode() === 419, 'Status changes bypassed existing CSRF protection: '
. $response->getStatusCode() . ' ' . (string) $response->getBody());
$token = AdminCsrf::token();
$response = $protected->process($request('POST', $path, ['status' => 'withdrawn'])
->withHeader(AdminCsrf::HEADER_NAME, $token), new Response());
$assert($response->getStatusCode() === 200
&& json_decode((string) $response->getBody(), true)['announcement']['status'] === 'withdrawn',
'Valid CSRF-protected status request failed.');
$assert(CloudEngineClient::$calls === 0 && CloudSessionService::$calls === 0, 'Announcements acquired engine state.');
echo "Announcement guarded/idempotent empty-schema migration, plain text, clamped pagination, stale edits, publication, API/auth/CSRF and read-only queries passed.\n";
}

@ -0,0 +1,101 @@
<?php
require dirname(__DIR__) . '/vendor/autoload.php';
set_error_handler(static function (int $severity, string $message, string $file, int $line): bool {
if ((error_reporting() & $severity) && ($severity & (E_WARNING | E_USER_WARNING | E_DEPRECATED))) {
throw new ErrorException($message, 0, $severity, $file, $line);
}
return false;
});
// Rendering and browser fixtures use synthetic accounts and announcements only.
$smarty = new Smarty();
$compileDir = sys_get_temp_dir() . '/user-announcement-view-' . bin2hex(random_bytes(6));
mkdir($compileDir);
$smarty->setCompileDir($compileDir);
$smarty->setTemplateDir(dirname(__DIR__) . '/resources/views/venix');
$smarty->assign('config', ['appName' => 'Venix Test', 'jump_delay' => 1000]);
$smarty->assign('cdn', '');
$smarty->assign('user', (object) ['user_name' => '演示用户']);
$smarty->assign('admin_can_manage', false);
$smarty->assign('ticket_navigation_enabled', true);
$smarty->assign('user_iso_enabled', false);
$preview = '<section class="host-card"><h1>用户页面预览</h1><p>此处仅使用合成数据,公告打开前不请求公告接口。</p></section>'
. str_repeat('<section class="host-card"><h2>预览内容</h2><p>用于检查打开公告前后页面滚动位置。</p></section>', 8);
$accountHtml = $smarty->fetch('string:{include file="user/layout_header.tpl" vu_title="账户设置" vu_active="edit"}')
. $preview . $smarty->fetch('string:{include file="user/layout_footer.tpl"}{include file="user/layout_scripts.tpl"}</body></html>');
$smarty->assign('cloud_page', 'fixture');
$smarty->assign('cloud_title', '我的实例');
$smarty->assign('cloud_vm_id', '');
$smarty->assign('cloud_invoice_id', '');
$cloudHtml = $smarty->fetch('cloud/page.tpl');
$cloudFixture = str_replace('<main class="content">', '<main class="content">' . $preview, $cloudHtml);
// Isolate this feature's browser preview from unrelated VM/session requests.
$cloudFixture = preg_replace('#<script type="module" src="/cloud/app\.js\?[^\"]*"></script>#', '', $cloudFixture);
$now = time();
$items = [];
for ($id = 12; $id >= 1; --$id) {
$kind = $id === 12 ? 'maintenance' : ($id === 11 ? 'incident' : 'notice');
$items[] = ['id' => $id, 'title' => $id === 12 ? '香港区域计划维护通知' : ($id === 11 ? '区域网络故障说明' : '站点服务通知 ' . $id),
'type' => $kind, 'type_label' => ['notice' => '通知', 'maintenance' => '维护', 'incident' => '故障'][$kind],
'body' => $id === 12 ? "维护时间:2026-10-01 02:00 至 03:00(站点时间)。\n维护期间可能短暂中断,请提前保存工作。\n这是一条预览公告,不代表真实维护安排。"
: ($id === 11 ? "历史故障说明,仅用于预览。\nHTML 不执行:<img src=x onerror=alert(1)>\n<script>window.announcementUnsafe=1</script>"
: "服务通知正文。\n保持段落换行,使用原有用户页面主题。"),
'status' => 'published', 'published_at' => '2026-09-' . str_pad((string) (17 + $id), 2, '0', STR_PAD_LEFT) . ' 10:00:00',
'updated_at' => '2026-09-' . str_pad((string) (17 + $id), 2, '0', STR_PAD_LEFT) . ' 10:00:00'];
}
$pages = [];
foreach ([1, 2] as $page) {
$pages[$page] = ['items' => array_slice($items, ($page - 1) * 10, 10),
'pagination' => ['page' => $page, 'per_page' => 10, 'total' => 12, 'total_pages' => 2], 'generated_at' => $now];
}
$empty = ['items' => [], 'pagination' => ['page' => 1, 'per_page' => 10, 'total' => 0, 'total_pages' => 1], 'generated_at' => $now];
if (in_array('--fixture', $argv ?? [], true)) {
echo json_encode(['html' => ['account' => $accountHtml, 'cloud' => $cloudFixture], 'pages' => $pages, 'empty' => $empty],
JSON_UNESCAPED_UNICODE | JSON_INVALID_UTF8_SUBSTITUTE | JSON_THROW_ON_ERROR);
exit;
}
$assert = static function (bool $condition, string $message): void { if (!$condition) throw new RuntimeException($message); };
$parse = static function (string $html): DOMXPath {
$dom = new DOMDocument(); libxml_use_internal_errors(true);
$dom->loadHTML('<?xml encoding="UTF-8">' . $html);
return new DOMXPath($dom);
};
foreach (['account' => $accountHtml, 'cloud' => $cloudHtml] as $mode => $html) {
$xpath = $parse($html);
$assert($xpath->query('//dialog[@id="panel-announcements-drawer"]')->length === 1, $mode . ': drawer missing or duplicated.');
$assert($xpath->query('//script[contains(@src,"/cloud/announcements.js?")]')->length === 1, $mode . ': shared module must load once.');
$assert($xpath->query('//header[contains(@class,"panel-topbar")]//button[@data-announcements-open]')->length === 1,
$mode . ': global topbar announcement trigger missing.');
$assert($xpath->query('//button[@data-announcements-open and @aria-controls="panel-announcements-drawer" and @aria-haspopup="dialog"]')->length === 1,
$mode . ': trigger accessibility contract missing.');
$assert($xpath->query('//a[@href="/user/announcement"]')->length === 0, $mode . ': retired announcement navigation remains.');
$assert($xpath->query('//*[@id="panel-announcements-list"]/*')->length === 0,
$mode . ': should not preload unrelated announcement content into every user response.');
$assert($xpath->query('//link[contains(@href,"admin-home.css")]')->length === 0,
$mode . ': user shell must not load the administrator theme.');
$assert($xpath->query('//button[@id="panel-announcements-close" and @autofocus]')->length === 1,
$mode . ': drawer needs an accessible initial close control.');
$assert(!str_contains($html, '未读') && !str_contains($html, 'new-announcement-dot'),
$mode . ': do not fabricate unread state.');
}
$smarty->assign('user', (object) ['user_name' => '<img src=x onerror=alert(1)>']);
$unsafeHtml = $smarty->fetch('user/panel_topbar.tpl');
$assert($parse($unsafeHtml)->query('//*[@onerror]')->length === 0, 'The shared topbar must retain username escaping.');
$invite = file_get_contents(dirname(__DIR__) . '/resources/views/venix/user/invite.tpl');
$assert(!str_contains($invite, '/user/announcement') && str_contains($invite, 'data-announcements-open'),
'Invite rules must use the drawer instead of the removed page.');
$script = file_get_contents(dirname(__DIR__) . '/public/cloud/announcements.js');
$assert(!str_contains($script, '.innerHTML') && !str_contains($script, 'insertAdjacentHTML')
&& str_contains($script, 'node.textContent = String(value)'), 'Announcement title and body must be plain text.');
$assert(str_contains($script, '/api/v1/announcements?page=') && !str_contains($script, '/session')
&& !str_contains($script, 'from \'./runtime.js\''), 'Announcements must not depend on a VM session.');
$assert(str_contains($script, "item.status === 'published'") && str_contains($script, 'void load(1);'),
'Reopening must revalidate published content.');
$css = file_get_contents(dirname(__DIR__) . '/public/cloud/client.css');
$assert(preg_match('/\.panel-announcements-trigger\.button \{[^}]*width: 30px;[^}]*height: 30px;[^}]*background: transparent;/', $css) === 1,
'The topbar announcement trigger must match the 30px avatar without a large button background.');
$assert(preg_match('/\.panel-announcements-close\.button \{[^}]*width: 44px;[^}]*height: 44px;/', $css) === 1,
'The drawer close control must retain its 44px touch size.');
echo "User announcement shared shell, lazy drawer, plain-text contract and retired navigation checks passed.\n";

@ -91,6 +91,7 @@ $assert(str_contains($sharedSidebar, '/user/logout') && !str_contains($clientScr
$retiredUserPages = [
'/account' => 'index',
'/profile' => 'profile',
'/announcement' => 'announcement',
];
foreach ($retiredUserPages as $route => $method) {
$assert(!str_contains($routes, "get('" . $route . "', 'App\\Controllers\\UserController:" . $method . "')"),
@ -104,7 +105,7 @@ $assert(!str_contains($routes, "'App\\Controllers\\UserController:bought'")
&& !str_contains($userController, 'public function boughtInvoice(')
&& !str_contains($userController, 'public function deleteBoughtGet('),
'Retired user order history handlers remain');
foreach (['index.tpl', 'profile.tpl', 'bought.tpl', 'bought_invoice.tpl'] as $retiredTemplate) {
foreach (['index.tpl', 'profile.tpl', 'bought.tpl', 'bought_invoice.tpl', 'announcement.tpl'] as $retiredTemplate) {
$assert(!is_file($views . '/user/' . $retiredTemplate),
'Retired user page template remains: ' . $retiredTemplate);
}
@ -114,7 +115,8 @@ foreach (glob($views . '/user/*.tpl') as $template) {
}
$assert(!str_contains($sharedSidebar . $remainingUserTemplates, '/user/account')
&& !str_contains($sharedSidebar . $remainingUserTemplates, '/user/profile')
&& !str_contains($sharedSidebar . $remainingUserTemplates, '/user/bought'),
&& !str_contains($sharedSidebar . $remainingUserTemplates, '/user/bought')
&& !str_contains($sharedSidebar . $remainingUserTemplates, '/user/announcement'),
'A retained user template links to a retired user page');
$assert(str_contains($routes, "'/cloud/invoices'")
&& str_contains($routes, "get('/billing', 'App\\Controllers\\Admin\\CloudPageController:billing')")

Loading…
Cancel
Save