diff --git a/Dockerfile b/Dockerfile index 38a56fc2..de5860a5 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20 AS builder +FROM alpine:3.21 AS builder ARG INSTALL_DIR=/app @@ -14,7 +14,7 @@ ENV PATH="/opt/venv/bin:$PATH" COPY . ${INSTALL_DIR}/ -RUN pip install openwrt-luci-rpc asusrouter asyncio aiohttp graphene flask netifaces tplink-omada-client wakeonlan pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros git+https://github.com/foreign-sub/aiofreepybox.git \ +RUN pip install openwrt-luci-rpc asusrouter asyncio aiohttp graphene flask tplink-omada-client wakeonlan pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros git+https://github.com/foreign-sub/aiofreepybox.git \ && bash -c "find ${INSTALL_DIR} -type d -exec chmod 750 {} \;" \ && bash -c "find ${INSTALL_DIR} -type f -exec chmod 640 {} \;" \ && bash -c "find ${INSTALL_DIR} -type f \( -name '*.sh' -o -name '*.py' -o -name 'speedtest-cli' \) -exec chmod 750 {} \;" @@ -23,7 +23,7 @@ RUN pip install openwrt-luci-rpc asusrouter asyncio aiohttp graphene flask netif RUN cat ${INSTALL_DIR}/install/freebox_certificate.pem >> /opt/venv/lib/python3.12/site-packages/aiofreepybox/freebox_certificates.pem # second stage -FROM alpine:3.20 AS runner +FROM alpine:3.21 AS runner ARG INSTALL_DIR=/app diff --git a/Dockerfile.debian b/Dockerfile.debian index 736b61f5..9cd785dc 100755 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -43,7 +43,7 @@ RUN phpenmod -v 8.2 sqlite3 RUN apt-get install -y python3-venv RUN python3 -m venv myenv -RUN /bin/bash -c "source myenv/bin/activate && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && pip3 install openwrt-luci-rpc asusrouter asyncio aiohttp graphene flask netifaces tplink-omada-client wakeonlan pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros " +RUN /bin/bash -c "source myenv/bin/activate && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && pip3 install openwrt-luci-rpc asusrouter asyncio aiohttp graphene flask tplink-omada-client wakeonlan pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros " # Create a buildtimestamp.txt to later check if a new version was released RUN date +%s > ${INSTALL_DIR}/front/buildtimestamp.txt diff --git a/docker-compose.yml b/docker-compose.yml index cdca7e7b..165c3930 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,7 +62,6 @@ services: - ${DEV_LOCATION}/front/workflows.php:/app/front/workflows.php - ${DEV_LOCATION}/front/appEventsCore.php:/app/front/appEventsCore.php - ${DEV_LOCATION}/front/multiEditCore.php:/app/front/multiEditCore.php - - ${DEV_LOCATION}/front/donations.php:/app/front/donations.php - ${DEV_LOCATION}/front/plugins:/app/front/plugins # DELETE END anyone trying to use this file: comment out / delete ABOVE lines, they are only for development purposes # --------------------------------------------------------------------------- diff --git a/front/css/app.css b/front/css/app.css index dd925a02..dd6c533e 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -1331,8 +1331,8 @@ input[readonly] { top: -6px; position: absolute; z-index: 1; - left: 0px; - font-size: large; + left: 4px; + font-size: smaller; } .drag @@ -1397,6 +1397,7 @@ input[readonly] { { display: none; padding-top: 2em; + cursor: default; } /* ----------------------------------------------------------------- */ @@ -1618,6 +1619,20 @@ input[readonly] { } } +/* ----------------------------------------------------------------- */ +/* EVENTS page */ +/* ----------------------------------------------------------------- */ + +.eventsPeriodSelectWrap{ + display: inline; + float: right; +} + +.eventsPage #tableEventsTitle +{ + float: left ; +} + /* ----------------------------------------------------------------- */ /* PLUGINS page */ /* ----------------------------------------------------------------- */ @@ -1800,10 +1815,7 @@ input[readonly] { ----------------------------------------------------------------------------- */ #multiEditPlc { - position: fixed; - bottom: 50px; - right: 0px; - z-index: 10; + padding-right: 10px; } diff --git a/front/devices.php b/front/devices.php index 04087828..8cb26730 100755 --- a/front/devices.php +++ b/front/devices.php @@ -28,14 +28,6 @@
- -
-

