From 8bca99c203fb6d51abc564688d1e072fbe78b4af Mon Sep 17 00:00:00 2001 From: Maxim Harder Date: Tue, 15 Sep 2026 15:05:25 +0200 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=D0=B8=D0=BD=D1=82=D0=B5=D0=B3?= =?UTF-8?q?=D1=80=D0=B8=D1=80=D1=83=D0=B5=D1=82=20=D0=B7=D0=B0=D0=B3=D1=80?= =?UTF-8?q?=D1=83=D0=B7=D0=BA=D1=83=20Admin=20SDK=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20OpenAP?= =?UTF-8?q?I?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавляет скрипт для автоматической загрузки последней версии DevCraft Admin с витрины и использует её модели Schema при генерации openapi.yaml. Переносит логику генерации в отдельный PHP-скрипт с поддержкой переменных окружения. Обновляет workflow для передачи URL загрузки и пути к SDK. Исправляет тип поля schema_org в Category с integer на string. Добавляет новые схемы MailCampaigns и MailCampaignUsers. --- .github/scripts/fetch-admin-sdk.sh | 77 +++++++++++++++++++++++ .github/workflows/openapi.yml | 7 +++ apidata/openapi.yaml | 79 ++++++++++++++++++++++-- upload/api/composer.json | 2 +- upload/api/scripts/generate-openapi.php | 60 ++++++++++++++++++ upload/api/scripts/openapi-bootstrap.php | 32 ++++++++++ 6 files changed, 251 insertions(+), 6 deletions(-) create mode 100755 .github/scripts/fetch-admin-sdk.sh create mode 100644 upload/api/scripts/generate-openapi.php create mode 100644 upload/api/scripts/openapi-bootstrap.php diff --git a/.github/scripts/fetch-admin-sdk.sh b/.github/scripts/fetch-admin-sdk.sh new file mode 100755 index 00000000..e9bd0274 --- /dev/null +++ b/.github/scripts/fetch-admin-sdk.sh @@ -0,0 +1,77 @@ +#!/usr/bin/env sh +# Скачивает текущий zip DevCraft Admin с витрины и кладёт sdk/dle (модели Schema). +# /download отдаёт GitHub-снимок репозитория: mhadmin-rel-{версия}.zip +# (корень архива mhadmin-rel-200.4.1/upload/devcraft/src/sdk/dle). +# Env: ADMIN_DOWNLOAD_URL, DLE_ADMIN_SDK (каталог назначения = …/sdk/dle) +set -eu + +URL="${ADMIN_DOWNLOAD_URL:-https://devcraft.club/downloads/devcraft-admin-panel.4/download}" +DEST="${DLE_ADMIN_SDK:-}" + +if [ -z "$DEST" ]; then + echo "DLE_ADMIN_SDK не задан" >&2 + exit 1 +fi + +TMP="$(mktemp -d)" +cleanup() { rm -rf "$TMP"; } +trap cleanup EXIT + +echo "Admin SDK: скачиваю ${URL}" >&2 +# -J: имя файла из Content-Disposition → mhadmin-rel-200.4.1.zip +( + cd "$TMP" + curl -fsSL --retry 3 --retry-delay 2 -L -J -O "$URL" +) + +ZIP="$(find "$TMP" -maxdepth 1 -type f \( -name '*.zip' -o -name '*.ZIP' \) | head -n 1)" +if [ -z "$ZIP" ]; then + echo "Admin SDK: zip не появился в ${TMP}" >&2 + ls -la "$TMP" >&2 || true + exit 1 +fi + +echo "Admin SDK: файл $(basename "$ZIP")" >&2 + +if ! unzip -t "$ZIP" >/dev/null 2>&1; then + echo "Admin SDK: ответ не zip (Cloudflare / вход?)" >&2 + head -c 200 "$ZIP" >&2 || true + exit 1 +fi + +unzip -q "$ZIP" -d "$TMP/unpack" + +SDK="" +# GitHub archive: mhadmin-rel-200.4.1/upload/devcraft/src/sdk/dle +for root in "$TMP/unpack"/mhadmin-rel-* "$TMP/unpack"/mhadmin-*; do + [ -d "$root" ] || continue + cand="$root/upload/devcraft/src/sdk/dle" + if [ -d "$cand/Schema" ] && [ -d "$cand/Xfield/Schema" ]; then + SDK="$cand" + echo "Admin SDK: корень $(basename "$root")" >&2 + break + fi +done + +if [ -z "$SDK" ]; then + while IFS= read -r dir; do + if [ -d "$dir/Schema" ] && [ -d "$dir/Xfield/Schema" ]; then + SDK="$dir" + break + fi + done <&2 + find "$TMP/unpack" -maxdepth 3 -type d >&2 || true + exit 1 +fi + +rm -rf "$DEST" +mkdir -p "$DEST" +cp -a "$SDK"/. "$DEST"/ + +echo "Admin SDK: модели → ${DEST} (Schema=$(find "$DEST/Schema" -name '*.php' | wc -l))" >&2 diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml index 1ba19bd3..9df7f5a1 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -9,6 +9,8 @@ on: - 'upload/api/composer.json' - 'upload/api/composer.lock' - '.github/workflows/openapi.yml' + - '.github/scripts/fetch-admin-sdk.sh' + - 'upload/api/scripts/**' permissions: contents: write @@ -37,6 +39,9 @@ jobs: composer install --no-dev --no-interaction --prefer-dist --no-progress - name: Generate openapi.yaml + env: + DLE_ADMIN_SDK: ${{ runner.temp }}/dle-admin-sdk + ADMIN_DOWNLOAD_URL: https://devcraft.club/downloads/devcraft-admin-panel.4/download run: composer openapi - name: Open PR if spec changed @@ -50,5 +55,7 @@ jobs: body: | Автоматическая регенерация `apidata/openapi.yaml` из PHP-атрибутов. + Модели Schema — из последней версии [DevCraft Admin](https://devcraft.club/downloads/devcraft-admin-panel.4/download). + Триггер: `${{ github.event_name }}` labels: documentation diff --git a/apidata/openapi.yaml b/apidata/openapi.yaml index 252ded78..fa8314f3 100644 --- a/apidata/openapi.yaml +++ b/apidata/openapi.yaml @@ -1406,7 +1406,7 @@ components: type: integer schema_org: description: 'Колонка category.schema_org' - type: integer + type: string disable_index: description: 'Колонка category.disable_index' type: integer @@ -1789,6 +1789,71 @@ components: description: 'Колонка lostdb.lostid' type: string type: object + MailCampaignUsers: + description: 'Схема таблицы `mail_campaign_users`.' + properties: + campaign_id: + description: 'ID кампании (mail_campaign_users.campaign_id)' + type: integer + user_id: + description: 'ID пользователя (mail_campaign_users.user_id)' + type: integer + type: object + MailCampaigns: + description: 'Схема таблицы `mail_campaigns`.' + properties: + id: + description: 'Первичный ключ (mail_campaigns.id)' + type: integer + type: + description: 'Колонка mail_campaigns.type' + type: integer + enabled: + description: 'Колонка mail_campaigns.enabled' + type: integer + send_method: + description: 'Колонка mail_campaigns.send_method' + type: integer + sender_id: + description: 'ID отправителя (mail_campaigns.sender_id)' + type: integer + title: + description: 'Заголовок (mail_campaigns.title)' + type: string + message: + description: 'Текст сообщения (mail_campaigns.message)' + type: string + users_per_pass: + description: 'Колонка mail_campaigns.users_per_pass' + type: integer + send_interval: + description: 'Колонка mail_campaigns.send_interval' + type: integer + start_date: + description: 'Колонка mail_campaigns.start_date' + type: integer + total_users: + description: 'Колонка mail_campaigns.total_users' + type: integer + user_groups: + description: 'Колонка mail_campaigns.user_groups' + type: string + reg_date_from: + description: 'Колонка mail_campaigns.reg_date_from' + type: integer + reg_date_to: + description: 'Колонка mail_campaigns.reg_date_to' + type: integer + last_visit_from: + description: 'Колонка mail_campaigns.last_visit_from' + type: integer + last_visit_to: + description: 'Колонка mail_campaigns.last_visit_to' + type: integer + allow_mail: + description: 'Колонка mail_campaigns.allow_mail' + type: integer + type: object MailLog: description: 'Схема таблицы `mail_log`.' properties: @@ -2348,8 +2413,8 @@ components: description: 'Колонка rss.cookie' type: string category: - description: 'CSV id или all (таблица rss.category)' - type: string + description: 'ID категории (rss.category)' + type: integer lastdate: description: 'Колонка rss.lastdate' type: integer @@ -2560,7 +2625,7 @@ components: type: integer name: description: 'Имя (storage.name)' - type: integer + type: string type: description: 'Колонка storage.type' type: integer @@ -2684,6 +2749,10 @@ components: $ref: '#/components/schemas/Lostdb' - $ref: '#/components/schemas/MailLog' + - + $ref: '#/components/schemas/MailCampaigns' + - + $ref: '#/components/schemas/MailCampaignUsers' - $ref: '#/components/schemas/Metatags' - @@ -3360,7 +3429,7 @@ components: type: integer date: description: 'Дата/время (vote.date)' - type: integer + type: string title: description: 'Заголовок (vote.title)' type: string diff --git a/upload/api/composer.json b/upload/api/composer.json index 9edcfd23..8916b224 100644 --- a/upload/api/composer.json +++ b/upload/api/composer.json @@ -29,7 +29,7 @@ }, "scripts": { "openapi": [ - "@php vendor/zircote/swagger-php/bin/openapi -b ../devcraft/vendor/autoload.php -o ../../apidata/openapi.yaml -f yaml ./src/OpenApi ../devcraft/src/sdk/dle/Schema ../devcraft/src/sdk/dle/Xfield/Schema" + "@php scripts/generate-openapi.php" ] }, "config": { diff --git a/upload/api/scripts/generate-openapi.php b/upload/api/scripts/generate-openapi.php new file mode 100644 index 00000000..df905251 --- /dev/null +++ b/upload/api/scripts/generate-openapi.php @@ -0,0 +1,60 @@ + Date: Sun, 20 Sep 2026 16:09:38 +0200 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D1=82=20=D0=BF=D1=83=D1=82=D0=B8=20=D0=B8?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D0=BE=D0=BA=20=D0=B8=20=D0=BE=D0=B1=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D1=8F=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit конфигурацию установки плагина Удаляет слеш в начале пути иконки для корректной работы с относительными путями. Добавляет запись в таблицу admin_sections при установке плагина. Расширяет права доступа на группы 1 и 2. Обновляет уведомление сссылками на плагин и документацию. Добавляет комментарий для обозначения кода DleApi в конфиге email. --- .github/scripts/fetch-admin-sdk.sh | 49 +- .github/workflows/openapi.yml | 6 +- LICENSE | 682 +----------------- README.md | 2 +- upload/api/composer.json | 2 +- upload/api/scripts/generate-openapi.php | 9 +- .../DleApi/Controller/ProfileController.php | 112 +++ .../DleApi/Controller/show_dleapi_profile.php | 29 + .../src/modules/DleApi/DleApiIdentity.php | 21 + .../src/modules/DleApi/Pages/SettingsPage.php | 14 - .../modules/DleApi/Public/dleapi_profile.css} | 0 .../modules/DleApi/Public}/dleapi_profile.js | 0 .../src/modules/DleApi/changelog.data.php | 6 +- .../devcraft/src/modules/DleApi/manifest.php | 34 +- .../modules/devcraft/dleapi_profile.php | 124 ---- upload/install.xml | 23 +- 16 files changed, 274 insertions(+), 839 deletions(-) create mode 100644 upload/devcraft/src/modules/DleApi/Controller/ProfileController.php create mode 100644 upload/devcraft/src/modules/DleApi/Controller/show_dleapi_profile.php create mode 100644 upload/devcraft/src/modules/DleApi/DleApiIdentity.php rename upload/{templates/Default/devcraft/dleapi/profile.css => devcraft/src/modules/DleApi/Public/dleapi_profile.css} (100%) rename upload/{templates/Default/devcraft/dleapi => devcraft/src/modules/DleApi/Public}/dleapi_profile.js (100%) delete mode 100644 upload/engine/modules/devcraft/dleapi_profile.php diff --git a/.github/scripts/fetch-admin-sdk.sh b/.github/scripts/fetch-admin-sdk.sh index e9bd0274..8fd1c2a8 100755 --- a/.github/scripts/fetch-admin-sdk.sh +++ b/.github/scripts/fetch-admin-sdk.sh @@ -2,10 +2,11 @@ # Скачивает текущий zip DevCraft Admin с витрины и кладёт sdk/dle (модели Schema). # /download отдаёт GitHub-снимок репозитория: mhadmin-rel-{версия}.zip # (корень архива mhadmin-rel-200.4.1/upload/devcraft/src/sdk/dle). -# Env: ADMIN_DOWNLOAD_URL, DLE_ADMIN_SDK (каталог назначения = …/sdk/dle) +# Env: ADMIN_DOWNLOAD_URL, ADMIN_ARCHIVE_URL, DLE_ADMIN_SDK, GITHUB_TOKEN set -eu URL="${ADMIN_DOWNLOAD_URL:-https://devcraft.club/downloads/devcraft-admin-panel.4/download}" +FALLBACK="${ADMIN_ARCHIVE_URL:-https://github.com/DevCraftClub/mhadmin/archive/refs/heads/rel/200.4.1.zip}" DEST="${DLE_ADMIN_SDK:-}" if [ -z "$DEST" ]; then @@ -13,32 +14,50 @@ if [ -z "$DEST" ]; then exit 1 fi +if ! command -v unzip >/dev/null 2>&1; then + echo "Admin SDK: нет unzip" >&2 + exit 1 +fi + TMP="$(mktemp -d)" cleanup() { rm -rf "$TMP"; } trap cleanup EXIT -echo "Admin SDK: скачиваю ${URL}" >&2 -# -J: имя файла из Content-Disposition → mhadmin-rel-200.4.1.zip -( - cd "$TMP" - curl -fsSL --retry 3 --retry-delay 2 -L -J -O "$URL" -) +ZIP="$TMP/admin.zip" -ZIP="$(find "$TMP" -maxdepth 1 -type f \( -name '*.zip' -o -name '*.ZIP' \) | head -n 1)" -if [ -z "$ZIP" ]; then - echo "Admin SDK: zip не появился в ${TMP}" >&2 - ls -la "$TMP" >&2 || true - exit 1 -fi +curl_zip() { + src="$1" + echo "Admin SDK: скачиваю ${src}" >&2 + # Фиксированное имя: -J/-O на CI часто даёт файл «download» без .zip. + if [ -n "${GITHUB_TOKEN:-}" ] && printf '%s' "$src" | grep -q 'github.com'; then + curl -fsSL --retry 3 --retry-delay 2 -L \ + -H "Authorization: Bearer ${GITHUB_TOKEN}" \ + -o "$ZIP" "$src" + else + curl -fsSL --retry 3 --retry-delay 2 -L -o "$ZIP" "$src" + fi +} + +zip_ok() { + [ -s "$ZIP" ] && unzip -t "$ZIP" >/dev/null 2>&1 +} -echo "Admin SDK: файл $(basename "$ZIP")" >&2 +if ! curl_zip "$URL" || ! zip_ok; then + echo "Admin SDK: витрина не zip, пробую снимок GitHub" >&2 + head -c 160 "$ZIP" >&2 || true + echo >&2 + curl_zip "$FALLBACK" +fi -if ! unzip -t "$ZIP" >/dev/null 2>&1; then +if ! zip_ok; then echo "Admin SDK: ответ не zip (Cloudflare / вход?)" >&2 + ls -la "$TMP" >&2 || true head -c 200 "$ZIP" >&2 || true exit 1 fi +echo "Admin SDK: файл $(wc -c < "$ZIP") байт" >&2 + unzip -q "$ZIP" -d "$TMP/unpack" SDK="" diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml index 9df7f5a1..dca11aba 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -42,7 +42,11 @@ jobs: env: DLE_ADMIN_SDK: ${{ runner.temp }}/dle-admin-sdk ADMIN_DOWNLOAD_URL: https://devcraft.club/downloads/devcraft-admin-panel.4/download - run: composer openapi + ADMIN_ARCHIVE_URL: https://github.com/DevCraftClub/mhadmin/archive/refs/heads/rel/200.4.1.zip + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + composer openapi + test -s ../../apidata/openapi.yaml - name: Open PR if spec changed uses: peter-evans/create-pull-request@v8 diff --git a/LICENSE b/LICENSE index be3f7b28..94894b3f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,661 +1,21 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. +MIT License + +Copyright (c) 2024-2026 Maxim Harder / DevCraft Club + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index e7b5c028..09bcd04a 100644 --- a/README.md +++ b/README.md @@ -40,4 +40,4 @@ ## Лицензия - [AGPL-3.0-or-later](LICENSE) \ No newline at end of file + [MIT](LICENSE) \ No newline at end of file diff --git a/upload/api/composer.json b/upload/api/composer.json index 8916b224..c443e5ef 100644 --- a/upload/api/composer.json +++ b/upload/api/composer.json @@ -1,7 +1,7 @@ { "name": "devcraftclub/dle-api", "description": "Неофициальное REST API для DataLife Engine", - "license": "GPL-3.0-only", + "license": "MIT", "require": { "ext-json": "*", "ext-pdo": "*", diff --git a/upload/api/scripts/generate-openapi.php b/upload/api/scripts/generate-openapi.php index df905251..0e283cd5 100644 --- a/upload/api/scripts/generate-openapi.php +++ b/upload/api/scripts/generate-openapi.php @@ -57,4 +57,11 @@ $line = implode(' ', array_map('escapeshellarg', $cmd)); passthru($line, $code); -exit($code); +if($code !== 0) { + exit($code); +} +if(!is_file($outFile) || filesize($outFile) < 32) { + fwrite(STDERR, "OpenAPI: файл не записан: {$outFile}\n"); + exit(1); +} +echo "OpenAPI: записан {$outFile} (" . filesize($outFile) . " байт)\n"; diff --git a/upload/devcraft/src/modules/DleApi/Controller/ProfileController.php b/upload/devcraft/src/modules/DleApi/Controller/ProfileController.php new file mode 100644 index 00000000..2ef31523 --- /dev/null +++ b/upload/devcraft/src/modules/DleApi/Controller/ProfileController.php @@ -0,0 +1,112 @@ +isAdminViewer((array) $member_id, is_array($user_group ?? null)? $user_group : []); + $isForeignModeration = $viewerCanModerate && $viewerId !== $profileId; + + if($profileId < 1 || ($viewerId !== $profileId && !$viewerCanModerate)) { + return ''; + } + + if(empty($cfg['profile_allow_generate']) && empty($cfg['profile_show_field']) && !$isForeignModeration) { + return ''; + } + + if(!isset($tpl) || !is_object($tpl)) { + if(!class_exists('dle_template', false)) { + require_once \DLEPlugins::Check(ENGINE_DIR . '/classes/templates.class.php'); + } + + $tpl = new \dle_template(); + $tpl->dir = ROOT_DIR . '/templates/' . (string) ($config['skin'] ?? 'Default'); + } + + $skin = totranslit((string) ($config['skin'] ?? 'Default'), false, false); + + if(!is_dir(ROOT_DIR . '/templates/' . $skin . '/devcraft/dleapi')) { + $skin = 'Default'; + } + + $restoreDir = $tpl->dir; + $tpl->dir = ROOT_DIR . '/templates/' . $skin; + $e = static fn(string $value): string => htmlspecialchars($value, ENT_QUOTES, 'UTF-8'); + + $tpl->set('{user-hash}', $e((string) ($dle_login_hash ?? ''))); + $tpl->set('{profile-id}', (string) $profileId); + $tpl->set('{viewer-id}', (string) $viewerId); + $tpl->set('{admin-mode}', $isForeignModeration? '1' : '0'); + $tpl->set('{title}', $e(__('API-ключ'))); + $tpl->set('{new-label}', $e(__('Новый'))); + $tpl->set('{loading-label}', $e(__('Загрузка…'))); + $tpl->set('{key-label}', $e(__('Ключ'))); + $tpl->set('{copy-label}', $e(__('Копировать'))); + $tpl->set('{from-label}', $e(__('Когда'))); + $tpl->set('{until-label}', $e(__('Истекает'))); + $tpl->set('{level-label}', $e(__('Уровень'))); + $tpl->set('{request-label}', $e(__('Запросить ключ'))); + $tpl->set('{approve-label}', $e(__('Одобрить'))); + $tpl->set('{deny-label}', $e(__('Отказать'))); + $tpl->set('{request-hidden}', empty($cfg['profile_allow_generate'])? ' hidden' : ''); + + $html = ''; + + try { + $tpl->result['content'] = ''; + $tpl->load_template('devcraft/dleapi/profile.tpl'); + $tpl->compile('content'); + $html = (string) ($tpl->result['content'] ?? ''); + } finally { + $tpl->dir = $restoreDir; + } + + return $html; + } + + /** + * @param array $member + * @param array $groups + */ + private function isAdminViewer(array $member, array $groups): bool { + $groupId = (int) ($member['user_group'] ?? 0); + $group = $groups[$groupId] ?? []; + + return $groupId === 1 + || !empty($group['allow_all_edit']) + || !empty($group['allow_admin']); + } + +} diff --git a/upload/devcraft/src/modules/DleApi/Controller/show_dleapi_profile.php b/upload/devcraft/src/modules/DleApi/Controller/show_dleapi_profile.php new file mode 100644 index 00000000..6238ea92 --- /dev/null +++ b/upload/devcraft/src/modules/DleApi/Controller/show_dleapi_profile.php @@ -0,0 +1,29 @@ +render($focus); diff --git a/upload/devcraft/src/modules/DleApi/DleApiIdentity.php b/upload/devcraft/src/modules/DleApi/DleApiIdentity.php new file mode 100644 index 00000000..58056f26 --- /dev/null +++ b/upload/devcraft/src/modules/DleApi/DleApiIdentity.php @@ -0,0 +1,21 @@ +addBreadcrumb(__('Настройки')); - $configFile = Paths::config() . '/dleapi.json'; - - if(!is_file($configFile)) { - DataManager::saveConfig(DleApiIdentity::code(), [ - 'algo' => 'sha256', - 'secret' => '', - 'length' => 32, - 'secure' => true, - 'token_ttl' => 3600, - ]); - } - $current = DataManager::getConfig(DleApiIdentity::code()); $merged = KeyNotifyDelivery::loadEditorConfig(is_array($current) ? $current : []); if(!is_array($current) || $merged !== $current) { diff --git a/upload/templates/Default/devcraft/dleapi/profile.css b/upload/devcraft/src/modules/DleApi/Public/dleapi_profile.css similarity index 100% rename from upload/templates/Default/devcraft/dleapi/profile.css rename to upload/devcraft/src/modules/DleApi/Public/dleapi_profile.css diff --git a/upload/templates/Default/devcraft/dleapi/dleapi_profile.js b/upload/devcraft/src/modules/DleApi/Public/dleapi_profile.js similarity index 100% rename from upload/templates/Default/devcraft/dleapi/dleapi_profile.js rename to upload/devcraft/src/modules/DleApi/Public/dleapi_profile.js diff --git a/upload/devcraft/src/modules/DleApi/changelog.data.php b/upload/devcraft/src/modules/DleApi/changelog.data.php index 65d44426..91a3e1ac 100644 --- a/upload/devcraft/src/modules/DleApi/changelog.data.php +++ b/upload/devcraft/src/modules/DleApi/changelog.data.php @@ -12,14 +12,18 @@ */ return [ ChangelogBuilder::create('200.1.1') - ->date('2026-09-10') + ->date('2026-09-20') ->changed([ __('Зависимость: DevCraft Admin ≥ 200.4.1 для авто-создания таблиц api_* после установки ядра.'), __('In-process SDK (Schema / Fluent / Xfield / DcApi) переехал в DevCraft Admin (devcraft/src/sdk/dle/); пакет API стал его потребителем. Фасад DcApi и контракт /api/v2 не изменились.'), __('Namespace SDK: DleApi\{Schema,Fluent,Xfield,Sdk} → DevCraft\Dle\... Старые имена работают через алиасы классов (уйдут в следующем мажоре). Namespace DleApi\Http и DleApi\OpenApi остались в пакете API.'), + __('install.xml: иконка — путь к Public/icon.png, allow_groups 1,2, notice — страница плагина и документация.'), + __('Блок профиля: Controller/show_dleapi_profile.php; CSS/JS — Public/ + siteAssets на userinfo.'), ]) ->removed([ __('api/sdk/bootstrap.php и вставки в engine/init.php: SDK поднимается через devcraft/init.php.'), + __('Файл engine/modules/devcraft/dleapi_profile.php и CSS/JS профиля в теме.'), + __('Автопосев dleapi.json при открытии настроек, если файла нет.'), ]) ->fixed([ __('При SQLSTATE[42S02] на api_*: нужен DevCraft Admin ≥ 200.4.1 (GenerateMigrations при пересборке схемы); сброс cycle_orm_schema.ser и повторный заход в модуль.'), diff --git a/upload/devcraft/src/modules/DleApi/manifest.php b/upload/devcraft/src/modules/DleApi/manifest.php index 1743b22d..0cac0024 100644 --- a/upload/devcraft/src/modules/DleApi/manifest.php +++ b/upload/devcraft/src/modules/DleApi/manifest.php @@ -8,6 +8,8 @@ use DevCraft\Builders\ModuleAssetsBuilder; use DevCraft\Builders\ModuleManifestBuilder; use DevCraft\Builders\ModuleAjaxConfigBuilder; +use DevCraft\Builders\ModuleSiteAssetsBuilder; +use DevCraft\Modules\DleApi\DleApiIdentity; use DevCraft\Modules\DleApi\Pages\KeysPage; use DevCraft\Modules\DleApi\Pages\OauthPage; use DevCraft\Modules\DleApi\Pages\SettingsPage; @@ -44,26 +46,26 @@ * @return ModuleManifest */ return ModuleManifestBuilder::create() - ->mod('dleapi') - ->code('dleapi') + ->mod(DleApiIdentity::mod()) + ->code(DleApiIdentity::code()) ->crowdinName('dle-api') ->crowdinStatId('16830581-921125') ->name('DLE API') ->version('200.1.1') ->description(__('Неофициальное REST API для DLE: ключи, OAuth2 Bearer, /api/v2')) ->icon('mif-embed2') - ->docsLink('https://readme.devcraft.club/dev/dle/dle_api/200.1.1/getting_started') + ->docsLink('https://readme.devcraft.club/latest/dev/dle_api/install/') ->siteLink('https://devcraft.club/downloads/dle-api.20/') ->siteId(20) ->menu([ - AdminLink::page(__('Главная'), 'dashboard', DashboardPage::class, 'mif-home', 'dleapi'), - AdminLink::page(__('API-ключи'), 'keys', KeysPage::class, 'mif-key', 'dleapi'), - AdminLink::page(__('Уровни доступа'), 'access', AccessLevelsPage::class, 'mif-security', 'dleapi'), - AdminLink::page(__('Синхронизация с группами'), 'access_sync', AccessSyncPage::class, 'mif-users', 'dleapi'), - AdminLink::page(__('Заявки на ключ'), 'key_requests', KeyRequestsPage::class, 'mif-mail', 'dleapi'), - AdminLink::page(__('OAuth-клиенты'), 'oauth', OauthPage::class, 'mif-lock', 'dleapi'), - AdminLink::page(__('Настройки'), 'settings', SettingsPage::class, 'mif-cog', 'dleapi'), - AdminLink::page(__('Журнал изменений'), 'changelog', ChangelogPage::class, 'mif-library', 'dleapi'), + AdminLink::page(__('Главная'), 'dashboard', DashboardPage::class, 'mif-home', DleApiIdentity::mod()), + AdminLink::page(__('API-ключи'), 'keys', KeysPage::class, 'mif-key', DleApiIdentity::mod()), + AdminLink::page(__('Уровни доступа'), 'access', AccessLevelsPage::class, 'mif-security', DleApiIdentity::mod()), + AdminLink::page(__('Синхронизация с группами'), 'access_sync', AccessSyncPage::class, 'mif-users', DleApiIdentity::mod()), + AdminLink::page(__('Заявки на ключ'), 'key_requests', KeyRequestsPage::class, 'mif-mail', DleApiIdentity::mod()), + AdminLink::page(__('OAuth-клиенты'), 'oauth', OauthPage::class, 'mif-lock', DleApiIdentity::mod()), + AdminLink::page(__('Настройки'), 'settings', SettingsPage::class, 'mif-cog', DleApiIdentity::mod()), + AdminLink::page(__('Журнал изменений'), 'changelog', ChangelogPage::class, 'mif-library', DleApiIdentity::mod()), ]) ->ajax( ModuleAjaxConfigBuilder::create('admin') @@ -91,6 +93,14 @@ ComposerTypeBuilder::create('league/oauth2-server')->minVersion('^9.0')->hardRequired()->build(), ]) ->changelog(require DLEPlugins::Check(__DIR__ . '/changelog.data.php')) - // siteAssets не объявлен: Public JS только для админки; глобальная оболочка — через Admin {devcraft*} / siteAssets при появлении theme-global файлов. ->assets(ModuleAssetsBuilder::create()->js('dleapi.js')) + ->siteAssets( + ModuleSiteAssetsBuilder::create() + ->css('dleapi_profile.css', available: ['userinfo']) + ->js( + 'dleapi_profile.js', + dependsOn: ['devcraft/src/templates/core/assets/js/dc_public.js'], + available: ['userinfo'], + ) + ) ->build(__DIR__); diff --git a/upload/engine/modules/devcraft/dleapi_profile.php b/upload/engine/modules/devcraft/dleapi_profile.php deleted file mode 100644 index ebd0c82a..00000000 --- a/upload/engine/modules/devcraft/dleapi_profile.php +++ /dev/null @@ -1,124 +0,0 @@ - $params - */ - function __(string $phrase, array $params = [], int $count = 0): string { - return $phrase; - } -} - -global $is_logged, $member_id, $config, $dle_login_hash, $row, $user_group; - -$focus = isset($focus)? $focus : 'html'; -$homeUrl = rtrim((string) ($config['http_home_url'] ?? '/'), '/') . '/'; - -$cfg = []; -if(defined('DEVCRAFT_BOOTSTRAPPED')) { - $cfg = DleApiConfig::all(); -} - -$isAdminViewer = static function(array $member, array $groups): bool { - $groupId = (int) ($member['user_group'] ?? 0); - $group = $groups[$groupId] ?? []; - - return $groupId === 1 - || !empty($group['allow_all_edit']) - || !empty($group['allow_admin']); -}; - -$skin = totranslit((string) ($config['skin'] ?? 'Default'), false, false); -if(!is_dir(ROOT_DIR . '/templates/' . $skin . '/devcraft/dleapi')) { - $skin = 'Default'; -} - -$tpl->dir = ROOT_DIR . '/templates/' . $skin; -$modUrl = $homeUrl . 'templates/' . $skin . '/devcraft/dleapi'; -$ajaxUrl = $homeUrl . 'devcraft/ajax.php'; -$dcPublicUrl = $homeUrl . 'devcraft/src/templates/core/assets/js/dc_public.js'; - -if($focus === 'css') { - echo '' . "\n"; - - return; -} - -if($focus === 'js') { - $dcPublicPath = ROOT_DIR . '/devcraft/src/templates/core/assets/js/dc_public.js'; - if(is_file($dcPublicPath)) { - $dcPublicUrl .= '?v=' . filemtime($dcPublicPath); - } - - echo '' . "\n"; - echo '' . "\n"; - $jsPath = $tpl->dir . '/devcraft/dleapi/dleapi_profile.js'; - if(is_file($jsPath)) { - echo "\n"; - } - - return; -} - -if(empty($is_logged) || empty($member_id['user_id'])) { - return; -} - -$viewerId = (int) $member_id['user_id']; -$profileId = (isset($row) && is_array($row))? (int) ($row['user_id'] ?? 0) : 0; -$viewerCanModerate = $isAdminViewer((array) $member_id, is_array($user_group ?? null)? $user_group : []); -if($profileId < 1 || ($viewerId !== $profileId && !$viewerCanModerate)) { - return; -} - -$isForeignModerationView = $viewerCanModerate && $viewerId !== $profileId; -if(empty($cfg['profile_allow_generate']) && empty($cfg['profile_show_field']) && !$isForeignModerationView) { - return; -} - -$e = static fn(string $value): string => htmlspecialchars($value, ENT_QUOTES, 'UTF-8'); - -echo '' . "\n"; - -$tpl->set('{user-hash}', $e((string) ($dle_login_hash ?? ''))); -$tpl->set('{profile-id}', (string) $profileId); -$tpl->set('{viewer-id}', (string) $viewerId); -$tpl->set('{admin-mode}', $isForeignModerationView? '1' : '0'); -$tpl->set('{title}', $e(__('API-ключ'))); -$tpl->set('{new-label}', $e(__('Новый'))); -$tpl->set('{loading-label}', $e(__('Загрузка…'))); -$tpl->set('{key-label}', $e(__('Ключ'))); -$tpl->set('{copy-label}', $e(__('Копировать'))); -$tpl->set('{from-label}', $e(__('Когда'))); -$tpl->set('{until-label}', $e(__('Истекает'))); -$tpl->set('{level-label}', $e(__('Уровень'))); -$tpl->set('{request-label}', $e(__('Запросить ключ'))); -$tpl->set('{approve-label}', $e(__('Одобрить'))); -$tpl->set('{deny-label}', $e(__('Отказать'))); -$tpl->set('{request-hidden}', empty($cfg['profile_allow_generate'])? ' hidden' : ''); - -$tpl->load_template('devcraft/dleapi/profile.tpl'); -$tpl->compile('content'); -echo $tpl->result['content']; diff --git a/upload/install.xml b/upload/install.xml index b4f4efb7..1208f653 100644 --- a/upload/install.xml +++ b/upload/install.xml @@ -2,7 +2,7 @@ DLE-API Неофициальное REST API для DLE: ключи, OAuth2 Bearer, /api/v2 - /devcraft/src/modules/DleApi/Public/icon.png + devcraft/src/modules/DleApi/Public/icon.png 200.1.1 20.0 greater @@ -106,7 +106,8 @@ INSERT INTO {prefix}_email (name, template, use_html) VALUES ', 1) -ON DUPLICATE KEY UPDATE template=VALUES(template), use_html=VALUES(use_html);]]> +ON DUPLICATE KEY UPDATE template=VALUES(template), use_html=VALUES(use_html); +INSERT INTO {prefix}_admin_sections (name, title, descr, icon, allow_groups) VALUES ('dleapi', 'DLE-API v200.1.1', 'Неофициальное REST API для DLE: ключи, OAuth2 Bearer, /api/v2', 'devcraft/src/modules/DleApi/Public/icon.png', '1,2') ON DUPLICATE KEY UPDATE title='DLE-API v200.1.1', descr='Неофициальное REST API для DLE: ключи, OAuth2 Bearer, /api/v2', icon='devcraft/src/modules/DleApi/Public/icon.png', allow_groups='1,2';]]> @@ -204,9 +205,9 @@ INSERT INTO {prefix}_email (name, template, use_html) VALUES ', 1) ON DUPLICATE KEY UPDATE template=VALUES(template), use_html=VALUES(use_html); -INSERT INTO {prefix}_admin_sections (name, title, descr, icon, allow_groups) VALUES ('dleapi', 'DLE-API v200.1.1', 'Неофициальное REST API для DLE: ключи, OAuth2 Bearer, /api/v2', '/devcraft/src/modules/DleApi/Public/icon.png', 1) ON DUPLICATE KEY UPDATE title='DLE-API v200.1.1', descr='Неофициальное REST API для DLE: ключи, OAuth2 Bearer, /api/v2', icon='/devcraft/src/modules/DleApi/Public/icon.png'; +INSERT INTO {prefix}_admin_sections (name, title, descr, icon, allow_groups) VALUES ('dleapi', 'DLE-API v200.1.1', 'Неофициальное REST API для DLE: ключи, OAuth2 Bearer, /api/v2', 'devcraft/src/modules/DleApi/Public/icon.png', '1,2') ON DUPLICATE KEY UPDATE title='DLE-API v200.1.1', descr='Неофициальное REST API для DLE: ключи, OAuth2 Bearer, /api/v2', icon='devcraft/src/modules/DleApi/Public/icon.png', allow_groups='1,2'; ]]> - + - +
  • Ссылка на плагин: перейти
  • Документация: перейти
    • ]]>     safesql( $_POST['twofactor_text'] ) : ''; + // DevCraft DleApi: start $dleapi_key_request_html = isset($_POST['dleapi_key_request_html']) ? intval( $_POST['dleapi_key_request_html'] ) : 0; $dleapi_key_request_text = isset($_POST['dleapi_key_request_text']) ? $db->safesql( $_POST['dleapi_key_request_text'] ) : ''; $dleapi_key_decision_html = isset($_POST['dleapi_key_decision_html']) ? intval( $_POST['dleapi_key_decision_html'] ) : 0; - $dleapi_key_decision_text = isset($_POST['dleapi_key_decision_text']) ? $db->safesql( $_POST['dleapi_key_decision_text'] ) : '';]]> + $dleapi_key_decision_text = isset($_POST['dleapi_key_decision_text']) ? $db->safesql( $_POST['dleapi_key_decision_text'] ) : ''; + // DevCraft DleApi: end]]> 1 query( "UPDATE " . PREFIX . "_email SET template='$twofactor_text', use_html='$twofactor_html' WHERE name='twofactor'" );]]> query( "UPDATE " . PREFIX . "_email SET template='$twofactor_text', use_html='$twofactor_html' WHERE name='twofactor'" ); + // DevCraft DleApi: start $db->query( "UPDATE " . PREFIX . "_email SET template='$dleapi_key_request_text', use_html='$dleapi_key_request_html' WHERE name='dleapi_key_request'" ); - $db->query( "UPDATE " . PREFIX . "_email SET template='$dleapi_key_decision_text', use_html='$dleapi_key_decision_html' WHERE name='dleapi_key_decision'" );]]> + $db->query( "UPDATE " . PREFIX . "_email SET template='$dleapi_key_decision_text', use_html='$dleapi_key_decision_html' WHERE name='dleapi_key_decision'" ); + // DevCraft DleApi: end]]> 1 @@ -265,6 +270,7 @@ DELETE FROM {prefix}_admin_sections WHERE `name` = 'dleapi';]]> +
    @@ -290,10 +296,11 @@ DELETE FROM {prefix}_admin_sections WHERE `name` = 'dleapi';]]>
    Теги: {%username%}, {%user_id%}, {%api_key%}, {%subject%}

    -
    +
    +