- - -

-
-
@@ -78,6 +70,9 @@

+ + + @@ -106,7 +101,7 @@ -
+
@@ -749,9 +744,9 @@ function initializeDatatable (status) { // add multi-edit button $('#multiEditPlc').append( - ``) + ``) // Event listener for row selection in DataTable $('#tableDevices').on('click', 'tr', function (e) { diff --git a/front/donations.php b/front/donations.php deleted file mode 100755 index 0d4d428c..00000000 --- a/front/donations.php +++ /dev/null @@ -1,70 +0,0 @@ - - -
- -
-

- -

-
- - -
-
-
-

-
-
-
-
- - Sponsor Me on GitHub - -
-
- - Buy Me A Coffee - -
-
- - Support me on patreon - -
-
-
-
-

-
-
-
-
-
    -
  • Bitcoin: 1N8tupjeCK12qRVU2XrV17WvKK7LCawyZM
    • -
  • Ethereum: 0x6e2749Cb42F4411bc98501406BdcD82244e3f9C7
    • -
-
-
-
-
-
- -
- - - - \ No newline at end of file diff --git a/front/events.php b/front/events.php index eba002b6..a62fc9bd 100755 --- a/front/events.php +++ b/front/events.php @@ -1,17 +1,3 @@ - - @@ -19,26 +5,7 @@ -
- - -
-

- - -

- - - - - -
+
@@ -123,15 +90,31 @@
+
-
-

Events

+
+

Events

+
+ +
+
+ +
+ + + diff --git a/front/help_faq.php b/front/help_faq.php index c212e003..8bacc5e4 100755 --- a/front/help_faq.php +++ b/front/help_faq.php @@ -1,18 +1,9 @@
- - -
- -

- - -

-
-

diff --git a/front/maintenance.php b/front/maintenance.php index ffc3604b..abeabe09 100755 --- a/front/maintenance.php +++ b/front/maintenance.php @@ -1,47 +1,16 @@ - - - - - - -
- -
- -

- - -

-
- - -
+ +
- close();
-
-
">' .lang('Maintenance_new_version').''.'' .lang('Maintenance_current_version').'';?>
+
"> + ' .lang('Maintenance_new_version').''.'' .lang('Maintenance_current_version').'';?> +
diff --git a/front/network.php b/front/network.php index ba8f0af0..c318145b 100755 --- a/front/network.php +++ b/front/network.php @@ -1,6 +1,7 @@ Online
'); @@ -15,21 +16,13 @@ // show spinning icon showSpinner() -
- -
- -

- - -

-
+
diff --git a/front/php/templates/header.php b/front/php/templates/header.php index 756ab493..6969f0f3 100755 --- a/front/php/templates/header.php +++ b/front/php/templates/header.php @@ -356,7 +356,10 @@
  • -
    ">🆕
    + +
    "> + +
    @@ -430,17 +433,14 @@
    • -
  • +
  • -
      -
    • - -
      • +
        • diff --git a/front/php/templates/language/ar_ar.json b/front/php/templates/language/ar_ar.json index 7a8c1cd7..af855c37 100755 --- a/front/php/templates/language/ar_ar.json +++ b/front/php/templates/language/ar_ar.json @@ -716,6 +716,7 @@ "general_event_title": "", "go_to_node_event_icon": "", "go_to_node_event_tooltip": "", + "new_version_available": "", "report_guid": "", "report_guid_missing": "", "report_select_format": "", diff --git a/front/php/templates/language/ca_ca.json b/front/php/templates/language/ca_ca.json index 69dc277a..5b5e9b67 100755 --- a/front/php/templates/language/ca_ca.json +++ b/front/php/templates/language/ca_ca.json @@ -489,7 +489,7 @@ "Maintenance_lang_selector_empty": "Tria idioma", "Maintenance_lang_selector_lable": "Selecció d'idioma", "Maintenance_lang_selector_text": "El canvi té lloc en el cantó del client, així que afecta només el navegador actual.", - "Maintenance_new_version": "🆕 Hi ha una nova versió. Comprova release notes.", + "Maintenance_new_version": "Hi ha una nova versió. Comprova release notes.", "Maintenance_themeselector_apply": "Aplica", "Maintenance_themeselector_empty": "Tria una Skin", "Maintenance_themeselector_lable": "Selecciona una Skin", @@ -716,6 +716,7 @@ "general_event_title": "Execució d'un esdeveniment ad-hoc", "go_to_node_event_icon": "fa-square-up-right", "go_to_node_event_tooltip": "Navegació a la pàgina de la Xarxa del node donat", + "new_version_available": "", "report_guid": "Notificació guid:", "report_guid_missing": "No s'ha trobat la notificació enllaçada. Hi ha un petit retard entre les notificacions enviades recentment i que estiguin disponibles. Refresqui la pàgina i la memòria cau d'aquí uns segons. També és possible que la notificació seleccionada s'hagi esborrat durant el manteniment tal com s'especifica a la configuració DBCLNP_NOTIFI_HIST.

        L'última notificació es mostra en el seu lloc. La notificació perduda té el següent GUID:", "report_select_format": "Seleccioneu Format:", @@ -750,4 +751,4 @@ "settings_update_item_warning": "Actualitza el valor sota. Sigues curós de seguir el format anterior. No hi ha validació.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Deseu els canvis primer abans de comprovar la configuració." -} +} \ No newline at end of file diff --git a/front/php/templates/language/cs_cz.json b/front/php/templates/language/cs_cz.json index 7a8c1cd7..af855c37 100755 --- a/front/php/templates/language/cs_cz.json +++ b/front/php/templates/language/cs_cz.json @@ -716,6 +716,7 @@ "general_event_title": "", "go_to_node_event_icon": "", "go_to_node_event_tooltip": "", + "new_version_available": "", "report_guid": "", "report_guid_missing": "", "report_select_format": "", diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json index 2c823fc4..7edd3a4a 100755 --- a/front/php/templates/language/de_de.json +++ b/front/php/templates/language/de_de.json @@ -515,7 +515,7 @@ "Maintenance_lang_selector_empty": "Sprache wählen", "Maintenance_lang_selector_lable": "Sprachauswahl", "Maintenance_lang_selector_text": "Die Änderung findet serverseitig statt, betrifft also alle verwendeten Geräte.", - "Maintenance_new_version": "🆕 Eine neue Version ist vefügbar. Sieh dir die Versionshinweise an.", + "Maintenance_new_version": "Eine neue Version ist vefügbar. Sieh dir die Versionshinweise an.", "Maintenance_themeselector_apply": "Übernehmen", "Maintenance_themeselector_empty": "Skin wählen", "Maintenance_themeselector_lable": "Skin Auswahl", @@ -797,6 +797,7 @@ "general_event_title": "", "go_to_node_event_icon": "", "go_to_node_event_tooltip": "", + "new_version_available": "", "report_guid": "", "report_guid_missing": "", "report_select_format": "Format auswählen:", @@ -831,4 +832,4 @@ "settings_update_item_warning": "", "test_event_icon": "", "test_event_tooltip": "Speichere die Änderungen, bevor Sie die Einstellungen testen." -} +} \ No newline at end of file diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index 9129a8cd..501eb0be 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -489,7 +489,7 @@ "Maintenance_lang_selector_empty": "Choose Language", "Maintenance_lang_selector_lable": "Select Language", "Maintenance_lang_selector_text": "The change takes place on the client side, so it affects only the current browser.", - "Maintenance_new_version": "🆕 A new version is available. Check out the release notes.", + "Maintenance_new_version": "A new version is available. Check out the release notes.", "Maintenance_themeselector_apply": "Apply", "Maintenance_themeselector_empty": "Choose a Skin", "Maintenance_themeselector_lable": "Select Skin", @@ -716,6 +716,7 @@ "general_event_title": "Executing an ad-hoc event", "go_to_node_event_icon": "fa-square-up-right", "go_to_node_event_tooltip": "Navigate to the Network page of the given node", + "new_version_available": "A new version is available.", "report_guid": "Notification guid:", "report_guid_missing": "Linked notification not found. There is a small delay between recently sent notifications and them being available. Referesh your page and cache after a few seconds. It's also possible the selected notification have been deleted during maintenance as specified in the DBCLNP_NOTIFI_HIST setting.

        The latest notification is displayed instead. The missing notification has the following GUID:", "report_select_format": "Select Format:", diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json index 2cc2024c..00360a99 100755 --- a/front/php/templates/language/es_es.json +++ b/front/php/templates/language/es_es.json @@ -513,7 +513,7 @@ "Maintenance_lang_selector_empty": "Elija un idioma", "Maintenance_lang_selector_lable": "Seleccione su idioma", "Maintenance_lang_selector_text": "El cambio se produce en el lado del cliente, por lo que sólo afecta al navegador actual.", - "Maintenance_new_version": "🆕 Una nueva versión está disponible. Comprueba las notas de lanzamiento.", + "Maintenance_new_version": "Una nueva versión está disponible. Comprueba las notas de lanzamiento.", "Maintenance_themeselector_apply": "Aplicar", "Maintenance_themeselector_empty": "Elige un tema", "Maintenance_themeselector_lable": "Seleccionar tema", @@ -795,6 +795,7 @@ "general_event_title": "Ejecutar un evento ad-hoc", "go_to_node_event_icon": "fa-square-up-right", "go_to_node_event_tooltip": "Vaya a la página de Red del nodo indicado", + "new_version_available": "", "report_guid": "Guía de las notificaciones:", "report_guid_missing": "No se ha encontrado la notificación vinculada. Hay un pequeño retraso entre las notificaciones enviadas recientemente y su disponibilidad. Actualiza tu página y la caché después de unos segundos. También es posible que la notificación seleccionada se haya eliminado durante el mantenimiento, tal y como se especifica en la configuración de DBCLNP_NOTIFI_HIST.

        En su lugar, se muestra la notificación más reciente. La notificación que falta tiene el siguiente GUID:", "report_select_format": "Selecciona el formato:", @@ -829,4 +830,4 @@ "settings_update_item_warning": "Actualice el valor a continuación. Tenga cuidado de seguir el formato anterior. O la validación no se realiza.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Guarda tus cambios antes de probar nuevos ajustes." -} +} \ No newline at end of file diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json index c708163e..9878c1c3 100755 --- a/front/php/templates/language/fr_fr.json +++ b/front/php/templates/language/fr_fr.json @@ -489,7 +489,7 @@ "Maintenance_lang_selector_empty": "Choix de la langue", "Maintenance_lang_selector_lable": "Sélectionner une langue", "Maintenance_lang_selector_text": "Le changement est effectué côté client, cela ne concerne donc que le navigateur actuel.", - "Maintenance_new_version": "🆕 Une nouvelle version est disponible. Consulter les notes de version.", + "Maintenance_new_version": "Une nouvelle version est disponible. Consulter les notes de version.", "Maintenance_themeselector_apply": "Appliquer", "Maintenance_themeselector_empty": "Choisir un thème", "Maintenance_themeselector_lable": "Sélectionner un thème", @@ -716,6 +716,7 @@ "general_event_title": "Lancement d'un événement sur mesure", "go_to_node_event_icon": "fa-square-up-right", "go_to_node_event_tooltip": "Aller vers la page Réseau du nœud concerné", + "new_version_available": "", "report_guid": "GUID de la notification :", "report_guid_missing": "La notification associée n'a pas été trouvée. Un petit délai existe entre l'envoi d'une notification et sa disponibilité réelle pour affichage. Rafraichissez la page et votre cache après quelques secondes. Il est aussi possible que la notification sélectionnée ait été supprimée durant une opération de maintenance, comme renseigné dans le paramètre DBCLNP_NOTIFI_HIST.

        La dernière notification est affichée à sa place. La notification manquante dispose du GUID suivant :", "report_select_format": "Sélectionner un format :", @@ -750,4 +751,4 @@ "settings_update_item_warning": "Mettre à jour la valeur ci-dessous. Veillez à bien suivre le même format qu'auparavant. Il n'y a pas de pas de contrôle.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Enregistrer d'abord vos modifications avant de tester vôtre paramétrage." -} +} \ No newline at end of file diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json index fade0416..f4ff2416 100755 --- a/front/php/templates/language/it_it.json +++ b/front/php/templates/language/it_it.json @@ -489,7 +489,7 @@ "Maintenance_lang_selector_empty": "Scegli lingua", "Maintenance_lang_selector_lable": "Seleziona lingua", "Maintenance_lang_selector_text": "Questa modifica avviene lato client, quindi influisce solo sul browser attualmente in uso.", - "Maintenance_new_version": "🆕 È disponibile una nuova versione. Controlla le note di rilascio.", + "Maintenance_new_version": "È disponibile una nuova versione. Controlla le note di rilascio.", "Maintenance_themeselector_apply": "Applica", "Maintenance_themeselector_empty": "Scegli una skin", "Maintenance_themeselector_lable": "Seleziona skin", @@ -716,6 +716,7 @@ "general_event_title": "Esecuzione di un evento ad-hoc", "go_to_node_event_icon": "fa-square-up-right", "go_to_node_event_tooltip": "Passa alla pagina Rete del nodo specificato", + "new_version_available": "", "report_guid": "GUID notifica:", "report_guid_missing": "Notifica collegata non trovata. C'è un piccolo ritardo tra la disponibilità delle notifiche inviate di recente e la loro disponibilità. Aggiorna la pagina e la cache dopo alcuni secondi. È anche possibile che la notifica selezionata sia stata eliminata durante la manutenzione come specificato nell'impostazione DBCLNP_NOTIFI_HIST.

        Viene invece visualizzata l'ultima notifica. La notifica mancante ha il seguente GUID:", "report_select_format": "Seleziona formato:", @@ -750,4 +751,4 @@ "settings_update_item_warning": "Aggiorna il valore qui sotto. Fai attenzione a seguire il formato precedente. La convalida non viene eseguita.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Salva le modifiche prima di provare le nuove impostazioni." -} +} \ No newline at end of file diff --git a/front/php/templates/language/nb_no.json b/front/php/templates/language/nb_no.json index 716ea5fa..367e512a 100755 --- a/front/php/templates/language/nb_no.json +++ b/front/php/templates/language/nb_no.json @@ -489,7 +489,7 @@ "Maintenance_lang_selector_empty": "Velg språk", "Maintenance_lang_selector_lable": "Velg språk", "Maintenance_lang_selector_text": "Endringen skjer på klientsiden, så den påvirker bare den nåværende nettleseren.", - "Maintenance_new_version": "🆕 En ny versjon er tilgjengelig. Sjekk ut utgivelsesnotater.", + "Maintenance_new_version": "En ny versjon er tilgjengelig. Sjekk ut utgivelsesnotater.", "Maintenance_themeselector_apply": "Bruk", "Maintenance_themeselector_empty": "Velg ett skinn", "Maintenance_themeselector_lable": "Velg skinn", @@ -716,6 +716,7 @@ "general_event_title": "Utfører en ad-hoc hendelse", "go_to_node_event_icon": "", "go_to_node_event_tooltip": "", + "new_version_available": "", "report_guid": "Notifikasjons GUID:", "report_guid_missing": "Koblet notifikasjon ikke funnet. Det er en liten forsinkelse mellom nylig sendt notifikasjoner og at de er tilgjengelige. Oppdater siden din og hurtigbufferen etter noen sekunder. Det er også mulig den valgte notifikasjonen er slettet under vedlikehold som spesifisert i DBCLNP_NOTIFI_HIST innstillingen.

        Den siste notifikasjonen vises i stedet. Den manglende notifikasjonen har følgende GUID:", "report_select_format": "Velg format:", @@ -750,4 +751,4 @@ "settings_update_item_warning": "Oppdater verdien nedenfor. Pass på å følge forrige format. Validering etterpå utføres ikke.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Lagre endringene først, før du tester innstillingene dine." -} +} \ No newline at end of file diff --git a/front/php/templates/language/pl_pl.json b/front/php/templates/language/pl_pl.json index f59a4978..b44a81ba 100755 --- a/front/php/templates/language/pl_pl.json +++ b/front/php/templates/language/pl_pl.json @@ -716,6 +716,7 @@ "general_event_title": "Wykonywanie wydarzeń ad-hoc", "go_to_node_event_icon": "", "go_to_node_event_tooltip": "", + "new_version_available": "", "report_guid": "Przewodnik powiadomień:", "report_guid_missing": "Linkowane powiadomienie nie znaleziono. Jest małe opóźnienie między wysłaniem powiadomienia a ich dostępnością. Odśwież stronę i cache za kilka sekund. Możliwe też że zaznaczone powiadomienie zostało usunięte podczas konserwacji tak jak określono w ustawieniu DBCLNP_NOTIFI_HIST.

        Zamiast tego wyświetlane jest najnowsze powiadomienie. Brakujące powiadomienie ma następujące GUID:", "report_select_format": "Wybierz Format:", @@ -750,4 +751,4 @@ "settings_update_item_warning": "Zaktualizuj poniższą wartość. Zachowaj ostrożność i postępuj zgodnie z poprzednim formatem. Walidacja nie jest wykonywana.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Zapisz zmiany zanim będziesz testować swoje ustawienia." -} +} \ No newline at end of file diff --git a/front/php/templates/language/pt_br.json b/front/php/templates/language/pt_br.json index bc7d40f3..bace247d 100755 --- a/front/php/templates/language/pt_br.json +++ b/front/php/templates/language/pt_br.json @@ -716,6 +716,7 @@ "general_event_title": "", "go_to_node_event_icon": "", "go_to_node_event_tooltip": "", + "new_version_available": "", "report_guid": "", "report_guid_missing": "", "report_select_format": "", @@ -750,4 +751,4 @@ "settings_update_item_warning": "", "test_event_icon": "", "test_event_tooltip": "" -} +} \ No newline at end of file diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json index 7ca1a643..f8044092 100755 --- a/front/php/templates/language/ru_ru.json +++ b/front/php/templates/language/ru_ru.json @@ -489,7 +489,7 @@ "Maintenance_lang_selector_empty": "Выберите язык", "Maintenance_lang_selector_lable": "Выбрать язык", "Maintenance_lang_selector_text": "Изменение происходит на стороне клиента, поэтому оно влияет только на текущий браузер.", - "Maintenance_new_version": "🆕 Доступна новая версия. Ознакомьтесь с примечаниями к выпуску.", + "Maintenance_new_version": "Доступна новая версия. Ознакомьтесь с примечаниями к выпуску.", "Maintenance_themeselector_apply": "Применить", "Maintenance_themeselector_empty": "Выбрать скин", "Maintenance_themeselector_lable": "Выбрать Скин", @@ -716,6 +716,7 @@ "general_event_title": "Выполнение специального события", "go_to_node_event_icon": "fa-square-up-right", "go_to_node_event_tooltip": "Переход на страницу \"Сеть\" данного узла", + "new_version_available": "", "report_guid": "Идентификатор уведомления:", "report_guid_missing": "Связанное уведомление не найдено. Между недавно отправленными уведомлениями и их доступностью существует небольшая задержка. Обновите страницу и кэшируйте ее через несколько секунд. Также возможно, что выбранное уведомление было удалено во время обслуживания, как указано в настройке DBCLNP_NOTIFI_HIST.

        Вместо этого отображается последнее уведомление. Отсутствующее уведомление имеет следующий GUID:", "report_select_format": "Выбрать формат:", @@ -750,4 +751,4 @@ "settings_update_item_warning": "Обновить значение ниже. Будьте осторожны, следуя предыдущему формату. Проверка не выполняется.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Сначала сохраните изменения, прежде чем проверять настройки." -} +} \ No newline at end of file diff --git a/front/php/templates/language/tr_tr.json b/front/php/templates/language/tr_tr.json index 4b887197..ce7d6128 100755 --- a/front/php/templates/language/tr_tr.json +++ b/front/php/templates/language/tr_tr.json @@ -716,6 +716,7 @@ "general_event_title": "", "go_to_node_event_icon": "", "go_to_node_event_tooltip": "", + "new_version_available": "", "report_guid": "", "report_guid_missing": "", "report_select_format": "", diff --git a/front/php/templates/language/uk_ua.json b/front/php/templates/language/uk_ua.json index 69f740b0..66a92d54 100755 --- a/front/php/templates/language/uk_ua.json +++ b/front/php/templates/language/uk_ua.json @@ -489,7 +489,7 @@ "Maintenance_lang_selector_empty": "Виберіть мову", "Maintenance_lang_selector_lable": "Виберіть мови", "Maintenance_lang_selector_text": "Зміна відбувається на стороні клієнта, тому вона впливає лише на поточний браузер.", - "Maintenance_new_version": "🆕 Доступна нова версія. Перегляньте примітки до випуску.", + "Maintenance_new_version": "Доступна нова версія. Перегляньте примітки до випуску.", "Maintenance_themeselector_apply": "Застосувати", "Maintenance_themeselector_empty": "Виберіть скін", "Maintenance_themeselector_lable": "Виберіть Скін", @@ -716,6 +716,7 @@ "general_event_title": "Виконання спеціальної події", "go_to_node_event_icon": "fa-квадрат-вгору-вправо", "go_to_node_event_tooltip": "Перейдіть на сторінку Мережа даного вузла", + "new_version_available": "", "report_guid": "Довідник сповіщень:", "report_guid_missing": "Пов’язане сповіщення не знайдено. Існує невелика затримка між нещодавно надісланими сповіщеннями та їх доступністю. Оновіть сторінку та кеш через кілька секунд. Також можливо, вибране сповіщення було видалено під час обслуговування, як зазначено в параметрі DBCLNP_NOTIFI_HIST.

        Натомість відображається останнє сповіщення. Відсутнє сповіщення має такий GUID:", "report_select_format": "Виберіть формат:", @@ -750,4 +751,4 @@ "settings_update_item_warning": "Оновіть значення нижче. Слідкуйте за попереднім форматом. Перевірка не виконана.", "test_event_icon": "fa-vial-circle- check", "test_event_tooltip": "Перш ніж перевіряти налаштування, збережіть зміни." -} +} \ No newline at end of file diff --git a/front/php/templates/language/zh_cn.json b/front/php/templates/language/zh_cn.json index 3b9ed48a..cf12068d 100755 --- a/front/php/templates/language/zh_cn.json +++ b/front/php/templates/language/zh_cn.json @@ -489,7 +489,7 @@ "Maintenance_lang_selector_empty": "选择语言", "Maintenance_lang_selector_lable": "选择语言", "Maintenance_lang_selector_text": "该更改发生在客户端，因此只影响当前浏览器。", - "Maintenance_new_version": "🆕 有新版本可用。查看发行说明。", + "Maintenance_new_version": "有新版本可用。查看发行说明。", "Maintenance_themeselector_apply": "应用", "Maintenance_themeselector_empty": "选择皮肤", "Maintenance_themeselector_lable": "选择皮肤", @@ -716,6 +716,7 @@ "general_event_title": "执行自组织网络事件", "go_to_node_event_icon": "", "go_to_node_event_tooltip": "", + "new_version_available": "", "report_guid": "通知guid：", "report_guid_missing": "未找到链接的通知。最近发送的通知与可用通知之间存在短暂延迟。几秒钟后刷新页面并缓存。所选通知也可能已在维护期间被删除，如 DBCLNP_NOTIFI_HIST 设置中所述。

        系统将改为显示最新通知。缺失的通知具有以下 GUID：", "report_select_format": "选择格式：", @@ -750,4 +751,4 @@ "settings_update_item_warning": "更新下面的值。请注意遵循先前的格式。未执行验证。", "test_event_icon": "", "test_event_tooltip": "在测试设置之前，请先保存更改。" -} +} \ No newline at end of file diff --git a/front/plugins.php b/front/plugins.php index 7a7107f3..bccb7ed8 100755 --- a/front/plugins.php +++ b/front/plugins.php @@ -7,20 +7,9 @@
        - -
        - -

        - - -

        -
        - - -
        diff --git a/front/plugins/omada_sdn_imp/omada_sdn.py b/front/plugins/omada_sdn_imp/omada_sdn.py index 2136b1a8..faf29c61 100755 --- a/front/plugins/omada_sdn_imp/omada_sdn.py +++ b/front/plugins/omada_sdn_imp/omada_sdn.py @@ -36,8 +36,6 @@ import subprocess import multiprocessing -# import netifaces - # Define the installation path and extend the system path for plugin imports INSTALL_PATH = "/app" sys.path.extend([f"{INSTALL_PATH}/front/plugins", f"{INSTALL_PATH}/server"]) diff --git a/front/plugins/sync/config.json b/front/plugins/sync/config.json index 41204b22..ddea36d8 100755 --- a/front/plugins/sync/config.json +++ b/front/plugins/sync/config.json @@ -146,7 +146,7 @@ "description": [ { "language_code": "en_us", - "string": "Encryption key used to encrypt the data before sending and for decryption on the hub. The key needs to be the same on the hub and on the nodes." + "string": "The encryption key is used to secure data by encrypting it before transmission and decrypting it upon arrival at the hub. For the system to function correctly, the encryption key must be identical on both the hub and all the nodes. Similarly, the API_TOKEN must also be set to the same value across the hub and all the nodes to ensure proper authentication and communication." } ] }, @@ -222,7 +222,7 @@ "description": [ { "language_code": "en_us", - "string": "If specified, the hub will pull Devices data from the listed nodes." + "string": "If specified, the hub will pull Devices data from the listed nodes. The API_TOKEN and SYNC_encryption_key must be set to the same value across the hub and all the nodes to ensure proper authentication and communication." } ] }, diff --git a/front/presence.php b/front/presence.php index 340df7d3..75593036 100755 --- a/front/presence.php +++ b/front/presence.php @@ -19,14 +19,6 @@
        - -
        -

        - - -

        -
        -
        diff --git a/front/report.php b/front/report.php index e565ea37..65a17ccc 100755 --- a/front/report.php +++ b/front/report.php @@ -1,31 +1,14 @@ +
        -
        - -

        - - -

        -
        -
        diff --git a/front/settings.php b/front/settings.php index 6c67f8d7..408abd73 100755 --- a/front/settings.php +++ b/front/settings.php @@ -59,35 +59,11 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX
        -
        -
        -

        - - - - - - - -

        -
        - -
        "> -
        - : - - -
        -
        - -
        - - - +
        "> @@ -142,6 +118,15 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX
        + + +
        diff --git a/front/systeminfo.php b/front/systeminfo.php index 2bd96be5..5c71fdb4 100755 --- a/front/systeminfo.php +++ b/front/systeminfo.php @@ -13,21 +13,13 @@ require 'php/templates/header.php'; ?> +
        - -
        - -

        - - -

        -
        -
        diff --git a/front/userNotifications.php b/front/userNotifications.php index 3cef875c..4e203578 100755 --- a/front/userNotifications.php +++ b/front/userNotifications.php @@ -11,18 +11,6 @@ require 'php/templates/header.php';
        - - - -
        - -

        - - -

        - -
        -
        diff --git a/front/workflows.php b/front/workflows.php index f771c58f..0f0cbed3 100755 --- a/front/workflows.php +++ b/front/workflows.php @@ -9,16 +9,6 @@
        - -
        - -

        - - -

        -
        - - diff --git a/install/freebox_certificate.pem b/install/freebox_certificate.pem old mode 100644 new mode 100755 diff --git a/install/install_dependencies.debian.sh b/install/install_dependencies.debian.sh index 3be19064..8cac386f 100755 --- a/install/install_dependencies.debian.sh +++ b/install/install_dependencies.debian.sh @@ -30,5 +30,5 @@ source myenv/bin/activate update-alternatives --install /usr/bin/python python /usr/bin/python3 10 # install packages thru pip3 -pip3 install openwrt-luci-rpc asusrouter asyncio aiohttp graphene flask netifaces tplink-omada-client wakeonlan pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros git+https://github.com/foreign-sub/aiofreepybox.git +pip3 install openwrt-luci-rpc asusrouter asyncio aiohttp graphene flask tplink-omada-client wakeonlan pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros git+https://github.com/foreign-sub/aiofreepybox.git