diff options
| author | Gitea <gitea@fake.local> | 2021-11-10 17:53:13 +0100 |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2021-11-10 17:53:13 +0100 |
| commit | 7b4af63a90a726b98a59b83e53f040a7a566a11d (patch) | |
| tree | b85747947816fe4375e85ab6b822ffabec548c7b | |
| parent | 80f78c2925530e945503ab603e79d1acc53075f4 (diff) | |
| download | electrode-7b4af63a90a726b98a59b83e53f040a7a566a11d.tar.gz electrode-7b4af63a90a726b98a59b83e53f040a7a566a11d.tar.bz2 electrode-7b4af63a90a726b98a59b83e53f040a7a566a11d.zip | |
Update
547 files changed, 1519 insertions, 3864 deletions
diff --git a/Neutron-trunk/.gitignore b/Neutron-trunk/.gitignore index 08bf557..08bf557 100755..100644 --- a/Neutron-trunk/.gitignore +++ b/Neutron-trunk/.gitignore diff --git a/Neutron-trunk/.gitlab-ci.yml b/Neutron-trunk/.gitlab-ci.yml index 0b2b573..0b2b573 100755..100644 --- a/Neutron-trunk/.gitlab-ci.yml +++ b/Neutron-trunk/.gitlab-ci.yml diff --git a/Neutron-trunk/.gitmodules b/Neutron-trunk/.gitmodules index 3d86347..3d86347 100755..100644 --- a/Neutron-trunk/.gitmodules +++ b/Neutron-trunk/.gitmodules diff --git a/Neutron-trunk/.vs/MPCMS/v16/.suo b/Neutron-trunk/.vs/MPCMS/v16/.suo Binary files differnew file mode 100644 index 0000000..5fa3320 --- /dev/null +++ b/Neutron-trunk/.vs/MPCMS/v16/.suo diff --git a/Neutron-trunk/.vs/VSWorkspaceState.json b/Neutron-trunk/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..6b61141 --- /dev/null +++ b/Neutron-trunk/.vs/VSWorkspaceState.json @@ -0,0 +1,6 @@ +{ + "ExpandedNodes": [ + "" + ], + "PreviewInSolutionExplorer": false +}
\ No newline at end of file diff --git a/Neutron-trunk/.vs/slnx.sqlite b/Neutron-trunk/.vs/slnx.sqlite Binary files differnew file mode 100644 index 0000000..b909ef9 --- /dev/null +++ b/Neutron-trunk/.vs/slnx.sqlite diff --git a/Neutron-trunk/CONTRIBUTING.md b/Neutron-trunk/CONTRIBUTING.md index 01d18bd..544e378 100755..100644 --- a/Neutron-trunk/CONTRIBUTING.md +++ b/Neutron-trunk/CONTRIBUTING.md @@ -1,3 +1,5 @@ +> Will translate this when I'll have time + # Contributions Quand vous contribuez à ce projet, merci de d'abord en discuter en utilisant au choix une issue, @@ -36,4 +38,4 @@ Vous pouvez contribuer si : * vous voulez corriger un problème de compatibilité > Merci de nous donner aussi la page correspondante sur [Can I use](https://caniuse.com) afin que nous puissions aussi corriger ce problème sur les autres plate-formes affectées. * vous voulez améliorer l'interface graphique ou l'expérience utilisateur du logiciel -> Avec l'issue que vous créez, attachez-y aussi une ou plusieurs captures d'écran de l'interface modifiée ainsi que les dimensions utilisées en pixels ou en pourcentages.
\ No newline at end of file +> Avec l'issue que vous créez, attachez-y aussi une ou plusieurs captures d'écran de l'interface modifiée ainsi que les dimensions utilisées en pixels ou en pourcentages. diff --git a/Neutron-trunk/LICENSE b/Neutron-trunk/LICENSE index 0d907f6..0d907f6 100755..100644 --- a/Neutron-trunk/LICENSE +++ b/Neutron-trunk/LICENSE diff --git a/Neutron-trunk/README.md b/Neutron-trunk/README.md index c250d36..c250d36 100755..100644 --- a/Neutron-trunk/README.md +++ b/Neutron-trunk/README.md diff --git a/Neutron-trunk/SatteliteGiteaData.txt b/Neutron-trunk/SatteliteGiteaData.txt new file mode 100644 index 0000000..d1e3892 --- /dev/null +++ b/Neutron-trunk/SatteliteGiteaData.txt @@ -0,0 +1 @@ +Neutron
\ No newline at end of file diff --git a/Neutron-trunk/api/.htaccess b/Neutron-trunk/api/.htaccess index bc839cb..bc839cb 100755..100644 --- a/Neutron-trunk/api/.htaccess +++ b/Neutron-trunk/api/.htaccess diff --git a/Neutron-trunk/api/admin/appearance.php b/Neutron-trunk/api/admin/appearance.php index 28ebe74..ec0eece 100755..100644 --- a/Neutron-trunk/api/admin/appearance.php +++ b/Neutron-trunk/api/admin/appearance.php @@ -2,8 +2,9 @@ <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; +$num_samples = 2; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { if (isset($_POST['sitename'])) { if (trim($_POST['sitename']) == "") { diff --git a/Neutron-trunk/api/admin/cache_content_reset.php b/Neutron-trunk/api/admin/cache_content_reset.php index 6e9e02b..6e9e02b 100755..100644 --- a/Neutron-trunk/api/admin/cache_content_reset.php +++ b/Neutron-trunk/api/admin/cache_content_reset.php diff --git a/Neutron-trunk/api/admin/cache_pages_update.php b/Neutron-trunk/api/admin/cache_pages_update.php index 3122731..3122731 100755..100644 --- a/Neutron-trunk/api/admin/cache_pages_update.php +++ b/Neutron-trunk/api/admin/cache_pages_update.php diff --git a/Neutron-trunk/api/admin/calendar_create.php b/Neutron-trunk/api/admin/calendar_create.php index eff4682..6384528 100755..100644 --- a/Neutron-trunk/api/admin/calendar_create.php +++ b/Neutron-trunk/api/admin/calendar_create.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/calendar_delete.php b/Neutron-trunk/api/admin/calendar_delete.php index edeb86d..720a2f5 100755..100644 --- a/Neutron-trunk/api/admin/calendar_delete.php +++ b/Neutron-trunk/api/admin/calendar_delete.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/calendar_nextevents.php b/Neutron-trunk/api/admin/calendar_nextevents.php index 6dc0cae..c6fbec7 100755..100644 --- a/Neutron-trunk/api/admin/calendar_nextevents.php +++ b/Neutron-trunk/api/admin/calendar_nextevents.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/create_page.php b/Neutron-trunk/api/admin/create_page.php index f7d67e7..cdffbff 100755..100644 --- a/Neutron-trunk/api/admin/create_page.php +++ b/Neutron-trunk/api/admin/create_page.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/customization_colors.php b/Neutron-trunk/api/admin/customization_colors.php index 9e650e8..d784134 100755..100644 --- a/Neutron-trunk/api/admin/customization_colors.php +++ b/Neutron-trunk/api/admin/customization_colors.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/customization_theme.php b/Neutron-trunk/api/admin/customization_theme.php index cc4d081..f161f43 100755..100644 --- a/Neutron-trunk/api/admin/customization_theme.php +++ b/Neutron-trunk/api/admin/customization_theme.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/delete_page.php b/Neutron-trunk/api/admin/delete_page.php index beaf8f0..be33058 100755..100644 --- a/Neutron-trunk/api/admin/delete_page.php +++ b/Neutron-trunk/api/admin/delete_page.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/edit_page.php b/Neutron-trunk/api/admin/edit_page.php index 17d84bb..cf88aaa 100755..100644 --- a/Neutron-trunk/api/admin/edit_page.php +++ b/Neutron-trunk/api/admin/edit_page.php @@ -8,7 +8,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log")) { } else { file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log", date("d/m/Y H:i:s") . " - API/" . $_SERVER['REQUEST_METHOD'] . " - " . $_SERVER['REQUEST_URI'] . " - " . $_SERVER['HTTP_USER_AGENT'] . "\n\n"); } -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { if (isset($_POST['content'])) { if (isset($_POST['title'])) { diff --git a/Neutron-trunk/api/admin/flag_disable.php b/Neutron-trunk/api/admin/flag_disable.php index d15b667..92d940d 100755..100644 --- a/Neutron-trunk/api/admin/flag_disable.php +++ b/Neutron-trunk/api/admin/flag_disable.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/flag_enable.php b/Neutron-trunk/api/admin/flag_enable.php index 0f2a9f4..0f95e26 100755..100644 --- a/Neutron-trunk/api/admin/flag_enable.php +++ b/Neutron-trunk/api/admin/flag_enable.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/footer.php b/Neutron-trunk/api/admin/footer.php index 5422d0c..961f8ea 100755..100644 --- a/Neutron-trunk/api/admin/footer.php +++ b/Neutron-trunk/api/admin/footer.php @@ -8,7 +8,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log")) { } else { file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log", date("d/m/Y H:i:s") . " - API/" . $_SERVER['REQUEST_METHOD'] . " - " . $_SERVER['REQUEST_URI'] . " - " . $_SERVER['HTTP_USER_AGENT'] . "\n\n"); } -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { if (isset($_POST['footer'])) { file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/footer", $_POST['footer']); diff --git a/Neutron-trunk/api/admin/galery_create_category.php b/Neutron-trunk/api/admin/galery_create_category.php index a849d05..26c63d4 100755..100644 --- a/Neutron-trunk/api/admin/galery_create_category.php +++ b/Neutron-trunk/api/admin/galery_create_category.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/galery_delete_category.php b/Neutron-trunk/api/admin/galery_delete_category.php index 603a5d0..0fb74e7 100755..100644 --- a/Neutron-trunk/api/admin/galery_delete_category.php +++ b/Neutron-trunk/api/admin/galery_delete_category.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/galery_delete_image.php b/Neutron-trunk/api/admin/galery_delete_image.php index 88ca220..a2dc112 100755..100644 --- a/Neutron-trunk/api/admin/galery_delete_image.php +++ b/Neutron-trunk/api/admin/galery_delete_image.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/galery_label_picture.php b/Neutron-trunk/api/admin/galery_label_picture.php index 07b3b59..4ce1ded 100755..100644 --- a/Neutron-trunk/api/admin/galery_label_picture.php +++ b/Neutron-trunk/api/admin/galery_label_picture.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/galery_publish_photo.php b/Neutron-trunk/api/admin/galery_publish_photo.php index a4c9628..8df004e 100755..100644 --- a/Neutron-trunk/api/admin/galery_publish_photo.php +++ b/Neutron-trunk/api/admin/galery_publish_photo.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/galery_toggle_state.php b/Neutron-trunk/api/admin/galery_toggle_state.php index 582faa9..224ec45 100755..100644 --- a/Neutron-trunk/api/admin/galery_toggle_state.php +++ b/Neutron-trunk/api/admin/galery_toggle_state.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/instant_language_change.php b/Neutron-trunk/api/admin/instant_language_change.php index c4fd575..1e5535f 100755..100644 --- a/Neutron-trunk/api/admin/instant_language_change.php +++ b/Neutron-trunk/api/admin/instant_language_change.php @@ -8,7 +8,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log")) { } else { file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log", date("d/m/Y H:i:s") . " - API/" . $_SERVER['REQUEST_METHOD'] . " - " . $_SERVER['REQUEST_URI'] . " - " . $_SERVER['HTTP_USER_AGENT'] . "\n\n"); } -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { if (isset($_POST['lang'])) { file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/lang", $_POST['lang']); diff --git a/Neutron-trunk/api/admin/login.php b/Neutron-trunk/api/admin/login.php index 4a88f30..4a88f30 100755..100644 --- a/Neutron-trunk/api/admin/login.php +++ b/Neutron-trunk/api/admin/login.php diff --git a/Neutron-trunk/api/admin/password.php b/Neutron-trunk/api/admin/password.php index a823721..ff57028 100755..100644 --- a/Neutron-trunk/api/admin/password.php +++ b/Neutron-trunk/api/admin/password.php @@ -46,7 +46,7 @@ if ($_POST['newpass'] == $_POST['newpassr']) {} else { require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit($lang["api"]["passnewnomatch"]); } -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { $tokens = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/tokens"); foreach ($tokens as $token) { diff --git a/Neutron-trunk/api/admin/rename_page.php b/Neutron-trunk/api/admin/rename_page.php index 4091940..b7f023c 100755..100644 --- a/Neutron-trunk/api/admin/rename_page.php +++ b/Neutron-trunk/api/admin/rename_page.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/admin/reset.php b/Neutron-trunk/api/admin/reset.php index 7c67207..f732ad9 100755..100644 --- a/Neutron-trunk/api/admin/reset.php +++ b/Neutron-trunk/api/admin/reset.php @@ -18,7 +18,7 @@ function rrmdir($dir) { } } - if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { + if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { @@ -60,7 +60,7 @@ if ($keep) { rrmdir($_SERVER['DOCUMENT_ROOT'] . "/resources/upload"); mkdir($_SERVER['DOCUMENT_ROOT'] . "/resources/upload"); copy($_SERVER['DOCUMENT_ROOT'] . "/resources/image/siteicon.png", $_SERVER['DOCUMENT_ROOT'] . "/resources/upload/siteicon.png"); - file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widgets.json", '{"list":[],"settings":{}'); + file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widgets.json", '{"list":[]}'); rrmdir($_SERVER['DOCUMENT_ROOT'] . "/data/tokens"); rrmdir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/cache"); mkdir($_SERVER['DOCUMENT_ROOT'] . "/data/tokens"); diff --git a/Neutron-trunk/api/admin/save_advanced.php b/Neutron-trunk/api/admin/save_advanced.php index 179f22d..4d7c958 100755..100644 --- a/Neutron-trunk/api/admin/save_advanced.php +++ b/Neutron-trunk/api/admin/save_advanced.php @@ -13,7 +13,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log")) { } else { file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log", date("d/m/Y H:i:s") . " - API/" . $_SERVER['REQUEST_METHOD'] . " - " . $_SERVER['REQUEST_URI'] . " - " . $_SERVER['HTTP_USER_AGENT'] . "\n\n"); } -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { if (isset($_POST['content'])) { if (true) { diff --git a/Neutron-trunk/api/admin/widgets.php b/Neutron-trunk/api/admin/widgets.php index 231543f..f87a01b 100755..100644 --- a/Neutron-trunk/api/admin/widgets.php +++ b/Neutron-trunk/api/admin/widgets.php @@ -3,7 +3,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { diff --git a/Neutron-trunk/api/bugs b/Neutron-trunk/api/bugs index d12473d..a22c270 100755..100644 --- a/Neutron-trunk/api/bugs +++ b/Neutron-trunk/api/bugs @@ -1 +1 @@ -https://jetbrains.minteck.ro.lt:1024/youtrack/newIssue?project=NEU&_dummy=
\ No newline at end of file +https://github.com/Minteck/Neutron/issues
\ No newline at end of file diff --git a/Neutron-trunk/api/codename b/Neutron-trunk/api/codename index 1c883f0..08d818a 100755..100644 --- a/Neutron-trunk/api/codename +++ b/Neutron-trunk/api/codename @@ -1 +1 @@ -Fluffy Fennec
\ No newline at end of file +Glaced Valley
\ No newline at end of file diff --git a/Neutron-trunk/api/cyclic_version b/Neutron-trunk/api/cyclic_version index a625450..a625450 100755..100644 --- a/Neutron-trunk/api/cyclic_version +++ b/Neutron-trunk/api/cyclic_version diff --git a/Neutron-trunk/api/electrode/quit.php b/Neutron-trunk/api/electrode/quit.php index 6aaad20..6aaad20 100755..100644 --- a/Neutron-trunk/api/electrode/quit.php +++ b/Neutron-trunk/api/electrode/quit.php diff --git a/Neutron-trunk/api/electrode/version b/Neutron-trunk/api/electrode/version index afaf360..afaf360 100755..100644 --- a/Neutron-trunk/api/electrode/version +++ b/Neutron-trunk/api/electrode/version diff --git a/Neutron-trunk/api/engine-cyclic/components/banner.php b/Neutron-trunk/api/engine-cyclic/components/banner.php index 800ead1..800ead1 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/components/banner.php +++ b/Neutron-trunk/api/engine-cyclic/components/banner.php diff --git a/Neutron-trunk/api/engine-cyclic/components/content.php b/Neutron-trunk/api/engine-cyclic/components/content.php index e3e3be5..e3e3be5 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/components/content.php +++ b/Neutron-trunk/api/engine-cyclic/components/content.php diff --git a/Neutron-trunk/api/engine-cyclic/components/drawer.php b/Neutron-trunk/api/engine-cyclic/components/drawer.php index f0e1db7..f0e1db7 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/components/drawer.php +++ b/Neutron-trunk/api/engine-cyclic/components/drawer.php diff --git a/Neutron-trunk/api/engine-cyclic/components/favicon.php b/Neutron-trunk/api/engine-cyclic/components/favicon.php index 3d078a1..3d078a1 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/components/favicon.php +++ b/Neutron-trunk/api/engine-cyclic/components/favicon.php diff --git a/Neutron-trunk/api/engine-cyclic/components/footer.php b/Neutron-trunk/api/engine-cyclic/components/footer.php index 10a89ed..ca571cb 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/components/footer.php +++ b/Neutron-trunk/api/engine-cyclic/components/footer.php @@ -5,12 +5,7 @@ <div id="page-footer-title-inner" class="title"><?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/sitename") ?></div> <div id="page-footer-title-buttons"> <a id="page-footer-title-top-button" onclick="$('html, body').animate({scrollTop:0},'20');"><button class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button" id="page-footer-title-top-button-inner" onclick="$('html, body').animate({scrollTop:0},'20');">arrow_upward</button></a> - <?php /** @var boolean $__electrode */ - if (isset($__electrode) && $__electrode): ?> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home" id="page-footer-title-settings-button"><button class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button" id="page-footer-title-settings-button-inner">settings</button></a> - <?php else: ?> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin" id="page-footer-title-settings-button"><button class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button" id="page-footer-title-settings-button-inner">settings</button></a> - <?php endif; ?> + <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2" id="page-footer-title-settings-button"><button class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button" id="page-footer-title-settings-button-inner">settings</button></a> </div> </div> <div id="page-footer-content"> diff --git a/Neutron-trunk/api/engine-cyclic/components/init.php b/Neutron-trunk/api/engine-cyclic/components/init.php index d17792e..d17792e 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/components/init.php +++ b/Neutron-trunk/api/engine-cyclic/components/init.php diff --git a/Neutron-trunk/api/engine-cyclic/components/menubar.php b/Neutron-trunk/api/engine-cyclic/components/menubar.php index b6bce59..b6bce59 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/components/menubar.php +++ b/Neutron-trunk/api/engine-cyclic/components/menubar.php diff --git a/Neutron-trunk/api/engine-cyclic/components/widgets.php b/Neutron-trunk/api/engine-cyclic/components/widgets.php index c2a903c..c2a903c 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/components/widgets.php +++ b/Neutron-trunk/api/engine-cyclic/components/widgets.php diff --git a/Neutron-trunk/api/engine-cyclic/heads.php b/Neutron-trunk/api/engine-cyclic/heads.php index 0eeba9a..0eeba9a 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/heads.php +++ b/Neutron-trunk/api/engine-cyclic/heads.php diff --git a/Neutron-trunk/api/engine-cyclic/homepage.php b/Neutron-trunk/api/engine-cyclic/homepage.php index 995a76a..995a76a 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/homepage.php +++ b/Neutron-trunk/api/engine-cyclic/homepage.php diff --git a/Neutron-trunk/api/engine-cyclic/includes/cache.php b/Neutron-trunk/api/engine-cyclic/includes/cache.php index 80ea283..80ea283 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/includes/cache.php +++ b/Neutron-trunk/api/engine-cyclic/includes/cache.php diff --git a/Neutron-trunk/api/engine-cyclic/includes/getPageContent.php b/Neutron-trunk/api/engine-cyclic/includes/getPageContent.php index 31b202c..31b202c 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/includes/getPageContent.php +++ b/Neutron-trunk/api/engine-cyclic/includes/getPageContent.php diff --git a/Neutron-trunk/api/engine-cyclic/includes/getPageName.php b/Neutron-trunk/api/engine-cyclic/includes/getPageName.php index e364493..e364493 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/includes/getPageName.php +++ b/Neutron-trunk/api/engine-cyclic/includes/getPageName.php diff --git a/Neutron-trunk/api/engine-cyclic/includes/includes.php b/Neutron-trunk/api/engine-cyclic/includes/includes.php index 05f0f23..05f0f23 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/includes/includes.php +++ b/Neutron-trunk/api/engine-cyclic/includes/includes.php diff --git a/Neutron-trunk/api/engine-cyclic/pages.php b/Neutron-trunk/api/engine-cyclic/pages.php index 995a76a..995a76a 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/pages.php +++ b/Neutron-trunk/api/engine-cyclic/pages.php diff --git a/Neutron-trunk/api/engine-cyclic/render.php b/Neutron-trunk/api/engine-cyclic/render.php index b5d5959..b5d5959 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/render.php +++ b/Neutron-trunk/api/engine-cyclic/render.php diff --git a/Neutron-trunk/api/engine-cyclic/special.php b/Neutron-trunk/api/engine-cyclic/special.php index 995a76a..995a76a 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/special.php +++ b/Neutron-trunk/api/engine-cyclic/special.php diff --git a/Neutron-trunk/api/engine-cyclic/tails.php b/Neutron-trunk/api/engine-cyclic/tails.php index 9e9e5f4..9e9e5f4 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/tails.php +++ b/Neutron-trunk/api/engine-cyclic/tails.php diff --git a/Neutron-trunk/api/engine-cyclic/wrapper.php b/Neutron-trunk/api/engine-cyclic/wrapper.php index 196060d..196060d 100755..100644 --- a/Neutron-trunk/api/engine-cyclic/wrapper.php +++ b/Neutron-trunk/api/engine-cyclic/wrapper.php diff --git a/Neutron-trunk/api/engine-jaw/homepage.php b/Neutron-trunk/api/engine-jaw/homepage.php index e5f76c8..e5f76c8 100755..100644 --- a/Neutron-trunk/api/engine-jaw/homepage.php +++ b/Neutron-trunk/api/engine-jaw/homepage.php diff --git a/Neutron-trunk/api/engine-jaw/init.php b/Neutron-trunk/api/engine-jaw/init.php index a9da042..a9da042 100755..100644 --- a/Neutron-trunk/api/engine-jaw/init.php +++ b/Neutron-trunk/api/engine-jaw/init.php diff --git a/Neutron-trunk/api/engine-jaw/render.php b/Neutron-trunk/api/engine-jaw/render.php index 9a9efd3..9a9efd3 100755..100644 --- a/Neutron-trunk/api/engine-jaw/render.php +++ b/Neutron-trunk/api/engine-jaw/render.php diff --git a/Neutron-trunk/api/experimental b/Neutron-trunk/api/experimental index c227083..c227083 100755..100644 --- a/Neutron-trunk/api/experimental +++ b/Neutron-trunk/api/experimental diff --git a/Neutron-trunk/api/jaw_version b/Neutron-trunk/api/jaw_version index 7c483e8..04474ed 100755..100644 --- a/Neutron-trunk/api/jaw_version +++ b/Neutron-trunk/api/jaw_version @@ -1 +1 @@ -1.7
\ No newline at end of file +1.7-DEPRECATED!
\ No newline at end of file diff --git a/Neutron-trunk/api/lang/processor.php b/Neutron-trunk/api/lang/processor.php index 8ab2e99..d9c9566 100755..100644 --- a/Neutron-trunk/api/lang/processor.php +++ b/Neutron-trunk/api/lang/processor.php @@ -27,9 +27,10 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/" . $langsel)) { } } } else { - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/fr")) { + $langsel = "en"; + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/en")) { echo("Unable to load language files: unable to find selected language files, loading fallback files"); - $langprops = scandir($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/fr/"); + $langprops = scandir($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/en/"); foreach ($langprops as $langprop) { if ($langprop != "." && $langprop != "..") { $langpieces = explode("/", implode("/", explode("\\", $langprop))); @@ -38,9 +39,9 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/" . $langsel)) { if ($langitemsel[count($langitemsel) - 1] != "json") { require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("Unable to load language file: " . implode(".", $langitemsel) . " is not in a valid format. Language files must be JSON."); } else { - json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/fr/" . $langprop), true); + json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/en/" . $langprop), true); if (json_last_error() == JSON_ERROR_NONE) { - $lang[$langitemsel[count($langitemsel) - 2]] = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/fr/" . $langprop), true); + $lang[$langitemsel[count($langitemsel) - 2]] = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/en/" . $langprop), true); } else { require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("Unable to load language file: " . implode(".", $langitemsel) . " isn't a valid JSON file. Please check for syntax errors and retry."); } diff --git a/Neutron-trunk/api/lang/setup.php b/Neutron-trunk/api/lang/setup.php index 88792e2..88792e2 100755..100644 --- a/Neutron-trunk/api/lang/setup.php +++ b/Neutron-trunk/api/lang/setup.php diff --git a/Neutron-trunk/api/prettyver b/Neutron-trunk/api/prettyver index 0f941f3..3edb724 100755..100644 --- a/Neutron-trunk/api/prettyver +++ b/Neutron-trunk/api/prettyver @@ -1 +1 @@ -21H2
\ No newline at end of file +21H2 Beta 2
\ No newline at end of file diff --git a/Neutron-trunk/api/public b/Neutron-trunk/api/public index b502f32..b502f32 100755..100644 --- a/Neutron-trunk/api/public +++ b/Neutron-trunk/api/public diff --git a/Neutron-trunk/api/renderer/main.php b/Neutron-trunk/api/renderer/main.php index c873f60..c873f60 100755..100644 --- a/Neutron-trunk/api/renderer/main.php +++ b/Neutron-trunk/api/renderer/main.php diff --git a/Neutron-trunk/api/renderer/render.php b/Neutron-trunk/api/renderer/render.php index 30f32c1..30f32c1 100755..100644 --- a/Neutron-trunk/api/renderer/render.php +++ b/Neutron-trunk/api/renderer/render.php diff --git a/Neutron-trunk/api/setup/check.php b/Neutron-trunk/api/setup/check.php index d3eb831..d3eb831 100755..100644 --- a/Neutron-trunk/api/setup/check.php +++ b/Neutron-trunk/api/setup/check.php diff --git a/Neutron-trunk/api/setup/defaultHomepage.html b/Neutron-trunk/api/setup/defaultHomepage.html index 88da957..88da957 100755..100644 --- a/Neutron-trunk/api/setup/defaultHomepage.html +++ b/Neutron-trunk/api/setup/defaultHomepage.html diff --git a/Neutron-trunk/api/setup/push.php b/Neutron-trunk/api/setup/push.php index 20d8898..20d8898 100755..100644 --- a/Neutron-trunk/api/setup/push.php +++ b/Neutron-trunk/api/setup/push.php diff --git a/Neutron-trunk/api/snow-bold.png b/Neutron-trunk/api/snow-bold.png Binary files differindex 0d7b2e6..0d7b2e6 100755..100644 --- a/Neutron-trunk/api/snow-bold.png +++ b/Neutron-trunk/api/snow-bold.png diff --git a/Neutron-trunk/api/snow-light.png b/Neutron-trunk/api/snow-light.png Binary files differindex 20ea123..20ea123 100755..100644 --- a/Neutron-trunk/api/snow-light.png +++ b/Neutron-trunk/api/snow-light.png diff --git a/Neutron-trunk/api/snow-medium.png b/Neutron-trunk/api/snow-medium.png Binary files differindex ac11309..ac11309 100755..100644 --- a/Neutron-trunk/api/snow-medium.png +++ b/Neutron-trunk/api/snow-medium.png diff --git a/Neutron-trunk/api/version b/Neutron-trunk/api/version index ed21ed3..0ad7baf 100755..100644 --- a/Neutron-trunk/api/version +++ b/Neutron-trunk/api/version @@ -1 +1 @@ -10.0.236.53 +10.0.258.54 diff --git a/Neutron-trunk/cms-special/.htaccess b/Neutron-trunk/cms-special/.htaccess index bc839cb..bc839cb 100755..100644 --- a/Neutron-trunk/cms-special/.htaccess +++ b/Neutron-trunk/cms-special/.htaccess diff --git a/Neutron-trunk/cms-special/admin-v2/$panes/accounts.php b/Neutron-trunk/cms-special/admin-v2/$panes/accounts.php new file mode 100644 index 0000000..8ade4f5 --- /dev/null +++ b/Neutron-trunk/cms-special/admin-v2/$panes/accounts.php @@ -0,0 +1,64 @@ +<?php + +require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); +require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; +require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/session.php"; + +global $lang; + +?> +<!DOCTYPE html> +<html> + + <head> + <title>base</title> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/main.css"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/inner.css"> + <?php if (strpos($_SERVER['HTTP_USER_AGENT'], "Chrome/")): ?> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/chromium.css"> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + <?php endif; ?> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + </head> + + <body> + <div id="inner-items"> + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/password"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/password.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["accounts_items"][0] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["accounts_descriptions"][0] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + </div> + </body> + + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/jquery.js"></script> + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/admin_v2.js"></script> + +</html>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$panes/content.php b/Neutron-trunk/cms-special/admin-v2/$panes/content.php new file mode 100644 index 0000000..9fd564b --- /dev/null +++ b/Neutron-trunk/cms-special/admin-v2/$panes/content.php @@ -0,0 +1,94 @@ +<?php + +require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); +require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; +require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/session.php"; + +global $lang; + +?> +<!DOCTYPE html> +<html> + + <head> + <title>base</title> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/main.css"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/inner.css"> + <?php if (strpos($_SERVER['HTTP_USER_AGENT'], "Chrome/")): ?> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/chromium.css"> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + <?php endif; ?> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + </head> + + <body> + <div id="inner-items"> + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/pages.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["content_items"][0] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["content_descriptions"][0] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/gallery"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/gallery.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["content_items"][1] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["content_descriptions"][1] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/calendar"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/calendar.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["content_items"][2] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["content_descriptions"][2] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + </div> + </body> + + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/jquery.js"></script> + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/admin_v2.js"></script> + +</html>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$panes/features.php b/Neutron-trunk/cms-special/admin-v2/$panes/features.php new file mode 100644 index 0000000..8e956d3 --- /dev/null +++ b/Neutron-trunk/cms-special/admin-v2/$panes/features.php @@ -0,0 +1,81 @@ +<?php + +require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); +require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; +require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/session.php"; + +global $lang; + +?> +<!DOCTYPE html> +<html> + + <head> + <title>base</title> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/main.css"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/inner.css"> + <?php if (strpos($_SERVER['HTTP_USER_AGENT'], "Chrome/")): ?> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/chromium.css"> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + <?php endif; ?> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + </head> + + <body> + <div id="inner-items"> + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/widgets"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/optional.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["features_items"][0] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["features_descriptions"][0] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + </div> + + <div id="inner-items"> + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/flags"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/flag.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["features_items"][1] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["features_descriptions"][1] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + </div> + </body> + + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/jquery.js"></script> + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/admin_v2.js"></script> + +</html>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$panes/language.php b/Neutron-trunk/cms-special/admin-v2/$panes/language.php new file mode 100644 index 0000000..878bfc2 --- /dev/null +++ b/Neutron-trunk/cms-special/admin-v2/$panes/language.php @@ -0,0 +1,68 @@ +<?php + +require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); +require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; +require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/session.php"; + +global $lang; + +?> +<!DOCTYPE html> +<html> + +<head> + <title>base</title> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/main.css"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/inner.css"> + <?php if (strpos($_SERVER['HTTP_USER_AGENT'], "Chrome/")): ?> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/chromium.css"> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + <?php endif; ?> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> +</head> + +<body> +<div id="inner-items"> + <?php foreach (scandir($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n") as $locale): if (trim($locale) !== "." && trim($locale) !== ".."): ?> + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/language/?_=<?= $locale ?>"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/locale.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/" . $locale . "/\$metadata.json"), true)["localized_name"]; ?></span><br> + <span class="inner-item-description"><?= json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/" . $locale . "/\$metadata.json"), true)["name"]; ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <?php global $langsel; if ($locale === $langsel): ?> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/selected.png"> + <?php endif; ?> + </div> + </div> + <?php endif; endforeach; ?> +</div> +</body> + +<script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/jquery.js"></script> +<script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/admin_v2.js"></script> + +</html>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$panes/maintenance.php b/Neutron-trunk/cms-special/admin-v2/$panes/maintenance.php new file mode 100644 index 0000000..b49fcef --- /dev/null +++ b/Neutron-trunk/cms-special/admin-v2/$panes/maintenance.php @@ -0,0 +1,64 @@ +<?php + +require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); +require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; +require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/session.php"; + +global $lang; + +?> +<!DOCTYPE html> +<html> + + <head> + <title>base</title> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/main.css"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/inner.css"> + <?php if (strpos($_SERVER['HTTP_USER_AGENT'], "Chrome/")): ?> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/chromium.css"> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + <?php endif; ?> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + </head> + + <body> + <div id="inner-items"> + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/reset"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/reset.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["maintenance_items"][0] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["maintenance_descriptions"][0] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + </div> + </body> + + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/jquery.js"></script> + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/admin_v2.js"></script> + +</html>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$panes/personalization.php b/Neutron-trunk/cms-special/admin-v2/$panes/personalization.php new file mode 100644 index 0000000..40991a8 --- /dev/null +++ b/Neutron-trunk/cms-special/admin-v2/$panes/personalization.php @@ -0,0 +1,94 @@ +<?php + +require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); +require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; +require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/session.php"; + +global $lang; + +?> +<!DOCTYPE html> +<html> + + <head> + <title>base</title> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/main.css"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/inner.css"> + <?php if (strpos($_SERVER['HTTP_USER_AGENT'], "Chrome/")): ?> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/chromium.css"> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + <?php endif; ?> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + </head> + + <body> + <div id="inner-items"> + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/appearance"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/branding.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["personalization_items"][0] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["personalization_descriptions"][0] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/customization"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/colour.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["personalization_items"][1] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["personalization_descriptions"][1] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/footer"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/footer.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["personalization_items"][2] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["personalization_descriptions"][2] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + </div> + </body> + + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/jquery.js"></script> + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/admin_v2.js"></script> + +</html>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$panes/security.php b/Neutron-trunk/cms-special/admin-v2/$panes/security.php new file mode 100644 index 0000000..31cdc52 --- /dev/null +++ b/Neutron-trunk/cms-special/admin-v2/$panes/security.php @@ -0,0 +1,80 @@ +<?php + +require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); +require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; +require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/session.php"; + +global $lang; + +?> +<!DOCTYPE html> +<html> + + <head> + <title>base</title> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/main.css"> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/inner.css"> + <?php if (strpos($_SERVER['HTTP_USER_AGENT'], "Chrome/")): ?> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/chromium.css"> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + <?php endif; ?> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + </head> + + <body> + <div id="inner-items"> + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/advanced/jsonconf"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/advanced.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["security_items"][0] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["security_descriptions"][0] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/stats"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/stats.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["security_items"][1] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["security_descriptions"][1] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + + </div> + </body> + + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/jquery.js"></script> + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/admin_v2.js"></script> + +</html>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$panes/system.php b/Neutron-trunk/cms-special/admin-v2/$panes/system.php index 916f798..34cbc91 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/$panes/system.php +++ b/Neutron-trunk/cms-special/admin-v2/$panes/system.php @@ -1,11 +1,33 @@ +<?php + +require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); +require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; +require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/session.php"; + +global $lang; + +?> <!DOCTYPE html> <html> <head> + <title>base</title> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/main.css"> <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/inner.css"> + <?php if (strpos($_SERVER['HTTP_USER_AGENT'], "Chrome/")): ?> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/chromium.css"> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + <?php endif; ?> <style>:root { --mpcms-banner: url(<?php if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { @@ -25,27 +47,78 @@ <div id="system-head-version"> <div> <b>Neutron 10</b><br> - version <?= trim(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/api/prettyver")) ?> + version <?= trim(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/api/prettyver")) ?> « <?= trim(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/api/codename")) ?> » · build <?= substr(trim(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/api/version")), 5) ?> + </div> + </div> + </div> + + + <div class="inner-item" data-item-href="top://<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/logout"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/logoff.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["system_items"][3] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["system_descriptions"][3] ?></span> </div> </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> </div> <div id="inner-items"> - <div class="inner-item"> + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/about"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/about.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["system_items"][0] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["system_descriptions"][0] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + + <div class="inner-item" data-item-href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/logs"> + <div class="inner-item-image-outer"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/audit.png"> + </div> + <div class="inner-item-text"> + <div> + <span class="inner-item-title"><?= $lang["admin-v2"]["system_items"][1] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["system_descriptions"][1] ?></span> + </div> + </div> + <div class="inner-item-enter-outer"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + </div> + </div> + + <?php if (!file_exists($GLOBALS['ORIGINAL_DOCUMENT_ROOT'] . "/NeutronCloud")): ?> + <div class="inner-item" data-item-href="parent://minteck.ro.lt/creations/neutron"> <div class="inner-item-image-outer"> - <img class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/about.png"> + <img alt="" class="inner-item-image" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/install.png"> </div> <div class="inner-item-text"> <div> - <span class="inner-item-title">About Neutron</span><br> - <span class="inner-item-description">View Neutron versions and data usage</span> + <span class="inner-item-title"><?= $lang["admin-v2"]["system_items"][2] ?></span><br> + <span class="inner-item-description"><?= $lang["admin-v2"]["system_descriptions"][2] ?></span> </div> </div> <div class="inner-item-enter-outer"> - <img class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> + <img alt="" class="inner-item-enter" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/enter.png"> </div> </div> + <?php endif; ?> </div> </body> + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/jquery.js"></script> + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/admin_v2.js"></script> + </html>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/admin.js b/Neutron-trunk/cms-special/admin-v2/$resources/admin.js index bca683b..e69de29 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/$resources/admin.js +++ b/Neutron-trunk/cms-special/admin-v2/$resources/admin.js @@ -1,16 +0,0 @@ -window.onscroll = () => { - // console.log("> Scroll"); - if (window.scrollY >= 52 && !document.getElementById('portal-background').classList.contains('scrolled')) { - // console.log("> ADD"); - document.getElementById('portal-background').classList.add('scrolled'); - } else if (window.scrollY < 52 && document.getElementById('portal-background').classList.contains('scrolled')) { - // console.log("> REMOVE"); - document.getElementById('portal-background').classList.remove('scrolled'); - } else { - // console.log("> Nothing"); - } -} - -window.onbeforeunload = () => { - window.parent.$("#loader").fadeIn(200); -}
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/common.css b/Neutron-trunk/cms-special/admin-v2/$resources/common.css index 3826747..1276d2f 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/$resources/common.css +++ b/Neutron-trunk/cms-special/admin-v2/$resources/common.css @@ -47,15 +47,15 @@ html, body { .ttdemo { padding: 10px; - font-family: "CMS", "Ubuntu", "Roboto", "Google Sans", "Segoe UI", "Noto Sans", Tahoma, Geneva, Verdana, sans-serif !important; + font-family: "Noto Sans", "Segoe UI", "CMS", "Ubuntu", "Roboto", "Google Sans", "Segoe UI", "Noto Sans", Tahoma, Geneva, Verdana, sans-serif !important; } * { - font-family: "CMS", "Ubuntu", "Roboto", "Google Sans", "Segoe UI", "Noto Sans", Tahoma, Geneva, Verdana, sans-serif; + font-family: "Noto Sans", "Segoe UI", "CMS", "Ubuntu", "Roboto", "Google Sans", "Segoe UI", "Noto Sans", Tahoma, Geneva, Verdana, sans-serif; } span, p, body, div, h1, h2, h3, h4, h5, h6 { - font-family: "CMS", "Ubuntu", "Roboto", "Google Sans", "Segoe UI", "Noto Sans", Tahoma, Geneva, Verdana, sans-serif !important; + font-family: "Noto Sans", "Segoe UI", "CMS", "Ubuntu", "Roboto", "Google Sans", "Segoe UI", "Noto Sans", Tahoma, Geneva, Verdana, sans-serif !important; } #main-content { @@ -69,15 +69,10 @@ span, p, body, div, h1, h2, h3, h4, h5, h6 { overflow-y: auto; } -html, body, #app-grid { - height: 100%; -} - #app-frame { margin: -16px; border: none; width: calc(100% + 32px); - height: calc(100% + 32px); } .mdc-top-app-bar--fixed-adjust { diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/header.php b/Neutron-trunk/cms-special/admin-v2/$resources/header.php index e69de29..e69de29 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/$resources/header.php +++ b/Neutron-trunk/cms-special/admin-v2/$resources/header.php diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/index-auto.css b/Neutron-trunk/cms-special/admin-v2/$resources/index-auto.css index 773eab9..773eab9 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/$resources/index-auto.css +++ b/Neutron-trunk/cms-special/admin-v2/$resources/index-auto.css diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/index-dark.css b/Neutron-trunk/cms-special/admin-v2/$resources/index-dark.css index 1683192..1683192 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/$resources/index-dark.css +++ b/Neutron-trunk/cms-special/admin-v2/$resources/index-dark.css diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/index.css b/Neutron-trunk/cms-special/admin-v2/$resources/index.css index 57dd995..57dd995 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/$resources/index.css +++ b/Neutron-trunk/cms-special/admin-v2/$resources/index.css diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/postcontent.php b/Neutron-trunk/cms-special/admin-v2/$resources/postcontent.php index 573a1d9..cface57 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/$resources/postcontent.php +++ b/Neutron-trunk/cms-special/admin-v2/$resources/postcontent.php @@ -3,4 +3,4 @@ </body> </html> -<script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/admin.js" charset="utf-8"></script>
\ No newline at end of file +<script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/admin.js" charset="utf-8"></script>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/precontent.php b/Neutron-trunk/cms-special/admin-v2/$resources/precontent.php index af8d999..9b7e60c 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/$resources/precontent.php +++ b/Neutron-trunk/cms-special/admin-v2/$resources/precontent.php @@ -47,19 +47,19 @@ if (isset($lang["admin-titles"][$pageid])) { $invalid = false; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin/?pr=" . str_replace("/index.php", "", $_SERVER['SCRIPT_NAME']) . "&pa=" . urlencode("?" . explode("?", $_SERVER['REQUEST_URI'])[1]) . "'</script>"); + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin-v2/login'</script>"); } } else { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin/?pr=" . str_replace("/index.php", "", $_SERVER['SCRIPT_NAME']) . "&pa=" . urlencode("?" . explode("?", $_SERVER['REQUEST_URI'])[1]) . "'</script>"); + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin-v2/login'</script>"); } if (isset($_POST['password'])) { if (password_verify($_POST['password'], file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/password"))) { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin/home';</script>"); + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin-v2/home';</script>"); return; } else { $invalid = true; @@ -112,7 +112,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso ?> <!DOCTYPE html> -<html> +<html style="background-color:transparent !important;"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> @@ -127,19 +127,19 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/ui.css"> <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/codename.css"> <link rel="icon" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/siteicon.png"> - <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/admin.js"></script> + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/admin.js"></script> <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/fonts-import.css" as="style"> <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/alerts.css" as="style"> <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin.css" as="style"> <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/ui.css" as="style"> - <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/common.css" as="style"> - <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/index.css" as="style"> - <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/responsive.css" as="style"> - <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/index-dark.css" as="style"> + <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/common.css" as="style"> + <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/index.css" as="style"> + <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/responsive.css" as="style"> + <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/index-dark.css" as="style"> <link rel="preload" href="<?= $_MD_INCLUDES ?>/material-components-web.min.css" as="style"> <link rel="preload" href="<?= $_MDI_PATH ?>" as="style"> <link rel="preload" href="<?= $_MD_INCLUDES ?>/material-components-web.min.js" as="script"> - <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/admin.js" as="script"> + <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/admin.js" as="script"> <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/documenthead.php"; ?> <?php @@ -154,15 +154,27 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso ?> <?php - if (file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme") == "dark") { - echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin/$resources/index-dark.css">'); - } elseif (file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme") == "auto") { - echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin/$resources/index-auto.css">'); + /*if (file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme") == "dark") {*/ + echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin-v2/$resources/index-dark.css">'); + /*} elseif (file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme") == "auto") { + echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin-v2/$resources/index-auto.css">'); } else { - echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin/$resources/index.css">'); - } + echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin-v2/$resources/index.css">'); + }*/ ?> <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/lib/pushbar.js/library.css"> + <?php if (strpos($_SERVER['HTTP_USER_AGENT'], "Chrome/")): ?> + <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin_v2/chromium.css"> + <style>:root { --mpcms-banner: url(<?php + + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/upload/banner.jpg")) { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/upload/banner.jpg"'); + } else { + echo('"' . $GLOBALS["SYSTEM_ROOT"] . '/resources/image/default.jpg"'); + } + + ?>); }</style> + <?php endif; ?> <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/lib/pushbar.js/library.js"></script> <title><?php @@ -199,8 +211,8 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso ?> </head> -<body id="settings" style="overflow-x:hidden;"> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/spotlight.php"; ?> +<body id="settings" style="background-color:transparent !important;overflow-x:hidden;"> + <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/spotlight.php"; ?> <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/documentbody.php"; @@ -209,15 +221,15 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso $name = $pageConfig['headerName']; ?> - <div id="admin"> + <div id="admin" style="background-color:transparent !important;"> <?php if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/updates")) { - echo("<div id=\"updates-available\">" . $lang["admin-home"]["updates"][0] . " — <a href=\"/cms-special/admin/updates\">" . $lang["admin-home"]["updates"][1] . "</a></div>"); + echo("<div id=\"updates-available\">" . $lang["admin-home"]["updates"][0] . " — <a href=\"/cms-special/admin-v2/updates\">" . $lang["admin-home"]["updates"][1] . "</a></div>"); $updatable = true; } else { $updatable = false; } ?> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/header.php"; ?>
\ No newline at end of file + <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/header.php"; ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/responsive.css b/Neutron-trunk/cms-special/admin-v2/$resources/responsive.css index 75810b1..75810b1 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/$resources/responsive.css +++ b/Neutron-trunk/cms-special/admin-v2/$resources/responsive.css diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/session.php b/Neutron-trunk/cms-special/admin-v2/$resources/session.php new file mode 100644 index 0000000..ae480ba --- /dev/null +++ b/Neutron-trunk/cms-special/admin-v2/$resources/session.php @@ -0,0 +1,11 @@ +<?php + +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { + if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { + + } else { + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin-v2/login'</script>"); + } +} else { + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin-v2/login'</script>"); +}
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/spotlight-test.php b/Neutron-trunk/cms-special/admin-v2/$resources/spotlight-test.php index bffaa87..625f734 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/$resources/spotlight-test.php +++ b/Neutron-trunk/cms-special/admin-v2/$resources/spotlight-test.php @@ -9,6 +9,6 @@ <link rel="stylesheet" href="/resources/lib/material/iconfont.css"> </head> <body> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/spotlight.php"; ?> + <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/spotlight.php"; ?> </body> </html>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/$resources/spotlight.php b/Neutron-trunk/cms-special/admin-v2/$resources/spotlight.php index f803f52..2a09ed3 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/$resources/spotlight.php +++ b/Neutron-trunk/cms-special/admin-v2/$resources/spotlight.php @@ -4,7 +4,7 @@ <?php -$data = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/home/all/db.json")); +$data = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/home/all/db.json")); ?> <ul class="spotlight-elements"> diff --git a/Neutron-trunk/cms-special/admin-v2/.htaccess b/Neutron-trunk/cms-special/admin-v2/.htaccess index 90f6271..d53a146 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/.htaccess +++ b/Neutron-trunk/cms-special/admin-v2/.htaccess @@ -1,4 +1,4 @@ -ErrorDocument 404 "/cms-special/admin/error" -ErrorDocument 403 "/cms-special/admin/error" -ErrorDocument 401 "/cms-special/admin/error" -ErrorDocument 500 "/cms-special/admin/error"
\ No newline at end of file +ErrorDocument 404 "/cms-special/admin-v2/error" +ErrorDocument 403 "/cms-special/admin-v2/error" +ErrorDocument 401 "/cms-special/admin-v2/error" +ErrorDocument 500 "/cms-special/admin-v2/error"
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/about/index.php b/Neutron-trunk/cms-special/admin-v2/about/index.php index 1551ff0..c9791a0 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/about/index.php +++ b/Neutron-trunk/cms-special/admin-v2/about/index.php @@ -1,12 +1,12 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Mise à jour et sécurité", "headerName" => "Mise à jour et sécurité" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Mise à jour et sécurité", "headerName" => "Mise à jour et sécurité" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <?php $currentVersionP = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/api/version"); $currentVersion = $currentVersionP; ?> - <h3><?= $lang["admin-about"]["info"] ?></h3> + <h3><?= $lang["admin-about"]["new"]["overview"] ?></h3> <ul><li> <?php @@ -30,87 +30,69 @@ $sizestr = $size . " " . $lang["sizes"]["bytes"] . ""; } - echo("<li>" . $lang["admin-about"]["diskspace"][0] . " <b>" . $sizestr . "</b> " . $lang["admin-about"]["diskspace"][1] . "</li>"); + if (!file_exists($GLOBALS["ORIGINAL_DOCUMENT_ROOT"] . "/NeutronCloud")) { + echo("<li>" . $lang["admin-about"]["diskspace"][0] . " <b>" . $sizestr . "</b> " . $lang["admin-about"]["diskspace"][1] . "</li>"); + } else { + $sizep = $size; + switch (file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/Tier")) { + case "3": + $size = 104857600; + break; + + case "5": + $size = 262144000; + break; + + case "7": + $size = 524288000; + break; + } + $sizestr2 = $size . " " . $lang["sizes"]["bytes"] . ""; + if ($size > 1024) { + if ($size > 1048576) { + if ($size > 1073741824) { + $sizestr2 = round($size / 1073741824, 3) . " " . $lang["sizes"]["gibibytes"] . ""; + } else { + $sizestr2 = round($size / 1048576, 3) . " " . $lang["sizes"]["mebibytes"] . ""; + } + } else { + $sizestr2 = round($size / 1024, 3) . " " . $lang["sizes"]["kibibytes"] . ""; + } + } else { + $sizestr2 = $size . " " . $lang["sizes"]["bytes"] . ""; + } + + echo("<li>" . $lang["admin-about"]["diskspace"][0] . " <b>" . $sizestr . "/" . $sizestr2 . "</b> " . $lang["admin-about"]["diskspace"][1]); + if (file_exists($GLOBALS["ORIGINAL_DOCUMENT_ROOT"] . "/NeutronCloud")) { + echo(" (" . round(($sizep / $size) * 100, 2) . "%)"); + } + echo("</li>"); + } ?> </ul> - <h3><?= $lang["admin-about"]["disk"] ?></h3> - <div id="storagebar" value="0" max="1"></div> - <span style="margin-left: 10px;"></span> - <?php - $globalSize = $size; +<h3><?= $lang["admin-about"]["new"]["version"] ?></h3> - $size = 0; - getData($_SERVER['DOCUMENT_ROOT'] . "/api"); - $mpcmsSize = $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/cms-special"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/widgets"); - $mpcmsSize = $mpcmsSize + $size; - - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/css"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/fonts"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/image"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/js"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/lib"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/private"); - $mpcmsSize = $mpcmsSize + $size; +<ul> + <li><b>Neutron <?= trim(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/api/prettyver")) ?> « <?= trim(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/api/codename")) ?> »</b> (build <?= substr(trim(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/api/version")), 5) ?>)</li> - $size = 0; - getData($_SERVER['DOCUMENT_ROOT'] . "/data"); - $dataSize = $size; + <?php if (file_exists($GLOBALS["ORIGINAL_DOCUMENT_ROOT"] . "/NeutronCloud")): ?><li><?= $lang["admin-about"]["new"]["types"][0] ?></li><?php else: ?><li><?= $lang["admin-about"]["new"]["types"][1] ?></li><?php endif; ?> - $calSize = filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/caldb.json"); - $confSize = filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/sitename") + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log") + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widgets.json") + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/password") + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/footer"); - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widget-notes-data")) { - $confSize = $confSize + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widget-notes-data"); - } - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widget-contact-data")) { - $confSize = $confSize + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widget-contact-data"); - } + <li><b><?= $lang["admin-about"]["new"]["renderer"][0] ?></b> <?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/api/cyclic_version") ?></li> + <li><b><?= $lang["admin-about"]["new"]["renderer"][1] ?></b> <?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/api/jaw_version") ?></li> +</ul> - $size = 0; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/upload"); - $resSize = $size; +<h3><?= $lang["admin-about"]["new"]["system"] ?></h3> - $globalSize = $resSize + $mpcmsSize + $confSize + $dataSize + $calSize; +<ul> + <?php if (isset($__electrode) && isset($__electrode_version) && isset($__electrode_node_version)): ?> + <li><?= "Electrode " . $__electrode_version . "</li><li>NodeJS " . $__electrode_node_version ?></li> + <?php endif; ?> - ?> - <div style="display:grid;grid-template-columns:1fr 1fr 1fr 1fr;"> - <span><span style="margin-right:5px;border-radius:999px;vertical-align:middle;background-color:#8bcf69;position:relative;width:15px;height:15px;display:inline-block;"></span><span style="margin-right:30px;"><?= $lang["admin-about"]["categories"]['system'] ?> (<?= round(($mpcmsSize*100)/$globalSize, 2) ?>%)</span></span> - <span><span style="margin-right:5px;border-radius:999px;vertical-align:middle;background-color:#e6d450;position:relative;width:15px;height:15px;display:inline-block;"></span><span style="margin-right:30px;"><?= $lang["admin-about"]["categories"]['config'] ?> (<?= round(($dataSize*100)/$globalSize, 2) ?>%)</span></span> - <span><span style="margin-right:5px;border-radius:999px;vertical-align:middle;background-color:#cf82bf;position:relative;width:15px;height:15px;display:inline-block;"></span><span style="margin-right:30px;"><?= $lang["admin-about"]["categories"]['resources'] ?> (<?= round(($resSize*100)/$globalSize, 2) ?>%)</span></span> - <span><span style="margin-right:5px;border-radius:999px;vertical-align:middle;background-color:gray;position:relative;width:15px;height:15px;display:inline-block;"></span><span style="margin-right:30px;"><?= $lang["admin-about"]["categories"]['misc'] ?></span></span> - </div> - <!-- <?= $globalSize - ($mpcmsSize + $dataSize + $resSize) ?> - <?= "<br>" ?> - <?= (($mpcmsSize + $dataSize + $resSize) * 100)/$globalSize ?> --> - <style> - #storagebar { - height: 12px; - width: calc(100% - 16px); - margin: 8px; - border-radius: 5px; - box-shadow: 0 5px 5px -5px #999 inset; - background-image: linear-gradient( - 90deg, - #8bcf69 <?= round(($mpcmsSize*100)/$globalSize, 2) ?>%, - #e6d450 <?= round(($mpcmsSize*100)/$globalSize, 2) ?>%, - #e6d450 <?= round(($dataSize*100)/$globalSize, 2) ?>%, - #cf82bf <?= round(($dataSize*100)/$globalSize, 2) ?>%, - #cf82bf <?= round(($resSize*100)/$globalSize, 2) ?>%, - gray <?= round(($resSize*100)/$globalSize, 2) ?>%, - gray 100% - ); - background-size: 100% 100%; - } - </style> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> + <li>PHP <?= PHP_VERSION ?> (<?= PHP_SAPI ?>, <?= PHP_BINARY ?>)</li> + + <li><?= php_uname('s') . " " . php_uname('m') . " " . php_uname('r') ?></li> +</ul> + +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> diff --git a/Neutron-trunk/cms-special/admin-v2/advanced/index.php b/Neutron-trunk/cms-special/admin-v2/advanced/index.php index ae80b96..72a4fe1 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/advanced/index.php +++ b/Neutron-trunk/cms-special/admin-v2/advanced/index.php @@ -1,8 +1,8 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Options avancées", "headerName" => "Options avancées" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Options avancées", "headerName" => "Options avancées" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <ul> <li> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/advanced/jsonconf" title="<?= $lang["admin-advanced-home"]["placeholders"]['dev'] ?>" class="sblink"><?= $lang["admin-advanced-home"]["dev"] ?></a> + <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/advanced/jsonconf" title="<?= $lang["admin-advanced-home"]["placeholders"]['dev'] ?>" class="sblink"><?= $lang["admin-advanced-home"]["dev"] ?></a> </li> </ul> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
\ No newline at end of file +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/advanced/jsonconf/index.php b/Neutron-trunk/cms-special/admin-v2/advanced/jsonconf/index.php index f087b1c..030c9bb 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/advanced/jsonconf/index.php +++ b/Neutron-trunk/cms-special/admin-v2/advanced/jsonconf/index.php @@ -1,11 +1,11 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Préférences de développement - Options avancées", "headerName" => "Préférences de développement" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Préférences de développement - Options avancées", "headerName" => "Préférences de développement" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <p><table class="message_warning"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_warning.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-advanced-dev"]["warning"] ?></p><p><?= $lang["admin-advanced-dev"]["remove"][0] ?> <code>/data/webcontent/customSettings.json</code>. <?= $lang["admin-advanced-dev"]["remove"][1] ?></p></td></tr></tbody></table></p> <div id="editing"> <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/CodeEditor$3.php" ?> </div> <div class="hide" id="loader" style="text-align: center;"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> window.onbeforeunload = function (e) { @@ -36,7 +36,7 @@ function pushSettings() { success: function (data) { if (data == "ok") { window.onbeforeunload = undefined; - location.href = "/cms-special/admin/home"; + location.href = "/cms-special/admin-v2/home"; } else { alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = false}) diff --git a/Neutron-trunk/cms-special/admin-v2/appearance/index.php b/Neutron-trunk/cms-special/admin-v2/appearance/index.php index 22c5065..4d15264 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/appearance/index.php +++ b/Neutron-trunk/cms-special/admin-v2/appearance/index.php @@ -1,5 +1,5 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $loadEditor = false;$pageConfig = [ "domName" => "Apparence", "headerName" => "Apparence" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $loadEditor = false;$pageConfig = [ "domName" => "Apparence", "headerName" => "Apparence" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <span id="appearance-error-box" class="hide"><div id="error"><span id="appearance-error"><?= $lang["admin-appearance"]["error"] ?></span></div></span> <div id="appearance-settings" style="text-align: center;"> <?= $lang["admin-appearance"]["site"] ?> <input onchange="validateName()" onkeyup="validateName()" onkeydown="validateName()" type="text" id="name-field" placeholder="Nom du site" value="<?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/sitename") ?>"><br> @@ -31,47 +31,7 @@ <a onclick="submitData()" class="button"><?= $lang["admin-appearance"]["save"] ?></a> </div> <div style="text-align: center;"><div id="appearance-loader" class="hide"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div></div> - <h2><?= $lang["admin-appearance"]["footer"] ?></h2> - <span id="footer-error-box" class="hide"><div id="error"><span id="footer-error"><?= $lang["admin-appearance"]["error"] ?></span></div></span> - <div id="footer-settings"><div style="text-align: center;"> - <div style="text-align: center;"><?= $lang["admin-appearance"]["fdesc"] ?></div> - <div name="content" id="fedit"> - <?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/footer") ?> - </div><br> - <a onclick="updateFooter()" class="button"><?= $lang["admin-appearance"]["publish"] ?></a> - <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/ckeditor5/ckeditor.js"></script><script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/ckeditor5/translations/<?= $langsel ?>.js"></script> - <script> - let editor; - ClassicEditor - .create( document.querySelector( '#fedit' ), { - language: { - ui: '<?= $langsel ?>', - content: '<?= $langsel ?>' - }, - toolbar: [ - 'heading', '|', 'bold', 'italic', 'link', '|', 'mediaembed', 'blockquote', 'inserttable', '|', 'bulletedList', 'numberedList', '|', 'undo', 'redo' - ] - } ) - .then( newEditor => { - editor = newEditor; - } ) - .catch( error => { - console.error( error ); - } ); - </script></div> - <p><table class="message_info"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_info.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-appearance"]["fdisc"][0] ?></p><p><?= $lang["admin-appearance"]["fdisc"][1] ?></p></td></tr></tbody></table></p> - </div> - <div style="text-align: center;"><div id="footer-loader" class="hide"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div></div> - <h2><?= $lang["admin-appearance"]["password"] ?></h2> - <span id="password-error-box" class="hide"><div id="error"><span id="password-error"><?= $lang["admin-appearance"]["error"] ?></span></div></span> - <div id="password-settings" style="text-align: center;"> - <p><?= $lang["admin-appearance"]["oldpass"] ?> <input type="password" id="old-password" placeholder="<?= $lang["admin-appearance"]["secure"] ?>"></p> - <p><?= $lang["admin-appearance"]["newpass"] ?> <input type="password" id="new-password" placeholder="<?= $lang["admin-appearance"]["secure"] ?>"></p> - <p><?= $lang["admin-appearance"]["passrep"] ?> <input type="password" id="repeat-password" placeholder="<?= $lang["admin-appearance"]["secure"] ?>"></p> - <a onclick="changePassword()" class="button"><?= $lang["admin-appearance"]["change"] ?></a> - </div> - <div style="text-align: center;"><div id="password-loader" class="hide"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div></div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> @@ -165,78 +125,10 @@ function submitData() { } }, error: function (error) { - document.getElementById('password-error').innerHTML = "<?= $lang["admin-errors"]["connerror"] ?>" - document.getElementById('password-error-box').classList.remove("hide") - document.getElementById('password-loader').classList.add('hide') - document.getElementById('password-settings').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -function changePassword() { - document.getElementById('password-loader').classList.remove('hide') - document.getElementById('password-settings').classList.add('hide') - var formData = new FormData(); - formData.append("oldpass", document.getElementById('old-password').value); - formData.append("newpass", document.getElementById('new-password').value); - formData.append("newpassr", document.getElementById('repeat-password').value); - document.getElementById('password-error-box').classList.add("hide") - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/password.php", - success: function (data) { - if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/login"; - } else { - document.getElementById('password-error').innerHTML = data - document.getElementById('password-error-box').classList.remove("hide") - document.getElementById('password-loader').classList.add('hide') - document.getElementById('password-settings').classList.remove('hide') - } - }, - error: function (error) { - document.getElementById('password-error').innerHTML = "<?= $lang["admin-errors"]["connerror"] ?>" - document.getElementById('password-error-box').classList.remove("hide") - document.getElementById('password-loader').classList.add('hide') - document.getElementById('password-settings').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -function updateFooter() { - document.getElementById('footer-loader').classList.remove('hide') - document.getElementById('footer-settings').classList.add('hide') - var formData = new FormData(); - formData.append("footer", editor.getData()); - document.getElementById('footer-error-box').classList.add("hide") - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/footer.php", - success: function (data) { - if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/appearance"; - } else { - document.getElementById('footer-error').innerHTML = data - document.getElementById('footer-error-box').classList.remove("hide") - document.getElementById('footer-loader').classList.add('hide') - document.getElementById('footer-settings').classList.remove('hide') - } - }, - error: function (error) { - document.getElementById('footer-error').innerHTML = "<?= $lang["admin-errors"]["connerror"] ?>" - document.getElementById('footer-error-box').classList.remove("hide") - document.getElementById('footer-loader').classList.add('hide') - document.getElementById('footer-settings').classList.remove('hide') + document.getElementById('appearance-error').innerHTML = "<?= $lang["admin-errors"]["connerror"] ?>" + document.getElementById('appearance-error-box').classList.remove("hide") + document.getElementById('appearance-loader').classList.add('hide') + document.getElementById('appearance-settings').classList.remove('hide') }, data: formData, cache: false, diff --git a/Neutron-trunk/cms-special/admin-v2/calendar/add/index.php b/Neutron-trunk/cms-special/admin-v2/calendar/add/index.php index 1029788..8d1169f 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/calendar/add/index.php +++ b/Neutron-trunk/cms-special/admin-v2/calendar/add/index.php @@ -1,5 +1,5 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Ajouter un événement - Calendrier", "headerName" => "Ajouter un événement" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Ajouter un événement - Calendrier", "headerName" => "Ajouter un événement" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <div id="datainput"> <h3><?= $lang["admin-calendar"]["create"]["date"] ?></h3> <ul> @@ -78,7 +78,7 @@ <p><table class="message_info"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_info.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-calendar"]["create"]["notice"] ?></p></td></tr></tbody></table></p> <div style="text-align: center;"><p><a class="button" onclick="createCmsEvent()"><?= $lang["admin-calendar"]["create"]["complete"] ?></a></p></div><br> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> @@ -120,7 +120,7 @@ function createCmsEvent() { url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/calendar_create.php", success: function (data) { if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/calendar"; + location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/calendar"; } else { alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) document.getElementById('datainput').classList.remove('hide') diff --git a/Neutron-trunk/cms-special/admin-v2/calendar/index.php b/Neutron-trunk/cms-special/admin-v2/calendar/index.php index e596551..59851b9 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/calendar/index.php +++ b/Neutron-trunk/cms-special/admin-v2/calendar/index.php @@ -1,5 +1,5 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Calendrier", "headerName" => "Gestion des événements" ]; include_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Calendrier", "headerName" => "Gestion des événements" ]; include_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <?php if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/calendar_events")) { @@ -32,7 +32,7 @@ $events = json_decode($dbraw); foreach ($events->events as $event) { if (isset($event->timestamp)) { - echo("<li><span style=\"cursor:help;\" title=\"" . $event->description . "\">" . $event->name . "</span> (" . $event->datestr . ")" . " - <a class=\"sblink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/calendar/manage/?id=" . $event->timestamp . "\" title=\"{$lang['admin-calendar']['manageph']}\">" . $lang["admin-calendar"]["manage"] . "</a></li>"); + echo("<li><span style=\"cursor:help;\" title=\"" . $event->description . "\">" . $event->name . "</span> (" . $event->datestr . ")" . " - <a class=\"sblink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/calendar/manage/?id=" . $event->timestamp . "\" title=\"{$lang['admin-calendar']['manageph']}\">" . $lang["admin-calendar"]["manage"] . "</a></li>"); } } } else { @@ -47,12 +47,12 @@ <?php if (!$corrupted) { - echo('<br><li><i><a href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin/calendar/add" title="' . $lang["admin-calendar"]["addph"] . '" class="sblink">' . $lang["admin-calendar"]["add"] . '</a></i></li>'); + echo('<br><li><i><a href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin-v2/calendar/add" title="' . $lang["admin-calendar"]["addph"] . '" class="sblink">' . $lang["admin-calendar"]["add"] . '</a></i></li>'); } ?> </ul> -<?php include_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php include_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> function updateNextEvents() { diff --git a/Neutron-trunk/cms-special/admin-v2/calendar/manage/index.php b/Neutron-trunk/cms-special/admin-v2/calendar/manage/index.php index a6f4ebd..db5d226 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/calendar/manage/index.php +++ b/Neutron-trunk/cms-special/admin-v2/calendar/manage/index.php @@ -1,9 +1,9 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Supprimer un événement - Calendrier", "headerName" => "Supprimer un événement" ]; include_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Supprimer un événement - Calendrier", "headerName" => "Supprimer un événement" ]; include_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <?php $eventsraw = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/caldb.json"); if (isset($_GET['id'])) {} else { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS['SYSTEM_ROOT'] . "/cms-special/admin/calendar';</script>"); + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS['SYSTEM_ROOT'] . "/cms-special/admin-v2/calendar';</script>"); } if (isJson($eventsraw)) { $events = json_decode($eventsraw); @@ -15,10 +15,10 @@ if (isJson($eventsraw)) { } } } else { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS['SYSTEM_ROOT'] . "/cms-special/admin/calendar';</script>"); + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS['SYSTEM_ROOT'] . "/cms-special/admin-v2/calendar';</script>"); } if (!isset($event)) { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS['SYSTEM_ROOT'] . "/cms-special/admin/calendar';</script>"); + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS['SYSTEM_ROOT'] . "/cms-special/admin-v2/calendar';</script>"); } ?> <h3><?= $lang["admin-calendar"]["info"] ?></h3> @@ -41,10 +41,10 @@ if (!isset($event)) { </ul> <h3><?= $lang["admin-calendar"]["deleteask"] ?></h3> <ul id="delete"> - <li><a class="sblink" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/calendar" title="<?= $lang["admin-calendar"]["deletenoph"] ?>"><?= $lang["admin-calendar"]["deleteno"] ?></a></li> + <li><a class="sblink" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/calendar" title="<?= $lang["admin-calendar"]["deletenoph"] ?>"><?= $lang["admin-calendar"]["deleteno"] ?></a></li> <li><a class="sblink" onclick="deleteEvent()" title="<?= $lang["admin-calendar"]["deleteyesph"] ?>"><?= $lang["admin-calendar"]["deleteyes"] ?></a></li> </ul> -<?php include_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php include_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> @@ -58,7 +58,7 @@ function deleteEvent() { url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/calendar_delete.php", success: function (data) { if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/calendar"; + location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/calendar"; } else { alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) document.getElementById('delete').classList.remove('hide') diff --git a/Neutron-trunk/cms-special/admin-v2/customization/index.php b/Neutron-trunk/cms-special/admin-v2/customization/index.php index 66aee2f..a50196b 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/customization/index.php +++ b/Neutron-trunk/cms-special/admin-v2/customization/index.php @@ -1,5 +1,5 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Personnalisation", "headerName" => "Personnalisation" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Personnalisation", "headerName" => "Personnalisation" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <div class="hidden"> <h3><?= $lang["admin-customization"]["theme"] ?></h3> <select id="theme" onchange="updateTheme()"> @@ -148,7 +148,7 @@ </div> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> function updateColors() { diff --git a/Neutron-trunk/cms-special/admin-v2/error/index.php b/Neutron-trunk/cms-special/admin-v2/error/index.php index c68c6a6..54f3910 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/error/index.php +++ b/Neutron-trunk/cms-special/admin-v2/error/index.php @@ -1,11 +1,11 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Erreur", "headerName" => "Erreur" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Erreur", "headerName" => "Erreur" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <h1><div style="text-align: center;"><?= $lang["admin-errors"]["common"]['title'] ?></div></h1> <p><div style="text-align: center;"><?= $lang["admin-errors"]["common"]['message'] ?></div></p> <p><div style="text-align: center;"> <ul> <li><a href="<?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/api/bugs") ?>" target="_blank"><?= $lang["admin-errors"]["common"]['report'] ?></a></li> - <li><a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home"><?= $lang["admin-errors"]["common"]['home'] ?></a></li> + <li><a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/home"><?= $lang["admin-errors"]["common"]['home'] ?></a></li> </ul> </div></p> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> diff --git a/Neutron-trunk/cms-special/admin-v2/flags/index.php b/Neutron-trunk/cms-special/admin-v2/flags/index.php index c243a49..102861b 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/flags/index.php +++ b/Neutron-trunk/cms-special/admin-v2/flags/index.php @@ -3,7 +3,7 @@ /** @var boolean $__electrode */ if (isset($__electrode) && $__electrode) { - header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home"); + header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/home"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); } @@ -15,13 +15,13 @@ function fflag($name, $title, $description) { echo("><span class=\"slider round\"></span></label></td><td class=\"widget-header-info\"><b>{$title}</b></td></tr></tbody></table></div><p>{$description}</p></div>"); } -$pageConfig = [ "domName" => "Drapeaux", "headerName" => "Drapeaux" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +$pageConfig = [ "domName" => "Drapeaux", "headerName" => "Drapeaux" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <p><table class="message_info"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_info.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-flags"]["notice"] ?></p></td></tr></tbody></table></p> <?php fflag("boundaries", "Show Layout Boundaries", "Shows a thin colored border around different DOM elements.") ?> <?php fflag("trace", "Trace Rendering Process", "Shows technical info on the bottom of each page. May contain personal/confidential information!") ?> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> diff --git a/Neutron-trunk/cms-special/admin-v2/footer/index.php b/Neutron-trunk/cms-special/admin-v2/footer/index.php new file mode 100644 index 0000000..bc37967 --- /dev/null +++ b/Neutron-trunk/cms-special/admin-v2/footer/index.php @@ -0,0 +1,71 @@ +<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> +<?php $loadEditor = false;$pageConfig = [ "domName" => "Apparence", "headerName" => "Apparence" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> + <h2><?= $lang["admin-appearance"]["footer"] ?></h2> + <span id="footer-error-box" class="hide"><div id="error"><span id="footer-error"><?= $lang["admin-appearance"]["error"] ?></span></div></span> + <div id="footer-settings"><div style="text-align: center;"> + <div style="text-align: center;"><?= $lang["admin-appearance"]["fdesc"] ?></div> + <div name="content" id="fedit"> + <?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/footer") ?> + </div><br> + <a onclick="updateFooter()" class="button"><?= $lang["admin-appearance"]["publish"] ?></a> + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/ckeditor5/ckeditor.js"></script><script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/ckeditor5/translations/<?= $langsel ?>.js"></script> + <script> + let editor; + ClassicEditor + .create( document.querySelector( '#fedit' ), { + language: { + ui: '<?= $langsel ?>', + content: '<?= $langsel ?>' + }, + toolbar: [ + 'heading', '|', 'bold', 'italic', 'link', '|', 'mediaembed', 'blockquote', 'inserttable', '|', 'bulletedList', 'numberedList', '|', 'undo', 'redo' + ] + } ) + .then( newEditor => { + editor = newEditor; + } ) + .catch( error => { + console.error( error ); + } ); + </script></div> + <p><table class="message_info"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_info.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-appearance"]["fdisc"][0] ?></p><p><?= $lang["admin-appearance"]["fdisc"][1] ?></p></td></tr></tbody></table></p> + </div> + <div style="text-align: center;"><div id="footer-loader" class="hide"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div></div> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> + +<script> + +function updateFooter() { + document.getElementById('footer-loader').classList.remove('hide') + document.getElementById('footer-settings').classList.add('hide') + var formData = new FormData(); + formData.append("footer", editor.getData()); + document.getElementById('footer-error-box').classList.add("hide") + $.ajax({ + type: "POST", + dataType: 'html', + url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/footer.php", + success: function (data) { + if (data == "ok") { + location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$panes/personalization.php"; + } else { + document.getElementById('footer-error').innerHTML = data + document.getElementById('footer-error-box').classList.remove("hide") + document.getElementById('footer-loader').classList.add('hide') + document.getElementById('footer-settings').classList.remove('hide') + } + }, + error: function (error) { + document.getElementById('footer-error').innerHTML = "<?= $lang["admin-errors"]["connerror"] ?>" + document.getElementById('footer-error-box').classList.remove("hide") + document.getElementById('footer-loader').classList.add('hide') + document.getElementById('footer-settings').classList.remove('hide') + }, + data: formData, + cache: false, + contentType: false, + processData: false + }); +} + +</script>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/galery/addcategory/index.php b/Neutron-trunk/cms-special/admin-v2/galery/addcategory/index.php index f2438e1..a40e31b 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/galery/addcategory/index.php +++ b/Neutron-trunk/cms-special/admin-v2/galery/addcategory/index.php @@ -1,2 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?>
-<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/gallery/addcategory") ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/gallery/addcategory") ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/galery/index.php b/Neutron-trunk/cms-special/admin-v2/galery/index.php index 82ad59c..f0e5652 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/galery/index.php +++ b/Neutron-trunk/cms-special/admin-v2/galery/index.php @@ -1,2 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?>
-<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/gallery") ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/gallery") ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/galery/publish/index.php b/Neutron-trunk/cms-special/admin-v2/galery/publish/index.php index ac5f616..91e2a81 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/galery/publish/index.php +++ b/Neutron-trunk/cms-special/admin-v2/galery/publish/index.php @@ -1,2 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?>
-<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/gallery/publish") ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/gallery/publish") ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/gallery/addcategory/index.php b/Neutron-trunk/cms-special/admin-v2/gallery/addcategory/index.php index 68451fc..e29a1aa 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/gallery/addcategory/index.php +++ b/Neutron-trunk/cms-special/admin-v2/gallery/addcategory/index.php @@ -1,11 +1,11 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Nouvelle catégorie - Galerie de photos", "headerName" => "Nouvelle catégorie" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Nouvelle catégorie - Galerie de photos", "headerName" => "Nouvelle catégorie" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <div id="hidding"> <input type="text" id="catname" placeholder="<?= $lang["admin-gallery"]["addcat"]["placeholder"] ?>"> <p><i><?= $lang["admin-gallery"]["addcat"]["same"] ?></i></p> <p><div style="text-align: center;"><a class="button" onclick="createCat()"><?= $lang["admin-gallery"]["addcat"]["confirm"] ?></a></div></p> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> @@ -19,7 +19,7 @@ function createCat() { url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/galery_create_category.php", success: function (data) { if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/gallery"; + location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/gallery"; } else { alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) document.getElementById('hidding').classList.remove('hide') diff --git a/Neutron-trunk/cms-special/admin-v2/gallery/index.php b/Neutron-trunk/cms-special/admin-v2/gallery/index.php index 7623820..7c25c60 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/gallery/index.php +++ b/Neutron-trunk/cms-special/admin-v2/gallery/index.php @@ -1,5 +1,5 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Galerie de photos", "headerName" => "Galerie de photos" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Galerie de photos", "headerName" => "Galerie de photos" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <?php if (!file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery")) { @@ -42,7 +42,7 @@ if (!file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery")) { } ?> <?= $lang["admin-gallery"]["lists"]['picture'] ?><?php if ($count > 1) {echo("s");} ?></li> - <li><a class="sblink" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/gallery/addcategory"><?= $lang["admin-gallery"]["categories"]["add"] ?></a></li> + <li><a class="sblink" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/gallery/addcategory"><?= $lang["admin-gallery"]["categories"]["add"] ?></a></li> </ul> <h3><?= $lang["admin-gallery"]["categories"]['title'] ?></h3> <i><?= $lang["admin-gallery"]["categories"]['edit'] ?></i> @@ -70,7 +70,7 @@ if (!file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery")) { } } if ($count == 0) { - echo("<i>" . $lang["admin-gallery"]["pictures"]['none'] . "</i><p><a class=\"sblink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/gallery/publish\">" . $lang["admin-gallery"]["pictures"]['add'] . "</a></p>"); + echo("<i>" . $lang["admin-gallery"]["pictures"]['none'] . "</i><p><a class=\"sblink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/gallery/publish\">" . $lang["admin-gallery"]["pictures"]['add'] . "</a></p>"); } else { foreach ($dirs as $el) { if ($el == "." || $el == "..") {} else { @@ -87,12 +87,12 @@ if (!file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery")) { echo(", <a onclick=\"labelPicture('$el')\" class=\"sblink\">{$lang["admin-gallery"]["general"]["label"]}</a> - <a href=\"{$GLOBALS["SYSTEM_ROOT"]}" . explode('|', file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/pictures/" . $el))[0] . "\" class=\"sblink\" download>" . $lang["admin-gallery"]["pictures"]['download'] . "</a> - <a onclick=\"confirmDelete('$el')\" class=\"sblink\">" . $lang["admin-gallery"]["pictures"]['delete'] . "</a></li>"); } } - echo("<b><a class=\"sblink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/gallery/publish\">" . $lang["admin-gallery"]["pictures"]['add'] . "</a></b>"); + echo("<b><a class=\"sblink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/gallery/publish\">" . $lang["admin-gallery"]["pictures"]['add'] . "</a></b>"); } ?> </ul> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> diff --git a/Neutron-trunk/cms-special/admin-v2/gallery/publish/index.php b/Neutron-trunk/cms-special/admin-v2/gallery/publish/index.php index e2768ac..1217164 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/gallery/publish/index.php +++ b/Neutron-trunk/cms-special/admin-v2/gallery/publish/index.php @@ -1,5 +1,5 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Nouvelle photo - Galerie de photos", "headerName" => "Nouvelle photo" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Nouvelle photo - Galerie de photos", "headerName" => "Nouvelle photo" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <div id="hidding"> <p><?= $lang["admin-gallery"]["publish"]["category"] ?> <select id="category"> <option value="unclassed" selected><?= $lang["admin-gallery"]["publish"]["default"] ?></option> @@ -18,7 +18,7 @@ <p><?= $lang["admin-gallery"]["publish"]["file"] ?> <input type="file" id="file"> <i><?= $lang["admin-gallery"]["publish"]["max"] ?> <?= ini_get("upload_max_filesize") ?></i></p> <p><div style="text-align: center;"><a class="button" onclick="createCat()"><?= $lang["admin-gallery"]["publish"]["publish"] ?></a></div></p> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> @@ -35,7 +35,7 @@ function createCat() { url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/galery_publish_photo.php", success: function (data) { if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/gallery"; + location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/gallery"; } else { alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) document.getElementById('hidding').classList.remove('hide') diff --git a/Neutron-trunk/cms-special/admin-v2/home/all/db.json b/Neutron-trunk/cms-special/admin-v2/home/all/db.json index 8a6ad37..8a6ad37 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/home/all/db.json +++ b/Neutron-trunk/cms-special/admin-v2/home/all/db.json diff --git a/Neutron-trunk/cms-special/admin-v2/home/all/index.php b/Neutron-trunk/cms-special/admin-v2/home/all/index.php index f844070..a780757 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/home/all/index.php +++ b/Neutron-trunk/cms-special/admin-v2/home/all/index.php @@ -1,4 +1,4 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> <?php -header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home");
\ No newline at end of file +header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/home");
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/home/appearance/index.php b/Neutron-trunk/cms-special/admin-v2/home/appearance/index.php index 318611a..c5cff76 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/home/appearance/index.php +++ b/Neutron-trunk/cms-special/admin-v2/home/appearance/index.php @@ -1,9 +1,9 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> <?php -$pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +$pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <div style="text-align: center;"> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home" class="mdc-button mdc-button--outlined"> + <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/home" class="mdc-button mdc-button--outlined"> <div class="mdc-button__ripple"></div> <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">arrow_back</i> <span class="mdc-button__label"><?= $lang["admin-home"]["items"][7] ?></span> @@ -13,33 +13,33 @@ $pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord <div id="home-grid"> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["appearance"]['items'][0] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/appearance" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">tour</a> + <a title="<?= $lang["admin-home"]["appearance"]['items'][0] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/appearance" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">tour</a> <br> <?= $lang["admin-home"]["appearance"]['items'][0] ?> </div> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["appearance"]['items'][1] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/customization" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">palette</a> + <a title="<?= $lang["admin-home"]["appearance"]['items'][1] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/customization" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">palette</a> <br> <?= $lang["admin-home"]["appearance"]['items'][1] ?> </div> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["appearance"]['items'][3] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/language" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">language</a> + <a title="<?= $lang["admin-home"]["appearance"]['items'][3] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/language" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">language</a> <br> <?= $lang["admin-home"]["appearance"]['items'][3] ?> </div> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["appearance"]['items'][4] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/plugins" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">extension</a> + <a title="<?= $lang["admin-home"]["appearance"]['items'][4] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/plugins" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">extension</a> <br> <?= $lang["admin-home"]["appearance"]['items'][4] ?> </div> <?php /** @var boolean $__electrode */ if (!isset($__electrode) || !$__electrode): ?> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["appearance"]['items'][5] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/flags" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">flag</a> + <a title="<?= $lang["admin-home"]["appearance"]['items'][5] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/flags" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">flag</a> <br> <?= $lang["admin-home"]["appearance"]['items'][5] ?> </div> <?php endif; ?> </div> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
\ No newline at end of file +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/home/data/index.php b/Neutron-trunk/cms-special/admin-v2/home/data/index.php index 29205dc..ee9d7bc 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/home/data/index.php +++ b/Neutron-trunk/cms-special/admin-v2/home/data/index.php @@ -1,9 +1,9 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> <?php -$pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +$pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <div style="text-align: center;"> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home" class="mdc-button mdc-button--outlined"> + <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/home" class="mdc-button mdc-button--outlined"> <div class="mdc-button__ripple"></div> <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">arrow_back</i> <span class="mdc-button__label"><?= $lang["admin-home"]["items"][7] ?></span> @@ -13,15 +13,15 @@ $pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord <div id="home-grid"> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["data"]['items'][0] ?>" id="home-grid-item-data" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/stats" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">pie_chart</a> + <a title="<?= $lang["admin-home"]["data"]['items'][0] ?>" id="home-grid-item-data" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/stats" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">pie_chart</a> <br> <?= $lang["admin-home"]["data"]['items'][0] ?> </div> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["data"]['items'][1] ?>" id="home-grid-item-data" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/logs" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">text_snippet</a> + <a title="<?= $lang["admin-home"]["data"]['items'][1] ?>" id="home-grid-item-data" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/logs" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">text_snippet</a> <br> <?= $lang["admin-home"]["data"]['items'][1] ?> </div> </div> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
\ No newline at end of file +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/home/housekeeping/index.php b/Neutron-trunk/cms-special/admin-v2/home/housekeeping/index.php index 8c0deae..7e0cf3e 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/home/housekeeping/index.php +++ b/Neutron-trunk/cms-special/admin-v2/home/housekeeping/index.php @@ -1,9 +1,9 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> <?php -$pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +$pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <div style="text-align: center;"> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home" class="mdc-button mdc-button--outlined"> + <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/home" class="mdc-button mdc-button--outlined"> <div class="mdc-button__ripple"></div> <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">arrow_back</i> <span class="mdc-button__label"><?= $lang["admin-home"]["items"][7] ?></span> @@ -13,15 +13,15 @@ $pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord <div id="home-grid"> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["housekeeping"]['items'][0] ?>" id="home-grid-item-housekeeping" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/reset" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">restore</a> + <a title="<?= $lang["admin-home"]["housekeeping"]['items'][0] ?>" id="home-grid-item-housekeeping" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/reset" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">restore</a> <br> <?= $lang["admin-home"]["housekeeping"]['items'][0] ?> </div> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["housekeeping"]['items'][1] ?>" id="home-grid-item-housekeeping" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/about" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">info</a> + <a title="<?= $lang["admin-home"]["housekeeping"]['items'][1] ?>" id="home-grid-item-housekeeping" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/about" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">info</a> <br> <?= $lang["admin-home"]["housekeeping"]['items'][1] ?> </div> </div> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
\ No newline at end of file +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/home/index.php b/Neutron-trunk/cms-special/admin-v2/home/index.php index 327ab36..7a41bf4 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/home/index.php +++ b/Neutron-trunk/cms-special/admin-v2/home/index.php @@ -1,36 +1,36 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> <?php -$pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +$pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <div style="text-align: center;"> - <a title="<?= $lang["admin-home"]["language"] ?>/Switch Language" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/language" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button" id="language-selector">translate</a> + <a title="<?= $lang["admin-home"]["language"] ?>/Switch Language" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/language" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button" id="language-selector">translate</a> <h1><?= $lang["admin-home"]["greeting"] ?></h1> <div id="home-grid"> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["items"][0] ?>" id="home-grid-item-pages" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">layers</a> + <a title="<?= $lang["admin-home"]["items"][0] ?>" id="home-grid-item-pages" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">layers</a> <br> <?= $lang["admin-home"]["items"][0] ?> </div> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["items"][1] ?>" id="home-grid-item-calendar" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/calendar" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">event_note</a><br> + <a title="<?= $lang["admin-home"]["items"][1] ?>" id="home-grid-item-calendar" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/calendar" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">event_note</a><br> <?= $lang["admin-home"]["items"][1] ?> </div> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["items"][2] ?>" id="home-grid-item-gallery" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/gallery" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">photo</a><br> + <a title="<?= $lang["admin-home"]["items"][2] ?>" id="home-grid-item-gallery" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/gallery" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">photo</a><br> <?= $lang["admin-home"]["items"][2] ?> </div> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["items"][3] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home/appearance" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">brush</a><br> + <a title="<?= $lang["admin-home"]["items"][3] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/home/appearance" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">brush</a><br> <?= $lang["admin-home"]["items"][3] ?> </div> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["items"][4] ?>" id="home-grid-item-data" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home/data" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">dns</a><br> + <a title="<?= $lang["admin-home"]["items"][4] ?>" id="home-grid-item-data" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/home/data" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">dns</a><br> <?= $lang["admin-home"]["items"][4] ?> </div> <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["items"][5] ?>" id="home-grid-item-housekeeping" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home/housekeeping" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">cleaning_services</a><br> + <a title="<?= $lang["admin-home"]["items"][5] ?>" id="home-grid-item-housekeeping" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/home/housekeeping" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">cleaning_services</a><br> <?= $lang["admin-home"]["items"][5] ?> </div> </div> @@ -43,7 +43,7 @@ $pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord <span class="mdc-button__label"><?= $lang["admin-home"]["items"][6] ?></span> </a> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/logout" class="mdc-button mdc-button--outlined"> + <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/logout" class="mdc-button mdc-button--outlined"> <div class="mdc-button__ripple"></div> <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">power_settings_new</i> <span class="mdc-button__label"><?= $lang["admin-home"]["items"][8] ?></span> @@ -55,4 +55,4 @@ $pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord <span class="mdc-button__label"><?= $lang["admin-home"]["items"][9] ?></span> </a> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> diff --git a/Neutron-trunk/cms-special/admin-v2/housekeeping/index.php b/Neutron-trunk/cms-special/admin-v2/housekeeping/index.php index a5d0bbc..cc06932 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/housekeeping/index.php +++ b/Neutron-trunk/cms-special/admin-v2/housekeeping/index.php @@ -1,2 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?>
-<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home/housekeeping"); ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/home/housekeeping"); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/housekeeping/reset/index.php b/Neutron-trunk/cms-special/admin-v2/housekeeping/reset/index.php index 35b36d1..1bf27eb 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/housekeeping/reset/index.php +++ b/Neutron-trunk/cms-special/admin-v2/housekeeping/reset/index.php @@ -1,2 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?>
-<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/reset"); ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/reset"); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/index.php b/Neutron-trunk/cms-special/admin-v2/index.php index 55e029a..a7c6c9a 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/index.php +++ b/Neutron-trunk/cms-special/admin-v2/index.php @@ -1,4 +1,12 @@ -<?php require_once "../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> +<?php + +require_once "../../resources/private/relative.php"; getRelativeDetails("cms-special"); +require_once $_SERVER['DOCUMENT_ROOT'] . "/api/lang/processor.php"; +require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/session.php"; + +global $lang; + +?> <!DOCTYPE html> <html> @@ -30,7 +38,7 @@ <div class="bg"></div> <main> <aside> - <div id="nav-header"> + <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/" id="nav-header"> <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/upload/siteicon.png" id="nav-header-icon"> <div id="nav-header-names-outer"> <div id="nav-header-names"> @@ -38,78 +46,80 @@ <?php if (file_exists($GLOBALS['ORIGINAL_DOCUMENT_ROOT'] . "/NeutronCloud")): - echo("Neutron Cloud X" . trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/Tier"))); + echo("Cloud X" . trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/Tier"))); else: - echo("Neutron On-premises"); + echo($lang["admin-v2"]["on-premises"]); endif; ?> </div> </div> - </div> + </a> <div id="nav-items"> <div class="nav-item selected" data-pane="system"> <img class="nav-item-icon" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/system.png" alt=""> - <span class="nav-item-name">System</span> + <span class="nav-item-name"><?= $lang["admin-v2"]["drawer"][0] ?></span> </div> <div class="nav-item" data-pane="content"> <img class="nav-item-icon" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/content.png" alt=""> - <span class="nav-item-name">Content</span> + <span class="nav-item-name"><?= $lang["admin-v2"]["drawer"][1] ?></span> </div> <div class="nav-item" data-pane="personalization"> <img class="nav-item-icon" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/personalization.png" alt=""> - <span class="nav-item-name">Personalization</span> + <span class="nav-item-name"><?= $lang["admin-v2"]["drawer"][2] ?></span> </div> <div class="nav-item" data-pane="features"> <img class="nav-item-icon" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/features.png" alt=""> - <span class="nav-item-name">Features</span> + <span class="nav-item-name"><?= $lang["admin-v2"]["drawer"][3] ?></span> </div> <div class="nav-item" data-pane="accounts"> <img class="nav-item-icon" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/accounts.png" alt=""> - <span class="nav-item-name">Accounts</span> + <span class="nav-item-name"><?= $lang["admin-v2"]["drawer"][4] ?></span> </div> <div class="nav-item" data-pane="language"> <img class="nav-item-icon" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/language.png" alt=""> - <span class="nav-item-name">Region & language</span> + <span class="nav-item-name"><?= $lang["admin-v2"]["drawer"][5] ?></span> </div> <div class="nav-item" data-pane="security"> <img class="nav-item-icon" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/security.png" alt=""> - <span class="nav-item-name">Data & security</span> + <span class="nav-item-name"><?= $lang["admin-v2"]["drawer"][6] ?></span> </div> <div class="nav-item" data-pane="maintenance"> <img class="nav-item-icon" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/maintenance.png" alt=""> - <span class="nav-item-name">Advanced options</span> + <span class="nav-item-name"><?= $lang["admin-v2"]["drawer"][7] ?></span> </div> + <?php if (false): ?> <div class="nav-item" data-pane="cloud"> <img class="nav-item-icon" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/cloud.png" alt=""> - <span class="nav-item-name">Neutron Cloud</span> + <span class="nav-item-name"><?= $lang["admin-v2"]["drawer"][8] ?></span> </div> + <?php endif; ?> + <?php if (false): ?> <div class="nav-item" data-pane="electrode"> <img class="nav-item-icon" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/electrode.png" alt=""> - <span class="nav-item-name">Electrode Server</span> + <span class="nav-item-name"><?= $lang["admin-v2"]["drawer"][9] ?></span> </div> + <?php endif; ?> <script> Array.from(document.getElementsByClassName("nav-item")).forEach((item) => { item.onclick = () => { - if (item.classList.contains("selected")) { return; } - Array.from(document.getElementsByClassName("nav-item")).forEach((i) => { i.classList.remove("selected"); }) item.classList.add("selected") document.getElementById("main-iframe").src = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$panes/" + item.getAttribute("data-pane") + ".php"; - document.getElementById("main-title").innerText = item.children[1].innerText; + document.getElementById("main-title-inner").innerText = item.children[1].innerText; } }) </script> @@ -117,9 +127,21 @@ </aside> <article id="main-content"> - <span id="main-title">System</span> + <div id="main-title" style="margin-top: 2px;"><span id="main-title-inner"><?= $lang["admin-v2"]["drawer"][0] ?></span> <span class="main-title-home-outer" onclick='$(".selected").click()'><img class="main-title-home" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/admin2/home.png" alt=""></span></div> <iframe id="main-iframe" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$panes/system.php"></iframe> </article> + + <script> + document.getElementById("main-iframe").onload = () => { + if (document.getElementById("main-iframe").contentDocument.title !== "base") { + document.getElementById("main-title").style.marginTop = "0"; + $(".main-title-home-outer").fadeIn(200); + } else { + document.getElementById("main-title").style.marginTop = "2px"; + $(".main-title-home-outer").fadeOut(200); + } + } + </script> </main> </body> diff --git a/Neutron-trunk/cms-special/admin-v2/language/index.php b/Neutron-trunk/cms-special/admin-v2/language/index.php index 4c16e04..5d069d7 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/language/index.php +++ b/Neutron-trunk/cms-special/admin-v2/language/index.php @@ -1,57 +1,9 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Langue et région", "headerName" => "Langue et région" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> -<div style="text-align: center;"><select id="langselect"> - <?php +<?php $pageConfig = [ "domName" => "Langue et région", "headerName" => "Langue et région" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> +<?php - $langs = scandir($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n"); - foreach ($langs as $language) { - if ($language != "." && $language != ".." && $language != ".htaccess") { - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/" . $language . "/\$metadata.json")) { - echo("<option value=\"" . $language . "\">"); - echo(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/" . $language . "/\$metadata.json"))->localized_name . " — " . json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/" . $language . "/\$metadata.json"))->name); - echo("</option>"); - } - } - } - - ?> -</select> -</p> -<input id="langselect-confirm" type="button" value="OK" onclick="changeLanguage()"></div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function changeLanguage() { - document.getElementById('langselect').disabled = true; - document.getElementById('langselect-confirm').disabled = true; - var formData = new FormData(); - formData.append("lang", document.getElementById('langselect').value); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/instant_language_change.php", - success: function (data) { - if (data == "ok") { - document.getElementById('langselect').disabled = false; - document.getElementById('langselect-confirm').disabled = false; - ajaxPageReload(); - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data); - document.getElementById('langselect').disabled = false; - document.getElementById('langselect-confirm').disabled = false; - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>\n\n<?= $lang["admin-errors"]["housekeeping"][1] ?>") - document.getElementById('langselect').disabled = false; - document.getElementById('langselect-confirm').disabled = false; - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); +if (isset($_GET['_'])) { + file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/lang", trim($_GET['_'])); } -</script>
\ No newline at end of file +echo("<script>window.parent.location.reload();</script>");
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/login-old/index.php b/Neutron-trunk/cms-special/admin-v2/login-old/index.php index d4428d7..a2f09ba 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/login-old/index.php +++ b/Neutron-trunk/cms-special/admin-v2/login-old/index.php @@ -14,7 +14,7 @@ if (isset($_POST['authkey'])) { $callback = $_GET['pr']; } } else { - $callback = "{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home"; + $callback = "{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"; } if (password_verify($_POST['password'], file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/password"))) { $token = str_ireplace("/", "-", password_hash(password_hash(rand(0, 999999) + rand(0, 999999) + rand(0, 999999) + rand(0, 999999) + rand(0, 999999), PASSWORD_BCRYPT, ['cost' => 12,]), PASSWORD_BCRYPT, ['cost' => 12,])); @@ -37,7 +37,7 @@ if (isset($_POST['authkey'])) { } } -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { if (isset($_GET['pr'])) { if (isset($_GET['pa'])) { @@ -46,7 +46,7 @@ if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] $callback = $_GET['pr']; } } else { - $callback = "{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home"; + $callback = "{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"; } header("Location: " . $callback); } @@ -94,7 +94,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent")) { <div class="centered"> <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/upload/siteicon.png" style="border-radius:100%;" class="intro-element"> <h2 style="margin-bottom:0;"><?= $lang["login"]["title"] ?></h2> - <p><small><?= str_replace("}", "</a>", str_replace("{", "<a class=\"clink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/login\">", $lang["login"]["redirect"])); ?></small></p> + <p><small><?= str_replace("}", "</a>", str_replace("{", "<a class=\"clink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/login\">", $lang["login"]["redirect"])); ?></small></p> <p><?php if (isset($_GET['authkey'])) { @@ -114,7 +114,7 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent")) { <?php else: ?> <form action="#" method="post"> <input name="authkey" type="password" placeholder="<?= isset($_GET['authkey']) ? $lang["login"]["authph"] : $lang["login"]["password"] ?>" disabled><br><br> - <small><?= $lang["login"]["nokey"][0] . " <a class=\"clink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/login\">" . $lang["login"]["nokey"][1] . "</a> " . $lang["login"]["nokey"][2] ?></small> + <small><?= $lang["login"]["nokey"][0] . " <a class=\"clink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/login\">" . $lang["login"]["nokey"][1] . "</a> " . $lang["login"]["nokey"][2] ?></small> </form><br> <?php endif ?> </div> diff --git a/Neutron-trunk/cms-special/admin-v2/login/index.php b/Neutron-trunk/cms-special/admin-v2/login/index.php index 57a1b6a..6472865 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/login/index.php +++ b/Neutron-trunk/cms-special/admin-v2/login/index.php @@ -1,7 +1,7 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> <?php -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { if (isset($_GET['pr'])) { if (isset($_GET['pa'])) { @@ -10,7 +10,7 @@ if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] $callback = $_GET['pr']; } } else { - $callback = "{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home"; + $callback = "{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"; } header("Location: " . $callback); } @@ -23,7 +23,7 @@ if (isset($_GET['pr'])) { $callback = $_GET['pr']; } } else { - $callback = "{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home"; + $callback = "{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"; } ?> @@ -57,7 +57,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso <script src="<?= $_MD_INCLUDES ?>/material-components-web.min.js"></script> <link rel="stylesheet" href="<?= $_MDI_PATH ?>"> <?php - echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin/$resources/index-dark.css">'); + echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin-v2/$resources/index-dark.css">'); ?> <title><?php @@ -77,14 +77,14 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso <script> window.onerror = () => { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/login-old"; + location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/login-old"; } </script> </head> <body id="login"> <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/documentbody.php"; ?> - <div id="loader" style="display:none;z-index:99;"> + <div id="loader" style="backdrop-filter: blur(10px);display:none;z-index:99;"> <svg class="spinner" width="48px" height="48px" viewBox="0 0 66 66" xmlns="http://www.w3.org/2000/svg"> <circle class="path" fill="none" stroke-width="6" stroke-linecap="round" cx="33" cy="33" r="30"></circle> </svg> @@ -103,7 +103,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso <span class="mdc-button__label"><?= $lang["admin-login"]["modes"][0] ?></span> </button> <?php if (file_exists($GLOBALS["ORIGINAL_DOCUMENT_ROOT"] . "/NeutronCloud") && is_file($GLOBALS["ORIGINAL_DOCUMENT_ROOT"] . "/NeutronCloud")): ?> - <button onclick="window.parent.location.href='https://minteck.ro.lt/admin/NeutronManage/?_='+location.pathname.split('/')[1];" class="mdc-button mdc-button--outlined" id="loginwith-authkey"> + <button onclick="window.parent.location.href='https://admin.minteck.org/NeutronManage/?_='+location.pathname.split('/')[1];" class="mdc-button mdc-button--outlined" id="loginwith-authkey"> <div class="mdc-button__ripple"></div> <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">admin_panel_settings</i> <span class="mdc-button__label">Cloud Admin Console</span> diff --git a/Neutron-trunk/cms-special/admin-v2/logout/index.php b/Neutron-trunk/cms-special/admin-v2/logout/index.php index 5c51269..12c5319 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/logout/index.php +++ b/Neutron-trunk/cms-special/admin-v2/logout/index.php @@ -1,7 +1,7 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> <?php -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { $tokens = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/tokens"); foreach ($tokens as $token) { @@ -11,5 +11,5 @@ if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] } } } -header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/login"); +header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/login"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit();
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/logs/index.php b/Neutron-trunk/cms-special/admin-v2/logs/index.php index b653ad0..1bb62df 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/logs/index.php +++ b/Neutron-trunk/cms-special/admin-v2/logs/index.php @@ -1,5 +1,5 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Historique d'activité", "headerName" => "Historique d'activité" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Historique d'activité", "headerName" => "Historique d'activité" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <div id="logs"> <?php @@ -14,4 +14,4 @@ ?> </div><br><br> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
\ No newline at end of file +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/pages/add/index.php b/Neutron-trunk/cms-special/admin-v2/pages/add/index.php index 54dacdb..823d9d4 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/pages/add/index.php +++ b/Neutron-trunk/cms-special/admin-v2/pages/add/index.php @@ -1,5 +1,5 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Nouvelle page - Pages", "headerName" => "Nouvelle page" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Nouvelle page - Pages", "headerName" => "Nouvelle page" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <p> <form name="settings"> <div class="nd_Field nd_Field_input nd_Field__centered" id="namebox"> @@ -35,7 +35,7 @@ </div> </div> <div class="hide" id="loader" style="text-align: center;"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> window.onbeforeunload = function (e) { @@ -67,7 +67,7 @@ function createPageVisual() { url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/create_page.php", success: function (data) { if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages"; + location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages"; } else { alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = false}) diff --git a/Neutron-trunk/cms-special/admin-v2/pages/delete/index.php b/Neutron-trunk/cms-special/admin-v2/pages/delete/index.php index 4cbcb49..964c208 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/pages/delete/index.php +++ b/Neutron-trunk/cms-special/admin-v2/pages/delete/index.php @@ -4,16 +4,16 @@ if (isset($_GET['slug'])) { $currentSlug = $_GET['slug']; if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pages/" . $currentSlug)) {} else { - header("Location: /cms-special/admin/pages"); + header("Location: /cms-special/admin-v2/pages"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); } } else { - header("Location: /cms-special/admin/pages"); + header("Location: /cms-special/admin-v2/pages"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); } ?> -<?php $pageConfig = [ "domName" => "Pages", "headerName" => "Pages" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Pages", "headerName" => "Pages" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <?php if ($currentSlug == "index") { @@ -37,9 +37,9 @@ if ($currentSlug == "index") { ?> <!--<ul> <li><a onclick="deletePage()" class="sblink" title="<?= $lang["admin-pages"]["deleteyl"] ?>"><?= $lang["admin-pages"]["deletey"] ?></a></li> - <li><a onclick="location.href='/cms-special/admin/pages/manage/?slug=<?= $currentSlug ?>'" class="sblink" title="<?= $lang["admin-pages"]["deletenl"] ?>"><?= $lang["admin-pages"]["deleten"] ?></a></li> + <li><a onclick="location.href='/cms-special/admin-v2/pages/manage/?slug=<?= $currentSlug ?>'" class="sblink" title="<?= $lang["admin-pages"]["deletenl"] ?>"><?= $lang["admin-pages"]["deleten"] ?></a></li> </ul>--> - <a title="<?= $lang["admin-pages"]["deletenl"] ?>" onclick="location.href='/cms-special/admin/pages';" class="mdc-button mdc-button--raised"> + <a title="<?= $lang["admin-pages"]["deletenl"] ?>" onclick="location.href='/cms-special/admin-v2/pages';" class="mdc-button mdc-button--raised"> <div class="mdc-button__ripple"></div> <span class="mdc-button__label"><?= $lang["admin-pages"]["deleten"] ?></span> </a> @@ -51,7 +51,7 @@ if ($currentSlug == "index") { </div> <div class="hide" id="loader" style="text-align: center;"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> @@ -66,7 +66,7 @@ function deletePage() { url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/delete_page.php", success: function (data) { if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages"; + location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages"; } else { alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) document.getElementById('loader').classList.add('hide') diff --git a/Neutron-trunk/cms-special/admin-v2/pages/edit/index.php b/Neutron-trunk/cms-special/admin-v2/pages/edit/index.php index b198566..3044904 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/pages/edit/index.php +++ b/Neutron-trunk/cms-special/admin-v2/pages/edit/index.php @@ -4,16 +4,16 @@ if (isset($_GET['slug'])) { $currentSlug = $_GET['slug']; if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pages/" . $currentSlug)) {} else { - header("Location: /cms-special/admin/pages"); + header("Location: /cms-special/admin-v2/pages"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); } } else { - header("Location: /cms-special/admin/pages"); + header("Location: /cms-special/admin-v2/pages"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); } ?> -<?php $pageConfig = [ "domName" => "Pages", "headerName" => "Pages" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Pages", "headerName" => "Pages" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <div id="editing"> <?php @@ -44,7 +44,7 @@ if (isset($_GET['slug'])) { ?> </div> <div class="hide" id="loader" style="text-align: center;"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> window.onbeforeunload = function (e) { @@ -75,7 +75,7 @@ function updatePage() { success: function (data) { if (data == "ok") { window.onbeforeunload = null; - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages"; + location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages"; } else { alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) document.getElementById('loader').classList.add('hide') @@ -172,7 +172,7 @@ function updatePageHTML() { url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/edit_page.php", success: function (data) { if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages"; + location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages"; } else { alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) document.getElementById('loader').classList.add('hide') diff --git a/Neutron-trunk/cms-special/admin-v2/pages/index.php b/Neutron-trunk/cms-special/admin-v2/pages/index.php index d8e1e3d..71b55db 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/pages/index.php +++ b/Neutron-trunk/cms-special/admin-v2/pages/index.php @@ -1,5 +1,5 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Pages", "headerName" => "Gestionnaire de pages" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Pages", "headerName" => "Gestionnaire de pages" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <div class="admin-pages-list"> <?php @@ -22,18 +22,18 @@ $sizetotal = $sizetotal + $size; $sizestr = str_replace(".", ",", $sizestr); if ($page == "index"): ?> -<!-- echo("<li><a href='/cms-special/admin/pages/manage/?slug={$page}' class='sblink' title='{$lang['admin-pages']['lore']}'>{$lang['admin-pages']['home']}</a> ({$page}), {$typestr}, {$sizestr}</li>");--> +<!-- echo("<li><a href='/cms-special/admin-v2/pages/manage/?slug={$page}' class='sblink' title='{$lang['admin-pages']['lore']}'>{$lang['admin-pages']['home']}</a> ({$page}), {$typestr}, {$sizestr}</li>");--> <div class="mdc-card mdc-card--outlined" style="width:256px;margin:10px;display:inline-block;"> <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> <h2 style="margin-bottom:5px;white-space: nowrap;overflow: hidden !important;text-overflow: ellipsis;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-pages"]["home"] ?></h2> <h3 style="margin-top:5px;" class="mdc-typography mdc-typography--subtitle2"><?php $text = strip_tags(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pages/" . $page));if (strlen($text)>100){echo(substr($text,0,100) . " …");}else{echo($text);} ?></h3> </div><br><br> <div class="mdc-card__actions mdc-card__actions-pages-list"> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages/edit/?slug=<?= $page ?>" title="<?= $lang["admin-pages"]["editl"] ?>" class="mdc-button mdc-card__action mdc-card__action--button"> + <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages/edit/?slug=<?= $page ?>" title="<?= $lang["admin-pages"]["editl"] ?>" class="mdc-button mdc-card__action mdc-card__action--button"> <div class="mdc-button__ripple"></div> <span class="mdc-button__label"><?= $lang["admin-pages"]["edit"] ?></span> </a> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages/edit/?slug=<?= $page ?>&forcehtml" class="material-icons mdc-icon-button mdc-card__action mdc-card__action--icon mdi-icbtn-card" title="<?= $lang["admin-pages"]["editcode"] ?>">code</a> + <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages/edit/?slug=<?= $page ?>&forcehtml" class="material-icons mdc-icon-button mdc-card__action mdc-card__action--icon mdi-icbtn-card" title="<?= $lang["admin-pages"]["editcode"] ?>">code</a> </div> </div> <?php else: ?> @@ -43,12 +43,12 @@ <h3 style="margin-top:5px;" class="mdc-typography mdc-typography--subtitle2"><?php $text = strip_tags(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pages/" . $page));if (strlen($text)>100){echo(substr($text,0,100) . " …");}else{echo($text);} ?></h3> </div><br><br> <div class="mdc-card__actions mdc-card__actions-pages-list"> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages/edit/?slug=<?= $page ?>" title="<?= $lang["admin-pages"]["editl"] ?>" class="mdc-button mdc-card__action mdc-card__action--button"> + <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages/edit/?slug=<?= $page ?>" title="<?= $lang["admin-pages"]["editl"] ?>" class="mdc-button mdc-card__action mdc-card__action--button"> <div class="mdc-button__ripple"></div> <span class="mdc-button__label"><?= $lang["admin-pages"]["edit"] ?></span> </a> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages/rename/?slug=<?= $page ?>" class="material-icons mdc-icon-button mdc-card__action mdc-card__action--icon mdi-icbtn-card" title="<?= $lang["admin-pages"]["renamel"] ?>">create</a> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages/delete/?slug=<?= $page ?>" class="material-icons mdc-icon-button mdc-card__action mdc-card__action--icon mdi-icbtn-card" title="<?= $lang["admin-pages"]["deletel"] ?>">delete</a> + <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages/rename/?slug=<?= $page ?>" class="material-icons mdc-icon-button mdc-card__action mdc-card__action--icon mdi-icbtn-card" title="<?= $lang["admin-pages"]["renamel"] ?>">create</a> + <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages/delete/?slug=<?= $page ?>" class="material-icons mdc-icon-button mdc-card__action mdc-card__action--icon mdi-icbtn-card" title="<?= $lang["admin-pages"]["deletel"] ?>">delete</a> </div> </div> <?php endif; @@ -57,10 +57,10 @@ ?> </div> <p><div style="text-align: center;"> - <a title="<?= $lang["admin-pages"]["alore"] ?>" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages/add" class="mdc-button mdc-button--outlined"> + <a title="<?= $lang["admin-pages"]["alore"] ?>" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages/add" class="mdc-button mdc-button--outlined"> <div class="mdc-button__ripple"></div> <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">add</i> <span class="mdc-button__label"><?= $lang["admin-pages"]["create"] ?></span> </a> </div></p> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
\ No newline at end of file +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/pages/rename/index.php b/Neutron-trunk/cms-special/admin-v2/pages/rename/index.php index d7118ba..cf7b67e 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/pages/rename/index.php +++ b/Neutron-trunk/cms-special/admin-v2/pages/rename/index.php @@ -4,16 +4,16 @@ if (isset($_GET['slug'])) { $currentSlug = $_GET['slug']; if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pages/" . $currentSlug)) {} else { - header("Location: /cms-special/admin/pages"); + header("Location: /cms-special/admin-v2/pages"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); } } else { - header("Location: /cms-special/admin/pages"); + header("Location: /cms-special/admin-v2/pages"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); } ?> -<?php $pageConfig = [ "domName" => "Pages", "headerName" => "Pages" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Pages", "headerName" => "Pages" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <?php if ($currentSlug == "index") { @@ -51,7 +51,7 @@ if ($currentSlug == "index") { </div> <div class="hide" id="loader" style="text-align: center;"><img src="/resources/image/loader.svg" class="loader"> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> @@ -67,7 +67,7 @@ function renamePage() { url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/rename_page.php", success: function (data) { if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages"; + location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/pages"; } else { alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) document.getElementById('loader').classList.add('hide') diff --git a/Neutron-trunk/cms-special/admin-v2/password/index.php b/Neutron-trunk/cms-special/admin-v2/password/index.php new file mode 100644 index 0000000..2ea9e60 --- /dev/null +++ b/Neutron-trunk/cms-special/admin-v2/password/index.php @@ -0,0 +1,51 @@ +<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> +<?php $loadEditor = false;$pageConfig = [ "domName" => "Apparence", "headerName" => "Apparence" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> + <h2><?= $lang["admin-appearance"]["password"] ?></h2> + <span id="password-error-box" class="hide"><div id="error"><span id="password-error"><?= $lang["admin-appearance"]["error"] ?></span></div></span> + <div id="password-settings" style="text-align: center;"> + <p><?= $lang["admin-appearance"]["oldpass"] ?> <input type="password" id="old-password" placeholder="<?= $lang["admin-appearance"]["secure"] ?>"></p> + <p><?= $lang["admin-appearance"]["newpass"] ?> <input type="password" id="new-password" placeholder="<?= $lang["admin-appearance"]["secure"] ?>"></p> + <p><?= $lang["admin-appearance"]["passrep"] ?> <input type="password" id="repeat-password" placeholder="<?= $lang["admin-appearance"]["secure"] ?>"></p> + <a onclick="changePassword()" class="button"><?= $lang["admin-appearance"]["change"] ?></a> + </div> + <div style="text-align: center;"><div id="password-loader" class="hide"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div></div> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> + +<script> + +function changePassword() { + document.getElementById('password-loader').classList.remove('hide') + document.getElementById('password-settings').classList.add('hide') + var formData = new FormData(); + formData.append("oldpass", document.getElementById('old-password').value); + formData.append("newpass", document.getElementById('new-password').value); + formData.append("newpassr", document.getElementById('repeat-password').value); + document.getElementById('password-error-box').classList.add("hide") + $.ajax({ + type: "POST", + dataType: 'html', + url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/password.php", + success: function (data) { + if (data == "ok") { + location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$panes/accounts.php"; + } else { + document.getElementById('password-error').innerHTML = data + document.getElementById('password-error-box').classList.remove("hide") + document.getElementById('password-loader').classList.add('hide') + document.getElementById('password-settings').classList.remove('hide') + } + }, + error: function (error) { + document.getElementById('password-error').innerHTML = "<?= $lang["admin-errors"]["connerror"] ?>" + document.getElementById('password-error-box').classList.remove("hide") + document.getElementById('password-loader').classList.add('hide') + document.getElementById('password-settings').classList.remove('hide') + }, + data: formData, + cache: false, + contentType: false, + processData: false + }); +} + +</script>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/plugins/index.php b/Neutron-trunk/cms-special/admin-v2/plugins/index.php index 58be08f..2676076 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/plugins/index.php +++ b/Neutron-trunk/cms-special/admin-v2/plugins/index.php @@ -1,7 +1,7 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> <?php -$pageConfig = [ "domName" => "Extensions", "headerName" => "Extensions" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +$pageConfig = [ "domName" => "Extensions", "headerName" => "Extensions" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <p><table class="message_info"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_info.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-plugins"]["newnotice"] ?></p></td></tr></tbody></table></p> <?php @@ -30,7 +30,7 @@ $pageConfig = [ "domName" => "Extensions", "headerName" => "Extensions" ]; requi } ?> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> diff --git a/Neutron-trunk/cms-special/admin-v2/reset/index.php b/Neutron-trunk/cms-special/admin-v2/reset/index.php index efa215c..5c1471e 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/reset/index.php +++ b/Neutron-trunk/cms-special/admin-v2/reset/index.php @@ -1,5 +1,5 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Réinitialisation - Maintenance", "headerName" => "Réinitialisation" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Réinitialisation - Maintenance", "headerName" => "Réinitialisation" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <div id="page-confirm"> <div style="text-align: center;"><p><?= $lang["admin-housekeeping"]["disclaimer"][0] ?><ul><li><?= $lang["admin-housekeeping"]["disclaimer"][1] ?></li><li><?= $lang["admin-housekeeping"]["disclaimer"][2] ?></li><li><?= $lang["admin-housekeeping"]["disclaimer"][3] ?></li><li><?= $lang["admin-housekeeping"]["disclaimer"][4] ?></li></ul></p> <p><b><?= $lang["admin-housekeeping"]["confirm"] ?></b></p><input id="confirm" onkeyup="validate()" onkeydown="validate()" onchange="validate()" type="text" placeholder="<?= $lang["admin-housekeeping"]["confirmboxph"] ?>"></div> @@ -24,7 +24,7 @@ <div id="loader" style="text-align: center;"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div> <p><small><?= $lang["admin-housekeeping"]["select"][7] ?><br><span id="reset-message">-</span></small></p> </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/postcontent.php"; ?> <script> @@ -39,7 +39,7 @@ function resetKeep() { url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/reset.php", success: function (data) { if (data == "ok") { - window.parent.location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/resetted"; + window.parent.location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/resetted"; } else { alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data + "\n\n<?= $lang["admin-errors"]["housekeeping"][0] ?>") Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = false}) @@ -68,7 +68,7 @@ function resetClear() { url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/reset.php", success: function (data) { if (data == "ok") { - window.parent.location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/resetted"; + window.parent.location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/resetted"; } else { alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data + "\n\n<?= $lang["admin-errors"]["housekeeping"][0] ?>") Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = false}) diff --git a/Neutron-trunk/cms-special/admin-v2/resetted/index.php b/Neutron-trunk/cms-special/admin-v2/resetted/index.php index 21fe104..21fe104 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/resetted/index.php +++ b/Neutron-trunk/cms-special/admin-v2/resetted/index.php diff --git a/Neutron-trunk/cms-special/admin-v2/stats/index.php b/Neutron-trunk/cms-special/admin-v2/stats/index.php index 81b4b69..28fd46d 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/stats/index.php +++ b/Neutron-trunk/cms-special/admin-v2/stats/index.php @@ -1,5 +1,5 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Statistiques", "headerName" => "Statistiques" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> +<?php $pageConfig = [ "domName" => "Statistiques", "headerName" => "Statistiques" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?> <?php if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats")) { echo("<h2>" . $lang["admin-stats"]["new"] . "</h2><p>" . $lang["admin-stats"]["notice"] . "</p>"); } ?> <?php @@ -277,4 +277,4 @@ foreach ($dates as $date) { </tbody> </table> <?php endif; ?> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?>
\ No newline at end of file +<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/precontent.php"; ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin-v2/widgets/index.php b/Neutron-trunk/cms-special/admin-v2/widgets/index.php index ed6d9db..d0890d0 100755..100644 --- a/Neutron-trunk/cms-special/admin-v2/widgets/index.php +++ b/Neutron-trunk/cms-special/admin-v2/widgets/index.php @@ -1,5 +1,5 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> <?php -header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/plugins"); +header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2/plugins"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit();
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/$resources/admin.js b/Neutron-trunk/cms-special/admin/$resources/admin.js index bca683b..bca683b 100755..100644 --- a/Neutron-trunk/cms-special/admin/$resources/admin.js +++ b/Neutron-trunk/cms-special/admin/$resources/admin.js diff --git a/Neutron-trunk/cms-special/admin/$resources/common.css b/Neutron-trunk/cms-special/admin/$resources/common.css index 3826747..3826747 100755..100644 --- a/Neutron-trunk/cms-special/admin/$resources/common.css +++ b/Neutron-trunk/cms-special/admin/$resources/common.css diff --git a/Neutron-trunk/cms-special/admin/$resources/header.php b/Neutron-trunk/cms-special/admin/$resources/header.php index e69de29..e69de29 100755..100644 --- a/Neutron-trunk/cms-special/admin/$resources/header.php +++ b/Neutron-trunk/cms-special/admin/$resources/header.php diff --git a/Neutron-trunk/cms-special/admin/$resources/index-auto.css b/Neutron-trunk/cms-special/admin/$resources/index-auto.css index 773eab9..773eab9 100755..100644 --- a/Neutron-trunk/cms-special/admin/$resources/index-auto.css +++ b/Neutron-trunk/cms-special/admin/$resources/index-auto.css diff --git a/Neutron-trunk/cms-special/admin/$resources/index-dark.css b/Neutron-trunk/cms-special/admin/$resources/index-dark.css index 1683192..1683192 100755..100644 --- a/Neutron-trunk/cms-special/admin/$resources/index-dark.css +++ b/Neutron-trunk/cms-special/admin/$resources/index-dark.css diff --git a/Neutron-trunk/cms-special/admin/$resources/index.css b/Neutron-trunk/cms-special/admin/$resources/index.css index 57dd995..57dd995 100755..100644 --- a/Neutron-trunk/cms-special/admin/$resources/index.css +++ b/Neutron-trunk/cms-special/admin/$resources/index.css diff --git a/Neutron-trunk/cms-special/admin/$resources/postcontent.php b/Neutron-trunk/cms-special/admin/$resources/postcontent.php index 573a1d9..cface57 100755..100644 --- a/Neutron-trunk/cms-special/admin/$resources/postcontent.php +++ b/Neutron-trunk/cms-special/admin/$resources/postcontent.php @@ -3,4 +3,4 @@ </body> </html> -<script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/admin.js" charset="utf-8"></script>
\ No newline at end of file +<script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/admin.js" charset="utf-8"></script>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/$resources/precontent.php b/Neutron-trunk/cms-special/admin/$resources/precontent.php index b133975..e32c599 100755..100644 --- a/Neutron-trunk/cms-special/admin/$resources/precontent.php +++ b/Neutron-trunk/cms-special/admin/$resources/precontent.php @@ -47,19 +47,19 @@ if (isset($lang["admin-titles"][$pageid])) { $invalid = false; -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { +if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/" && strpos($_COOKIE['_NEUTRON_ADMIN_TOKEN'], "/") === false) { if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { } else { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin/?pr=" . str_replace("/index.php", "", $_SERVER['SCRIPT_NAME']) . "&pa=" . urlencode("?" . explode("?", $_SERVER['REQUEST_URI'])[1]) . "'</script>"); + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin-v2/?pr=" . str_replace("/index.php", "", $_SERVER['SCRIPT_NAME']) . "&pa=" . urlencode("?" . explode("?", $_SERVER['REQUEST_URI'])[1]) . "'</script>"); } } else { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin/?pr=" . str_replace("/index.php", "", $_SERVER['SCRIPT_NAME']) . "&pa=" . urlencode("?" . explode("?", $_SERVER['REQUEST_URI'])[1]) . "'</script>"); + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin-v2/?pr=" . str_replace("/index.php", "", $_SERVER['SCRIPT_NAME']) . "&pa=" . urlencode("?" . explode("?", $_SERVER['REQUEST_URI'])[1]) . "'</script>"); } if (isset($_POST['password'])) { if (password_verify($_POST['password'], file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/password"))) { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin/home';</script>"); + require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS["SYSTEM_ROOT"] . "/cms-special/admin-v2/home';</script>"); return; } else { $invalid = true; @@ -127,19 +127,19 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/ui.css"> <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/codename.css"> <link rel="icon" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/siteicon.png"> - <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/admin.js"></script> + <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/admin.js"></script> <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/fonts-import.css" as="style"> <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/alerts.css" as="style"> <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin.css" as="style"> <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/ui.css" as="style"> - <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/common.css" as="style"> - <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/index.css" as="style"> - <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/responsive.css" as="style"> - <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/index-dark.css" as="style"> + <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/common.css" as="style"> + <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/index.css" as="style"> + <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/responsive.css" as="style"> + <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/index-dark.css" as="style"> <link rel="preload" href="<?= $_MD_INCLUDES ?>/material-components-web.min.css" as="style"> <link rel="preload" href="<?= $_MDI_PATH ?>" as="style"> <link rel="preload" href="<?= $_MD_INCLUDES ?>/material-components-web.min.js" as="script"> - <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/admin.js" as="script"> + <link rel="preload" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/admin.js" as="script"> <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/documenthead.php"; ?> <?php @@ -149,17 +149,17 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso } if ($loadEditor) { - echo('<script src="' . $GLOBALS["SYSTEM_ROOT"] . '/resources/js/ckeditor5/ckeditor.js"></script><script src="' . $GLOBALS["SYSTEM_ROOT"] . '/resources/js/ckeditor5/translations/fr.js"></script><script src="' . $GLOBALS["SYSTEM_ROOT"] . '/resources/js/ckeditor5/translations/en.js"></script>'); + echo('<script src="' . $GLOBALS["SYSTEM_ROOT"] . '/resources/js/ckeditor5/ckeditor.js"></script><script src="' . $GLOBALS["SYSTEM_ROOT"] . '/resources/js/ckeditor5/translations/fr.js"></script>'); } ?> <?php if (file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme") == "dark") { - echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin/$resources/index-dark.css">'); + echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin-v2/$resources/index-dark.css">'); } elseif (file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme") == "auto") { - echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin/$resources/index-auto.css">'); + echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin-v2/$resources/index-auto.css">'); } else { - echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin/$resources/index.css">'); + echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin-v2/$resources/index.css">'); } ?> <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/lib/pushbar.js/library.css"> @@ -199,8 +199,13 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso ?> </head> -<body id="settings" style="overflow-x:hidden;background-color: transparent !important;"> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/spotlight.php"; ?> +<body id="settings" style="display:none;overflow-x:hidden;background-color: transparent !important;"> + <script> + window.addEventListener("load", () => { + $("#settings").fadeIn(75) + }) + </script> + <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/spotlight.php"; ?> <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/documentbody.php"; @@ -209,15 +214,14 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocesso $name = $pageConfig['headerName']; ?> - <div id="admin" style="background-color: transparent !important;"> + <div id="admin" style="margin-bottom:50px;margin-top:20px;background-color: transparent !important;"> <?php if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/updates")) { - echo("<div id=\"updates-available\">" . $lang["admin-home"]["updates"][0] . " — <a href=\"/cms-special/admin/updates\">" . $lang["admin-home"]["updates"][1] . "</a></div>"); + echo("<div id=\"updates-available\">" . $lang["admin-home"]["updates"][0] . " — <a href=\"/cms-special/admin-v2/updates\">" . $lang["admin-home"]["updates"][1] . "</a></div>"); $updatable = true; } else { $updatable = false; } - ?> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/header.php"; ?>
\ No newline at end of file + ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/$resources/responsive.css b/Neutron-trunk/cms-special/admin/$resources/responsive.css index 75810b1..75810b1 100755..100644 --- a/Neutron-trunk/cms-special/admin/$resources/responsive.css +++ b/Neutron-trunk/cms-special/admin/$resources/responsive.css diff --git a/Neutron-trunk/cms-special/admin/$resources/spotlight-test.php b/Neutron-trunk/cms-special/admin/$resources/spotlight-test.php index bffaa87..625f734 100755..100644 --- a/Neutron-trunk/cms-special/admin/$resources/spotlight-test.php +++ b/Neutron-trunk/cms-special/admin/$resources/spotlight-test.php @@ -9,6 +9,6 @@ <link rel="stylesheet" href="/resources/lib/material/iconfont.css"> </head> <body> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/spotlight.php"; ?> + <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/\$resources/spotlight.php"; ?> </body> </html>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/$resources/spotlight.php b/Neutron-trunk/cms-special/admin/$resources/spotlight.php index f803f52..2a09ed3 100755..100644 --- a/Neutron-trunk/cms-special/admin/$resources/spotlight.php +++ b/Neutron-trunk/cms-special/admin/$resources/spotlight.php @@ -4,7 +4,7 @@ <?php -$data = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/home/all/db.json")); +$data = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin-v2/home/all/db.json")); ?> <ul class="spotlight-elements"> diff --git a/Neutron-trunk/cms-special/admin/.htaccess b/Neutron-trunk/cms-special/admin/.htaccess index 90f6271..d53a146 100755..100644 --- a/Neutron-trunk/cms-special/admin/.htaccess +++ b/Neutron-trunk/cms-special/admin/.htaccess @@ -1,4 +1,4 @@ -ErrorDocument 404 "/cms-special/admin/error" -ErrorDocument 403 "/cms-special/admin/error" -ErrorDocument 401 "/cms-special/admin/error" -ErrorDocument 500 "/cms-special/admin/error"
\ No newline at end of file +ErrorDocument 404 "/cms-special/admin-v2/error" +ErrorDocument 403 "/cms-special/admin-v2/error" +ErrorDocument 401 "/cms-special/admin-v2/error" +ErrorDocument 500 "/cms-special/admin-v2/error"
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/about/index.php b/Neutron-trunk/cms-special/admin/about/index.php index 1551ff0..7d45b3e 100755..100644 --- a/Neutron-trunk/cms-special/admin/about/index.php +++ b/Neutron-trunk/cms-special/admin/about/index.php @@ -1,116 +1 @@ -<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Mise à jour et sécurité", "headerName" => "Mise à jour et sécurité" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <?php - - $currentVersionP = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/api/version"); - $currentVersion = $currentVersionP; - - ?> - <h3><?= $lang["admin-about"]["info"] ?></h3> - <ul><li> - <?php - - echo("" . $lang['admin-about']['version']['prefix'] . " <b>" . $currentVersionP . "</b>"); - echo("</li>"); - - $size = 0; - getData($_SERVER['DOCUMENT_ROOT']); - $sizestr = $size . " " . $lang["sizes"]["bytes"] . ""; - if ($size > 1024) { - if ($size > 1048576) { - if ($size > 1073741824) { - $sizestr = round($size / 1073741824, 3) . " " . $lang["sizes"]["gibibytes"] . ""; - } else { - $sizestr = round($size / 1048576, 3) . " " . $lang["sizes"]["mebibytes"] . ""; - } - } else { - $sizestr = round($size / 1024, 3) . " " . $lang["sizes"]["kibibytes"] . ""; - } - } else { - $sizestr = $size . " " . $lang["sizes"]["bytes"] . ""; - } - - echo("<li>" . $lang["admin-about"]["diskspace"][0] . " <b>" . $sizestr . "</b> " . $lang["admin-about"]["diskspace"][1] . "</li>"); - - ?> - </ul> - <h3><?= $lang["admin-about"]["disk"] ?></h3> - <div id="storagebar" value="0" max="1"></div> - <span style="margin-left: 10px;"></span> - <?php - - $globalSize = $size; - - $size = 0; - getData($_SERVER['DOCUMENT_ROOT'] . "/api"); - $mpcmsSize = $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/cms-special"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/widgets"); - $mpcmsSize = $mpcmsSize + $size; - - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/css"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/fonts"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/image"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/js"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/lib"); - $mpcmsSize = $mpcmsSize + $size; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/private"); - $mpcmsSize = $mpcmsSize + $size; - - $size = 0; - getData($_SERVER['DOCUMENT_ROOT'] . "/data"); - $dataSize = $size; - - $calSize = filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/caldb.json"); - $confSize = filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/sitename") + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log") + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widgets.json") + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/password") + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/footer"); - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widget-notes-data")) { - $confSize = $confSize + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widget-notes-data"); - } - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widget-contact-data")) { - $confSize = $confSize + filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widget-contact-data"); - } - - $size = 0; - getData($_SERVER['DOCUMENT_ROOT'] . "/resources/upload"); - $resSize = $size; - - $globalSize = $resSize + $mpcmsSize + $confSize + $dataSize + $calSize; - - ?> - <div style="display:grid;grid-template-columns:1fr 1fr 1fr 1fr;"> - <span><span style="margin-right:5px;border-radius:999px;vertical-align:middle;background-color:#8bcf69;position:relative;width:15px;height:15px;display:inline-block;"></span><span style="margin-right:30px;"><?= $lang["admin-about"]["categories"]['system'] ?> (<?= round(($mpcmsSize*100)/$globalSize, 2) ?>%)</span></span> - <span><span style="margin-right:5px;border-radius:999px;vertical-align:middle;background-color:#e6d450;position:relative;width:15px;height:15px;display:inline-block;"></span><span style="margin-right:30px;"><?= $lang["admin-about"]["categories"]['config'] ?> (<?= round(($dataSize*100)/$globalSize, 2) ?>%)</span></span> - <span><span style="margin-right:5px;border-radius:999px;vertical-align:middle;background-color:#cf82bf;position:relative;width:15px;height:15px;display:inline-block;"></span><span style="margin-right:30px;"><?= $lang["admin-about"]["categories"]['resources'] ?> (<?= round(($resSize*100)/$globalSize, 2) ?>%)</span></span> - <span><span style="margin-right:5px;border-radius:999px;vertical-align:middle;background-color:gray;position:relative;width:15px;height:15px;display:inline-block;"></span><span style="margin-right:30px;"><?= $lang["admin-about"]["categories"]['misc'] ?></span></span> - </div> - <!-- <?= $globalSize - ($mpcmsSize + $dataSize + $resSize) ?> - <?= "<br>" ?> - <?= (($mpcmsSize + $dataSize + $resSize) * 100)/$globalSize ?> --> - <style> - #storagebar { - height: 12px; - width: calc(100% - 16px); - margin: 8px; - border-radius: 5px; - box-shadow: 0 5px 5px -5px #999 inset; - background-image: linear-gradient( - 90deg, - #8bcf69 <?= round(($mpcmsSize*100)/$globalSize, 2) ?>%, - #e6d450 <?= round(($mpcmsSize*100)/$globalSize, 2) ?>%, - #e6d450 <?= round(($dataSize*100)/$globalSize, 2) ?>%, - #cf82bf <?= round(($dataSize*100)/$globalSize, 2) ?>%, - #cf82bf <?= round(($resSize*100)/$globalSize, 2) ?>%, - gray <?= round(($resSize*100)/$globalSize, 2) ?>%, - gray 100% - ); - background-size: 100% 100%; - } - </style> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/advanced/index.php b/Neutron-trunk/cms-special/admin/advanced/index.php index ae80b96..7d45b3e 100755..100644 --- a/Neutron-trunk/cms-special/admin/advanced/index.php +++ b/Neutron-trunk/cms-special/admin/advanced/index.php @@ -1,8 +1 @@ -<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Options avancées", "headerName" => "Options avancées" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <ul> - <li> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/advanced/jsonconf" title="<?= $lang["admin-advanced-home"]["placeholders"]['dev'] ?>" class="sblink"><?= $lang["admin-advanced-home"]["dev"] ?></a> - </li> - </ul> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
\ No newline at end of file +<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/advanced/jsonconf/index.php b/Neutron-trunk/cms-special/admin/advanced/jsonconf/index.php index f087b1c..8387b16 100755..100644 --- a/Neutron-trunk/cms-special/admin/advanced/jsonconf/index.php +++ b/Neutron-trunk/cms-special/admin/advanced/jsonconf/index.php @@ -1,59 +1 @@ -<?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Préférences de développement - Options avancées", "headerName" => "Préférences de développement" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <p><table class="message_warning"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_warning.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-advanced-dev"]["warning"] ?></p><p><?= $lang["admin-advanced-dev"]["remove"][0] ?> <code>/data/webcontent/customSettings.json</code>. <?= $lang["admin-advanced-dev"]["remove"][1] ?></p></td></tr></tbody></table></p> - <div id="editing"> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/CodeEditor$3.php" ?> - </div> - <div class="hide" id="loader" style="text-align: center;"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - window.onbeforeunload = function (e) { - e = e || window.event; - - // For IE and Firefox prior to version 4 - if (e) { - e.returnValue = "Quit?"; - } - - // For Safari - return "Quit?"; - }; -</script> - -<script> - -function pushSettings() { - Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = true}) - document.getElementById('loader').classList.remove('hide') - document.getElementById('editing').classList.add('hide') - var formData = new FormData(); - formData.append("content", ace.edit("editor").getValue()); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/save_advanced.php", - success: function (data) { - if (data == "ok") { - window.onbeforeunload = undefined; - location.href = "/cms-special/admin/home"; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = false}) - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -</script>
\ No newline at end of file +<?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/appearance/index.php b/Neutron-trunk/cms-special/admin/appearance/index.php index 22c5065..7d45b3e 100755..100644 --- a/Neutron-trunk/cms-special/admin/appearance/index.php +++ b/Neutron-trunk/cms-special/admin/appearance/index.php @@ -1,253 +1 @@ -<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $loadEditor = false;$pageConfig = [ "domName" => "Apparence", "headerName" => "Apparence" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <span id="appearance-error-box" class="hide"><div id="error"><span id="appearance-error"><?= $lang["admin-appearance"]["error"] ?></span></div></span> - <div id="appearance-settings" style="text-align: center;"> - <?= $lang["admin-appearance"]["site"] ?> <input onchange="validateName()" onkeyup="validateName()" onkeydown="validateName()" type="text" id="name-field" placeholder="Nom du site" value="<?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/sitename") ?>"><br> - <p id="04-name-tip" class="tip-red"><?= $lang["admin-appearance"]["name"][0] ?></p> - <input type="file" id="icon-file" class="hide"> - <p><img id="icon-img" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/config_file_replace.svg" onclick="Icon_UploadFile()" class="icon_button"><br><small><?= $lang["admin-appearance"]["icon"] ?></small></p> - <input type="file" id="banner-file" class="hide"> - <p><img id="icon-img" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/config_file_replace.svg" onclick="Banner_UploadFile()" class="icon_button"><br><small><?= $lang["admin-appearance"]["banner"] ?></small></p> - <div style="display:none;"><p> - <input type="checkbox" id="oldrenderer" <?php if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/oldRenderer")) {echo("checked");$oldr=true;} else {$oldr=false;} ?> onchange="toggleRender();"><label for="oldrenderer"><?= $lang["admin-appearance"]["old"] ?></label> - </p> - <p id="<?= $oldr ? "" : "onlyold" ?>" class="oldopts"><small id="oo-disclaimer" <?= $oldr ? "style=\"display:none;\"" : "" ?>><?= $lang["admin-appearance"]["oldopts"] ?></small><br><?= $lang["admin-appearance"]["pages"][0] ?> - <?php if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pagesInMenuBar")) { $pimb = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pagesInMenuBar") + 1 - 1; } else { $pimb = 4; } ?> - <select id="showpages" <?= !$oldr ? "disabled" : "" ?>> - <option value="1"<?= $pimb == 1 ? " selected" : "" ?>>1</option> - <option value="2"<?= $pimb == 2 ? " selected" : "" ?>>2</option> - <option value="3"<?= $pimb == 3 ? " selected" : "" ?>>3</option> - <option value="4"<?= $pimb == 4 ? " selected" : "" ?>>4</option> - <option value="5"<?= $pimb == 5 ? " selected" : "" ?>>5</option> - <option value="6"<?= $pimb == 6 ? " selected" : "" ?>>6</option> - <option value="7"<?= $pimb == 7 ? " selected" : "" ?>>7</option> - <option value="8"<?= $pimb == 8 ? " selected" : "" ?>>8</option> - <option value="9"<?= $pimb == 9 ? " selected" : "" ?>>9</option> - <option value="10"<?= $pimb == 10 ? " selected" : "" ?>>10</option> - </select> - <?= $lang["admin-appearance"]["pages"][1] ?><br> - <input type="checkbox" id="alwaysmenu" <?= !$oldr ? "disabled" : "" ?> <?php if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/alwaysmenu")) {echo("checked");} ?>><label for="alwaysmenu"><?= $lang["admin-appearance"]["alwaysmenu"] ?></label></p></div> - <br> - <a onclick="submitData()" class="button"><?= $lang["admin-appearance"]["save"] ?></a> - </div> - <div style="text-align: center;"><div id="appearance-loader" class="hide"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div></div> - <h2><?= $lang["admin-appearance"]["footer"] ?></h2> - <span id="footer-error-box" class="hide"><div id="error"><span id="footer-error"><?= $lang["admin-appearance"]["error"] ?></span></div></span> - <div id="footer-settings"><div style="text-align: center;"> - <div style="text-align: center;"><?= $lang["admin-appearance"]["fdesc"] ?></div> - <div name="content" id="fedit"> - <?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/footer") ?> - </div><br> - <a onclick="updateFooter()" class="button"><?= $lang["admin-appearance"]["publish"] ?></a> - <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/ckeditor5/ckeditor.js"></script><script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/ckeditor5/translations/<?= $langsel ?>.js"></script> - <script> - let editor; - ClassicEditor - .create( document.querySelector( '#fedit' ), { - language: { - ui: '<?= $langsel ?>', - content: '<?= $langsel ?>' - }, - toolbar: [ - 'heading', '|', 'bold', 'italic', 'link', '|', 'mediaembed', 'blockquote', 'inserttable', '|', 'bulletedList', 'numberedList', '|', 'undo', 'redo' - ] - } ) - .then( newEditor => { - editor = newEditor; - } ) - .catch( error => { - console.error( error ); - } ); - </script></div> - <p><table class="message_info"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_info.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-appearance"]["fdisc"][0] ?></p><p><?= $lang["admin-appearance"]["fdisc"][1] ?></p></td></tr></tbody></table></p> - </div> - <div style="text-align: center;"><div id="footer-loader" class="hide"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div></div> - <h2><?= $lang["admin-appearance"]["password"] ?></h2> - <span id="password-error-box" class="hide"><div id="error"><span id="password-error"><?= $lang["admin-appearance"]["error"] ?></span></div></span> - <div id="password-settings" style="text-align: center;"> - <p><?= $lang["admin-appearance"]["oldpass"] ?> <input type="password" id="old-password" placeholder="<?= $lang["admin-appearance"]["secure"] ?>"></p> - <p><?= $lang["admin-appearance"]["newpass"] ?> <input type="password" id="new-password" placeholder="<?= $lang["admin-appearance"]["secure"] ?>"></p> - <p><?= $lang["admin-appearance"]["passrep"] ?> <input type="password" id="repeat-password" placeholder="<?= $lang["admin-appearance"]["secure"] ?>"></p> - <a onclick="changePassword()" class="button"><?= $lang["admin-appearance"]["change"] ?></a> - </div> - <div style="text-align: center;"><div id="password-loader" class="hide"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div></div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function validateName() { - document.getElementById('04-name-tip').classList.remove('tip-orange') - document.getElementById('04-name-tip').classList.remove('tip-green') - document.getElementById('04-name-tip').classList.remove('tip-red') - document.getElementById('04-name-tip').innerHTML = "..."; - setTimeout(() => { - name = document.getElementById('name-field').value - if (name.trim() == "") { - document.getElementById('04-name-tip').classList.add('tip-red') - document.getElementById('04-name-tip').innerHTML = "<?= $lang["admin-appearance"]["name"][0] ?>"; - return; - } - if (name.includes("<") || name.includes(">") || name.includes("#") || name.includes("@") || name.includes("}") || name.includes("{") || name.includes("|")) { - document.getElementById('04-name-tip').classList.add('tip-red') - document.getElementById('04-name-tip').innerHTML = "<?= $lang["admin-appearance"]["name"][1] ?>"; - return; - } - if (name.length > 75) { - document.getElementById('04-name-tip').classList.add('tip-red') - document.getElementById('04-name-tip').innerHTML = "<?= $lang["admin-appearance"]["name"][2] ?>"; - return; - } - if (name.length < 4) { - document.getElementById('04-name-tip').classList.add('tip-orange') - document.getElementById('04-name-tip').innerHTML = "<?= $lang["admin-appearance"]["name"][3] ?>"; - return; - } - if (name.length > 30) { - document.getElementById('04-name-tip').classList.add('tip-orange') - document.getElementById('04-name-tip').innerHTML = "<?= $lang["admin-appearance"]["name"][4] ?>"; - return; - } - document.getElementById('04-name-tip').classList.add('tip-green') - document.getElementById('04-name-tip').innerHTML = "<?= $lang["admin-appearance"]["name"][5] ?>"; - return; - }, 100) -} - -function Icon_UploadFile() { - $("#icon-file").trigger('click'); -} - -function Banner_UploadFile() { - $("#banner-file").trigger('click'); -} - -function toggleRender() { - if (!document.getElementById('oldrenderer').checked) { - document.getElementsByClassName('oldopts')[0].id = "onlyold"; - $('#oo-disclaimer').show(200); - document.getElementById('showpages').disabled = true; - document.getElementById('alwaysmenu').disabled = true; - } else { - document.getElementsByClassName('oldopts')[0].id = ""; - $('#oo-disclaimer').hide(200); - document.getElementById('showpages').disabled = false; - document.getElementById('alwaysmenu').disabled = false; - } -} - -function submitData() { - document.getElementById('appearance-loader').classList.remove('hide') - document.getElementById('appearance-settings').classList.add('hide') - var formData = new FormData(); - if (document.getElementById('icon-file').value.trim() != "") { - formData.append("icon", document.getElementById('icon-file').files[0], document.getElementById('icon-file').files[0].name); - } - if (document.getElementById('banner-file').value.trim() != "") { - formData.append("banner", document.getElementById('banner-file').files[0], document.getElementById('banner-file').files[0].name); - } - formData.append("sitename", document.getElementById('name-field').value); - formData.append("alwaysmenu", document.getElementById('alwaysmenu').checked.toString()); - formData.append("oldrenderer", document.getElementById('oldrenderer').checked.toString()); - formData.append("showpages", document.getElementById('showpages').value); - document.getElementById('appearance-error-box').classList.add("hide") - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/appearance.php", - success: function (data) { - if (data == "ok") { - reloadPage() - } else { - document.getElementById('appearance-error').innerHTML = data - document.getElementById('appearance-error-box').classList.remove("hide") - document.getElementById('appearance-loader').classList.add('hide') - document.getElementById('appearance-settings').classList.remove('hide') - } - }, - error: function (error) { - document.getElementById('password-error').innerHTML = "<?= $lang["admin-errors"]["connerror"] ?>" - document.getElementById('password-error-box').classList.remove("hide") - document.getElementById('password-loader').classList.add('hide') - document.getElementById('password-settings').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -function changePassword() { - document.getElementById('password-loader').classList.remove('hide') - document.getElementById('password-settings').classList.add('hide') - var formData = new FormData(); - formData.append("oldpass", document.getElementById('old-password').value); - formData.append("newpass", document.getElementById('new-password').value); - formData.append("newpassr", document.getElementById('repeat-password').value); - document.getElementById('password-error-box').classList.add("hide") - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/password.php", - success: function (data) { - if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/login"; - } else { - document.getElementById('password-error').innerHTML = data - document.getElementById('password-error-box').classList.remove("hide") - document.getElementById('password-loader').classList.add('hide') - document.getElementById('password-settings').classList.remove('hide') - } - }, - error: function (error) { - document.getElementById('password-error').innerHTML = "<?= $lang["admin-errors"]["connerror"] ?>" - document.getElementById('password-error-box').classList.remove("hide") - document.getElementById('password-loader').classList.add('hide') - document.getElementById('password-settings').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -function updateFooter() { - document.getElementById('footer-loader').classList.remove('hide') - document.getElementById('footer-settings').classList.add('hide') - var formData = new FormData(); - formData.append("footer", editor.getData()); - document.getElementById('footer-error-box').classList.add("hide") - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/footer.php", - success: function (data) { - if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/appearance"; - } else { - document.getElementById('footer-error').innerHTML = data - document.getElementById('footer-error-box').classList.remove("hide") - document.getElementById('footer-loader').classList.add('hide') - document.getElementById('footer-settings').classList.remove('hide') - } - }, - error: function (error) { - document.getElementById('footer-error').innerHTML = "<?= $lang["admin-errors"]["connerror"] ?>" - document.getElementById('footer-error-box').classList.remove("hide") - document.getElementById('footer-loader').classList.add('hide') - document.getElementById('footer-settings').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -validateName() - -document.getElementById('banner-file').value = "" -document.getElementById('icon-file').value = "" - -</script>
\ No newline at end of file +<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/calendar/add/index.php b/Neutron-trunk/cms-special/admin/calendar/add/index.php index 1029788..8387b16 100755..100644 --- a/Neutron-trunk/cms-special/admin/calendar/add/index.php +++ b/Neutron-trunk/cms-special/admin/calendar/add/index.php @@ -1,140 +1 @@ -<?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Ajouter un événement - Calendrier", "headerName" => "Ajouter un événement" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <div id="datainput"> - <h3><?= $lang["admin-calendar"]["create"]["date"] ?></h3> - <ul> - <li><?= $lang["admin-calendar"]["create"]["day"] ?> </li> - <select id="day"> - <option value="01" <?php if ("01" == date('d')) {echo("selected");} ?>>1er</option> - <option value="02" <?php if ("02" == date('d')) {echo("selected");} ?>>2</option> - <option value="03" <?php if ("03" == date('d')) {echo("selected");} ?>>3</option> - <option value="04" <?php if ("04" == date('d')) {echo("selected");} ?>>4</option> - <option value="05" <?php if ("05" == date('d')) {echo("selected");} ?>>5</option> - <option value="06" <?php if ("06" == date('d')) {echo("selected");} ?>>6</option> - <option value="07" <?php if ("07" == date('d')) {echo("selected");} ?>>7</option> - <option value="08" <?php if ("08" == date('d')) {echo("selected");} ?>>8</option> - <option value="09" <?php if ("09" == date('d')) {echo("selected");} ?>>9</option> - <option value="10" <?php if ("10" == date('d')) {echo("selected");} ?>>10</option> - <option value="11" <?php if ("11" == date('d')) {echo("selected");} ?>>11</option> - <option value="12" <?php if ("12" == date('d')) {echo("selected");} ?>>12</option> - <option value="13" <?php if ("13" == date('d')) {echo("selected");} ?>>13</option> - <option value="14" <?php if ("14" == date('d')) {echo("selected");} ?>>14</option> - <option value="15" <?php if ("15" == date('d')) {echo("selected");} ?>>15</option> - <option value="16" <?php if ("16" == date('d')) {echo("selected");} ?>>16</option> - <option value="17" <?php if ("17" == date('d')) {echo("selected");} ?>>17</option> - <option value="18" <?php if ("18" == date('d')) {echo("selected");} ?>>18</option> - <option value="19" <?php if ("19" == date('d')) {echo("selected");} ?>>19</option> - <option value="20" <?php if ("20" == date('d')) {echo("selected");} ?>>20</option> - <option value="21" <?php if ("21" == date('d')) {echo("selected");} ?>>21</option> - <option value="22" <?php if ("22" == date('d')) {echo("selected");} ?>>22</option> - <option value="23" <?php if ("23" == date('d')) {echo("selected");} ?>>23</option> - <option value="24" <?php if ("24" == date('d')) {echo("selected");} ?>>24</option> - <option value="25" <?php if ("25" == date('d')) {echo("selected");} ?>>25</option> - <option value="26" <?php if ("26" == date('d')) {echo("selected");} ?>>26</option> - <option value="27" <?php if ("27" == date('d')) {echo("selected");} ?>>27</option> - <option value="28" <?php if ("28" == date('d')) {echo("selected");} ?>>28</option> - <option value="29" <?php if ("29" == date('d')) {echo("selected");} ?>>29</option> - <option value="30" <?php if ("30" == date('d')) {echo("selected");} ?>>30</option> - <option value="31" <?php if ("31" == date('d')) {echo("selected");} ?>>31</option> - </select><br><br> - <li><?= $lang["admin-calendar"]["create"]["month"] ?> </li> - <select id="month"> - <option disabled><?= $lang["admin-calendar"]["create"]["trimesters"][0] ?></option> - <option value="1" <?php if ("01" == date('m')) {echo("selected");} ?>><?= $lang["admin-calendar"]["create"]["months"][0] ?></option> - <option value="2" <?php if ("02" == date('m')) {echo("selected");} ?>><?= $lang["admin-calendar"]["create"]["months"][1] ?></option> - <option value="3" <?php if ("03" == date('m')) {echo("selected");} ?>><?= $lang["admin-calendar"]["create"]["months"][2] ?></option> - <option disabled><?= $lang["admin-calendar"]["create"]["trimesters"][1] ?></option> - <option value="4" <?php if ("04" == date('m')) {echo("selected");} ?>><?= $lang["admin-calendar"]["create"]["months"][3] ?></option> - <option value="5" <?php if ("05" == date('m')) {echo("selected");} ?>><?= $lang["admin-calendar"]["create"]["months"][4] ?></option> - <option value="6" <?php if ("06" == date('m')) {echo("selected");} ?>><?= $lang["admin-calendar"]["create"]["months"][5] ?></option> - <option disabled><?= $lang["admin-calendar"]["create"]["trimesters"][2] ?></option> - <option value="7" <?php if ("07" == date('m')) {echo("selected");} ?>><?= $lang["admin-calendar"]["create"]["months"][6] ?></option> - <option value="8" <?php if ("08" == date('m')) {echo("selected");} ?>><?= $lang["admin-calendar"]["create"]["months"][7] ?></option> - <option value="9" <?php if ("09" == date('m')) {echo("selected");} ?>><?= $lang["admin-calendar"]["create"]["months"][8] ?></option> - <option disabled><?= $lang["admin-calendar"]["create"]["trimesters"][3] ?></option> - <option value="10" <?php if ("10" == date('m')) {echo("selected");} ?>><?= $lang["admin-calendar"]["create"]["months"][9] ?></option> - <option value="11" <?php if ("11" == date('m')) {echo("selected");} ?>><?= $lang["admin-calendar"]["create"]["months"][10] ?></option> - <option value="12" <?php if ("12" == date('m')) {echo("selected");} ?>><?= $lang["admin-calendar"]["create"]["months"][11] ?></option> - </select><br><br> - <li><?= $lang["admin-calendar"]["create"]["year"] ?></li> - <select id="year"> - <option value="<?= date('Y') ?>" selected><?= date('Y') ?></option> - <option value="<?= date('Y') + 1 ?>"><?= date('Y') + 1 ?></option> - <option value="<?= date('Y') + 2 ?>"><?= date('Y') + 2 ?></option> - <option value="<?= date('Y') + 3 ?>"><?= date('Y') + 3 ?></option> - <option value="<?= date('Y') + 4 ?>"><?= date('Y') + 4 ?></option> - <option value="<?= date('Y') + 5 ?>"><?= date('Y') + 5 ?></option> - </select> - </ul> - <h3><?= $lang["admin-calendar"]["create"]["info"] ?></h3> - <ul> - <li><?= $lang["admin-calendar"]["create"]["name"] ?></li> - <input type="text" placeholder="<?= $lang["admin-calendar"]["create"]["nameph"] ?>" id="name"><br><br> - <li><?= $lang["admin-calendar"]["create"]["desc"] ?> <i>(<?= $lang["admin-calendar"]["create"]["mandatory"] ?>)</i></li> - <input type="text" placeholder="<?= $lang["admin-calendar"]["create"]["web"] ?>" id="desc"><br><br> - <li><?= $lang["admin-calendar"]["create"]["web"] ?> <i>(<?= $lang["admin-calendar"]["create"]["mandatory"] ?>)</i> :</li> - <input onchange="validateUrl()" onkeyup="validateUrl()" onkeydown="validateUrl()" type="text" placeholder="<?= $lang["admin-calendar"]["create"]["webph"] ?>" id="link"><img id="link_check" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/storeloader.svg" style="vertical-align:middle;" class="hide" width="24px" height="24px"><a class="hide" id="link_invalid"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/close.svg" style="vertical-align:middle;" class="invert" width="24px" height="24px"></a> - </ul> - <p><table class="message_info"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_info.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-calendar"]["create"]["notice"] ?></p></td></tr></tbody></table></p> - <div style="text-align: center;"><p><a class="button" onclick="createCmsEvent()"><?= $lang["admin-calendar"]["create"]["complete"] ?></a></p></div><br> - </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function UrlRegex(str) { - var pattern = new RegExp('^(https?:\\/\\/)?'+ // protocol - '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|'+ // domain name - '((\\d{1,3}\\.){3}\\d{1,3}))'+ // OR ip (v4) address - '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*'+ // port and path - '(\\?[;&a-z\\d%_.~+=-]*)?'+ // query string - '(\\#[-a-z\\d_]*)?$','i'); // fragment locator - return !!pattern.test(str); -} - -function validateUrl() { - document.getElementById('link_invalid').classList.add('hide'); - document.getElementById('link_check').classList.remove('hide'); - setTimeout(() => { - if (!UrlRegex(document.getElementById('link').value)) { - document.getElementById('link_invalid').classList.remove('hide'); - } else { - document.getElementById('link_invalid').classList.add('hide'); - } - document.getElementById('link_check').classList.add('hide'); - }, 2000) -} - -function createCmsEvent() { - document.getElementById('datainput').classList.add('hide') - var formData = new FormData(); - formData.append("day", document.getElementById('day').value); - formData.append("month", document.getElementById('month').value); - formData.append("year", document.getElementById('year').value); - formData.append("name", document.getElementById('name').value); - formData.append("desc", document.getElementById('desc').value); - formData.append("link", document.getElementById('link').value); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/calendar_create.php", - success: function (data) { - if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/calendar"; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - document.getElementById('datainput').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('datainput').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -</script>
\ No newline at end of file +<?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/calendar/index.php b/Neutron-trunk/cms-special/admin/calendar/index.php index e596551..7d45b3e 100755..100644 --- a/Neutron-trunk/cms-special/admin/calendar/index.php +++ b/Neutron-trunk/cms-special/admin/calendar/index.php @@ -1,86 +1 @@ -<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Calendrier", "headerName" => "Gestion des événements" ]; include_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <?php - - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/calendar_events")) { - $calevn = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/calendar_events"); - } else { - $calevn = "3"; - } - - ?> - <?= $lang["admin-calendar"]["show"][0] ?> <select onchange="updateNextEvents()" id="nextevents"> - <option value="1" <?php if ($calevn == "1") { echo("selected"); } ?>>1</option> - <option value="2" <?php if ($calevn == "2") { echo("selected"); } ?>>2</option> - <option value="3" <?php if ($calevn == "3") { echo("selected"); } ?>>3</option> - <option value="4" <?php if ($calevn == "4") { echo("selected"); } ?>>4</option> - <option value="5" <?php if ($calevn == "5") { echo("selected"); } ?>>5</option> - <option value="6" <?php if ($calevn == "6") { echo("selected"); } ?>>6</option> - <option value="7" <?php if ($calevn == "7") { echo("selected"); } ?>>7</option> - <option value="8" <?php if ($calevn == "8") { echo("selected"); } ?>>8</option> - <option value="9" <?php if ($calevn == "9") { echo("selected"); } ?>>9</option> - <option value="10" <?php if ($calevn == "10") { echo("selected"); } ?>>10</option> - </select> <?= $lang["admin-calendar"]["show"][1] ?> - <h3><?= $lang["admin-calendar"]["events"] ?></h3> - <ul> - <?php - - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/caldb.json")) { - $dbraw = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/caldb.json"); - $corrupted = false; - if (isJson($dbraw)) { - $events = json_decode($dbraw); - foreach ($events->events as $event) { - if (isset($event->timestamp)) { - echo("<li><span style=\"cursor:help;\" title=\"" . $event->description . "\">" . $event->name . "</span> (" . $event->datestr . ")" . " - <a class=\"sblink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/calendar/manage/?id=" . $event->timestamp . "\" title=\"{$lang['admin-calendar']['manageph']}\">" . $lang["admin-calendar"]["manage"] . "</a></li>"); - } - } - } else { - echo("<div style=\"color:red; text-align: center;\"><b><u>{$lang['admin-calendar']['corrupt'][0]}</u> {$lang['admin-calendar']['corrupt'][1]} <u>{$lang['admin-calendar']['corrupt'][2]}</u></b></div>"); - $corrupted = true; - } - } else { - echo("<div style=\"text-align: center;\">{$lang['admin-calendar']['nothing']}</div>"); - } - - ?> - <?php - - if (!$corrupted) { - echo('<br><li><i><a href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin/calendar/add" title="' . $lang["admin-calendar"]["addph"] . '" class="sblink">' . $lang["admin-calendar"]["add"] . '</a></i></li>'); - } - - ?> - </ul> -<?php include_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> -<script> - -function updateNextEvents() { - value = document.getElementById('nextevents').value; - var formData = new FormData(); - formData.append("value", value); - document.getElementById('nextevents').disabled = true; - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/calendar_nextevents.php", - success: function (data) { - if (data == "ok") { - document.getElementById('nextevents').disabled = false; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - document.getElementById('nextevents').disabled = false; - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('nextevents').disabled = false; - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -</script>
\ No newline at end of file +<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/calendar/manage/index.php b/Neutron-trunk/cms-special/admin/calendar/manage/index.php index a6f4ebd..8387b16 100755..100644 --- a/Neutron-trunk/cms-special/admin/calendar/manage/index.php +++ b/Neutron-trunk/cms-special/admin/calendar/manage/index.php @@ -1,78 +1 @@ -<?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Supprimer un événement - Calendrier", "headerName" => "Supprimer un événement" ]; include_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> -<?php -$eventsraw = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/caldb.json"); -if (isset($_GET['id'])) {} else { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS['SYSTEM_ROOT'] . "/cms-special/admin/calendar';</script>"); -} -if (isJson($eventsraw)) { - $events = json_decode($eventsraw); - foreach ($events->events as $element) { - if (isset($element->timestamp)) { - if ($element->timestamp == $_GET['id']) { - $event = $element; - } - } - } -} else { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS['SYSTEM_ROOT'] . "/cms-special/admin/calendar';</script>"); -} -if (!isset($event)) { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '" . $GLOBALS['SYSTEM_ROOT'] . "/cms-special/admin/calendar';</script>"); -} -?> - <h3><?= $lang["admin-calendar"]["info"] ?></h3> - <ul> - <li><b><?= $event->name ?></b></li> - <?php - - if (trim($event->description) != "") { - echo("<li><i>" . $event->description . "</i></li>"); - } - - if (isset($event->link)) { - if (trim($event->link) != "") { - echo("<li><i>" . $event->link . "</i></li>"); - } - } - - ?> - <li><?= $event->datestr ?> (<code><?= $event->timestamp ?></code>)</li> - </ul> - <h3><?= $lang["admin-calendar"]["deleteask"] ?></h3> - <ul id="delete"> - <li><a class="sblink" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/calendar" title="<?= $lang["admin-calendar"]["deletenoph"] ?>"><?= $lang["admin-calendar"]["deleteno"] ?></a></li> - <li><a class="sblink" onclick="deleteEvent()" title="<?= $lang["admin-calendar"]["deleteyesph"] ?>"><?= $lang["admin-calendar"]["deleteyes"] ?></a></li> - </ul> -<?php include_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function deleteEvent() { - document.getElementById('delete').classList.add('hide') - var formData = new FormData(); - formData.append("id", <?= $event->timestamp ?>); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/calendar_delete.php", - success: function (data) { - if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/calendar"; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - document.getElementById('delete').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('delete').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -</script>
\ No newline at end of file +<?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/customization/index.php b/Neutron-trunk/cms-special/admin/customization/index.php index 66aee2f..7d45b3e 100755..100644 --- a/Neutron-trunk/cms-special/admin/customization/index.php +++ b/Neutron-trunk/cms-special/admin/customization/index.php @@ -1,214 +1 @@ -<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Personnalisation", "headerName" => "Personnalisation" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> -<div class="hidden"> - <h3><?= $lang["admin-customization"]["theme"] ?></h3> - <select id="theme" onchange="updateTheme()"> - <option value="auto" <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme")) == "auto") {echo("selected");} ?>><?= $lang["admin-customization"]["auto"] ?></option> - <option value="light" <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme")) == "light") {echo("selected");} ?>><?= $lang["admin-customization"]["light"] ?></option> - <option value="dark" <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme")) == "dark") {echo("selected");} ?>><?= $lang["admin-customization"]["dark"] ?></option> - </select> - <h3><?= $lang["admin-customization"]["color"] ?></h3> - <select id="colors" onchange="updateColors()"> - <option value="blue" <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "blue") {echo("selected");} ?>><?= $lang["admin-customization"]["colors"][0] ?></option> - <option value="green" <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "green") {echo("selected");} ?>><?= $lang["admin-customization"]["colors"][1] ?></option> - <option value="red" <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "red") {echo("selected");} ?>><?= $lang["admin-customization"]["colors"][2] ?></option> - <option value="orange" <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "orange") {echo("selected");} ?>><?= $lang["admin-customization"]["colors"][3] ?></option> - <option value="purple" <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "purple") {echo("selected");} ?>><?= $lang["admin-customization"]["colors"][4] ?></option> - <option value="brown" <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "brown") {echo("selected");} ?>><?= $lang["admin-customization"]["colors"][5] ?></option> - <option value="white" <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "white") {echo("selected");} ?>><?= $lang["admin-customization"]["colors"][6] ?></option> - </select> -</div> - -<h3><?= $lang["admin-customization"]["theme"] ?></h3> -<div class="mdc-card mdc-card--outlined <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme")) == "auto") {echo("mdc-card--selected");} ?>" onclick="document.getElementById('theme').value = 'auto';updateTheme();" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card__primary-action" tabindex="0" style="padding:0;"> - <div class="mdc-card__media mdc-card__media--16-9" style="background-image: url('<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/demos/theme-auto.jpg');"></div> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <h2 style="margin-bottom:5px;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-customization"]["auto2"] ?></h2> - <h3 style="margin-top:5px;" class="mdc-typography mdc-typography--subtitle2"><?= $lang["admin-customization"]["descriptions"][0] ?></h3> - </div> - </div> -</div> -<div class="mdc-card mdc-card--outlined <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme")) == "dark") {echo("mdc-card--selected");} ?>" onclick="document.getElementById('theme').value = 'dark';updateTheme();" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card__primary-action" tabindex="0" style="padding:0;"> - <div class="mdc-card__media mdc-card__media--16-9" style="background-image: url('<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/demos/theme-dark.jpg');"></div> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <h2 style="margin-bottom:5px;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-customization"]["dark"] ?></h2> - <h3 style="margin-top:5px;" class="mdc-typography mdc-typography--subtitle2"><?= $lang["admin-customization"]["descriptions"][1] ?></h3> - </div> - </div> -</div> -<div class="mdc-card mdc-card--outlined <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/theme")) == "light") {echo("mdc-card--selected");} ?>" onclick="document.getElementById('theme').value = 'light';updateTheme();" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card__primary-action" tabindex="0" style="padding:0;"> - <div class="mdc-card__media mdc-card__media--16-9" style="background-image: url('<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/demos/theme-light.jpg');"></div> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <h2 style="margin-bottom:5px;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-customization"]["light"] ?></h2> - <h3 style="margin-top:5px;" class="mdc-typography mdc-typography--subtitle2"><?= $lang["admin-customization"]["descriptions"][2] ?></h3> - </div> - </div> -</div> - -<h3><?= $lang["admin-customization"]["color"] ?></h3> -<div class="mdc-card mdc-card--outlined <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "blue") {echo("mdc-card--selected");} ?>" onclick="document.getElementById('colors').value = 'blue';updateColors();" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card__primary-action" tabindex="0" style="padding:0;"> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <table> - <tbody> - <tr> - <td><div style="background-image: url('<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/demos/color-blue.jpg');width: 73px;height: 73px;background-size: cover;margin-left: -10px;margin-top: -10px;margin-bottom: -10px;"></div></td> - <td><h2 style="margin-bottom:5px;margin-top: 5px;margin-left: 10px;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-customization"]["colors2"][0] ?></h2></td> - </tr> - </tbody> - </table> - </div> - </div> -</div> -<div class="mdc-card mdc-card--outlined <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "green") {echo("mdc-card--selected");} ?>" onclick="document.getElementById('colors').value = 'green';updateColors();" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card__primary-action" tabindex="0" style="padding:0;"> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <table> - <tbody> - <tr> - <td><div style="background-image: url('<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/demos/color-green.jpg');width: 73px;height: 73px;background-size: cover;margin-left: -10px;margin-top: -10px;margin-bottom: -10px;"></div></td> - <td><h2 style="margin-bottom:5px;margin-top: 5px;margin-left: 10px;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-customization"]["colors2"][1] ?></h2></td> - </tr> - </tbody> - </table> - </div> - </div> -</div> -<div class="mdc-card mdc-card--outlined <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "red") {echo("mdc-card--selected");} ?>" onclick="document.getElementById('colors').value = 'red';updateColors();" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card__primary-action" tabindex="0" style="padding:0;"> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <table> - <tbody> - <tr> - <td><div style="background-image: url('<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/demos/color-red.jpg');width: 73px;height: 73px;background-size: cover;margin-left: -10px;margin-top: -10px;margin-bottom: -10px;"></div></td> - <td><h2 style="margin-bottom:5px;margin-top: 5px;margin-left: 10px;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-customization"]["colors2"][2] ?></h2></td> - </tr> - </tbody> - </table> - </div> - </div> -</div> -<div class="mdc-card mdc-card--outlined <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "orange") {echo("mdc-card--selected");} ?>" onclick="document.getElementById('colors').value = 'orange';updateColors();" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card__primary-action" tabindex="0" style="padding:0;"> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <table> - <tbody> - <tr> - <td><div style="background-image: url('<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/demos/color-orange.jpg');width: 73px;height: 73px;background-size: cover;margin-left: -10px;margin-top: -10px;margin-bottom: -10px;"></div></td> - <td><h2 style="margin-bottom:5px;margin-top: 5px;margin-left: 10px;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-customization"]["colors2"][3] ?></h2></td> - </tr> - </tbody> - </table> - </div> - </div> -</div> -<div class="mdc-card mdc-card--outlined <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "purple") {echo("mdc-card--selected");} ?>" onclick="document.getElementById('colors').value = 'purple';updateColors();" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card__primary-action" tabindex="0" style="padding:0;"> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <table> - <tbody> - <tr> - <td><div style="background-image: url('<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/demos/color-purple.jpg');width: 73px;height: 73px;background-size: cover;margin-left: -10px;margin-top: -10px;margin-bottom: -10px;"></div></td> - <td><h2 style="margin-bottom:5px;margin-top: 5px;margin-left: 10px;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-customization"]["colors2"][4] ?></h2></td> - </tr> - </tbody> - </table> - </div> - </div> -</div> -<div class="mdc-card mdc-card--outlined <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "brown") {echo("mdc-card--selected");} ?>" onclick="document.getElementById('colors').value = 'brown';updateColors();" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card__primary-action" tabindex="0" style="padding:0;"> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <table> - <tbody> - <tr> - <td><div style="background-image: url('<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/demos/color-brown.jpg');width: 73px;height: 73px;background-size: cover;margin-left: -10px;margin-top: -10px;margin-bottom: -10px;"></div></td> - <td><h2 style="margin-bottom:5px;margin-top: 5px;margin-left: 10px;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-customization"]["colors2"][5] ?></h2></td> - </tr> - </tbody> - </table> - </div> - </div> -</div> -<div class="mdc-card mdc-card--outlined <?php if (trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/color")) == "white") {echo("mdc-card--selected");} ?>" onclick="document.getElementById('colors').value = 'white';updateColors();" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card__primary-action" tabindex="0" style="padding:0;"> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <table> - <tbody> - <tr> - <td><div style="background-image: url('<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/demos/color-white.jpg');width: 73px;height: 73px;background-size: cover;margin-left: -10px;margin-top: -10px;margin-bottom: -10px;"></div></td> - <td><h2 style="margin-bottom:5px;margin-top: 5px;margin-left: 10px;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-customization"]["colors2"][6] ?></h2></td> - </tr> - </tbody> - </table> - </div> - </div> -</div> - -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> -<script> - -function updateColors() { - $('body').fadeOut(200); - document.getElementById('colors').disabled = true; - var formData = new FormData(); - formData.append("color", document.getElementById('colors').value); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/customization_colors.php", - success: function (data) { - if (data == "ok") { - console.log("Saved") - setTimeout(() => { - document.getElementById('colors').disabled = false; - ajaxPageReload(); - }, 500) - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data); - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>"); - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -function updateTheme() { - $('body').fadeOut(200); - document.getElementById('theme').disabled = true; - var formData = new FormData(); - formData.append("theme", document.getElementById('theme').value); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/customization_theme.php", - success: function (data) { - if (data == "ok") { - console.log("Saved") - setTimeout(() => { - document.getElementById('theme').disabled = false; - ajaxPageReload(); - }, 500) - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data); - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>"); - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -</script>
\ No newline at end of file +<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/error/index.php b/Neutron-trunk/cms-special/admin/error/index.php index c68c6a6..7d45b3e 100755..100644 --- a/Neutron-trunk/cms-special/admin/error/index.php +++ b/Neutron-trunk/cms-special/admin/error/index.php @@ -1,11 +1 @@ -<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Erreur", "headerName" => "Erreur" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <h1><div style="text-align: center;"><?= $lang["admin-errors"]["common"]['title'] ?></div></h1> - <p><div style="text-align: center;"><?= $lang["admin-errors"]["common"]['message'] ?></div></p> - <p><div style="text-align: center;"> - <ul> - <li><a href="<?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/api/bugs") ?>" target="_blank"><?= $lang["admin-errors"]["common"]['report'] ?></a></li> - <li><a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home"><?= $lang["admin-errors"]["common"]['home'] ?></a></li> - </ul> - </div></p> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/flags/index.php b/Neutron-trunk/cms-special/admin/flags/index.php index c243a49..7d45b3e 100755..100644 --- a/Neutron-trunk/cms-special/admin/flags/index.php +++ b/Neutron-trunk/cms-special/admin/flags/index.php @@ -1,75 +1 @@ -<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -/** @var boolean $__electrode */ -if (isset($__electrode) && $__electrode) { - header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home"); - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); -} - -function fflag($name, $title, $description) { - echo('<div class="widget"><div id="header-' . $name . '" class="widget-header '); - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/flag_{$name}")) { echo("enabled"); } else { echo("disabled"); } - echo("\"><table><tbody><tr><td><label class=\"switch\"><input name=\"{$name}\" type=\"checkbox\" onclick=\"updateWidgetStatus('{$name}')\" onchange=\"updateWidgetStatus('{$name}')\""); - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/flag_{$name}")) { echo(" checked"); } - echo("><span class=\"slider round\"></span></label></td><td class=\"widget-header-info\"><b>{$title}</b></td></tr></tbody></table></div><p>{$description}</p></div>"); -} - -$pageConfig = [ "domName" => "Drapeaux", "headerName" => "Drapeaux" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <p><table class="message_info"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_info.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-flags"]["notice"] ?></p></td></tr></tbody></table></p> - -<?php fflag("boundaries", "Show Layout Boundaries", "Shows a thin colored border around different DOM elements.") ?> -<?php fflag("trace", "Trace Rendering Process", "Shows technical info on the bottom of each page. May contain personal/confidential information!") ?> - -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function updateWidgetStatus(widget) { - checkbox = document.getElementsByName(widget)[0] - if (typeof checkbox == "undefined") {} else { - if (checkbox.checked) { - enabled = true; - document.getElementById('header-' + widget).classList.remove('disabled'); - document.getElementById('header-' + widget).classList.add('enabled'); - } else { - enabled = false; - document.getElementById('header-' + widget).classList.remove('enabled'); - document.getElementById('header-' + widget).classList.add('disabled'); - } - Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = true}) - - var formData = new FormData(); - formData.append("element", widget); - if (enabled) { - url = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/flag_enable.php"; - } else { - url = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/flag_disable.php"; - } - $.ajax({ - type: "POST", - dataType: 'html', - url: url, - success: function (data) { - if (data == "ok") { - setTimeout(() => { - location.reload(); - }, 500) - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data); - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>"); - window.onbeforeunload = undefined; - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); - - } -} - -</script>
\ No newline at end of file +<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/galery/addcategory/index.php b/Neutron-trunk/cms-special/admin/galery/addcategory/index.php index f2438e1..ab09864 100755..100644 --- a/Neutron-trunk/cms-special/admin/galery/addcategory/index.php +++ b/Neutron-trunk/cms-special/admin/galery/addcategory/index.php @@ -1,2 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?>
-<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/gallery/addcategory") ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/galery/index.php b/Neutron-trunk/cms-special/admin/galery/index.php index 82ad59c..7d45b3e 100755..100644 --- a/Neutron-trunk/cms-special/admin/galery/index.php +++ b/Neutron-trunk/cms-special/admin/galery/index.php @@ -1,2 +1 @@ -<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?>
-<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/gallery") ?>
\ No newline at end of file +<?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/galery/publish/index.php b/Neutron-trunk/cms-special/admin/galery/publish/index.php index ac5f616..8387b16 100755..100644 --- a/Neutron-trunk/cms-special/admin/galery/publish/index.php +++ b/Neutron-trunk/cms-special/admin/galery/publish/index.php @@ -1,2 +1 @@ -<?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?>
-<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/gallery/publish") ?>
\ No newline at end of file +<?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/gallery/addcategory/index.php b/Neutron-trunk/cms-special/admin/gallery/addcategory/index.php index 68451fc..3674402 100755..100644 --- a/Neutron-trunk/cms-special/admin/gallery/addcategory/index.php +++ b/Neutron-trunk/cms-special/admin/gallery/addcategory/index.php @@ -1,39 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Nouvelle catégorie - Galerie de photos", "headerName" => "Nouvelle catégorie" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <div id="hidding"> - <input type="text" id="catname" placeholder="<?= $lang["admin-gallery"]["addcat"]["placeholder"] ?>"> - <p><i><?= $lang["admin-gallery"]["addcat"]["same"] ?></i></p> - <p><div style="text-align: center;"><a class="button" onclick="createCat()"><?= $lang["admin-gallery"]["addcat"]["confirm"] ?></a></div></p> - </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function createCat() { - document.getElementById('hidding').classList.add('hide') - var formData = new FormData(); - formData.append("category", document.getElementById('catname').value); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/galery_create_category.php", - success: function (data) { - if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/gallery"; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - document.getElementById('hidding').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('hidding').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -</script>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/gallery/index.php b/Neutron-trunk/cms-special/admin/gallery/index.php index 7623820..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/gallery/index.php +++ b/Neutron-trunk/cms-special/admin/gallery/index.php @@ -1,218 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Galerie de photos", "headerName" => "Galerie de photos" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> -<?php - -if (!file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery")) { - mkdir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery"); - mkdir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/categories"); - mkdir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/pictures"); -} - -?> - <h3><?= $lang["admin-gallery"]["general"]['title'] ?></h3> - <ul> - <li><?php - - $count = 0; - $dirs = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/categories"); - foreach ($dirs as $el) { - if ($el == "." || $el == "..") {} else { - $count = $count + 1; - } - } - if ($count != 0) { - echo($count); - } else { - echo($lang["admin-gallery"]["none"]); - } - - ?> <?= $lang["admin-gallery"]["lists"]['categories'] ?><?php if ($count > 1) {echo("s");} ?> - <?php - - $count = 0; - $dirs = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/pictures"); - foreach ($dirs as $el) { - if ($el == "." || $el == "..") {} else { - $count = $count + 1; - } - } - if ($count != 0) { - echo($count); - } else { - echo($lang["admin-gallery"]["none"]); - } - - ?> <?= $lang["admin-gallery"]["lists"]['picture'] ?><?php if ($count > 1) {echo("s");} ?></li> - <li><a class="sblink" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/gallery/addcategory"><?= $lang["admin-gallery"]["categories"]["add"] ?></a></li> - </ul> - <h3><?= $lang["admin-gallery"]["categories"]['title'] ?></h3> - <i><?= $lang["admin-gallery"]["categories"]['edit'] ?></i> - <ul> - <?php - - $dirs = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/categories"); - foreach ($dirs as $el) { - if ($el == "." || $el == "..") {} else { - echo("<li>" . file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/categories/" . $el) . ", <a class=\"sblink\" onclick=\"deleteCategory('{$el}')\">" . $lang["admin-gallery"]["categories"]['delete'] . "</a></li>"); - } - } - - ?> - </ul> - <h3><?= $lang["admin-gallery"]["pictures"]['title'] ?></h3> - <ul> - <?php - - $count = 0; - $dirs = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/pictures"); - foreach ($dirs as $el) { - if ($el == "." || $el == "..") {} else { - $count = $count + 1; - } - } - if ($count == 0) { - echo("<i>" . $lang["admin-gallery"]["pictures"]['none'] . "</i><p><a class=\"sblink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/gallery/publish\">" . $lang["admin-gallery"]["pictures"]['add'] . "</a></p>"); - } else { - foreach ($dirs as $el) { - if ($el == "." || $el == "..") {} else { - if (isset(explode('|', file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/pictures/" . $el))[2])) { - echo("<li><i>" . explode('|', file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/pictures/" . $el))[2] . "</i>, "); - } else { - echo("<li><code>" . $el ."</code>, "); - } - if (explode('|', file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/pictures/" . $el))[1] == "unclassed") { - echo($lang["gallery"]["unclassed"]); - } else { - echo(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/categories/" . explode('|', file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/pictures/" . $el))[1])); - } - echo(", <a onclick=\"labelPicture('$el')\" class=\"sblink\">{$lang["admin-gallery"]["general"]["label"]}</a> - <a href=\"{$GLOBALS["SYSTEM_ROOT"]}" . explode('|', file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/pictures/" . $el))[0] . "\" class=\"sblink\" download>" . $lang["admin-gallery"]["pictures"]['download'] . "</a> - <a onclick=\"confirmDelete('$el')\" class=\"sblink\">" . $lang["admin-gallery"]["pictures"]['delete'] . "</a></li>"); - } - } - echo("<b><a class=\"sblink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/gallery/publish\">" . $lang["admin-gallery"]["pictures"]['add'] . "</a></b>"); - } - - ?> - </ul> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function confirmDelete(id) { - if (confirm("<?= $lang["admin-gallery"]["delete"]['title'][0] ?>\n<?= $lang["admin-gallery"]["delete"]['title'][1] ?>")) { - $('#settings').fadeOut(200) - document.title = "<?= $lang["admin-gallery"]["delete"]['removing'] ?>" - var formData = new FormData(); - formData.append("id", id); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/galery_delete_image.php", - success: function (data) { - if (data == "ok") { - reloadPage() - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - reloadPage() - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - reloadPage() - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); - } -} - -function deleteCategory(id) { - if (confirm('<?= $lang["admin-gallery"]["delete"]['category'] ?>')) { - $('#settings').fadeOut(200) - document.title = "<?= $lang["admin-gallery"]["delete"]['catrm'] ?>" - var formData = new FormData(); - formData.append("id", id); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/galery_delete_category.php", - success: function (data) { - if (data == "ok") { - reloadPage() - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data, true) - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>", true) - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); - } -} - -function labelPicture(id) { - text = prompt("<?= $lang["admin-gallery"]["label"] ?>") - if (typeof text == "string") { - $('#settings').fadeOut(200) - document.title = "<?= $lang["admin-gallery"]["labelling"] ?>" - var formData = new FormData(); - formData.append("id", id); - formData.append("label", text); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/galery_label_picture.php", - success: function (data) { - if (data == "ok") { - reloadPage() - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data, true) - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>", true) - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); - } -} - -function changeState() { - document.getElementById('state').disabled = true; - var formData = new FormData(); - if (document.getElementById('state').checked) { - formData.append("state", "1"); - } else { - formData.append("state", "0"); - } - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/galery_toggle_state.php", - success: function (data) { - if (data == "ok") { - document.getElementById('state').disabled = false; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - document.getElementById('state').disabled = false; - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('state').disabled = false; - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -</script> +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/gallery/publish/index.php b/Neutron-trunk/cms-special/admin/gallery/publish/index.php index e2768ac..3674402 100755..100644 --- a/Neutron-trunk/cms-special/admin/gallery/publish/index.php +++ b/Neutron-trunk/cms-special/admin/gallery/publish/index.php @@ -1,57 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Nouvelle photo - Galerie de photos", "headerName" => "Nouvelle photo" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <div id="hidding"> - <p><?= $lang["admin-gallery"]["publish"]["category"] ?> <select id="category"> - <option value="unclassed" selected><?= $lang["admin-gallery"]["publish"]["default"] ?></option> - <?php - - $categories = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/categories"); - foreach ($categories as $category) { - if (trim($category) != "" && $category != "." && $category != "..") { - $catname = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/galery/categories/" . $category); - echo("<option value=\"" . $category . "\">" . $catname . "</option>"); - } - } - - ?> - </select></p> - <p><?= $lang["admin-gallery"]["publish"]["file"] ?> <input type="file" id="file"> <i><?= $lang["admin-gallery"]["publish"]["max"] ?> <?= ini_get("upload_max_filesize") ?></i></p> - <p><div style="text-align: center;"><a class="button" onclick="createCat()"><?= $lang["admin-gallery"]["publish"]["publish"] ?></a></div></p> - </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function createCat() { - document.getElementById('hidding').classList.add('hide') - var formData = new FormData(); - if (document.getElementById('file').value.trim() != "") { - formData.append("file", document.getElementById('file').files[0], document.getElementById('file').files[0].name); - } - formData.append("category", document.getElementById('category').value); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/galery_publish_photo.php", - success: function (data) { - if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/gallery"; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - document.getElementById('hidding').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('hidding').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -document.getElementById('file').value = ""; - -</script>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/home/all/db.json b/Neutron-trunk/cms-special/admin/home/all/db.json deleted file mode 100755 index 8a6ad37..0000000 --- a/Neutron-trunk/cms-special/admin/home/all/db.json +++ /dev/null @@ -1,178 +0,0 @@ -[ - { - "name": "pages", - "id": 0, - "icon": "insert_drive_file", - "items": [ - { - "name": "list", - "id": 0, - "icon": "list_alt", - "page": "pages" - }, - { - "name": "create", - "id": 1, - "icon": "add", - "page": "pages/add" - } - ] - }, - { - "name": "gallery", - "id": 1, - "icon": "photo", - "items": [ - { - "name": "list", - "id": 2, - "icon": "photo_library", - "page": "gallery" - }, - { - "name": "add", - "id": 3, - "icon": "add_photo_alternate", - "page": "gallery/publish" - }, - { - "name": "category", - "id": 4, - "icon": "local_offer", - "page": "gallery/addcategory" - }, - { - "name": "userspace", - "id": 5, - "icon": "image_search", - "page": "../gallery" - } - ] - }, - { - "name": "calendar", - "id": 2, - "icon": "event", - "items": [ - { - "name": "all", - "id": 6, - "icon": "event", - "page": "calendar" - }, - { - "name": "create", - "id": 7, - "icon": "event_available", - "page": "calendar/add" - }, - { - "name": "userspace", - "id": 8, - "icon": "event_note", - "page": "../calendar" - } - ] - }, - { - "name": "plugins", - "id": 3, - "icon": "extension", - "items": [ - { - "name": "all", - "id": 9, - "icon": "extension", - "page": "plugins" - } - ] - }, - { - "name": "technical", - "id": 4, - "icon": "build_circle", - "items": [ - { - "name": "all", - "id": 12, - "icon": "engineering", - "page": "advanced" - }, - { - "name": "advanced", - "id": 13, - "icon": "build_circle", - "page": "advanced/jsonconf" - } - ] - }, - { - "name": "data", - "id": 5, - "icon": "pie_chart", - "items": [ - { - "name": "reset", - "id": 15, - "icon": "delete", - "page": "reset" - }, - { - "name": "stats", - "id": 16, - "icon": "pie_chart", - "page": "stats" - }, - { - "name": "logs", - "id": 17, - "icon": "subject", - "page": "logs" - } - ] - }, - { - "name": "updates", - "id": 6, - "icon": "cloud_download", - "items": [ - { - "name": "info", - "id": 19, - "icon": "info", - "page": "about" - } - ] - }, - { - "name": "apparence", - "id": 7, - "icon": "brush", - "items": [ - { - "name": "general", - "id": 22, - "icon": "brush", - "page": "appearance" - }, - { - "name": "theme", - "id": 23, - "icon": "palette", - "page": "customization" - }, - { - "name": "language", - "id": 26, - "icon": "language", - "page": "language" - }, - { - "name": "flags", - "id": 27, - "icon": "flag", - "page": "flags" - } - ] - } -] diff --git a/Neutron-trunk/cms-special/admin/home/all/index.php b/Neutron-trunk/cms-special/admin/home/all/index.php index f844070..3674402 100755..100644 --- a/Neutron-trunk/cms-special/admin/home/all/index.php +++ b/Neutron-trunk/cms-special/admin/home/all/index.php @@ -1,4 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home");
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/home/appearance/index.php b/Neutron-trunk/cms-special/admin/home/appearance/index.php index 318611a..3674402 100755..100644 --- a/Neutron-trunk/cms-special/admin/home/appearance/index.php +++ b/Neutron-trunk/cms-special/admin/home/appearance/index.php @@ -1,45 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -$pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> -<div style="text-align: center;"> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home" class="mdc-button mdc-button--outlined"> - <div class="mdc-button__ripple"></div> - <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">arrow_back</i> - <span class="mdc-button__label"><?= $lang["admin-home"]["items"][7] ?></span> - </a> - - <h1><?= $lang["admin-home"]["appearance"]['greeting'] ?></h1> - - <div id="home-grid"> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["appearance"]['items'][0] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/appearance" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">tour</a> - <br> - <?= $lang["admin-home"]["appearance"]['items'][0] ?> - </div> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["appearance"]['items'][1] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/customization" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">palette</a> - <br> - <?= $lang["admin-home"]["appearance"]['items'][1] ?> - </div> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["appearance"]['items'][3] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/language" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">language</a> - <br> - <?= $lang["admin-home"]["appearance"]['items'][3] ?> - </div> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["appearance"]['items'][4] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/plugins" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">extension</a> - <br> - <?= $lang["admin-home"]["appearance"]['items'][4] ?> - </div> - <?php /** @var boolean $__electrode */ - if (!isset($__electrode) || !$__electrode): ?> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["appearance"]['items'][5] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/flags" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">flag</a> - <br> - <?= $lang["admin-home"]["appearance"]['items'][5] ?> - </div> - <?php endif; ?> - </div> -</div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/home/data/index.php b/Neutron-trunk/cms-special/admin/home/data/index.php index 29205dc..3674402 100755..100644 --- a/Neutron-trunk/cms-special/admin/home/data/index.php +++ b/Neutron-trunk/cms-special/admin/home/data/index.php @@ -1,27 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -$pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> -<div style="text-align: center;"> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home" class="mdc-button mdc-button--outlined"> - <div class="mdc-button__ripple"></div> - <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">arrow_back</i> - <span class="mdc-button__label"><?= $lang["admin-home"]["items"][7] ?></span> - </a> - - <h1><?= $lang["admin-home"]["data"]['greeting'] ?></h1> - - <div id="home-grid"> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["data"]['items'][0] ?>" id="home-grid-item-data" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/stats" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">pie_chart</a> - <br> - <?= $lang["admin-home"]["data"]['items'][0] ?> - </div> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["data"]['items'][1] ?>" id="home-grid-item-data" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/logs" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">text_snippet</a> - <br> - <?= $lang["admin-home"]["data"]['items'][1] ?> - </div> - </div> -</div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/home/housekeeping/index.php b/Neutron-trunk/cms-special/admin/home/housekeeping/index.php index 8c0deae..3674402 100755..100644 --- a/Neutron-trunk/cms-special/admin/home/housekeeping/index.php +++ b/Neutron-trunk/cms-special/admin/home/housekeeping/index.php @@ -1,27 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -$pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> -<div style="text-align: center;"> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home" class="mdc-button mdc-button--outlined"> - <div class="mdc-button__ripple"></div> - <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">arrow_back</i> - <span class="mdc-button__label"><?= $lang["admin-home"]["items"][7] ?></span> - </a> - - <h1><?= $lang["admin-home"]["housekeeping"]['greeting'] ?></h1> - - <div id="home-grid"> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["housekeeping"]['items'][0] ?>" id="home-grid-item-housekeeping" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/reset" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">restore</a> - <br> - <?= $lang["admin-home"]["housekeeping"]['items'][0] ?> - </div> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["housekeeping"]['items'][1] ?>" id="home-grid-item-housekeeping" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/about" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">info</a> - <br> - <?= $lang["admin-home"]["housekeeping"]['items'][1] ?> - </div> - </div> -</div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/home/index.php b/Neutron-trunk/cms-special/admin/home/index.php index 327ab36..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/home/index.php +++ b/Neutron-trunk/cms-special/admin/home/index.php @@ -1,58 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -$pageConfig = [ "domName" => "Tableau de bord", "headerName" => "Tableau de bord" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> -<div style="text-align: center;"> - <a title="<?= $lang["admin-home"]["language"] ?>/Switch Language" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/language" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button" id="language-selector">translate</a> - - <h1><?= $lang["admin-home"]["greeting"] ?></h1> - - <div id="home-grid"> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["items"][0] ?>" id="home-grid-item-pages" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">layers</a> - <br> - <?= $lang["admin-home"]["items"][0] ?> - </div> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["items"][1] ?>" id="home-grid-item-calendar" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/calendar" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">event_note</a><br> - <?= $lang["admin-home"]["items"][1] ?> - </div> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["items"][2] ?>" id="home-grid-item-gallery" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/gallery" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">photo</a><br> - <?= $lang["admin-home"]["items"][2] ?> - </div> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["items"][3] ?>" id="home-grid-item-appearance" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home/appearance" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">brush</a><br> - <?= $lang["admin-home"]["items"][3] ?> - </div> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["items"][4] ?>" id="home-grid-item-data" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home/data" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">dns</a><br> - <?= $lang["admin-home"]["items"][4] ?> - </div> - <div class="home-grid-item"> - <a title="<?= $lang["admin-home"]["items"][5] ?>" id="home-grid-item-housekeeping" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home/housekeeping" class="material-icons-outlined mdc-top-app-bar__navigation-icon mdc-icon-button home-grid-item-button">cleaning_services</a><br> - <?= $lang["admin-home"]["items"][5] ?> - </div> - </div> - - <br> - - <a onclick="document.getElementsByTagName('spotlight-bar')[0].show()" class="mdc-button mdc-button--outlined"> - <div class="mdc-button__ripple"></div> - <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">settings</i> - <span class="mdc-button__label"><?= $lang["admin-home"]["items"][6] ?></span> - </a> - - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/logout" class="mdc-button mdc-button--outlined"> - <div class="mdc-button__ripple"></div> - <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">power_settings_new</i> - <span class="mdc-button__label"><?= $lang["admin-home"]["items"][8] ?></span> - </a> - - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/?source=admin" target="_blank" class="mdc-button mdc-button--outlined"> - <div class="mdc-button__ripple"></div> - <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">public</i> - <span class="mdc-button__label"><?= $lang["admin-home"]["items"][9] ?></span> - </a> -</div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/housekeeping/index.php b/Neutron-trunk/cms-special/admin/housekeeping/index.php index a5d0bbc..792609b 100755..100644 --- a/Neutron-trunk/cms-special/admin/housekeeping/index.php +++ b/Neutron-trunk/cms-special/admin/housekeeping/index.php @@ -1,2 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?>
-<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home/housekeeping"); ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/housekeeping/reset/index.php b/Neutron-trunk/cms-special/admin/housekeeping/reset/index.php index 35b36d1..8387b16 100755..100644 --- a/Neutron-trunk/cms-special/admin/housekeeping/reset/index.php +++ b/Neutron-trunk/cms-special/admin/housekeeping/reset/index.php @@ -1,2 +1 @@ -<?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?>
-<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/reset"); ?>
\ No newline at end of file +<?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?><?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/index.php b/Neutron-trunk/cms-special/admin/index.php index 8e388b6..6d72277 100755..100644 --- a/Neutron-trunk/cms-special/admin/index.php +++ b/Neutron-trunk/cms-special/admin/index.php @@ -1,135 +1,2 @@ <?php require_once "../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -if (isset($_GET['pr']) || isset($_GET['pa'])) { - if (isset($_GET['pr']) && !isset($_GET['pa'])) { - header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/login/?pr=" . $_GET['pr']); - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); - } - if (!isset($_GET['pr']) && isset($_GET['pa'])) { - header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/login/?pa=" . $_GET['pa']); - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); - } - if (isset($_GET['pr']) && isset($_GET['pa'])) { - header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/login/?pr=" . $_GET['pr'] . "&pa=" . $_GET['pa']); - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); - } -} - -/** @var boolean $__electrode */ -if (isset($__electrode) && $__electrode) { - header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home"); - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); -} - -?> - -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="UTF-8"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <title>Neutron</title> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/ajax.css"> - <link rel="icon" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/siteicon.png"> - <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/jquery.js"></script> -</head> -<body> - <iframe id="content" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/login" style="border:none;"></iframe> - <div id="loader"> - <svg class="spinner" width="48px" height="48px" viewBox="0 0 66 66" xmlns="http://www.w3.org/2000/svg"> - <circle class="path" fill="none" stroke-width="6" stroke-linecap="round" cx="33" cy="33" r="30"></circle> - </svg> - </div> -</body> - -<script> - function iframeURLChange(iframe, callback) { - var unloadHandler = function () { - setTimeout(function () { - callback(iframe.contentWindow.location.href); - }, 0); - }; - - function attachUnload() { - iframe.contentWindow.removeEventListener("unload", unloadHandler); - iframe.contentWindow.addEventListener("unload", unloadHandler); - } - - iframe.addEventListener("load", attachUnload); - attachUnload(); - } - - iframeURLChange(document.getElementById("content"), function (newURL) { - $("#loader").fadeIn(200); - }); - - document.getElementById('content').onbeforeunload = () => { - $("#loader").fadeIn(200); - } - - document.getElementById('content').onload = () => { - $("#loader").fadeOut(200); - - setTimeout(() => { - $("#loader").fadeOut(200); - }, 300) - - els2 = document.getElementById('content').contentWindow.location.href.split("/"); - - els2.shift(); - els2.shift(); - els2.shift(); - - url = "/" + els2.join("/"); - if (!url.startsWith("<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin")) { - document.getElementById('content').contentWindow.history.back(); - window.open(url); - } - - els = document.getElementById('content').contentWindow.location.href.split("/"); - - els.shift(); - els.shift(); - els.shift(); - els.shift(); - els.shift(); - <?php if ($GLOBALS["SYSTEM_PREFIXED"]): ?> - els.shift(); - <?php endif; ?> - - oldu = "/" + els.join("/"); - - window.history.replaceState("Neutron", "Neutron", "#/" + els.join("/")); - console.log("<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/" + els.join("/")); - - document.title = document.getElementById('content').contentWindow.document.title; - } - - oldu = null; - setInterval(() => { - hash = location.hash.substr(1); - - if (hash == "" && hash != oldu) { - document.getElementById('content').src = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home"; - console.log("<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home"); - $("#loader").fadeIn(200); - - oldu = hash; - } else if (hash != oldu) { - if (hash.startsWith("/") && (hash.substr(1, 1) != "/")) { - document.getElementById('content').src = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin" + hash; - console.log("<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin" + hash); - $("#loader").fadeIn(200); - } else { - document.getElementById('content').src = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home"; - console.log("<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/home"); - $("#loader").fadeIn(200); - } - - oldu = hash; - } - }, 200) -</script> - -</html>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/language/index.php b/Neutron-trunk/cms-special/admin/language/index.php index 4c16e04..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/language/index.php +++ b/Neutron-trunk/cms-special/admin/language/index.php @@ -1,57 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Langue et région", "headerName" => "Langue et région" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> -<div style="text-align: center;"><select id="langselect"> - <?php - - $langs = scandir($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n"); - foreach ($langs as $language) { - if ($language != "." && $language != ".." && $language != ".htaccess") { - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/" . $language . "/\$metadata.json")) { - echo("<option value=\"" . $language . "\">"); - echo(json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/" . $language . "/\$metadata.json"))->localized_name . " — " . json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/i18n/" . $language . "/\$metadata.json"))->name); - echo("</option>"); - } - } - } - - ?> -</select> -</p> -<input id="langselect-confirm" type="button" value="OK" onclick="changeLanguage()"></div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function changeLanguage() { - document.getElementById('langselect').disabled = true; - document.getElementById('langselect-confirm').disabled = true; - var formData = new FormData(); - formData.append("lang", document.getElementById('langselect').value); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/instant_language_change.php", - success: function (data) { - if (data == "ok") { - document.getElementById('langselect').disabled = false; - document.getElementById('langselect-confirm').disabled = false; - ajaxPageReload(); - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data); - document.getElementById('langselect').disabled = false; - document.getElementById('langselect-confirm').disabled = false; - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>\n\n<?= $lang["admin-errors"]["housekeeping"][1] ?>") - document.getElementById('langselect').disabled = false; - document.getElementById('langselect-confirm').disabled = false; - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -</script>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/login-old/index.php b/Neutron-trunk/cms-special/admin/login-old/index.php index d4428d7..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/login-old/index.php +++ b/Neutron-trunk/cms-special/admin/login-old/index.php @@ -1,122 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -$invalid = false; - -if (isset($_POST['authkey'])) { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("UNSUPPORTED"); -} else { - if (isset($_POST['password'])) { - if (isset($_GET['pr'])) { - if (isset($_GET['pa'])) { - $callback = $_GET['pr'] . $_GET['pa']; - } else { - $callback = $_GET['pr']; - } - } else { - $callback = "{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home"; - } - if (password_verify($_POST['password'], file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/password"))) { - $token = str_ireplace("/", "-", password_hash(password_hash(rand(0, 999999) + rand(0, 999999) + rand(0, 999999) + rand(0, 999999) + rand(0, 999999), PASSWORD_BCRYPT, ['cost' => 12,]), PASSWORD_BCRYPT, ['cost' => 12,])); - if (!file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens")) { - mkdir($_SERVER['DOCUMENT_ROOT'] . "/data/tokens"); - } - $tokens = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/tokens"); - foreach ($tokens as $atoken) { - if ($atoken == "." || $atoken == "..") {} else { - unlink($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $atoken); - } - } - file_put_contents($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $token, ""); - header("Set-Cookie: _NEUTRON_ADMIN_TOKEN={$token}; Path=/; Http-Only; SameSite=Strict"); - header("Location: " . $callback); - return; - } else { - $invalid = true; - } - } -} - -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { - if (isset($_GET['pr'])) { - if (isset($_GET['pa'])) { - $callback = $_GET['pr'] . $_GET['pa']; - } else { - $callback = $_GET['pr']; - } - } else { - $callback = "{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home"; - } - header("Location: " . $callback); - } -} - -?> - -<?php ob_start();echo("<!--\n\n" . str_replace('%year%', date('Y'), file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/private/license")) . "\n\n-->") ?> -<?php - -if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent")) { - $ready = true; -} else { - $ready = false; -} - -?> - -<!DOCTYPE html> -<html lang="fr"> -<head> - <meta charset="UTF-8"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <meta http-equiv="X-UA-Compatible" content="ie=edge"> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin.css"> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/fonts-import.css"> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/ui.css"> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/header.php"; ?> - <title><?php - - if ($ready) { - echo($lang["login"]["login"] . " - " . $lang["login"]["title"] . " - " . file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/sitename")); - } else { - echo("Neutron"); - } - - ?></title> - <?php - if (!$ready) { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '{$GLOBALS["SYSTEM_ROOT"]}/cms-special/setup';</script></head>"); - } - ?> -</head> -<body id="login"> - <div class="centered"> - <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/upload/siteicon.png" style="border-radius:100%;" class="intro-element"> - <h2 style="margin-bottom:0;"><?= $lang["login"]["title"] ?></h2> - <p><small><?= str_replace("}", "</a>", str_replace("{", "<a class=\"clink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/login\">", $lang["login"]["redirect"])); ?></small></p> - <p><?php - - if (isset($_GET['authkey'])) { - echo('<small>' . $lang["login"]["uauth"] . '<br><a href="." class="clink">' . $lang['login']['pass'] . '</a></small>'); - } else { - echo('<small>' . $lang["login"]["upass"] . '<br><a href="./?authkey" class="clink">' . $lang['login']['auth'] . '</a></small>'); - } - - ?></p> - <?php if ($invalid) {echo('<div id="error">' . $lang["login"]["invalid"] . '</div>');} ?> - - <?php if (!isset($_GET['authkey'])): ?> - <form action="./<?php if (isset($_GET['pr'])) {echo("?pr=" . $_GET['pr']);if (isset($_GET['pa'])) {echo("&pa=" . urlencode($_GET['pa']));}} ?>" method="post"> - <input name="password" type="password" placeholder="<?= isset($_GET['authkey']) ? $lang["login"]["authph"] : $lang["login"]["password"] ?>"><br><br> - <input type="submit" class="button" value="<?= $lang["login"]["login"] ?>"> - </form><br> - <?php else: ?> - <form action="#" method="post"> - <input name="authkey" type="password" placeholder="<?= isset($_GET['authkey']) ? $lang["login"]["authph"] : $lang["login"]["password"] ?>" disabled><br><br> - <small><?= $lang["login"]["nokey"][0] . " <a class=\"clink\" href=\"{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/login\">" . $lang["login"]["nokey"][1] . "</a> " . $lang["login"]["nokey"][2] ?></small> - </form><br> - <?php endif ?> - </div> -</body> -</html>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/login/index.php b/Neutron-trunk/cms-special/admin/login/index.php index 57a1b6a..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/login/index.php +++ b/Neutron-trunk/cms-special/admin/login/index.php @@ -1,219 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { - if (isset($_GET['pr'])) { - if (isset($_GET['pa'])) { - $callback = $_GET['pr'] . $_GET['pa']; - } else { - $callback = $_GET['pr']; - } - } else { - $callback = "{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home"; - } - header("Location: " . $callback); - } -} - -if (isset($_GET['pr'])) { - if (isset($_GET['pa'])) { - $callback = $_GET['pr'] . $_GET['pa']; - } else { - $callback = $_GET['pr']; - } -} else { - $callback = "{$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/home"; -} - -?> - -<?php ob_start();echo("<!--\n\n" . str_replace('%year%', date('Y'), file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/private/license")) . "\n\n-->") ?> -<?php - -if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent")) { - $ready = true; -} else { - $ready = false; -} - -require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/preprocessor.php"; - -?> - -<!DOCTYPE html> -<html lang="fr"> -<head> - <meta charset="UTF-8"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <meta http-equiv="X-UA-Compatible" content="ie=edge"> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin.css"> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/fonts-import.css"> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/ui.css"> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/alerts.css"> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/codename.css"> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/ajax.css"> - <link href="<?= $_MD_INCLUDES ?>/material-components-web.min.css" rel="stylesheet"> - <script src="<?= $_MD_INCLUDES ?>/material-components-web.min.js"></script> - <link rel="stylesheet" href="<?= $_MDI_PATH ?>"> - <?php - echo('<link rel="stylesheet" href="' . $GLOBALS["SYSTEM_ROOT"] . '/cms-special/admin/$resources/index-dark.css">'); - ?> - <title><?php - - if ($ready) { - echo($lang["login"]["login"] . " - " . $lang["login"]["title"] . " - " . file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/sitename")); - } else { - echo("Neutron"); - } - - ?></title> - <?php - if (!$ready) { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<script>location.href = '{$GLOBALS["SYSTEM_ROOT"]}/cms-special/setup';</script></head>"); - } - ?> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/documenthead.php"; ?> - <script> - - window.onerror = () => { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/login-old"; - } - - </script> -</head> -<body id="login"> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/headers/documentbody.php"; ?> - <div id="loader" style="display:none;z-index:99;"> - <svg class="spinner" width="48px" height="48px" viewBox="0 0 66 66" xmlns="http://www.w3.org/2000/svg"> - <circle class="path" fill="none" stroke-width="6" stroke-linecap="round" cx="33" cy="33" r="30"></circle> - </svg> - </div> - <div id="admin"> - <main class="main-content" id="main-content"> - <div class="content"> - <div class="inner"> - <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/upload/siteicon.png" style="border-radius:100%;" class="intro-element"> - <h2><?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/sitename"); ?></h2> - - <div id="loginwith"> - <button class="mdc-button mdc-button--raised" id="loginwith-password" onclick="disableAuthKey();"> - <div class="mdc-button__ripple"></div> - <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">vpn_key</i> - <span class="mdc-button__label"><?= $lang["admin-login"]["modes"][0] ?></span> - </button> - <?php if (file_exists($GLOBALS["ORIGINAL_DOCUMENT_ROOT"] . "/NeutronCloud") && is_file($GLOBALS["ORIGINAL_DOCUMENT_ROOT"] . "/NeutronCloud")): ?> - <button onclick="window.parent.location.href='https://minteck.ro.lt/admin/NeutronManage/?_='+location.pathname.split('/')[1];" class="mdc-button mdc-button--outlined" id="loginwith-authkey"> - <div class="mdc-button__ripple"></div> - <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">admin_panel_settings</i> - <span class="mdc-button__label">Cloud Admin Console</span> - </button> - <?php else: ?> - <button class="mdc-button mdc-button--outlined" id="loginwith-authkey" <?php if (!file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/authkey")) { echo("disabled"); } else { echo('onclick="enableAuthKey();"'); } ?>> - <div class="mdc-button__ripple"></div> - <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">fingerprint</i> - <span class="mdc-button__label"><?= $lang["admin-login"]["modes"][1] ?></span> - </button> - <?php endif; ?> - </div> - <script>useAuthKey = false;</script> - - <div id="login-password"> - <div class="nd_Field fallback nd_Field_input" id="searchbox"> - <input id="password-box" type="password" placeholder="<?= $lang["admin-login"]["password"] ?>" spellcheck="false" autocomplete="off"> - </div> - </div> - - <div id="login-authkey" style="display:none;"> - <div class="nd_Field fallback nd_Field_input" id="searchbox"> - <input id="authkey-box" type="password" placeholder="<?= $lang["admin-login"]["key"] ?>" spellcheck="false" autocomplete="off"> - </div> - </div> - - <button class="mdc-button mdc-button--raised" id="loginwith-password" onclick="loginConfirm();"> - <div class="mdc-button__ripple"></div> - <span class="mdc-button__label"><?= $lang["admin-login"]["confirm"] ?></span> - </button> - - <p> - <small id="links"> - <a onclick="window.parent.location.href = '<?= $GLOBALS["SYSTEM_ROOT"] ?>/';" class="sblink"> - <?= $lang["admin-login"]["back"] ?></a> - - <a onclick="window.open('<?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . '/api/bugs') ?>');" target="_blank" class="sblink"> - <?= $lang["admin-login"]["report"] ?></a> - - <a onclick="window.open('<?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . '/api/public') ?>');" class="sblink"> - <?= $lang["admin-login"]["branding"] ?></a> - </small> - </p> - </div> - </div> - </main> - </div> -</body> - -<script> - function alert(message) { - alert_full(message); - } - - function enableAuthKey() { - useAuthKey = true; - document.getElementById('loginwith-authkey').classList.remove('mdc-button--outlined'); - document.getElementById('loginwith-authkey').classList.add('mdc-button--raised'); - document.getElementById('loginwith-password').classList.remove('mdc-button--raised'); - document.getElementById('loginwith-password').classList.add('mdc-button--outlined'); - document.getElementById('login-password').style.display = "none"; - document.getElementById('login-authkey').style.display = ""; - document.getElementById('password-box').value = ""; - document.getElementById('authkey-box').value = ""; - document.getElementById('authkey-box').focus(); - } - - function disableAuthKey() { - useAuthKey = false; - document.getElementById('loginwith-authkey').classList.add('mdc-button--outlined'); - document.getElementById('loginwith-authkey').classList.remove('mdc-button--raised'); - document.getElementById('loginwith-password').classList.add('mdc-button--raised'); - document.getElementById('loginwith-password').classList.remove('mdc-button--outlined'); - document.getElementById('login-password').style.display = ""; - document.getElementById('login-authkey').style.display = "none"; - document.getElementById('password-box').value = ""; - document.getElementById('authkey-box').value = ""; - document.getElementById('password-box').focus(); - } - - function loginConfirm() { - $("#loader").fadeIn(200); - var formData = new FormData(); - if (useAuthKey) { - formData.append("password", document.getElementById('authkey-box').value); - formData.append("authkey", "1"); - } else { - formData.append("password", document.getElementById('password-box').value); - } - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/login.php", - success: function (data) { - $("#loader").fadeOut(200); - if (data == "ok") { - location.href = "<?= $callback ?>"; - } else { - alert(data) - } - }, - error: function (error) { - $("#loader").fadeOut(200); - alert("<?= $lang["admin-errors"]["connerror"] ?>") - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); - } -</script> -</html>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/logout/index.php b/Neutron-trunk/cms-special/admin/logout/index.php index 5c51269..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/logout/index.php +++ b/Neutron-trunk/cms-special/admin/logout/index.php @@ -1,15 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -if (isset($_COOKIE['_NEUTRON_ADMIN_TOKEN']) && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != ".." && $_COOKIE['_NEUTRON_ADMIN_TOKEN'] != "/") { - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $_COOKIE['_NEUTRON_ADMIN_TOKEN'])) { - $tokens = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/tokens"); - foreach ($tokens as $token) { - if ($token == "." || $token == "..") {} else { - unlink($_SERVER['DOCUMENT_ROOT'] . "/data/tokens/" . $token); - } - } - } -} -header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/login"); -require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit();
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/logs/index.php b/Neutron-trunk/cms-special/admin/logs/index.php index b653ad0..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/logs/index.php +++ b/Neutron-trunk/cms-special/admin/logs/index.php @@ -1,17 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Historique d'activité", "headerName" => "Historique d'activité" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <div id="logs"> - <?php - - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log")) { - $file = file($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/system.log"); - for ($i = max(0, count($file)-100); $i < count($file); $i++) { - echo $file[$i] . "<br>"; - } - } else { - echo($lang["admin-logs"]["nothing"][0] . "<br><br>" . $lang["admin-logs"]["nothing"][1]); - } - - ?> - </div><br><br> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/pages/add/index.php b/Neutron-trunk/cms-special/admin/pages/add/index.php index 54dacdb..3674402 100755..100644 --- a/Neutron-trunk/cms-special/admin/pages/add/index.php +++ b/Neutron-trunk/cms-special/admin/pages/add/index.php @@ -1,145 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Nouvelle page - Pages", "headerName" => "Nouvelle page" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <p> - <form name="settings"> - <div class="nd_Field nd_Field_input nd_Field__centered" id="namebox"> - <input id="name" name="name" type="text" placeholder="<?= $lang["admin-pages"]["pagename"] ?>" spellcheck="false" autocomplete="off"> - <label for="name"><?= $lang["admin-pages"]["pagename"] ?></label> - </div><br> - <input style="display:none;" type="radio" id="type-visual" value="visual" onchange="switchEditor()" name="type" checked> - <input style="display:none;" type="radio" id="type-html" onchange="switchEditor()" value="html" name="type"> - <div style="text-align: center;"><div id="ptype-visual" class="mdc-card mdc-card--outlined mdc-card--selected" onclick="document.getElementsByName('type')[0].value = 'visual';switchEditor();" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card__primary-action" tabindex="0" style="padding:0;"> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <h2 style="margin-bottom:5px;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-pages"]["editors"][0] ?></h2> - <h3 style="margin-top:5px;" class="mdc-typography mdc-typography--subtitle2"><?= $lang["admin-pages"]["editordescs"][0] ?></h3> - </div> - </div> - </div> - <div id="ptype-html" class="mdc-card mdc-card--outlined" onclick="document.getElementsByName('type')[0].value = 'html';switchEditor();" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card__primary-action" tabindex="0" style="padding:0;"> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <h2 style="margin-bottom:5px;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-pages"]["editors"][1] ?></h2> - <h3 style="margin-top:5px;" class="mdc-typography mdc-typography--subtitle2"><?= $lang["admin-pages"]["editordescs"][1] ?></h3> - </div> - </div> - </div></div> - </form> - </p> - <div id="editing"><div id="editor-visual"> - <?php - require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/VisualEditor$2.php"; - ?></div> - <div id="editor-html" class="hide"> - <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/CodeEditor$2.php" ?> - </div> - </div> - <div class="hide" id="loader" style="text-align: center;"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - window.onbeforeunload = function (e) { - e = e || window.event; - - // For IE and Firefox prior to version 4 - if (e) { - e.returnValue = "<?= $lang["admin-pages"]["quitwarn"] ?>"; - } - - // For Safari - return "<?= $lang["admin-pages"]["quitwarn"] ?>"; - }; -</script> - -<script> - -function createPageVisual() { - Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = true}) - document.getElementById('loader').classList.remove('hide') - document.getElementById('editing').classList.add('hide') - var formData = new FormData(); - formData.append("title", document.getElementById('name').value); - formData.append("type", "0"); - formData.append("content", editor.getData()); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/create_page.php", - success: function (data) { - if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages"; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = false}) - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -function createPageVisualNoBack() { - Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = true}) - document.getElementById('loader').classList.remove('hide') - document.getElementById('editing').classList.add('hide') - var formData = new FormData(); - formData.append("title", document.getElementById('name').value); - formData.append("type", "0"); - formData.append("content", editor.getData()); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/create_page.php", - success: function (data) { - if (data == "ok") { - alert("<?= $lang["admin-pages"]["saved"] ?>"); - Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = false}) - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = false}) - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -function switchEditor() { - if (document.forms['settings'].type.value == "visual") { - document.getElementById('editor-visual').classList.remove('hide') - document.getElementById('editor-html').classList.add('hide') - document.getElementById('ptype-html').classList.remove('mdc-card--selected'); - document.getElementById('ptype-visual').classList.add('mdc-card--selected'); - } else { - document.getElementById('editor-visual').classList.add('hide') - document.getElementById('editor-html').classList.remove('hide') - document.getElementById('ptype-visual').classList.remove('mdc-card--selected'); - document.getElementById('ptype-html').classList.add('mdc-card--selected'); - loadAce() - } - document.body.focus(); -} - -document.forms['settings'].type.value = "visual" - -</script>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/pages/delete/index.php b/Neutron-trunk/cms-special/admin/pages/delete/index.php index 4cbcb49..3674402 100755..100644 --- a/Neutron-trunk/cms-special/admin/pages/delete/index.php +++ b/Neutron-trunk/cms-special/admin/pages/delete/index.php @@ -1,88 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -if (isset($_GET['slug'])) { - $currentSlug = $_GET['slug']; - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pages/" . $currentSlug)) {} else { - header("Location: /cms-special/admin/pages"); - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); - } -} else { - header("Location: /cms-special/admin/pages"); - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); -} - -?> -<?php $pageConfig = [ "domName" => "Pages", "headerName" => "Pages" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> -<?php - -if ($currentSlug == "index") { - $currentName = "{$lang["admin-pages"]["home"]}"; - echo("<script>page = \"index\"</script>"); -} else { - $currentName = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/" . $currentSlug . "/pagename"); - echo("<script>page = \"{$currentSlug}\"</script>"); -} - -?> - <div id="confirm"> - <div style="text-align:center;"> - <p><?= $lang["admin-pages"]["deletec"][0] . $currentName . $lang["admin-pages"]["deletec"][1] ?></p> - <?php - - if ($currentSlug == "index") { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<i>{$lang["admin-pages"]["deletec"][2]}</i></div></body></html>"); - } - - ?> - <!--<ul> - <li><a onclick="deletePage()" class="sblink" title="<?= $lang["admin-pages"]["deleteyl"] ?>"><?= $lang["admin-pages"]["deletey"] ?></a></li> - <li><a onclick="location.href='/cms-special/admin/pages/manage/?slug=<?= $currentSlug ?>'" class="sblink" title="<?= $lang["admin-pages"]["deletenl"] ?>"><?= $lang["admin-pages"]["deleten"] ?></a></li> - </ul>--> - <a title="<?= $lang["admin-pages"]["deletenl"] ?>" onclick="location.href='/cms-special/admin/pages';" class="mdc-button mdc-button--raised"> - <div class="mdc-button__ripple"></div> - <span class="mdc-button__label"><?= $lang["admin-pages"]["deleten"] ?></span> - </a> - <a title="<?= $lang["admin-pages"]["deleteyl"] ?>" onclick="deletePage();" class="mdc-button mdc-button--outlined"> - <div class="mdc-button__ripple"></div> - <span class="mdc-button__label"><?= $lang["admin-pages"]["deletey"] ?></span> - </a> - </div> - </div> - <div class="hide" id="loader" style="text-align: center;"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"> - </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function deletePage() { - document.getElementById('confirm').classList.add('hide') - document.getElementById('loader').classList.remove('hide') - var formData = new FormData(); - formData.append("page", "<?= $currentSlug ?>"); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/delete_page.php", - success: function (data) { - if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages"; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - document.getElementById('loader').classList.add('hide') - document.getElementById('confirm').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('loader').classList.add('hide') - document.getElementById('confirm').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -</script>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/pages/edit/index.php b/Neutron-trunk/cms-special/admin/pages/edit/index.php index b198566..3674402 100755..100644 --- a/Neutron-trunk/cms-special/admin/pages/edit/index.php +++ b/Neutron-trunk/cms-special/admin/pages/edit/index.php @@ -1,194 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -if (isset($_GET['slug'])) { - $currentSlug = $_GET['slug']; - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pages/" . $currentSlug)) {} else { - header("Location: /cms-special/admin/pages"); - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); - } -} else { - header("Location: /cms-special/admin/pages"); - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); -} - -?> -<?php $pageConfig = [ "domName" => "Pages", "headerName" => "Pages" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <div id="editing"> - <?php - - if ($currentSlug == "index") { - $currentName = "{$lang["admin-pages"]["home"]}"; - echo("<script>page = \"index\"</script>"); - } else { - $currentName = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/" . $currentSlug . "/pagename"); - echo("<script>page = \"{$currentSlug}\"</script>"); - } - - $type = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pagetypes/" . $currentSlug); - if (isset($_GET['forcehtml'])) { - $type = "1"; - } - if ($type == "0") { - require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/VisualEditor.php"; - } - if ($type == "1"): - - ?> - <p><table class="message_warning"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_warning.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-pages"]["htmlw"][0] ?></p><p><?= $lang["admin-pages"]["htmlw"][1] ?></p></td></tr></tbody></table></p> - <?php - - require_once $_SERVER['DOCUMENT_ROOT'] . "/resources/private/CodeEditor.php"; - endif; - - ?> - </div> - <div class="hide" id="loader" style="text-align: center;"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - window.onbeforeunload = function (e) { - e = e || window.event; - - // For IE and Firefox prior to version 4 - if (e) { - e.returnValue = "<?= $lang["admin-pages"]["quitwarn"] ?>"; - } - - // For Safari - return "<?= $lang["admin-pages"]["quitwarn"] ?>"; - }; -</script> - -<script> - -function updatePage() { - document.getElementById('loader').classList.remove('hide') - document.getElementById('editing').classList.add('hide') - var formData = new FormData(); - formData.append("title", "<?= $currentSlug ?>"); - formData.append("content", editor.getData()); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/edit_page.php", - success: function (data) { - if (data == "ok") { - window.onbeforeunload = null; - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages"; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -function updatePageNoBack() { - document.getElementById('loader').classList.remove('hide') - document.getElementById('editing').classList.add('hide') - var formData = new FormData(); - formData.append("title", "<?= $currentSlug ?>"); - formData.append("content", editor.getData()); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/edit_page.php", - success: function (data) { - if (data == "ok") { - alert("<?= $lang["admin-pages"]["saved"] ?>"); - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -function updatePageHTMLNoBack() { - document.getElementById('loader').classList.remove('hide') - document.getElementById('editing').classList.add('hide') - var formData = new FormData(); - formData.append("title", "<?= $currentSlug ?>"); - formData.append("content", ace.edit("editor").getValue()); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/edit_page.php", - success: function (data) { - if (data == "ok") { - alert("<?= $lang["admin-pages"]["saved"] ?>"); - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -function updatePageHTML() { - document.getElementById('loader').classList.remove('hide') - document.getElementById('editing').classList.add('hide') - var formData = new FormData(); - formData.append("title", "<?= $currentSlug ?>"); - formData.append("content", ace.edit("editor").getValue()); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/edit_page.php", - success: function (data) { - if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages"; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('loader').classList.add('hide') - document.getElementById('editing').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -</script>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/pages/index.php b/Neutron-trunk/cms-special/admin/pages/index.php index d8e1e3d..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/pages/index.php +++ b/Neutron-trunk/cms-special/admin/pages/index.php @@ -1,66 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Pages", "headerName" => "Gestionnaire de pages" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - - <div class="admin-pages-list"> - <?php - - $pages = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pages/"); - $sizetotal = 0; - foreach ($pages as $page) { - if ($page != "." && $page != "..") { - $type = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pagetypes/" . $page); - $size = filesize($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pages/" . $page); - if ($size > 1024) { - if ($size > 1048576) { - $sizestr = round($size / 1048576, 2) . " " . $lang["sizes"]["mib"]; - } else { - $sizestr = round($size / 1024, 2) . " " . $lang["sizes"]["kib"]; - } - } else { - $sizestr = $size . " " . $lang["sizes"]["bytes"]; - } - $sizetotal = $sizetotal + $size; - $sizestr = str_replace(".", ",", $sizestr); - if ($page == "index"): ?> -<!-- echo("<li><a href='/cms-special/admin/pages/manage/?slug={$page}' class='sblink' title='{$lang['admin-pages']['lore']}'>{$lang['admin-pages']['home']}</a> ({$page}), {$typestr}, {$sizestr}</li>");--> - <div class="mdc-card mdc-card--outlined" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <h2 style="margin-bottom:5px;white-space: nowrap;overflow: hidden !important;text-overflow: ellipsis;" class="mdc-typography mdc-typography--headline6"><?= $lang["admin-pages"]["home"] ?></h2> - <h3 style="margin-top:5px;" class="mdc-typography mdc-typography--subtitle2"><?php $text = strip_tags(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pages/" . $page));if (strlen($text)>100){echo(substr($text,0,100) . " …");}else{echo($text);} ?></h3> - </div><br><br> - <div class="mdc-card__actions mdc-card__actions-pages-list"> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages/edit/?slug=<?= $page ?>" title="<?= $lang["admin-pages"]["editl"] ?>" class="mdc-button mdc-card__action mdc-card__action--button"> - <div class="mdc-button__ripple"></div> - <span class="mdc-button__label"><?= $lang["admin-pages"]["edit"] ?></span> - </a> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages/edit/?slug=<?= $page ?>&forcehtml" class="material-icons mdc-icon-button mdc-card__action mdc-card__action--icon mdi-icbtn-card" title="<?= $lang["admin-pages"]["editcode"] ?>">code</a> - </div> - </div> - <?php else: ?> - <div class="mdc-card mdc-card--outlined" style="width:256px;margin:10px;display:inline-block;"> - <div class="mdc-card-wrapper__text-section" style="padding-left:5px;padding-right:5px;"> - <h2 style="margin-bottom:5px;white-space: nowrap;overflow: hidden !important;text-overflow: ellipsis;" class="mdc-typography mdc-typography--headline6"><?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/" . $page . "/pagename") ?></h2> - <h3 style="margin-top:5px;" class="mdc-typography mdc-typography--subtitle2"><?php $text = strip_tags(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pages/" . $page));if (strlen($text)>100){echo(substr($text,0,100) . " …");}else{echo($text);} ?></h3> - </div><br><br> - <div class="mdc-card__actions mdc-card__actions-pages-list"> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages/edit/?slug=<?= $page ?>" title="<?= $lang["admin-pages"]["editl"] ?>" class="mdc-button mdc-card__action mdc-card__action--button"> - <div class="mdc-button__ripple"></div> - <span class="mdc-button__label"><?= $lang["admin-pages"]["edit"] ?></span> - </a> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages/rename/?slug=<?= $page ?>" class="material-icons mdc-icon-button mdc-card__action mdc-card__action--icon mdi-icbtn-card" title="<?= $lang["admin-pages"]["renamel"] ?>">create</a> - <a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages/delete/?slug=<?= $page ?>" class="material-icons mdc-icon-button mdc-card__action mdc-card__action--icon mdi-icbtn-card" title="<?= $lang["admin-pages"]["deletel"] ?>">delete</a> - </div> - </div> - <?php endif; - } - } - ?> - </div> - <p><div style="text-align: center;"> - <a title="<?= $lang["admin-pages"]["alore"] ?>" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages/add" class="mdc-button mdc-button--outlined"> - <div class="mdc-button__ripple"></div> - <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">add</i> - <span class="mdc-button__label"><?= $lang["admin-pages"]["create"] ?></span> - </a> - </div></p> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/pages/rename/index.php b/Neutron-trunk/cms-special/admin/pages/rename/index.php index d7118ba..3674402 100755..100644 --- a/Neutron-trunk/cms-special/admin/pages/rename/index.php +++ b/Neutron-trunk/cms-special/admin/pages/rename/index.php @@ -1,89 +1,2 @@ <?php require_once "../../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -if (isset($_GET['slug'])) { - $currentSlug = $_GET['slug']; - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/pages/" . $currentSlug)) {} else { - header("Location: /cms-special/admin/pages"); - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); - } -} else { - header("Location: /cms-special/admin/pages"); - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit(); -} - -?> -<?php $pageConfig = [ "domName" => "Pages", "headerName" => "Pages" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> -<?php - -if ($currentSlug == "index") { - $currentName = "{$lang["admin-pages"]["home"]}"; - echo("<script>page = \"index\"</script>"); -} else { - $currentName = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/" . $currentSlug . "/pagename"); - echo("<script>page = \"{$currentSlug}\"</script>"); -} - -?> - <div id="confirm"> - <p><?= $lang["admin-pages"]["renamew"][0] . $currentName . $lang["admin-pages"]["renamew"][1] ?></p> - <?php - - if ($currentSlug == "index") { - require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit("<i>{$lang["admin-pages"]["renamew"][2]}</i></div></body></html>"); - } - - ?> - <div class="nd_Field nd_Field_input nd_Field__centered nd_Field__disabled" id="onamebox"> - <input id="oldname" name="oldname" type="text" placeholder="<?= $lang["admin-pages"]["oname"] ?>" spellcheck="false" disabled autocomplete="off" value="<?= $currentName ?>"> - <label for="name"><?= $lang["admin-pages"]["oname"] ?></label> - </div><div class="nd_Field nd_Field_input nd_Field__centered" id="nnamebox"> - <input id="newname" name="newname" type="text" placeholder="<?= $lang["admin-pages"]["nname"] ?>" spellcheck="false" autocomplete="off" value="<?= $currentName ?>"> - <label for="name"><?= $lang["admin-pages"]["nname"] ?></label> - </div> - <p><div style="text-align: center;"> - <a title="<?= $lang["admin-pages"]["renamel2"] ?>" onclick="renamePage();" class="mdc-button mdc-button--raised"> - <div class="mdc-button__ripple"></div> - <i class="material-icons-outlined mdc-button__icon" aria-hidden="true">edit</i> - <span class="mdc-button__label"><?= $lang["admin-pages"]["rename2"] ?></span> - </a> - </div></p> - </div> - <div class="hide" id="loader" style="text-align: center;"><img src="/resources/image/loader.svg" class="loader"> - </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function renamePage() { - document.getElementById('confirm').classList.add('hide') - document.getElementById('loader').classList.remove('hide') - var formData = new FormData(); - formData.append("page", "<?= $currentSlug ?>"); - formData.append("newname", document.getElementById('newname').value); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/rename_page.php", - success: function (data) { - if (data == "ok") { - location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/pages"; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data) - document.getElementById('loader').classList.add('hide') - document.getElementById('confirm').classList.remove('hide') - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>") - document.getElementById('loader').classList.add('hide') - document.getElementById('confirm').classList.remove('hide') - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -</script>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/plugins/index.php b/Neutron-trunk/cms-special/admin/plugins/index.php index 58be08f..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/plugins/index.php +++ b/Neutron-trunk/cms-special/admin/plugins/index.php @@ -1,79 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -$pageConfig = [ "domName" => "Extensions", "headerName" => "Extensions" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <p><table class="message_info"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_info.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-plugins"]["newnotice"] ?></p></td></tr></tbody></table></p> - <?php - - $widgets = scandir($_SERVER['DOCUMENT_ROOT'] . "/widgets/"); - $json = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/widgets.json")); - foreach ($widgets as $widget) { - if ($widget != "." && $widget != ".." && $widget != ".htaccess") { - $config = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/widgets/" . $widget . "/feature.json")); - echo("<div class=\"widget\"><div id=\"header-{$widget}\" class=\"widget-header "); - if (array_search($widget, $json->list) === false) { - echo("disabled"); - } else { - echo("enabled"); - } - echo("\"><table><tbody><tr><td><label class=\"switch\"><input name=\"" . $widget . "\" type=\"checkbox\" onclick=\"updateWidgetStatus('" . $widget . "')\" onchange=\"updateWidgetStatus('" . $widget . "')\""); - if (array_search($widget, $json->list) === false) {} else { - echo(" checked"); - } - echo("><span class=\"slider round\"></span></label></td><td class=\"widget-header-info\"><b>" . getName($config) . "</b>"); - if (isset($config->config)) { - echo("<a href=\"" . $config->config . "\" title=\"" . $lang["admin-plugins"]["config"] . "\" class=\"configure_ext\"><img src=\"{$GLOBALS["SYSTEM_ROOT"]}/resources/image/ext-settings.svg\"></a>"); - } - echo("</td></tr></tbody></table></div><p>" . getDescription($config) . "</p>"); - echo("</div>"); - } - } - - ?> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function updateWidgetStatus(widget) { - checkbox = document.getElementsByName(widget)[0] - if (typeof checkbox == "undefined") {} else { - if (checkbox.checked) { - document.getElementById('header-' + widget).classList.remove('disabled'); - document.getElementById('header-' + widget).classList.add('enabled'); - } else { - document.getElementById('header-' + widget).classList.remove('enabled'); - document.getElementById('header-' + widget).classList.add('disabled'); - } - Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = true}) - - var formData = new FormData(); - formData.append("element", widget); - formData.append("value", checkbox.checked.toString()); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/widgets.php", - success: function (data) { - if (data == "ok") { - alert("<?= $lang["admin-plugins"]["saved"] ?>"); - setTimeout(() => { - Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = false}) - }, 500) - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data); - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>"); - window.onbeforeunload = undefined; - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); - - } -} - -</script>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/reset/index.php b/Neutron-trunk/cms-special/admin/reset/index.php index efa215c..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/reset/index.php +++ b/Neutron-trunk/cms-special/admin/reset/index.php @@ -1,118 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Réinitialisation - Maintenance", "headerName" => "Réinitialisation" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> - <div id="page-confirm"> - <div style="text-align: center;"><p><?= $lang["admin-housekeeping"]["disclaimer"][0] ?><ul><li><?= $lang["admin-housekeeping"]["disclaimer"][1] ?></li><li><?= $lang["admin-housekeeping"]["disclaimer"][2] ?></li><li><?= $lang["admin-housekeeping"]["disclaimer"][3] ?></li><li><?= $lang["admin-housekeeping"]["disclaimer"][4] ?></li></ul></p> - <p><b><?= $lang["admin-housekeeping"]["confirm"] ?></b></p><input id="confirm" onkeyup="validate()" onkeydown="validate()" onchange="validate()" type="text" placeholder="<?= $lang["admin-housekeeping"]["confirmboxph"] ?>"></div> - <p><div style="text-align: center;"><a onclick="confirmPass()" id="reset-confirm" class="hide button-dangerous"><?= $lang["admin-housekeeping"]["confirmbutton"] ?></a></div></p> - </div> - <div id="page-select" class="hide"> - <?= $lang["admin-housekeeping"]["select"][0] ?> - <p><table class="message_warning"><tbody><tr><td><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/message_warning.svg" class="message_img"></td><td style="width:100%;"><p><?= $lang["admin-housekeeping"]["select"][1] ?></p></td></tr></tbody></table></p> - <div class="reset-option" onclick="resetKeep()"> - <b><?= $lang["admin-housekeeping"]["select"][2] ?></b> - <p><?= $lang["admin-housekeeping"]["select"][3] ?></p> - </div> - <div class="reset-option" onclick="resetClear()"> - <b><?= $lang["admin-housekeeping"]["select"][4] ?></b> - <p><?= $lang["admin-housekeeping"]["select"][5] ?></p> - </div> - </div> - </div> - <div class="hide" id="resetbox-placeholder"> - <div id="resetbox" class="centered"> - <p><?= $lang["admin-housekeeping"]["select"][6] ?></p> - <div id="loader" style="text-align: center;"><img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/loader.svg" class="loader"></div> - <p><small><?= $lang["admin-housekeeping"]["select"][7] ?><br><span id="reset-message">-</span></small></p> - </div> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/postcontent.php"; ?> - -<script> - -function resetKeep() { - document.getElementById('reset-message').innerHTML = "<?= $lang["admin-housekeeping"]["select"][2] ?>" - progressbox(true) - var formData = new FormData(); - formData.append("keep", "1"); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/reset.php", - success: function (data) { - if (data == "ok") { - window.parent.location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/resetted"; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data + "\n\n<?= $lang["admin-errors"]["housekeeping"][0] ?>") - Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = false}) - progressbox(false) - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>\n\n<?= $lang["admin-errors"]["housekeeping"][1] ?>") - progressbox(false) - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -function resetClear() { - document.getElementById('reset-message').innerHTML = "<?= $lang["admin-housekeeping"]["select"][4] ?>" - progressbox(true) - var formData = new FormData(); - formData.append("keep", "0"); - $.ajax({ - type: "POST", - dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/api/admin/reset.php", - success: function (data) { - if (data == "ok") { - window.parent.location.href = "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/resetted"; - } else { - alert("<?= $lang["admin-errors"]["errorprefix"] ?>" + data + "\n\n<?= $lang["admin-errors"]["housekeeping"][0] ?>") - Array.from(document.getElementsByTagName('input')).forEach((el) => {el.disabled = false}) - progressbox(false) - } - }, - error: function (error) { - alert("<?= $lang["admin-errors"]["connerror"] ?>\n\n<?= $lang["admin-errors"]["housekeeping"][1] ?>") - progressbox(false) - }, - data: formData, - cache: false, - contentType: false, - processData: false - }); -} - -function progressbox(toggle) { - if (typeof toggle != "boolean") { - throw new TypeError("Argument 1 expected to be boolean, " + typeof toggle + " given") - } else { - if (toggle) { - $('#resetbox-placeholder').fadeIn(200) - document.getElementById('settings').classList.add('blurred') - } else { - $('#resetbox-placeholder').fadeOut(200) - document.getElementById('settings').classList.remove('blurred') - } - } -} - -function confirmPass() { - document.getElementById('page-confirm').classList.add('hide') - document.getElementById('page-select').classList.remove('hide') -} - -function validate() { - if (document.getElementById('confirm').value == "<?= trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/sitename")) ?>") { - document.getElementById('reset-confirm').classList.remove('hide') - } else { - document.getElementById('reset-confirm').classList.add('hide') - } -} - -document.getElementById('confirm').value = "" - -</script> +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/resetted/index.php b/Neutron-trunk/cms-special/admin/resetted/index.php index 21fe104..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/resetted/index.php +++ b/Neutron-trunk/cms-special/admin/resetted/index.php @@ -1,21 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php ob_start();echo("<!--\n\n" . str_replace('%year%', date('Y'), file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/resources/private/license")) . "\n\n-->") ?> - -<!DOCTYPE html> -<html lang="fr"> -<head> - <meta charset="UTF-8"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <meta http-equiv="X-UA-Compatible" content="ie=edge"> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/admin.css"> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/fonts-import.css"> - <link rel="stylesheet" href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/css/ui.css"> - <title>Neutron</title> -</head> -<body> - <div id="settings" class="centered"> - <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/resetted.png" height="64px" width="64px"> - <p><a href="<?= $GLOBALS["SYSTEM_ROOT"] ?>/" class="button">OK</a></p> - </div> -</body> -</html>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/stats/index.php b/Neutron-trunk/cms-special/admin/stats/index.php index 81b4b69..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/stats/index.php +++ b/Neutron-trunk/cms-special/admin/stats/index.php @@ -1,280 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php $pageConfig = [ "domName" => "Statistiques", "headerName" => "Statistiques" ]; require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?> -<?php if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats")) { echo("<h2>" . $lang["admin-stats"]["new"] . "</h2><p>" . $lang["admin-stats"]["notice"] . "</p>"); } ?> -<?php - -function gystat($year, $month, $showYear = false) { - global $lang; - - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/newstats/" . $year . "/" . $month)) { - - $files = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/newstats/" . $year . "/" . $month); - $cmonth = 0; - foreach ($files as $file) { - if ($file != "." && $file != "..") { - $count = count(explode("\n", trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/newstats/" . $year . "/" . $month . "/" . $file)))); - if ($count > 0) { - $cmonth = $cmonth + $count; - } - } - } - - if ($cmonth > 0) { - if ($cmonth > 1) { - if ($showYear) { - echo("<tr><td><b>{$lang["admin-stats"]["months"][$month - 1]} {$year}{$lang["admin-stats"]["separator"]}</b></td><td> {$cmonth}</td><td> {$lang["admin-stats"]["visits2"]}</td></tr>"); - } else { - echo("<tr><td><b>{$lang["admin-stats"]["months"][$month - 1]}{$lang["admin-stats"]["separator"]}</b></td><td> {$cmonth}</td><td> {$lang["admin-stats"]["visits2"]}</td></tr>"); - } - } else { - if ($showYear) { - echo("<tr><td><b>{$lang["admin-stats"]["months"][$month - 1]} {$year}{$lang["admin-stats"]["separator"]}</b></td><td> {$cmonth}</td><td> {$lang["admin-stats"]["visit1"]}</td></tr>"); - } else { - echo("<tr><td><b>{$lang["admin-stats"]["months"][$month - 1]}{$lang["admin-stats"]["separator"]}</b></td><td> {$cmonth}</td><td> {$lang["admin-stats"]["visit1"]}</td></tr>"); - } - } - } - } -} - -?> -<h3><?= $lang["admin-stats"]["thisMonth"]?></h3> -<table> - <tbody> - <?php - - if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/newstats/" . date('Y') . "/" . date('m'))) { - $mtxt = $lang["admin-stats"]["monthslc"][date('m') - 1]; - - $files = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/newstats/" . date('Y') . "/" . date('m')); - foreach ($files as $file) { - if ($file != "." && $file != "..") { - $count = count(explode("\n", trim(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/newstats/" . date('Y') . "/" . date('m') . "/" . $file)))); - if ($count > 0) { - $day = (int)trim($file); - if ($count > 1) { - echo("<tr><td><b>{$day} {$mtxt}{$lang["admin-stats"]["separator"]}</b></td><td> {$count}</td><td> {$lang["admin-stats"]["visits2"]}</td></tr>"); - } else { - echo("<tr><td><b>{$day} {$mtxt}{$lang["admin-stats"]["separator"]}</b></td><td> {$count}</td><td> {$lang["admin-stats"]["visit1"]}</td></tr>"); - } - } - } - } - } - - ?> - </tbody> -</table> - -<h3><?= $lang["admin-stats"]["year"]?></h3> -<table> - <tbody> - <?php - - gystat(date('Y'), "01", false); - gystat(date('Y'), "02", false); - gystat(date('Y'), "03", false); - gystat(date('Y'), "04", false); - gystat(date('Y'), "05", false); - gystat(date('Y'), "06", false); - gystat(date('Y'), "07", false); - gystat(date('Y'), "08", false); - gystat(date('Y'), "09", false); - gystat(date('Y'), "10", false); - gystat(date('Y'), "11", false); - gystat(date('Y'), "12", false); - - ?> - </tbody> -</table> - -<h3><?= $lang["admin-stats"]["last2"]?><?= date('Y') - 1 ?></h3> -<table> - <tbody> - <?php - - gystat(date('Y') - 1, "1", true); - gystat(date('Y') - 1, "2", true); - gystat(date('Y') - 1, "3", true); - gystat(date('Y') - 1, "4", true); - gystat(date('Y') - 1, "5", true); - gystat(date('Y') - 1, "6", true); - gystat(date('Y') - 1, "7", true); - gystat(date('Y') - 1, "8", true); - gystat(date('Y') - 1, "9", true); - gystat(date('Y') - 1, "10", true); - gystat(date('Y') - 1, "11", true); - gystat(date('Y') - 1, "12", true); - - ?> - </tbody> -</table> - -<?php if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats")): ?> -<hr style="border-top:none;"> -<h2><?= $lang["admin-stats"]["old"] ?></h2> -<p><?= $lang["admin-stats"]["notice"] ?></p> - <h3><?= $lang["admin-stats"]["thisMonth"]?></h3> -<table><tbody><?php - -$dates = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats"); -foreach ($dates as $date) { - if ($date != "." && $date != "..") { - if (startsWith($date, date("Y-m-"))) { - $newdate = str_replace(date("Y-m-"), "", $date); - $newdatestr = $newdate . date("/m/Y"); - echo("<tr><td><b>{$newdatestr}{$lang["admin-stats"]["separator"]}</b></td><td>" . file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $date) . "</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - } - } -} - -?> -</tbody></table> - <h3><?= $lang["admin-stats"]["year"] ?></h3> - <table> - <tbody> - <?php - - $visits = []; - $visits['01'] = 0; - $visits['02'] = 0; - $visits['03'] = 0; - $visits['04'] = 0; - $visits['05'] = 0; - $visits['06'] = 0; - $visits['07'] = 0; - $visits['08'] = 0; - $visits['09'] = 0; - $visits['10'] = 0; - $visits['11'] = 0; - $visits['12'] = 0; - $lists = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats"); - foreach ($lists as $list) { - if (startsWith($list, date("Y") . "-01")) { - $visits['01'] = $visits['01'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, date("Y") . "-02")) { - $visits['02'] = $visits['02'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, date("Y") . "-03")) { - $visits['03'] = $visits['03'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, date("Y") . "-04")) { - $visits['04'] = $visits['04'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, date("Y") . "-05")) { - $visits['05'] = $visits['05'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, date("Y") . "-06")) { - $visits['06'] = $visits['06'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, date("Y") . "-07")) { - $visits['07'] = $visits['07'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, date("Y") . "-08")) { - $visits['08'] = $visits['08'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, date("Y") . "-09")) { - $visits['09'] = $visits['09'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, date("Y") . "-10")) { - $visits['10'] = $visits['10'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, date("Y") . "-11")) { - $visits['11'] = $visits['11'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, date("Y") . "-12")) { - $visits['12'] = $visits['12'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - } - - echo("<tr><td><b>{$lang["admin-stats"]["months"][0]}{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['01']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][1]}{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['02']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][2]}{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['03']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][3]}{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['04']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][4]}{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['05']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][5]}{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['06']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][6]}{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['07']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][7]}{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['08']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][8]}{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['09']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][9]}{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['10']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][10]}{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['11']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][11]}{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['12']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - ?> - </tbody> - </table> - <h3><?= $lang["admin-stats"]["last"] ?></h3> - <table> - <tbody> - <?php - - $visits = []; - $visits['01'] = 0; - $visits['02'] = 0; - $visits['03'] = 0; - $visits['04'] = 0; - $visits['05'] = 0; - $visits['06'] = 0; - $visits['07'] = 0; - $visits['08'] = 0; - $visits['09'] = 0; - $visits['10'] = 0; - $visits['11'] = 0; - $visits['12'] = 0; - $lists = scandir($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats"); - foreach ($lists as $list) { - if (startsWith($list, ((int)date("Y") - 1) . "-01")) { - $visits['01'] = $visits['01'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, ((int)date("Y") - 1) . "-02")) { - $visits['02'] = $visits['02'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, ((int)date("Y") - 1) . "-03")) { - $visits['03'] = $visits['03'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, ((int)date("Y") - 1) . "-04")) { - $visits['04'] = $visits['04'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, ((int)date("Y") - 1) . "-05")) { - $visits['05'] = $visits['05'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, ((int)date("Y") - 1) . "-06")) { - $visits['06'] = $visits['06'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, ((int)date("Y") - 1) . "-07")) { - $visits['07'] = $visits['07'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, ((int)date("Y") - 1) . "-08")) { - $visits['08'] = $visits['08'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, ((int)date("Y") - 1) . "-09")) { - $visits['09'] = $visits['09'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, ((int)date("Y") - 1) . "-10")) { - $visits['10'] = $visits['10'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, ((int)date("Y") - 1) . "-11")) { - $visits['11'] = $visits['11'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - if (startsWith($list, ((int)date("Y") - 1) . "-12")) { - $visits['12'] = $visits['12'] + (int)file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent/stats/" . $list); - } - } - - echo("<tr><td><b>{$lang["admin-stats"]["months"][0]} " . ((int)date("Y") - 1) . "{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['01']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][1]} " . ((int)date("Y") - 1) . "{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['02']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][2]} " . ((int)date("Y") - 1) . "{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['03']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][3]} " . ((int)date("Y") - 1) . "{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['04']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][4]} " . ((int)date("Y") - 1) . "{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['05']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][5]} " . ((int)date("Y") - 1) . "{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['06']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][6]} " . ((int)date("Y") - 1) . "{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['07']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][7]} " . ((int)date("Y") - 1) . "{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['08']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][8]} " . ((int)date("Y") - 1) . "{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['09']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][9]} " . ((int)date("Y") - 1) . "{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['10']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][10]} " . ((int)date("Y") - 1) . "{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['11']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - echo("<tr><td><b>{$lang["admin-stats"]["months"][11]} " . ((int)date("Y") - 1) . "{$lang["admin-stats"]["separator"]}</b></td><td>{$visits['12']}</td><td> {$lang["admin-stats"]["visits"]}</td></tr>"); - ?> - </tbody> - </table> - <?php endif; ?> -<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/cms-special/admin/\$resources/precontent.php"; ?>
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/admin/widgets/index.php b/Neutron-trunk/cms-special/admin/widgets/index.php index ed6d9db..e977d90 100755..100644 --- a/Neutron-trunk/cms-special/admin/widgets/index.php +++ b/Neutron-trunk/cms-special/admin/widgets/index.php @@ -1,5 +1,2 @@ <?php require_once "../../../resources/private/relative.php"; getRelativeDetails("cms-special"); ?> -<?php - -header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin/plugins"); -require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php";quit();
\ No newline at end of file +<?php header("Location: {$GLOBALS["SYSTEM_ROOT"]}/cms-special/admin-v2"); require $_SERVER['DOCUMENT_ROOT'] . "/api/electrode/quit.php"; quit(); ?>
\ No newline at end of file diff --git a/Neutron-trunk/cms-special/calendar/index.php b/Neutron-trunk/cms-special/calendar/index.php index 8843961..8843961 100755..100644 --- a/Neutron-trunk/cms-special/calendar/index.php +++ b/Neutron-trunk/cms-special/calendar/index.php diff --git a/Neutron-trunk/cms-special/error/index.php b/Neutron-trunk/cms-special/error/index.php index 3983bc7..3983bc7 100755..100644 --- a/Neutron-trunk/cms-special/error/index.php +++ b/Neutron-trunk/cms-special/error/index.php diff --git a/Neutron-trunk/cms-special/galery/index.php b/Neutron-trunk/cms-special/galery/index.php index 5a50af5..5a50af5 100755..100644 --- a/Neutron-trunk/cms-special/galery/index.php +++ b/Neutron-trunk/cms-special/galery/index.php diff --git a/Neutron-trunk/cms-special/galery/preview/index.php b/Neutron-trunk/cms-special/galery/preview/index.php index 945adf8..945adf8 100755..100644 --- a/Neutron-trunk/cms-special/galery/preview/index.php +++ b/Neutron-trunk/cms-special/galery/preview/index.php diff --git a/Neutron-trunk/cms-special/gallery/index.php b/Neutron-trunk/cms-special/gallery/index.php index 3fe2fad..3fe2fad 100755..100644 --- a/Neutron-trunk/cms-special/gallery/index.php +++ b/Neutron-trunk/cms-special/gallery/index.php diff --git a/Neutron-trunk/cms-special/gallery/preview/index.php b/Neutron-trunk/cms-special/gallery/preview/index.php index e033cc0..e033cc0 100755..100644 --- a/Neutron-trunk/cms-special/gallery/preview/index.php +++ b/Neutron-trunk/cms-special/gallery/preview/index.php diff --git a/Neutron-trunk/cms-special/setup/index.php b/Neutron-trunk/cms-special/setup/index.php index d17d5a6..5055510 100755..100644 --- a/Neutron-trunk/cms-special/setup/index.php +++ b/Neutron-trunk/cms-special/setup/index.php @@ -62,11 +62,13 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent")) { </script>' ?> <script src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/js/jquery.js"></script> <div class="centered box hide" id="00-error"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/error.png" alt="" height="64px"> <h2 id="00-error-title"><?= $lang['setup']['defaulterr'][0] ?></h2> <span id="00-error-message"><?= $lang['setup']['defaulterr'][1] ?></span><br><br> <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/config_restart.svg" onclick="reloadPage()" class="icon_button"><br><small><?= $lang['setup']['defaulterr'][2] ?></small> </div> <div class="centered box<?= $nolang ? "" : " hide" ?>" id="00-language"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/language.png" alt="" height="64px"> <h2>Neutron</h2> <p> <select id="00-language-select"> @@ -89,14 +91,17 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent")) { <input type="button" value="OK" onclick="location.href = '?lang=' + document.getElementById('00-language-select').value"> </div> <div class="centered box<?= $nolang ? " hide" : "" ?>" id="01-loader"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/init.png" alt="" height="64px"> <h2><?= $lang['setup']['sections'][0] ?></h2> <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/storeloader.svg" class="loader"> </div> <div class="centered box hide" id="02-check"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/check.png" alt="" height="64px"> <h2><?= $lang['setup']['sections'][1] ?></h2> <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/storeloader.svg" class="loader"> </div> <div class="centered box hide" id="03-welcome"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/welcome.png" alt="" height="64px"> <h2><?= $lang['setup']['sections'][2] ?></h2> <p><?= $lang['setup']['welcome'][0] ?></p> <p><?= $lang['setup']['welcome'][1] ?></p> @@ -104,13 +109,15 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent")) { <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/config_next.svg" onclick="document.title = '<?= $lang["setup"]["steps"][7] . " - " . $lang["setup"]["ititle"] ?> - Neutron';switchPage('03-welcome', '04-name');" class="icon_button"><br><small><?= $lang['setup']['links'][4] ?></small> </div> <div class="centered box hide" id="04-name"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/name.png" alt="" height="64px"> <h2><?= $lang['setup']['sections'][3] ?></h2> <p><?= $lang['setup']['name'][0] ?></p> <p><?= $lang['setup']['name'][1] ?></p> - <input id="04-name-field" type="text" onchange="validateName()" onkeyup="validateName()" onkeydown="validateName()" placeholder="Nom de votre site"><br><p id="04-name-tip" class="tip-red"><?= $lang['setup']['sitename'][0] ?></p> + <input id="04-name-field" type="text" onchange="validateName()" onkeyup="validateName()" onkeydown="validateName()" placeholder="<?= $lang["admin-housekeeping"]["confirmboxph"] ?>"><br><p id="04-name-tip" class="tip-red"><?= $lang['setup']['sitename'][0] ?></p> <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/config_next.svg" onclick="Name_ChangeIfOk()" class="icon_button"><br><small><?= $lang['setup']['links'][3] ?></small> </div> <div class="centered box hide" id="05-icon"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/icon.png" alt="" height="64px"> <h2><?= $lang['setup']['sections'][4] ?></h2> <p><?= $lang['setup']['logo'][0] ?></p> <p><?= $lang['setup']['logo'][1] ?></p> @@ -118,34 +125,41 @@ if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/data/webcontent")) { <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/config_next.svg" onclick="document.title = '<?= $lang["setup"]["steps"][8] . " - " . $lang["setup"]["ititle"] ?> - Neutron';switchPage('05-icon', '06-terms');" class="icon_button"><br><small><?= $lang['setup']['links'][3] ?></small> </div> <div class="centered box hide" id="06-terms"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/software-license.png" alt="" height="64px"> <h2><?= $lang['setup']['sections'][5] ?></h2> <p><?= $lang['setup']['license'] ?></p> <iframe class="termsbox" src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/lib/license.html" style="width:100%;"></iframe><br><br> <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/config_next.svg" onclick="document.title = '<?= $lang["setup"]["steps"][9] . " - " . $lang["setup"]["ititle"] ?> - Neutron';switchPage('06-terms', '07-finish');" class="icon_button"><br><small><?= $lang['setup']['links'][2] ?></small> </div> <div class="centered box hide" id="07-finish"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/finish.png" alt="" height="64px"> <h2><?= $lang['setup']['sections'][6] ?></h2> <p><?= $lang['setup']['confirm'][0] ?></p> <p><?= $lang['setup']['confirm'][1] ?></p> <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/config_finish.svg" onclick="upload()" class="icon_button"><br><small><?= $lang['setup']['links'][1] ?></small> </div> <div class="centered box hide" id="08-checking"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/installing.png" alt="" height="64px"> <h2><?= $lang['setup']['upload'][0] ?></h2> <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/storeloader.svg" class="finisher loadblink"><br><br><small><?= $lang['setup']['warning'][0] ?><br><?= $lang['setup']['warning'][1] ?></small> </div> <div class="centered box hide" id="09-uploading"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/installing.png" alt="" height="64px"> <h2><?= $lang['setup']['upload'][1] ?></h2> <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/storeloader.svg" class="finisher loadblink"><br><br><small><?= $lang['setup']['warning'][0] ?><br><?= $lang['setup']['warning'][1] ?></small> </div> <div class="centered box hide" id="10-summing"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/installing.png" alt="" height="64px"> <h2><?= $lang['setup']['upload'][2] ?></h2> <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/storeloader.svg" class="finisher loadblink"><br><br><small><?= $lang['setup']['warning'][0] ?><br><?= $lang['setup']['warning'][1] ?></small> </div> <div class="centered box hide" id="11-performance"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/installing.png" alt="" height="64px"> <h2><?= $lang['setup']['upload'][3] ?></h2> <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/storeloader.svg" class="finisher loadblink"><br><br><small><?= $lang['setup']['warning'][0] ?><br><?= $lang['setup']['warning'][1] ?></small> </div> <div class="centered box hide" id="12-done"> + <img src="<?= $GLOBALS["SYSTEM_ROOT"] ?>/resources/image/oobe/ready.png" alt="" height="64px"> <h2><?= $lang['setup']['done'][0] ?></h2> <p><?= $lang['setup']['done'][1] ?></p> <p><?= $lang['setup']['done'][2] ?> <b>MPCMS-usr-motdepasse</b><?= $lang['setup']['done'][3] ?></p> diff --git a/Neutron-trunk/cms-special/version/index.php b/Neutron-trunk/cms-special/version/index.php index 840de2d..d6d1046 100755..100644 --- a/Neutron-trunk/cms-special/version/index.php +++ b/Neutron-trunk/cms-special/version/index.php @@ -18,7 +18,7 @@ if (file_exists($GLOBALS["ORIGINAL_DOCUMENT_ROOT"] . "/NeutronCloud") && is_file if (isset($__electrode) && isset($__electrode_version) && isset($__electrode_node_version)) { buffer("Electrode " . $__electrode_version . ", NodeJS " . $__electrode_node_version . ", Neutron Cloud)"); } else { - buffer("Neutron Cloud)"); + buffer("Neutron Cloud, " . "PHP " . PHP_VERSION . ", " . php_uname('s') . " " . php_uname('m') . " " . php_uname('r') . ")"); } } else { buffer("PHP " . PHP_VERSION . ", " . php_uname('s') . " " . php_uname('m') . " " . php_uname('r') . ")"); diff --git a/Neutron-trunk/count-code.php b/Neutron-trunk/count-code.php index 21a5c82..21a5c82 100755..100644 --- a/Neutron-trunk/count-code.php +++ b/Neutron-trunk/count-code.php diff --git a/Neutron-trunk/data/.htaccess b/Neutron-trunk/data/.htaccess index 2c73686..2c73686 100755..100644 --- a/Neutron-trunk/data/.htaccess +++ b/Neutron-trunk/data/.htaccess diff --git a/Neutron-trunk/index.php b/Neutron-trunk/index.php index f1e8ebb..f1e8ebb 100755..100644 --- a/Neutron-trunk/index.php +++ b/Neutron-trunk/index.php diff --git a/Neutron-trunk/replace.php b/Neutron-trunk/replace.php index 2908207..2908207 100755..100644 --- a/Neutron-trunk/replace.php +++ b/Neutron-trunk/replace.php diff --git a/Neutron-trunk/resources/.htaccess b/Neutron-trunk/resources/.htaccess index bc839cb..bc839cb 100755..100644 --- a/Neutron-trunk/resources/.htaccess +++ b/Neutron-trunk/resources/.htaccess diff --git a/Neutron-trunk/resources/css/admin.css b/Neutron-trunk/resources/css/admin.css index 4179490..452fc9b 100755..100644 --- a/Neutron-trunk/resources/css/admin.css +++ b/Neutron-trunk/resources/css/admin.css @@ -701,4 +701,25 @@ html { left: 0 !important; right: 0 !important; position: fixed !important; +} + +#logs { + background: #15151573; + border-radius: 2px; + border-color: #00000038; +} + +.mdc-card { + border-color: #e0e0e014; + background-color: rgba(44, 44, 44, .58); +} + +.reset-option { + border-color: #00000038; + border-radius: 5px; + background: #0000004a; +} + +.reset-option:hover { + background: rgba(0, 0, 0, 0.56); }
\ No newline at end of file diff --git a/Neutron-trunk/resources/css/admin_v2/chromium.css b/Neutron-trunk/resources/css/admin_v2/chromium.css index 19dab45..95a694e 100755..100644 --- a/Neutron-trunk/resources/css/admin_v2/chromium.css +++ b/Neutron-trunk/resources/css/admin_v2/chromium.css @@ -4,5 +4,5 @@ main { } .bg { - background-image: var(--mpcms-banner); + background-image: url("../../../resources/image/codename.jpg"); }
\ No newline at end of file diff --git a/Neutron-trunk/resources/css/admin_v2/iframe.css b/Neutron-trunk/resources/css/admin_v2/iframe.css index de31677..de31677 100755..100644 --- a/Neutron-trunk/resources/css/admin_v2/iframe.css +++ b/Neutron-trunk/resources/css/admin_v2/iframe.css diff --git a/Neutron-trunk/resources/css/admin_v2/inner.css b/Neutron-trunk/resources/css/admin_v2/inner.css index 8c928a1..7fad334 100755..100644 --- a/Neutron-trunk/resources/css/admin_v2/inner.css +++ b/Neutron-trunk/resources/css/admin_v2/inner.css @@ -34,6 +34,7 @@ body { background-color: rgba(0, 0, 0, .5); border-radius: 10px; padding: 10px 20px; + margin-bottom: 10px; display: grid; cursor: default; grid-template-columns: 32px 1fr 32px; diff --git a/Neutron-trunk/resources/css/admin_v2/main.css b/Neutron-trunk/resources/css/admin_v2/main.css index de75268..de75268 100755..100644 --- a/Neutron-trunk/resources/css/admin_v2/main.css +++ b/Neutron-trunk/resources/css/admin_v2/main.css diff --git a/Neutron-trunk/resources/css/admin_v2/navigation.css b/Neutron-trunk/resources/css/admin_v2/navigation.css index e3d93d1..e45e54f 100755..100644 --- a/Neutron-trunk/resources/css/admin_v2/navigation.css +++ b/Neutron-trunk/resources/css/admin_v2/navigation.css @@ -48,4 +48,84 @@ .nav-item:not(.selected):focus, .nav-item:not(.selected):active { background: rgba(200, 200, 200, .25); +} + +.main-title-home { + top: -6px; + filter: invert(1); + width: 24px; + display: inline-block; + left: 2px; + position: relative; +} + +.main-title-home-outer { + display: none; + height: 28px; + display: inline-block; + padding: 2px; + width: 28px; + position: relative; + top: 8px; + border-radius: 5px; +} + +.main-title-home-outer:hover { + background: rgba(0, 0, 0, .5); +} + +.main-title-home-outer:active, .main-title-home-outer:focus { + background: rgba(0, 0, 0, .75); +} + +#nav-header { + border-radius: 5px; + margin: 20px 20px; + text-decoration: none; + padding: 10px 10px; + cursor: default; +} + +#nav-header:focus, #nav-header:active { + background: rgba(200, 200, 200, .25) !important; +} + +#nav-header:hover { + background: rgba(200, 200, 200, .1); +} + +@media (max-width: 700px) { + #nav-header-names-outer { + display: none !important; + } + + aside { + width: 64px !important; + } + + .nav-item-name { + display: none !important; + } + + .nav-item { + width: 45px !important; + } + + #main-content { + left: 64px !important; + top: 0 !important; + bottom: 0 !important; + right: 0 !important; + margin: 30px 20px !important; + } + + #nav-header-icon { + width: 32px !important; + height: 32px !important; + } + + #nav-header { + grid-template-columns: 32px 1fr !important; + margin: 5px 5px !important; + } }
\ No newline at end of file diff --git a/Neutron-trunk/resources/css/admin_widgets.css b/Neutron-trunk/resources/css/admin_widgets.css index 17b5719..17b5719 100755..100644 --- a/Neutron-trunk/resources/css/admin_widgets.css +++ b/Neutron-trunk/resources/css/admin_widgets.css diff --git a/Neutron-trunk/resources/css/ajax.css b/Neutron-trunk/resources/css/ajax.css index 1546df1..1546df1 100755..100644 --- a/Neutron-trunk/resources/css/ajax.css +++ b/Neutron-trunk/resources/css/ajax.css diff --git a/Neutron-trunk/resources/css/alerts.css b/Neutron-trunk/resources/css/alerts.css index 12dc0fd..12dc0fd 100755..100644 --- a/Neutron-trunk/resources/css/alerts.css +++ b/Neutron-trunk/resources/css/alerts.css diff --git a/Neutron-trunk/resources/css/codename.css b/Neutron-trunk/resources/css/codename.css index 9997736..5d28175 100755..100644 --- a/Neutron-trunk/resources/css/codename.css +++ b/Neutron-trunk/resources/css/codename.css @@ -1,5 +1,5 @@ :root { - --codename-theme: #8b7832; - --codename-secondary: #52410e; - --codename-light: #c2ac3e; + --codename-theme: #32818b; + --codename-secondary: #0e4a52; + --codename-light: #a2e2e8; }
\ No newline at end of file diff --git a/Neutron-trunk/resources/css/error.css b/Neutron-trunk/resources/css/error.css index 19cabbc..19cabbc 100755..100644 --- a/Neutron-trunk/resources/css/error.css +++ b/Neutron-trunk/resources/css/error.css diff --git a/Neutron-trunk/resources/css/fonts-import.css b/Neutron-trunk/resources/css/fonts-import.css index ca69eac..ca69eac 100755..100644 --- a/Neutron-trunk/resources/css/fonts-import.css +++ b/Neutron-trunk/resources/css/fonts-import.css diff --git a/Neutron-trunk/resources/css/main.css b/Neutron-trunk/resources/css/main.css index e6047b6..e6047b6 100755..100644 --- a/Neutron-trunk/resources/css/main.css +++ b/Neutron-trunk/resources/css/main.css diff --git a/Neutron-trunk/resources/css/polymer/content.css b/Neutron-trunk/resources/css/polymer/content.css index 7bdc471..7bdc471 100755..100644 --- a/Neutron-trunk/resources/css/polymer/content.css +++ b/Neutron-trunk/resources/css/polymer/content.css diff --git a/Neutron-trunk/resources/css/polymer/dark.css b/Neutron-trunk/resources/css/polymer/dark.css index de1f9a7..de1f9a7 100755..100644 --- a/Neutron-trunk/resources/css/polymer/dark.css +++ b/Neutron-trunk/resources/css/polymer/dark.css diff --git a/Neutron-trunk/resources/css/polymer/fonts.css b/Neutron-trunk/resources/css/polymer/fonts.css index 98057ed..98057ed 100755..100644 --- a/Neutron-trunk/resources/css/polymer/fonts.css +++ b/Neutron-trunk/resources/css/polymer/fonts.css diff --git a/Neutron-trunk/resources/css/polymer/gallery.css b/Neutron-trunk/resources/css/polymer/gallery.css index d4dccac..d4dccac 100755..100644 --- a/Neutron-trunk/resources/css/polymer/gallery.css +++ b/Neutron-trunk/resources/css/polymer/gallery.css diff --git a/Neutron-trunk/resources/css/polymer/menubar.css b/Neutron-trunk/resources/css/polymer/menubar.css index ba291fa..ba291fa 100755..100644 --- a/Neutron-trunk/resources/css/polymer/menubar.css +++ b/Neutron-trunk/resources/css/polymer/menubar.css diff --git a/Neutron-trunk/resources/css/polymer/responsive.css b/Neutron-trunk/resources/css/polymer/responsive.css index 2c4535b..2c4535b 100755..100644 --- a/Neutron-trunk/resources/css/polymer/responsive.css +++ b/Neutron-trunk/resources/css/polymer/responsive.css diff --git a/Neutron-trunk/resources/css/polymer/scrollbars.css b/Neutron-trunk/resources/css/polymer/scrollbars.css index 522cfd5..522cfd5 100755..100644 --- a/Neutron-trunk/resources/css/polymer/scrollbars.css +++ b/Neutron-trunk/resources/css/polymer/scrollbars.css diff --git a/Neutron-trunk/resources/css/polymer/warnings.css b/Neutron-trunk/resources/css/polymer/warnings.css index 05b25b6..05b25b6 100755..100644 --- a/Neutron-trunk/resources/css/polymer/warnings.css +++ b/Neutron-trunk/resources/css/polymer/warnings.css diff --git a/Neutron-trunk/resources/css/preview.css b/Neutron-trunk/resources/css/preview.css index 91ab1aa..91ab1aa 100755..100644 --- a/Neutron-trunk/resources/css/preview.css +++ b/Neutron-trunk/resources/css/preview.css diff --git a/Neutron-trunk/resources/css/ready.css b/Neutron-trunk/resources/css/ready.css index df489ba..df489ba 100755..100644 --- a/Neutron-trunk/resources/css/ready.css +++ b/Neutron-trunk/resources/css/ready.css diff --git a/Neutron-trunk/resources/css/setup.css b/Neutron-trunk/resources/css/setup.css index 66e7961..bc63787 100755..100644 --- a/Neutron-trunk/resources/css/setup.css +++ b/Neutron-trunk/resources/css/setup.css @@ -80,4 +80,23 @@ h1, h2, h3, h4, h5, h6 { .update-cancel:active { background: gray; border-color: black; +} + +.box { + display: block; + box-shadow: none; + backdrop-filter: blur(10px); + background: rgba(0, 0, 0, .5); + color: white; +} + +.loader, .finisher { + filter: none; +} + +.termsbox { + background: rgba(0, 0, 0, .5); + border: none; + border-radius: 5px; + box-shadow: none; }
\ No newline at end of file diff --git a/Neutron-trunk/resources/css/spotlight.css b/Neutron-trunk/resources/css/spotlight.css index ca72fd6..ca72fd6 100755..100644 --- a/Neutron-trunk/resources/css/spotlight.css +++ b/Neutron-trunk/resources/css/spotlight.css diff --git a/Neutron-trunk/resources/css/themes/blue-auto.css b/Neutron-trunk/resources/css/themes/blue-auto.css index 05864eb..05864eb 100755..100644 --- a/Neutron-trunk/resources/css/themes/blue-auto.css +++ b/Neutron-trunk/resources/css/themes/blue-auto.css diff --git a/Neutron-trunk/resources/css/themes/blue-dark.css b/Neutron-trunk/resources/css/themes/blue-dark.css index 7285ad4..7285ad4 100755..100644 --- a/Neutron-trunk/resources/css/themes/blue-dark.css +++ b/Neutron-trunk/resources/css/themes/blue-dark.css diff --git a/Neutron-trunk/resources/css/themes/blue-light.css b/Neutron-trunk/resources/css/themes/blue-light.css index b8ff9d7..b8ff9d7 100755..100644 --- a/Neutron-trunk/resources/css/themes/blue-light.css +++ b/Neutron-trunk/resources/css/themes/blue-light.css diff --git a/Neutron-trunk/resources/css/themes/brown-auto.css b/Neutron-trunk/resources/css/themes/brown-auto.css index 65ed947..65ed947 100755..100644 --- a/Neutron-trunk/resources/css/themes/brown-auto.css +++ b/Neutron-trunk/resources/css/themes/brown-auto.css diff --git a/Neutron-trunk/resources/css/themes/brown-dark.css b/Neutron-trunk/resources/css/themes/brown-dark.css index baaa3a9..baaa3a9 100755..100644 --- a/Neutron-trunk/resources/css/themes/brown-dark.css +++ b/Neutron-trunk/resources/css/themes/brown-dark.css diff --git a/Neutron-trunk/resources/css/themes/brown-light.css b/Neutron-trunk/resources/css/themes/brown-light.css index 4c83cb4..4c83cb4 100755..100644 --- a/Neutron-trunk/resources/css/themes/brown-light.css +++ b/Neutron-trunk/resources/css/themes/brown-light.css diff --git a/Neutron-trunk/resources/css/themes/green-auto.css b/Neutron-trunk/resources/css/themes/green-auto.css index ea9a940..ea9a940 100755..100644 --- a/Neutron-trunk/resources/css/themes/green-auto.css +++ b/Neutron-trunk/resources/css/themes/green-auto.css diff --git a/Neutron-trunk/resources/css/themes/green-dark.css b/Neutron-trunk/resources/css/themes/green-dark.css index b245c67..b245c67 100755..100644 --- a/Neutron-trunk/resources/css/themes/green-dark.css +++ b/Neutron-trunk/resources/css/themes/green-dark.css diff --git a/Neutron-trunk/resources/css/themes/green-light.css b/Neutron-trunk/resources/css/themes/green-light.css index 2aeba7c..2aeba7c 100755..100644 --- a/Neutron-trunk/resources/css/themes/green-light.css +++ b/Neutron-trunk/resources/css/themes/green-light.css diff --git a/Neutron-trunk/resources/css/themes/orange-auto.css b/Neutron-trunk/resources/css/themes/orange-auto.css index 59196ff..59196ff 100755..100644 --- a/Neutron-trunk/resources/css/themes/orange-auto.css +++ b/Neutron-trunk/resources/css/themes/orange-auto.css diff --git a/Neutron-trunk/resources/css/themes/orange-dark.css b/Neutron-trunk/resources/css/themes/orange-dark.css index 454e2f7..454e2f7 100755..100644 --- a/Neutron-trunk/resources/css/themes/orange-dark.css +++ b/Neutron-trunk/resources/css/themes/orange-dark.css diff --git a/Neutron-trunk/resources/css/themes/orange-light.css b/Neutron-trunk/resources/css/themes/orange-light.css index 8242e1b..8242e1b 100755..100644 --- a/Neutron-trunk/resources/css/themes/orange-light.css +++ b/Neutron-trunk/resources/css/themes/orange-light.css diff --git a/Neutron-trunk/resources/css/themes/purple-auto.css b/Neutron-trunk/resources/css/themes/purple-auto.css index b0e5dea..b0e5dea 100755..100644 --- a/Neutron-trunk/resources/css/themes/purple-auto.css +++ b/Neutron-trunk/resources/css/themes/purple-auto.css diff --git a/Neutron-trunk/resources/css/themes/purple-dark.css b/Neutron-trunk/resources/css/themes/purple-dark.css index 454e2f7..454e2f7 100755..100644 --- a/Neutron-trunk/resources/css/themes/purple-dark.css +++ b/Neutron-trunk/resources/css/themes/purple-dark.css diff --git a/Neutron-trunk/resources/css/themes/purple-light.css b/Neutron-trunk/resources/css/themes/purple-light.css index 09e4633..09e4633 100755..100644 --- a/Neutron-trunk/resources/css/themes/purple-light.css +++ b/Neutron-trunk/resources/css/themes/purple-light.css diff --git a/Neutron-trunk/resources/css/themes/red-auto.css b/Neutron-trunk/resources/css/themes/red-auto.css index 8419949..8419949 100755..100644 --- a/Neutron-trunk/resources/css/themes/red-auto.css +++ b/Neutron-trunk/resources/css/themes/red-auto.css diff --git a/Neutron-trunk/resources/css/themes/red-dark.css b/Neutron-trunk/resources/css/themes/red-dark.css index 824bd8f..824bd8f 100755..100644 --- a/Neutron-trunk/resources/css/themes/red-dark.css +++ b/Neutron-trunk/resources/css/themes/red-dark.css diff --git a/Neutron-trunk/resources/css/themes/red-light.css b/Neutron-trunk/resources/css/themes/red-light.css index 1c260ae..1c260ae 100755..100644 --- a/Neutron-trunk/resources/css/themes/red-light.css +++ b/Neutron-trunk/resources/css/themes/red-light.css diff --git a/Neutron-trunk/resources/css/themes/white-auto.css b/Neutron-trunk/resources/css/themes/white-auto.css index 954a4f2..954a4f2 100755..100644 --- a/Neutron-trunk/resources/css/themes/white-auto.css +++ b/Neutron-trunk/resources/css/themes/white-auto.css diff --git a/Neutron-trunk/resources/css/themes/white-dark.css b/Neutron-trunk/resources/css/themes/white-dark.css index ed8daa9..ed8daa9 100755..100644 --- a/Neutron-trunk/resources/css/themes/white-dark.css +++ b/Neutron-trunk/resources/css/themes/white-dark.css diff --git a/Neutron-trunk/resources/css/themes/white-light.css b/Neutron-trunk/resources/css/themes/white-light.css index abfd7e3..abfd7e3 100755..100644 --- a/Neutron-trunk/resources/css/themes/white-light.css +++ b/Neutron-trunk/resources/css/themes/white-light.css diff --git a/Neutron-trunk/resources/css/ui.css b/Neutron-trunk/resources/css/ui.css index 0fc04a7..0fc04a7 100755..100644 --- a/Neutron-trunk/resources/css/ui.css +++ b/Neutron-trunk/resources/css/ui.css diff --git a/Neutron-trunk/resources/fonts/body/Roboto-Black.ttf b/Neutron-trunk/resources/fonts/body/Roboto-Black.ttf Binary files differindex 2d45238..2d45238 100755..100644 --- a/Neutron-trunk/resources/fonts/body/Roboto-Black.ttf +++ b/Neutron-trunk/resources/fonts/body/Roboto-Black.ttf diff --git a/Neutron-trunk/resources/fonts/body/Roboto-BlackItalic.ttf b/Neutron-trunk/resources/fonts/body/Roboto-BlackItalic.ttf Binary files differindex 29a4359..29a4359 100755..100644 --- a/Neutron-trunk/resources/fonts/body/Roboto-BlackItalic.ttf +++ b/Neutron-trunk/resources/fonts/body/Roboto-BlackItalic.ttf diff --git a/Neutron-trunk/resources/fonts/body/Roboto-Bold.ttf b/Neutron-trunk/resources/fonts/body/Roboto-Bold.ttf Binary files differindex d998cf5..d998cf5 100755..100644 --- a/Neutron-trunk/resources/fonts/body/Roboto-Bold.ttf +++ b/Neutron-trunk/resources/fonts/body/Roboto-Bold.ttf diff --git a/Neutron-trunk/resources/fonts/body/Roboto-BoldItalic.ttf b/Neutron-trunk/resources/fonts/body/Roboto-BoldItalic.ttf Binary files differindex b4e2210..b4e2210 100755..100644 --- a/Neutron-trunk/resources/fonts/body/Roboto-BoldItalic.ttf +++ b/Neutron-trunk/resources/fonts/body/Roboto-BoldItalic.ttf diff --git a/Neutron-trunk/resources/fonts/body/Roboto-Italic.ttf b/Neutron-trunk/resources/fonts/body/Roboto-Italic.ttf Binary files differindex 5b390ff..5b390ff 100755..100644 --- a/Neutron-trunk/resources/fonts/body/Roboto-Italic.ttf +++ b/Neutron-trunk/resources/fonts/body/Roboto-Italic.ttf diff --git a/Neutron-trunk/resources/fonts/body/Roboto-Light.ttf b/Neutron-trunk/resources/fonts/body/Roboto-Light.ttf Binary files differindex 3526798..3526798 100755..100644 --- a/Neutron-trunk/resources/fonts/body/Roboto-Light.ttf +++ b/Neutron-trunk/resources/fonts/body/Roboto-Light.ttf diff --git a/Neutron-trunk/resources/fonts/body/Roboto-LightItalic.ttf b/Neutron-trunk/resources/fonts/body/Roboto-LightItalic.ttf Binary files differindex 46e9bf7..46e9bf7 100755..100644 --- a/Neutron-trunk/resources/fonts/body/Roboto-LightItalic.ttf +++ b/Neutron-trunk/resources/fonts/body/Roboto-LightItalic.ttf diff --git a/Neutron-trunk/resources/fonts/body/Roboto-Medium.ttf b/Neutron-trunk/resources/fonts/body/Roboto-Medium.ttf Binary files differindex f714a51..f714a51 100755..100644 --- a/Neutron-trunk/resources/fonts/body/Roboto-Medium.ttf +++ b/Neutron-trunk/resources/fonts/body/Roboto-Medium.ttf diff --git a/Neutron-trunk/resources/fonts/body/Roboto-MediumItalic.ttf b/Neutron-trunk/resources/fonts/body/Roboto-MediumItalic.ttf Binary files differindex 5dc6a2d..5dc6a2d 100755..100644 --- a/Neutron-trunk/resources/fonts/body/Roboto-MediumItalic.ttf +++ b/Neutron-trunk/resources/fonts/body/Roboto-MediumItalic.ttf diff --git a/Neutron-trunk/resources/fonts/body/Roboto-Regular.ttf b/Neutron-trunk/resources/fonts/body/Roboto-Regular.ttf Binary files differindex 2b6392f..2b6392f 100755..100644 --- a/Neutron-trunk/resources/fonts/body/Roboto-Regular.ttf +++ b/Neutron-trunk/resources/fonts/body/Roboto-Regular.ttf diff --git a/Neutron-trunk/resources/fonts/body/Roboto-Thin.ttf b/Neutron-trunk/resources/fonts/body/Roboto-Thin.ttf Binary files differindex 4e797cf..4e797cf 100755..100644 --- a/Neutron-trunk/resources/fonts/body/Roboto-Thin.ttf +++ b/Neutron-trunk/resources/fonts/body/Roboto-Thin.ttf diff --git a/Neutron-trunk/resources/fonts/body/Roboto-ThinItalic.ttf b/Neutron-trunk/resources/fonts/body/Roboto-ThinItalic.ttf Binary files differindex eea836f..eea836f 100755..100644 --- a/Neutron-trunk/resources/fonts/body/Roboto-ThinItalic.ttf +++ b/Neutron-trunk/resources/fonts/body/Roboto-ThinItalic.ttf diff --git a/Neutron-trunk/resources/fonts/font-bold-italic.ttf b/Neutron-trunk/resources/fonts/font-bold-italic.ttf Binary files differindex bdd22b0..bdd22b0 100755..100644 --- a/Neutron-trunk/resources/fonts/font-bold-italic.ttf +++ b/Neutron-trunk/resources/fonts/font-bold-italic.ttf diff --git a/Neutron-trunk/resources/fonts/font-bold.ttf b/Neutron-trunk/resources/fonts/font-bold.ttf Binary files differindex 96619df..96619df 100755..100644 --- a/Neutron-trunk/resources/fonts/font-bold.ttf +++ b/Neutron-trunk/resources/fonts/font-bold.ttf diff --git a/Neutron-trunk/resources/fonts/font-italic.ttf b/Neutron-trunk/resources/fonts/font-italic.ttf Binary files differindex 5b44037..5b44037 100755..100644 --- a/Neutron-trunk/resources/fonts/font-italic.ttf +++ b/Neutron-trunk/resources/fonts/font-italic.ttf diff --git a/Neutron-trunk/resources/fonts/font-regular.ttf b/Neutron-trunk/resources/fonts/font-regular.ttf Binary files differindex e2c69c3..e2c69c3 100755..100644 --- a/Neutron-trunk/resources/fonts/font-regular.ttf +++ b/Neutron-trunk/resources/fonts/font-regular.ttf diff --git a/Neutron-trunk/resources/i18n/en/$metadata.json b/Neutron-trunk/resources/i18n/en/$metadata.json index 9954d47..9954d47 100755..100644 --- a/Neutron-trunk/resources/i18n/en/$metadata.json +++ b/Neutron-trunk/resources/i18n/en/$metadata.json diff --git a/Neutron-trunk/resources/i18n/en/admin-about.json b/Neutron-trunk/resources/i18n/en/admin-about.json index 055b263..34fed00 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-about.json +++ b/Neutron-trunk/resources/i18n/en/admin-about.json @@ -54,5 +54,18 @@ "config": "Contents and configuration", "resources": "Photos and other resources", "misc": "Miscellaneous files" + }, + "new": { + "overview": "Overview", + "version": "Neutron Versions", + "system": "System Versions", + "types": [ + "Neutron Cloud, security and reliability assured, in a safe and simple environment", + "Neutron On-Premises, keep full control over your infrastructure" + ], + "renderer": [ + "Rendering engine version:", + "Render backwards compatibility layer version:" + ] } }
\ No newline at end of file diff --git a/Neutron-trunk/resources/i18n/en/admin-advanced-dev.json b/Neutron-trunk/resources/i18n/en/admin-advanced-dev.json index f1ca4a3..f1ca4a3 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-advanced-dev.json +++ b/Neutron-trunk/resources/i18n/en/admin-advanced-dev.json diff --git a/Neutron-trunk/resources/i18n/en/admin-advanced-home.json b/Neutron-trunk/resources/i18n/en/admin-advanced-home.json index 1b664e4..1b664e4 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-advanced-home.json +++ b/Neutron-trunk/resources/i18n/en/admin-advanced-home.json diff --git a/Neutron-trunk/resources/i18n/en/admin-appearance.json b/Neutron-trunk/resources/i18n/en/admin-appearance.json index 757af82..757af82 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-appearance.json +++ b/Neutron-trunk/resources/i18n/en/admin-appearance.json diff --git a/Neutron-trunk/resources/i18n/en/admin-calendar.json b/Neutron-trunk/resources/i18n/en/admin-calendar.json index 1578d19..1578d19 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-calendar.json +++ b/Neutron-trunk/resources/i18n/en/admin-calendar.json diff --git a/Neutron-trunk/resources/i18n/en/admin-customization.json b/Neutron-trunk/resources/i18n/en/admin-customization.json index c89cfb3..c89cfb3 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-customization.json +++ b/Neutron-trunk/resources/i18n/en/admin-customization.json diff --git a/Neutron-trunk/resources/i18n/en/admin-errors.json b/Neutron-trunk/resources/i18n/en/admin-errors.json index 4b46b7d..4b46b7d 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-errors.json +++ b/Neutron-trunk/resources/i18n/en/admin-errors.json diff --git a/Neutron-trunk/resources/i18n/en/admin-flags.json b/Neutron-trunk/resources/i18n/en/admin-flags.json index cd30666..cd30666 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-flags.json +++ b/Neutron-trunk/resources/i18n/en/admin-flags.json diff --git a/Neutron-trunk/resources/i18n/en/admin-gallery.json b/Neutron-trunk/resources/i18n/en/admin-gallery.json index dee3f09..dee3f09 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-gallery.json +++ b/Neutron-trunk/resources/i18n/en/admin-gallery.json diff --git a/Neutron-trunk/resources/i18n/en/admin-home.json b/Neutron-trunk/resources/i18n/en/admin-home.json index 2ad5cce..2ad5cce 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-home.json +++ b/Neutron-trunk/resources/i18n/en/admin-home.json diff --git a/Neutron-trunk/resources/i18n/en/admin-housekeeping.json b/Neutron-trunk/resources/i18n/en/admin-housekeeping.json index a21ed94..a21ed94 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-housekeeping.json +++ b/Neutron-trunk/resources/i18n/en/admin-housekeeping.json diff --git a/Neutron-trunk/resources/i18n/en/admin-login.json b/Neutron-trunk/resources/i18n/en/admin-login.json index ffd896d..ffd896d 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-login.json +++ b/Neutron-trunk/resources/i18n/en/admin-login.json diff --git a/Neutron-trunk/resources/i18n/en/admin-logs.json b/Neutron-trunk/resources/i18n/en/admin-logs.json index 6267f82..6267f82 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-logs.json +++ b/Neutron-trunk/resources/i18n/en/admin-logs.json diff --git a/Neutron-trunk/resources/i18n/en/admin-pages.json b/Neutron-trunk/resources/i18n/en/admin-pages.json index 7960631..7960631 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-pages.json +++ b/Neutron-trunk/resources/i18n/en/admin-pages.json diff --git a/Neutron-trunk/resources/i18n/en/admin-plugins.json b/Neutron-trunk/resources/i18n/en/admin-plugins.json index ab53970..ab53970 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-plugins.json +++ b/Neutron-trunk/resources/i18n/en/admin-plugins.json diff --git a/Neutron-trunk/resources/i18n/en/admin-stats.json b/Neutron-trunk/resources/i18n/en/admin-stats.json index 2d0d9b5..2d0d9b5 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-stats.json +++ b/Neutron-trunk/resources/i18n/en/admin-stats.json diff --git a/Neutron-trunk/resources/i18n/en/admin-titles.json b/Neutron-trunk/resources/i18n/en/admin-titles.json index b958c23..b958c23 100755..100644 --- a/Neutron-trunk/resources/i18n/en/admin-titles.json +++ b/Neutron-trunk/resources/i18n/en/admin-titles.json diff --git a/Neutron-trunk/resources/i18n/en/admin-v2.json b/Neutron-trunk/resources/i18n/en/admin-v2.json new file mode 100644 index 0000000..defe253 --- /dev/null +++ b/Neutron-trunk/resources/i18n/en/admin-v2.json @@ -0,0 +1,77 @@ +{ + "on-premises": "On-Premises", + "drawer": [ + "System", + "Content", + "Personalization", + "Features", + "Accounts", + "Region & language", + "Data & security", + "Advanced options", + "Neutron Cloud", + "Electrode Server" + ], + "system_items": [ + "About Neutron", + "Audit Logs", + "Manage Version", + "Logout" + ], + "system_descriptions": [ + "View Neutron software versions and data usage", + "View the list of accesses to pages and administration", + "Re-download Neutron to install a newer or older version", + "Safely and simply log out of the administration panel" + ], + "content_items": [ + "Pages", + "Gallery", + "Calendar" + ], + "content_descriptions": [ + "Create, edit, rename and delete your website's pages", + "Upload, categorize and delete your website's gallery photos", + "Create, change or delete calendar events" + ], + "personalization_items": [ + "Branding", + "Colour", + "Footer & legal" + ], + "personalization_descriptions": [ + "Logo, banner and website name", + "Switch between light and dark theme, and change the general theme", + "Place your website's legal notices in the footer" + ], + "features_items": [ + "Optional features", + "Experimental settings" + ], + "features_descriptions": [ + "Enable additional features that extend what you can do with Neutron", + "Settings that are experimental and that may make your website unstable" + ], + "accounts_items": [ + "Password", + "Administrator Access" + ], + "accounts_descriptions": [ + "Change the password you use to login to this website", + "See how and what system administrators can see from your website" + ], + "security_items": [ + "Extended configuration", + "Statistics" + ], + "security_descriptions": [ + "Website hardening and advanced customization options", + "Informations about the number of view to your website" + ], + "maintenance_items": [ + "Reset options" + ], + "maintenance_descriptions": [ + "Reset your website to the defaults or repair it" + ] +}
\ No newline at end of file diff --git a/Neutron-trunk/resources/i18n/en/api.json b/Neutron-trunk/resources/i18n/en/api.json index 41631af..41631af 100755..100644 --- a/Neutron-trunk/resources/i18n/en/api.json +++ b/Neutron-trunk/resources/i18n/en/api.json diff --git a/Neutron-trunk/resources/i18n/en/calendar.json b/Neutron-trunk/resources/i18n/en/calendar.json index 4077f5a..4077f5a 100755..100644 --- a/Neutron-trunk/resources/i18n/en/calendar.json +++ b/Neutron-trunk/resources/i18n/en/calendar.json diff --git a/Neutron-trunk/resources/i18n/en/editor.json b/Neutron-trunk/resources/i18n/en/editor.json index 410fbaf..410fbaf 100755..100644 --- a/Neutron-trunk/resources/i18n/en/editor.json +++ b/Neutron-trunk/resources/i18n/en/editor.json diff --git a/Neutron-trunk/resources/i18n/en/error.json b/Neutron-trunk/resources/i18n/en/error.json index 8af2850..8af2850 100755..100644 --- a/Neutron-trunk/resources/i18n/en/error.json +++ b/Neutron-trunk/resources/i18n/en/error.json diff --git a/Neutron-trunk/resources/i18n/en/gallery.json b/Neutron-trunk/resources/i18n/en/gallery.json index 4bd2a58..4bd2a58 100755..100644 --- a/Neutron-trunk/resources/i18n/en/gallery.json +++ b/Neutron-trunk/resources/i18n/en/gallery.json diff --git a/Neutron-trunk/resources/i18n/en/header.json b/Neutron-trunk/resources/i18n/en/header.json index 6ae91d5..6ae91d5 100755..100644 --- a/Neutron-trunk/resources/i18n/en/header.json +++ b/Neutron-trunk/resources/i18n/en/header.json diff --git a/Neutron-trunk/resources/i18n/en/login.json b/Neutron-trunk/resources/i18n/en/login.json index 0e8a847..0e8a847 100755..100644 --- a/Neutron-trunk/resources/i18n/en/login.json +++ b/Neutron-trunk/resources/i18n/en/login.json diff --git a/Neutron-trunk/resources/i18n/en/menu.json b/Neutron-trunk/resources/i18n/en/menu.json index 567558e..567558e 100755..100644 --- a/Neutron-trunk/resources/i18n/en/menu.json +++ b/Neutron-trunk/resources/i18n/en/menu.json diff --git a/Neutron-trunk/resources/i18n/en/setup.json b/Neutron-trunk/resources/i18n/en/setup.json index 05f9c4c..05f9c4c 100755..100644 --- a/Neutron-trunk/resources/i18n/en/setup.json +++ b/Neutron-trunk/resources/i18n/en/setup.json diff --git a/Neutron-trunk/resources/i18n/en/sizes.json b/Neutron-trunk/resources/i18n/en/sizes.json index 675ff7d..675ff7d 100755..100644 --- a/Neutron-trunk/resources/i18n/en/sizes.json +++ b/Neutron-trunk/resources/i18n/en/sizes.json diff --git a/Neutron-trunk/resources/i18n/en/spotlight.json b/Neutron-trunk/resources/i18n/en/spotlight.json index 2f9ff0b..2f9ff0b 100755..100644 --- a/Neutron-trunk/resources/i18n/en/spotlight.json +++ b/Neutron-trunk/resources/i18n/en/spotlight.json diff --git a/Neutron-trunk/resources/i18n/en/version.json b/Neutron-trunk/resources/i18n/en/version.json index 002ba1e..002ba1e 100755..100644 --- a/Neutron-trunk/resources/i18n/en/version.json +++ b/Neutron-trunk/resources/i18n/en/version.json diff --git a/Neutron-trunk/resources/i18n/en/viewer.json b/Neutron-trunk/resources/i18n/en/viewer.json index bcbca5d..bcbca5d 100755..100644 --- a/Neutron-trunk/resources/i18n/en/viewer.json +++ b/Neutron-trunk/resources/i18n/en/viewer.json diff --git a/Neutron-trunk/resources/i18n/en/widgets.json b/Neutron-trunk/resources/i18n/en/widgets.json index ce372dc..ce372dc 100755..100644 --- a/Neutron-trunk/resources/i18n/en/widgets.json +++ b/Neutron-trunk/resources/i18n/en/widgets.json diff --git a/Neutron-trunk/resources/i18n/fr/$metadata.json b/Neutron-trunk/resources/i18n/fr/$metadata.json index 40c2d7d..40c2d7d 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/$metadata.json +++ b/Neutron-trunk/resources/i18n/fr/$metadata.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-about.json b/Neutron-trunk/resources/i18n/fr/admin-about.json index aef4b72..ba1520b 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-about.json +++ b/Neutron-trunk/resources/i18n/fr/admin-about.json @@ -54,5 +54,18 @@ "config": "Contenu et configuration", "resources": "Photos et autres ressources", "misc": "Fichiers inconnus" + }, + "new": { + "overview": "Vue d'ensemble", + "version": "Versions de Neutron", + "system": "Versions système", + "types": [ + "Neutron Cloud, sécurité et fiabilité assurés, dans un environnement simple d'utilisation", + "Neutron Auto-hébergé, gardez le contrôle sur votre infrastructure" + ], + "renderer": [ + "Version du moteur de rendu :", + "Version de la couche de rétro-compatibilité de rendu :" + ] } } diff --git a/Neutron-trunk/resources/i18n/fr/admin-advanced-dev.json b/Neutron-trunk/resources/i18n/fr/admin-advanced-dev.json index a824a7e..a824a7e 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-advanced-dev.json +++ b/Neutron-trunk/resources/i18n/fr/admin-advanced-dev.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-advanced-home.json b/Neutron-trunk/resources/i18n/fr/admin-advanced-home.json index 80c84df..80c84df 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-advanced-home.json +++ b/Neutron-trunk/resources/i18n/fr/admin-advanced-home.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-appearance.json b/Neutron-trunk/resources/i18n/fr/admin-appearance.json index 34945ca..34945ca 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-appearance.json +++ b/Neutron-trunk/resources/i18n/fr/admin-appearance.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-calendar.json b/Neutron-trunk/resources/i18n/fr/admin-calendar.json index f9a19de..f9a19de 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-calendar.json +++ b/Neutron-trunk/resources/i18n/fr/admin-calendar.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-customization.json b/Neutron-trunk/resources/i18n/fr/admin-customization.json index f0991b7..f0991b7 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-customization.json +++ b/Neutron-trunk/resources/i18n/fr/admin-customization.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-errors.json b/Neutron-trunk/resources/i18n/fr/admin-errors.json index 33bb009..33bb009 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-errors.json +++ b/Neutron-trunk/resources/i18n/fr/admin-errors.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-flags.json b/Neutron-trunk/resources/i18n/fr/admin-flags.json index 7de7b03..7de7b03 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-flags.json +++ b/Neutron-trunk/resources/i18n/fr/admin-flags.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-gallery.json b/Neutron-trunk/resources/i18n/fr/admin-gallery.json index e46abf8..e46abf8 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-gallery.json +++ b/Neutron-trunk/resources/i18n/fr/admin-gallery.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-home.json b/Neutron-trunk/resources/i18n/fr/admin-home.json index 80a0095..80a0095 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-home.json +++ b/Neutron-trunk/resources/i18n/fr/admin-home.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-housekeeping.json b/Neutron-trunk/resources/i18n/fr/admin-housekeeping.json index 8c4c7ee..8c4c7ee 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-housekeeping.json +++ b/Neutron-trunk/resources/i18n/fr/admin-housekeeping.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-login.json b/Neutron-trunk/resources/i18n/fr/admin-login.json index 5e3193a..5e3193a 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-login.json +++ b/Neutron-trunk/resources/i18n/fr/admin-login.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-logs.json b/Neutron-trunk/resources/i18n/fr/admin-logs.json index c812da8..c812da8 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-logs.json +++ b/Neutron-trunk/resources/i18n/fr/admin-logs.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-pages.json b/Neutron-trunk/resources/i18n/fr/admin-pages.json index d9cc761..d9cc761 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-pages.json +++ b/Neutron-trunk/resources/i18n/fr/admin-pages.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-plugins.json b/Neutron-trunk/resources/i18n/fr/admin-plugins.json index 838e175..838e175 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-plugins.json +++ b/Neutron-trunk/resources/i18n/fr/admin-plugins.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-stats.json b/Neutron-trunk/resources/i18n/fr/admin-stats.json index f19887c..f19887c 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-stats.json +++ b/Neutron-trunk/resources/i18n/fr/admin-stats.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-titles.json b/Neutron-trunk/resources/i18n/fr/admin-titles.json index cdffb8f..cdffb8f 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/admin-titles.json +++ b/Neutron-trunk/resources/i18n/fr/admin-titles.json diff --git a/Neutron-trunk/resources/i18n/fr/admin-v2.json b/Neutron-trunk/resources/i18n/fr/admin-v2.json new file mode 100644 index 0000000..afa7bae --- /dev/null +++ b/Neutron-trunk/resources/i18n/fr/admin-v2.json @@ -0,0 +1,77 @@ +{ + "on-premises": "Auto-hébergé", + "drawer": [ + "Système", + "Contenu", + "Personalisation", + "Fonctionnalités", + "Comptes", + "Région & langue", + "Données & sécurité", + "Options avancées", + "Neutron Cloud", + "Serveur Web Electrode" + ], + "system_items": [ + "À propos de Neutron", + "Journal d'audit", + "Gérer la version", + "Fermer la session" + ], + "system_descriptions": [ + "Afficher la version de Neutron et l'utilisation d'espace disque", + "Voir la liste des accès aux pages et à l'administration", + "Re-téléchargez Neutron pour installer une version plus récente", + "Déconnectez-vous de manière sécurisée de l'administration du site" + ], + "content_items": [ + "Pages", + "Galerie", + "Calendrier" + ], + "content_descriptions": [ + "Créer, modifiez, déplacez et supprimez les pages de votre site", + "Téléversez, catégorisez et supprimez les photos de la galerie de votre site", + "Créez, changez ou supprimez des événements du calendrier" + ], + "personalization_items": [ + "Image de marque", + "Couleur", + "Pied de page & légal" + ], + "personalization_descriptions": [ + "Logo, bannière et nom du site", + "Changez entre le thème clair ou sombre, ou changez le thème général", + "Placer les mentions légales de votre site dans le pied de page" + ], + "features_items": [ + "Fonctionnalités optionnelles", + "Paramètres expérimentaux" + ], + "features_descriptions": [ + "Activez des fonctionnalités supplémentaires qui étendent Neutron", + "Paramètres expérimentaux qui pourraient rendre votre site instable" + ], + "accounts_items": [ + "Mot de passe", + "Accès aux administrateurs" + ], + "accounts_descriptions": [ + "Changez le mot de passe que vous utilisez pour vous connecter à ce site", + "Découvrez comment et ce que les administrateurs système voient" + ], + "security_items": [ + "Configuration étendue", + "Statistiques" + ], + "security_descriptions": [ + "Options de durcissement et options de personnalisation avancées", + "Informations sur le nombre de vues sur votre site" + ], + "maintenance_items": [ + "Options de réinitialisation" + ], + "maintenance_descriptions": [ + "Réinitialisez votre site aux paramètres d'usine ou réparez-le" + ] +}
\ No newline at end of file diff --git a/Neutron-trunk/resources/i18n/fr/api.json b/Neutron-trunk/resources/i18n/fr/api.json index 594fd5a..594fd5a 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/api.json +++ b/Neutron-trunk/resources/i18n/fr/api.json diff --git a/Neutron-trunk/resources/i18n/fr/calendar.json b/Neutron-trunk/resources/i18n/fr/calendar.json index 0de6389..0de6389 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/calendar.json +++ b/Neutron-trunk/resources/i18n/fr/calendar.json diff --git a/Neutron-trunk/resources/i18n/fr/editor.json b/Neutron-trunk/resources/i18n/fr/editor.json index 8eb734e..8eb734e 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/editor.json +++ b/Neutron-trunk/resources/i18n/fr/editor.json diff --git a/Neutron-trunk/resources/i18n/fr/error.json b/Neutron-trunk/resources/i18n/fr/error.json index 79a35e9..79a35e9 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/error.json +++ b/Neutron-trunk/resources/i18n/fr/error.json diff --git a/Neutron-trunk/resources/i18n/fr/gallery.json b/Neutron-trunk/resources/i18n/fr/gallery.json index d5035d4..d5035d4 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/gallery.json +++ b/Neutron-trunk/resources/i18n/fr/gallery.json diff --git a/Neutron-trunk/resources/i18n/fr/header.json b/Neutron-trunk/resources/i18n/fr/header.json index 0557e53..0557e53 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/header.json +++ b/Neutron-trunk/resources/i18n/fr/header.json diff --git a/Neutron-trunk/resources/i18n/fr/login.json b/Neutron-trunk/resources/i18n/fr/login.json index 0011e71..0011e71 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/login.json +++ b/Neutron-trunk/resources/i18n/fr/login.json diff --git a/Neutron-trunk/resources/i18n/fr/menu.json b/Neutron-trunk/resources/i18n/fr/menu.json index 00ff3de..00ff3de 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/menu.json +++ b/Neutron-trunk/resources/i18n/fr/menu.json diff --git a/Neutron-trunk/resources/i18n/fr/setup.json b/Neutron-trunk/resources/i18n/fr/setup.json index ad3292d..ad3292d 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/setup.json +++ b/Neutron-trunk/resources/i18n/fr/setup.json diff --git a/Neutron-trunk/resources/i18n/fr/sizes.json b/Neutron-trunk/resources/i18n/fr/sizes.json index 846bb81..846bb81 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/sizes.json +++ b/Neutron-trunk/resources/i18n/fr/sizes.json diff --git a/Neutron-trunk/resources/i18n/fr/spotlight.json b/Neutron-trunk/resources/i18n/fr/spotlight.json index a4e0dbd..a4e0dbd 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/spotlight.json +++ b/Neutron-trunk/resources/i18n/fr/spotlight.json diff --git a/Neutron-trunk/resources/i18n/fr/version.json b/Neutron-trunk/resources/i18n/fr/version.json index 21e80f3..21e80f3 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/version.json +++ b/Neutron-trunk/resources/i18n/fr/version.json diff --git a/Neutron-trunk/resources/i18n/fr/viewer.json b/Neutron-trunk/resources/i18n/fr/viewer.json index 02412fc..02412fc 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/viewer.json +++ b/Neutron-trunk/resources/i18n/fr/viewer.json diff --git a/Neutron-trunk/resources/i18n/fr/widgets.json b/Neutron-trunk/resources/i18n/fr/widgets.json index f4ff8a0..f4ff8a0 100755..100644 --- a/Neutron-trunk/resources/i18n/fr/widgets.json +++ b/Neutron-trunk/resources/i18n/fr/widgets.json diff --git a/Neutron-trunk/resources/image/admin.svg b/Neutron-trunk/resources/image/admin.svg index 8ce4765..8ce4765 100755..100644 --- a/Neutron-trunk/resources/image/admin.svg +++ b/Neutron-trunk/resources/image/admin.svg diff --git a/Neutron-trunk/resources/image/admin2/about.png b/Neutron-trunk/resources/image/admin2/about.png Binary files differindex 80c5733..80c5733 100755..100644 --- a/Neutron-trunk/resources/image/admin2/about.png +++ b/Neutron-trunk/resources/image/admin2/about.png diff --git a/Neutron-trunk/resources/image/admin2/accounts.png b/Neutron-trunk/resources/image/admin2/accounts.png Binary files differindex 0d33522..0d33522 100755..100644 --- a/Neutron-trunk/resources/image/admin2/accounts.png +++ b/Neutron-trunk/resources/image/admin2/accounts.png diff --git a/Neutron-trunk/resources/image/admin2/advanced.png b/Neutron-trunk/resources/image/admin2/advanced.png Binary files differnew file mode 100644 index 0000000..8d78638 --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/advanced.png diff --git a/Neutron-trunk/resources/image/admin2/audit.png b/Neutron-trunk/resources/image/admin2/audit.png Binary files differnew file mode 100644 index 0000000..9a61de1 --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/audit.png diff --git a/Neutron-trunk/resources/image/admin2/branding.png b/Neutron-trunk/resources/image/admin2/branding.png Binary files differnew file mode 100644 index 0000000..dc43ca4 --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/branding.png diff --git a/Neutron-trunk/resources/image/admin2/calendar.png b/Neutron-trunk/resources/image/admin2/calendar.png Binary files differnew file mode 100644 index 0000000..bf4944c --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/calendar.png diff --git a/Neutron-trunk/resources/image/admin2/cloud.png b/Neutron-trunk/resources/image/admin2/cloud.png Binary files differindex d942e7e..d942e7e 100755..100644 --- a/Neutron-trunk/resources/image/admin2/cloud.png +++ b/Neutron-trunk/resources/image/admin2/cloud.png diff --git a/Neutron-trunk/resources/image/admin2/colour.png b/Neutron-trunk/resources/image/admin2/colour.png Binary files differnew file mode 100644 index 0000000..3f2c452 --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/colour.png diff --git a/Neutron-trunk/resources/image/admin2/content.png b/Neutron-trunk/resources/image/admin2/content.png Binary files differindex dd12b3e..dd12b3e 100755..100644 --- a/Neutron-trunk/resources/image/admin2/content.png +++ b/Neutron-trunk/resources/image/admin2/content.png diff --git a/Neutron-trunk/resources/image/admin2/electrode.png b/Neutron-trunk/resources/image/admin2/electrode.png Binary files differindex 6211e78..6211e78 100755..100644 --- a/Neutron-trunk/resources/image/admin2/electrode.png +++ b/Neutron-trunk/resources/image/admin2/electrode.png diff --git a/Neutron-trunk/resources/image/admin2/enter.png b/Neutron-trunk/resources/image/admin2/enter.png Binary files differindex 679adc7..679adc7 100755..100644 --- a/Neutron-trunk/resources/image/admin2/enter.png +++ b/Neutron-trunk/resources/image/admin2/enter.png diff --git a/Neutron-trunk/resources/image/admin2/features.png b/Neutron-trunk/resources/image/admin2/features.png Binary files differindex 10a7045..10a7045 100755..100644 --- a/Neutron-trunk/resources/image/admin2/features.png +++ b/Neutron-trunk/resources/image/admin2/features.png diff --git a/Neutron-trunk/resources/image/admin2/flag.png b/Neutron-trunk/resources/image/admin2/flag.png Binary files differnew file mode 100644 index 0000000..3ea37f6 --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/flag.png diff --git a/Neutron-trunk/resources/image/admin2/footer.png b/Neutron-trunk/resources/image/admin2/footer.png Binary files differnew file mode 100644 index 0000000..7d042da --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/footer.png diff --git a/Neutron-trunk/resources/image/admin2/gallery.png b/Neutron-trunk/resources/image/admin2/gallery.png Binary files differnew file mode 100644 index 0000000..aae2b38 --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/gallery.png diff --git a/Neutron-trunk/resources/image/admin2/home.png b/Neutron-trunk/resources/image/admin2/home.png Binary files differnew file mode 100644 index 0000000..05f2f1f --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/home.png diff --git a/Neutron-trunk/resources/image/admin2/install.png b/Neutron-trunk/resources/image/admin2/install.png Binary files differnew file mode 100644 index 0000000..6d81ebf --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/install.png diff --git a/Neutron-trunk/resources/image/admin2/language.png b/Neutron-trunk/resources/image/admin2/language.png Binary files differindex e460fa1..e460fa1 100755..100644 --- a/Neutron-trunk/resources/image/admin2/language.png +++ b/Neutron-trunk/resources/image/admin2/language.png diff --git a/Neutron-trunk/resources/image/admin2/locale.png b/Neutron-trunk/resources/image/admin2/locale.png Binary files differnew file mode 100644 index 0000000..256a9d7 --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/locale.png diff --git a/Neutron-trunk/resources/image/admin2/logoff.png b/Neutron-trunk/resources/image/admin2/logoff.png Binary files differnew file mode 100644 index 0000000..a01434b --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/logoff.png diff --git a/Neutron-trunk/resources/image/admin2/maintenance.png b/Neutron-trunk/resources/image/admin2/maintenance.png Binary files differindex 6e53b11..6e53b11 100755..100644 --- a/Neutron-trunk/resources/image/admin2/maintenance.png +++ b/Neutron-trunk/resources/image/admin2/maintenance.png diff --git a/Neutron-trunk/resources/image/admin2/minteck-admin.png b/Neutron-trunk/resources/image/admin2/minteck-admin.png Binary files differnew file mode 100644 index 0000000..258446e --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/minteck-admin.png diff --git a/Neutron-trunk/resources/image/admin2/optional.png b/Neutron-trunk/resources/image/admin2/optional.png Binary files differnew file mode 100644 index 0000000..7f67ea0 --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/optional.png diff --git a/Neutron-trunk/resources/image/admin2/pages.png b/Neutron-trunk/resources/image/admin2/pages.png Binary files differnew file mode 100644 index 0000000..1b832ea --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/pages.png diff --git a/Neutron-trunk/resources/image/admin2/password.png b/Neutron-trunk/resources/image/admin2/password.png Binary files differnew file mode 100644 index 0000000..45cb0d7 --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/password.png diff --git a/Neutron-trunk/resources/image/admin2/personalization.png b/Neutron-trunk/resources/image/admin2/personalization.png Binary files differindex a3f44a7..a3f44a7 100755..100644 --- a/Neutron-trunk/resources/image/admin2/personalization.png +++ b/Neutron-trunk/resources/image/admin2/personalization.png diff --git a/Neutron-trunk/resources/image/admin2/reset.png b/Neutron-trunk/resources/image/admin2/reset.png Binary files differnew file mode 100644 index 0000000..5c488f8 --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/reset.png diff --git a/Neutron-trunk/resources/image/admin2/security.png b/Neutron-trunk/resources/image/admin2/security.png Binary files differindex c1359de..c1359de 100755..100644 --- a/Neutron-trunk/resources/image/admin2/security.png +++ b/Neutron-trunk/resources/image/admin2/security.png diff --git a/Neutron-trunk/resources/image/admin2/selected.png b/Neutron-trunk/resources/image/admin2/selected.png Binary files differnew file mode 100644 index 0000000..4716244 --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/selected.png diff --git a/Neutron-trunk/resources/image/admin2/stats.png b/Neutron-trunk/resources/image/admin2/stats.png Binary files differnew file mode 100644 index 0000000..9eff0d9 --- /dev/null +++ b/Neutron-trunk/resources/image/admin2/stats.png diff --git a/Neutron-trunk/resources/image/admin2/system.png b/Neutron-trunk/resources/image/admin2/system.png Binary files differindex c3947c0..c3947c0 100755..100644 --- a/Neutron-trunk/resources/image/admin2/system.png +++ b/Neutron-trunk/resources/image/admin2/system.png diff --git a/Neutron-trunk/resources/image/close.svg b/Neutron-trunk/resources/image/close.svg index e7261bc..e7261bc 100755..100644 --- a/Neutron-trunk/resources/image/close.svg +++ b/Neutron-trunk/resources/image/close.svg diff --git a/Neutron-trunk/resources/image/codename.jpg b/Neutron-trunk/resources/image/codename.jpg Binary files differindex f169121..76ead71 100755..100644 --- a/Neutron-trunk/resources/image/codename.jpg +++ b/Neutron-trunk/resources/image/codename.jpg diff --git a/Neutron-trunk/resources/image/config.jpg b/Neutron-trunk/resources/image/config.jpg Binary files differindex 4f6cfa4..b8c1854 100755..100644 --- a/Neutron-trunk/resources/image/config.jpg +++ b/Neutron-trunk/resources/image/config.jpg diff --git a/Neutron-trunk/resources/image/config_back.svg b/Neutron-trunk/resources/image/config_back.svg index 5ca0d1e..5ca0d1e 100755..100644 --- a/Neutron-trunk/resources/image/config_back.svg +++ b/Neutron-trunk/resources/image/config_back.svg diff --git a/Neutron-trunk/resources/image/config_explore.svg b/Neutron-trunk/resources/image/config_explore.svg index 6d0452c..6d0452c 100755..100644 --- a/Neutron-trunk/resources/image/config_explore.svg +++ b/Neutron-trunk/resources/image/config_explore.svg diff --git a/Neutron-trunk/resources/image/config_file_import.svg b/Neutron-trunk/resources/image/config_file_import.svg index 131f1c3..131f1c3 100755..100644 --- a/Neutron-trunk/resources/image/config_file_import.svg +++ b/Neutron-trunk/resources/image/config_file_import.svg diff --git a/Neutron-trunk/resources/image/config_file_replace.svg b/Neutron-trunk/resources/image/config_file_replace.svg index 9d7486d..9d7486d 100755..100644 --- a/Neutron-trunk/resources/image/config_file_replace.svg +++ b/Neutron-trunk/resources/image/config_file_replace.svg diff --git a/Neutron-trunk/resources/image/config_finish.svg b/Neutron-trunk/resources/image/config_finish.svg index 8f8bf11..8f8bf11 100755..100644 --- a/Neutron-trunk/resources/image/config_finish.svg +++ b/Neutron-trunk/resources/image/config_finish.svg diff --git a/Neutron-trunk/resources/image/config_next.svg b/Neutron-trunk/resources/image/config_next.svg index 892f4bd..892f4bd 100755..100644 --- a/Neutron-trunk/resources/image/config_next.svg +++ b/Neutron-trunk/resources/image/config_next.svg diff --git a/Neutron-trunk/resources/image/config_restart.svg b/Neutron-trunk/resources/image/config_restart.svg index c2dea82..c2dea82 100755..100644 --- a/Neutron-trunk/resources/image/config_restart.svg +++ b/Neutron-trunk/resources/image/config_restart.svg diff --git a/Neutron-trunk/resources/image/contact_address.svg b/Neutron-trunk/resources/image/contact_address.svg index 130799a..130799a 100755..100644 --- a/Neutron-trunk/resources/image/contact_address.svg +++ b/Neutron-trunk/resources/image/contact_address.svg diff --git a/Neutron-trunk/resources/image/contact_email.svg b/Neutron-trunk/resources/image/contact_email.svg index 1ed4686..1ed4686 100755..100644 --- a/Neutron-trunk/resources/image/contact_email.svg +++ b/Neutron-trunk/resources/image/contact_email.svg diff --git a/Neutron-trunk/resources/image/contact_phone.svg b/Neutron-trunk/resources/image/contact_phone.svg index 6b09749..6b09749 100755..100644 --- a/Neutron-trunk/resources/image/contact_phone.svg +++ b/Neutron-trunk/resources/image/contact_phone.svg diff --git a/Neutron-trunk/resources/image/contact_priority.svg b/Neutron-trunk/resources/image/contact_priority.svg index 40f94ce..40f94ce 100755..100644 --- a/Neutron-trunk/resources/image/contact_priority.svg +++ b/Neutron-trunk/resources/image/contact_priority.svg diff --git a/Neutron-trunk/resources/image/default.jpg b/Neutron-trunk/resources/image/default.jpg Binary files differindex 74c1918..74c1918 100755..100644 --- a/Neutron-trunk/resources/image/default.jpg +++ b/Neutron-trunk/resources/image/default.jpg diff --git a/Neutron-trunk/resources/image/demos/color-blue.jpg b/Neutron-trunk/resources/image/demos/color-blue.jpg Binary files differindex 156bbc2..156bbc2 100755..100644 --- a/Neutron-trunk/resources/image/demos/color-blue.jpg +++ b/Neutron-trunk/resources/image/demos/color-blue.jpg diff --git a/Neutron-trunk/resources/image/demos/color-brown.jpg b/Neutron-trunk/resources/image/demos/color-brown.jpg Binary files differindex 5ef73fa..5ef73fa 100755..100644 --- a/Neutron-trunk/resources/image/demos/color-brown.jpg +++ b/Neutron-trunk/resources/image/demos/color-brown.jpg diff --git a/Neutron-trunk/resources/image/demos/color-green.jpg b/Neutron-trunk/resources/image/demos/color-green.jpg Binary files differindex efd9a9b..efd9a9b 100755..100644 --- a/Neutron-trunk/resources/image/demos/color-green.jpg +++ b/Neutron-trunk/resources/image/demos/color-green.jpg diff --git a/Neutron-trunk/resources/image/demos/color-orange.jpg b/Neutron-trunk/resources/image/demos/color-orange.jpg Binary files differindex d682b77..d682b77 100755..100644 --- a/Neutron-trunk/resources/image/demos/color-orange.jpg +++ b/Neutron-trunk/resources/image/demos/color-orange.jpg diff --git a/Neutron-trunk/resources/image/demos/color-purple.jpg b/Neutron-trunk/resources/image/demos/color-purple.jpg Binary files differindex 0000975..0000975 100755..100644 --- a/Neutron-trunk/resources/image/demos/color-purple.jpg +++ b/Neutron-trunk/resources/image/demos/color-purple.jpg diff --git a/Neutron-trunk/resources/image/demos/color-red.jpg b/Neutron-trunk/resources/image/demos/color-red.jpg Binary files differindex 00905e9..00905e9 100755..100644 --- a/Neutron-trunk/resources/image/demos/color-red.jpg +++ b/Neutron-trunk/resources/image/demos/color-red.jpg diff --git a/Neutron-trunk/resources/image/demos/color-white.jpg b/Neutron-trunk/resources/image/demos/color-white.jpg Binary files differindex 8dc1192..8dc1192 100755..100644 --- a/Neutron-trunk/resources/image/demos/color-white.jpg +++ b/Neutron-trunk/resources/image/demos/color-white.jpg diff --git a/Neutron-trunk/resources/image/demos/theme-auto.jpg b/Neutron-trunk/resources/image/demos/theme-auto.jpg Binary files differindex 89ec238..89ec238 100755..100644 --- a/Neutron-trunk/resources/image/demos/theme-auto.jpg +++ b/Neutron-trunk/resources/image/demos/theme-auto.jpg diff --git a/Neutron-trunk/resources/image/demos/theme-dark.jpg b/Neutron-trunk/resources/image/demos/theme-dark.jpg Binary files differindex 2652232..2652232 100755..100644 --- a/Neutron-trunk/resources/image/demos/theme-dark.jpg +++ b/Neutron-trunk/resources/image/demos/theme-dark.jpg diff --git a/Neutron-trunk/resources/image/demos/theme-light.jpg b/Neutron-trunk/resources/image/demos/theme-light.jpg Binary files differindex 3c4f73c..3c4f73c 100755..100644 --- a/Neutron-trunk/resources/image/demos/theme-light.jpg +++ b/Neutron-trunk/resources/image/demos/theme-light.jpg diff --git a/Neutron-trunk/resources/image/display.svg b/Neutron-trunk/resources/image/display.svg index 15caec1..15caec1 100755..100644 --- a/Neutron-trunk/resources/image/display.svg +++ b/Neutron-trunk/resources/image/display.svg diff --git a/Neutron-trunk/resources/image/error.jpg b/Neutron-trunk/resources/image/error.jpg Binary files differindex 5b1fb17..5b1fb17 100755..100644 --- a/Neutron-trunk/resources/image/error.jpg +++ b/Neutron-trunk/resources/image/error.jpg diff --git a/Neutron-trunk/resources/image/ext-remove.svg b/Neutron-trunk/resources/image/ext-remove.svg index bb3db74..bb3db74 100755..100644 --- a/Neutron-trunk/resources/image/ext-remove.svg +++ b/Neutron-trunk/resources/image/ext-remove.svg diff --git a/Neutron-trunk/resources/image/ext-settings.svg b/Neutron-trunk/resources/image/ext-settings.svg index 015006b..015006b 100755..100644 --- a/Neutron-trunk/resources/image/ext-settings.svg +++ b/Neutron-trunk/resources/image/ext-settings.svg diff --git a/Neutron-trunk/resources/image/ext-store.svg b/Neutron-trunk/resources/image/ext-store.svg index 4451e77..4451e77 100755..100644 --- a/Neutron-trunk/resources/image/ext-store.svg +++ b/Neutron-trunk/resources/image/ext-store.svg diff --git a/Neutron-trunk/resources/image/gallery-zoom-minus.svg b/Neutron-trunk/resources/image/gallery-zoom-minus.svg index d6c04d3..d6c04d3 100755..100644 --- a/Neutron-trunk/resources/image/gallery-zoom-minus.svg +++ b/Neutron-trunk/resources/image/gallery-zoom-minus.svg diff --git a/Neutron-trunk/resources/image/gallery-zoom-plus.svg b/Neutron-trunk/resources/image/gallery-zoom-plus.svg index a807622..a807622 100755..100644 --- a/Neutron-trunk/resources/image/gallery-zoom-plus.svg +++ b/Neutron-trunk/resources/image/gallery-zoom-plus.svg diff --git a/Neutron-trunk/resources/image/getimage.png b/Neutron-trunk/resources/image/getimage.png Binary files differindex 221786b..221786b 100755..100644 --- a/Neutron-trunk/resources/image/getimage.png +++ b/Neutron-trunk/resources/image/getimage.png diff --git a/Neutron-trunk/resources/image/loader.svg b/Neutron-trunk/resources/image/loader.svg index 1ab478b..1ab478b 100755..100644 --- a/Neutron-trunk/resources/image/loader.svg +++ b/Neutron-trunk/resources/image/loader.svg diff --git a/Neutron-trunk/resources/image/login.jpg b/Neutron-trunk/resources/image/login.jpg Binary files differindex 1c67c0a..1c67c0a 100755..100644 --- a/Neutron-trunk/resources/image/login.jpg +++ b/Neutron-trunk/resources/image/login.jpg diff --git a/Neutron-trunk/resources/image/menu.svg b/Neutron-trunk/resources/image/menu.svg index a2d03a4..a2d03a4 100755..100644 --- a/Neutron-trunk/resources/image/menu.svg +++ b/Neutron-trunk/resources/image/menu.svg diff --git a/Neutron-trunk/resources/image/message_error.svg b/Neutron-trunk/resources/image/message_error.svg index 04e2223..04e2223 100755..100644 --- a/Neutron-trunk/resources/image/message_error.svg +++ b/Neutron-trunk/resources/image/message_error.svg diff --git a/Neutron-trunk/resources/image/message_info.svg b/Neutron-trunk/resources/image/message_info.svg index ab9cff7..ab9cff7 100755..100644 --- a/Neutron-trunk/resources/image/message_info.svg +++ b/Neutron-trunk/resources/image/message_info.svg diff --git a/Neutron-trunk/resources/image/message_warning.svg b/Neutron-trunk/resources/image/message_warning.svg index dfcf997..dfcf997 100755..100644 --- a/Neutron-trunk/resources/image/message_warning.svg +++ b/Neutron-trunk/resources/image/message_warning.svg diff --git a/Neutron-trunk/resources/image/oobe.svg b/Neutron-trunk/resources/image/oobe.svg index 30842c1..30842c1 100755..100644 --- a/Neutron-trunk/resources/image/oobe.svg +++ b/Neutron-trunk/resources/image/oobe.svg diff --git a/Neutron-trunk/resources/image/oobe/check.png b/Neutron-trunk/resources/image/oobe/check.png Binary files differnew file mode 100644 index 0000000..4a844d6 --- /dev/null +++ b/Neutron-trunk/resources/image/oobe/check.png diff --git a/Neutron-trunk/resources/image/oobe/error.png b/Neutron-trunk/resources/image/oobe/error.png Binary files differnew file mode 100644 index 0000000..8c34385 --- /dev/null +++ b/Neutron-trunk/resources/image/oobe/error.png diff --git a/Neutron-trunk/resources/image/oobe/finish.png b/Neutron-trunk/resources/image/oobe/finish.png Binary files differnew file mode 100644 index 0000000..c401bd4 --- /dev/null +++ b/Neutron-trunk/resources/image/oobe/finish.png diff --git a/Neutron-trunk/resources/image/oobe/icon.png b/Neutron-trunk/resources/image/oobe/icon.png Binary files differnew file mode 100644 index 0000000..5060593 --- /dev/null +++ b/Neutron-trunk/resources/image/oobe/icon.png diff --git a/Neutron-trunk/resources/image/oobe/init.png b/Neutron-trunk/resources/image/oobe/init.png Binary files differnew file mode 100644 index 0000000..28207c9 --- /dev/null +++ b/Neutron-trunk/resources/image/oobe/init.png diff --git a/Neutron-trunk/resources/image/oobe/installing.png b/Neutron-trunk/resources/image/oobe/installing.png Binary files differnew file mode 100644 index 0000000..0a37935 --- /dev/null +++ b/Neutron-trunk/resources/image/oobe/installing.png diff --git a/Neutron-trunk/resources/image/oobe/language.png b/Neutron-trunk/resources/image/oobe/language.png Binary files differnew file mode 100644 index 0000000..6f4cdb0 --- /dev/null +++ b/Neutron-trunk/resources/image/oobe/language.png diff --git a/Neutron-trunk/resources/image/oobe/name.png b/Neutron-trunk/resources/image/oobe/name.png Binary files differnew file mode 100644 index 0000000..dc301cf --- /dev/null +++ b/Neutron-trunk/resources/image/oobe/name.png diff --git a/Neutron-trunk/resources/image/oobe/ready.png b/Neutron-trunk/resources/image/oobe/ready.png Binary files differnew file mode 100644 index 0000000..94ef9cc --- /dev/null +++ b/Neutron-trunk/resources/image/oobe/ready.png diff --git a/Neutron-trunk/resources/image/oobe/software-license.png b/Neutron-trunk/resources/image/oobe/software-license.png Binary files differnew file mode 100644 index 0000000..192aa50 --- /dev/null +++ b/Neutron-trunk/resources/image/oobe/software-license.png diff --git a/Neutron-trunk/resources/image/oobe/welcome.png b/Neutron-trunk/resources/image/oobe/welcome.png Binary files differnew file mode 100644 index 0000000..759333a --- /dev/null +++ b/Neutron-trunk/resources/image/oobe/welcome.png diff --git a/Neutron-trunk/resources/image/ready.jpg b/Neutron-trunk/resources/image/ready.jpg Binary files differindex c64d4dc..c64d4dc 100755..100644 --- a/Neutron-trunk/resources/image/ready.jpg +++ b/Neutron-trunk/resources/image/ready.jpg diff --git a/Neutron-trunk/resources/image/regedit/backup.png b/Neutron-trunk/resources/image/regedit/backup.png Binary files differindex f15a9c2..f15a9c2 100755..100644 --- a/Neutron-trunk/resources/image/regedit/backup.png +++ b/Neutron-trunk/resources/image/regedit/backup.png diff --git a/Neutron-trunk/resources/image/regedit/data.png b/Neutron-trunk/resources/image/regedit/data.png Binary files differindex f68559e..f68559e 100755..100644 --- a/Neutron-trunk/resources/image/regedit/data.png +++ b/Neutron-trunk/resources/image/regedit/data.png diff --git a/Neutron-trunk/resources/image/regedit/folder.png b/Neutron-trunk/resources/image/regedit/folder.png Binary files differindex adc73eb..adc73eb 100755..100644 --- a/Neutron-trunk/resources/image/regedit/folder.png +++ b/Neutron-trunk/resources/image/regedit/folder.png diff --git a/Neutron-trunk/resources/image/regedit/icon.png b/Neutron-trunk/resources/image/regedit/icon.png Binary files differindex d8b489d..d8b489d 100755..100644 --- a/Neutron-trunk/resources/image/regedit/icon.png +++ b/Neutron-trunk/resources/image/regedit/icon.png diff --git a/Neutron-trunk/resources/image/regedit/image.png b/Neutron-trunk/resources/image/regedit/image.png Binary files differindex ef5f20a..ef5f20a 100755..100644 --- a/Neutron-trunk/resources/image/regedit/image.png +++ b/Neutron-trunk/resources/image/regedit/image.png diff --git a/Neutron-trunk/resources/image/regedit/json.png b/Neutron-trunk/resources/image/regedit/json.png Binary files differindex 9cc9b21..9cc9b21 100755..100644 --- a/Neutron-trunk/resources/image/regedit/json.png +++ b/Neutron-trunk/resources/image/regedit/json.png diff --git a/Neutron-trunk/resources/image/regedit/keys.png b/Neutron-trunk/resources/image/regedit/keys.png Binary files differindex 1bf414b..1bf414b 100755..100644 --- a/Neutron-trunk/resources/image/regedit/keys.png +++ b/Neutron-trunk/resources/image/regedit/keys.png diff --git a/Neutron-trunk/resources/image/regedit/old/data.svg b/Neutron-trunk/resources/image/regedit/old/data.svg index 35c07bc..35c07bc 100755..100644 --- a/Neutron-trunk/resources/image/regedit/old/data.svg +++ b/Neutron-trunk/resources/image/regedit/old/data.svg diff --git a/Neutron-trunk/resources/image/regedit/old/folder.svg b/Neutron-trunk/resources/image/regedit/old/folder.svg index 3299634..3299634 100755..100644 --- a/Neutron-trunk/resources/image/regedit/old/folder.svg +++ b/Neutron-trunk/resources/image/regedit/old/folder.svg diff --git a/Neutron-trunk/resources/image/regedit/old/icon.svg b/Neutron-trunk/resources/image/regedit/old/icon.svg index 5db1576..5db1576 100755..100644 --- a/Neutron-trunk/resources/image/regedit/old/icon.svg +++ b/Neutron-trunk/resources/image/regedit/old/icon.svg diff --git a/Neutron-trunk/resources/image/regedit/old/image.svg b/Neutron-trunk/resources/image/regedit/old/image.svg index 4a01018..4a01018 100755..100644 --- a/Neutron-trunk/resources/image/regedit/old/image.svg +++ b/Neutron-trunk/resources/image/regedit/old/image.svg diff --git a/Neutron-trunk/resources/image/regedit/old/json.svg b/Neutron-trunk/resources/image/regedit/old/json.svg index 84d17c9..84d17c9 100755..100644 --- a/Neutron-trunk/resources/image/regedit/old/json.svg +++ b/Neutron-trunk/resources/image/regedit/old/json.svg diff --git a/Neutron-trunk/resources/image/regedit/old/keys.svg b/Neutron-trunk/resources/image/regedit/old/keys.svg index d7538a9..d7538a9 100755..100644 --- a/Neutron-trunk/resources/image/regedit/old/keys.svg +++ b/Neutron-trunk/resources/image/regedit/old/keys.svg diff --git a/Neutron-trunk/resources/image/regedit/old/page.svg b/Neutron-trunk/resources/image/regedit/old/page.svg index 7370d4b..7370d4b 100755..100644 --- a/Neutron-trunk/resources/image/regedit/old/page.svg +++ b/Neutron-trunk/resources/image/regedit/old/page.svg diff --git a/Neutron-trunk/resources/image/regedit/old/special.svg b/Neutron-trunk/resources/image/regedit/old/special.svg index bdc1a71..bdc1a71 100755..100644 --- a/Neutron-trunk/resources/image/regedit/old/special.svg +++ b/Neutron-trunk/resources/image/regedit/old/special.svg diff --git a/Neutron-trunk/resources/image/regedit/old/token.svg b/Neutron-trunk/resources/image/regedit/old/token.svg index 42e852a..42e852a 100755..100644 --- a/Neutron-trunk/resources/image/regedit/old/token.svg +++ b/Neutron-trunk/resources/image/regedit/old/token.svg diff --git a/Neutron-trunk/resources/image/regedit/page.png b/Neutron-trunk/resources/image/regedit/page.png Binary files differindex 413c08b..413c08b 100755..100644 --- a/Neutron-trunk/resources/image/regedit/page.png +++ b/Neutron-trunk/resources/image/regedit/page.png diff --git a/Neutron-trunk/resources/image/regedit/special.png b/Neutron-trunk/resources/image/regedit/special.png Binary files differindex df3c490..df3c490 100755..100644 --- a/Neutron-trunk/resources/image/regedit/special.png +++ b/Neutron-trunk/resources/image/regedit/special.png diff --git a/Neutron-trunk/resources/image/regedit/token.png b/Neutron-trunk/resources/image/regedit/token.png Binary files differindex 5c8a635..5c8a635 100755..100644 --- a/Neutron-trunk/resources/image/regedit/token.png +++ b/Neutron-trunk/resources/image/regedit/token.png diff --git a/Neutron-trunk/resources/image/resetted.png b/Neutron-trunk/resources/image/resetted.png Binary files differindex 9499ad4..9499ad4 100755..100644 --- a/Neutron-trunk/resources/image/resetted.png +++ b/Neutron-trunk/resources/image/resetted.png diff --git a/Neutron-trunk/resources/image/siteicon.png b/Neutron-trunk/resources/image/siteicon.png Binary files differindex 5e2e85f..5e2e85f 100755..100644 --- a/Neutron-trunk/resources/image/siteicon.png +++ b/Neutron-trunk/resources/image/siteicon.png diff --git a/Neutron-trunk/resources/image/storeloader.svg b/Neutron-trunk/resources/image/storeloader.svg index 6212559..6212559 100755..100644 --- a/Neutron-trunk/resources/image/storeloader.svg +++ b/Neutron-trunk/resources/image/storeloader.svg diff --git a/Neutron-trunk/resources/image/tools.svg b/Neutron-trunk/resources/image/tools.svg index 8443703..8443703 100755..100644 --- a/Neutron-trunk/resources/image/tools.svg +++ b/Neutron-trunk/resources/image/tools.svg diff --git a/Neutron-trunk/resources/js/admin_v2.js b/Neutron-trunk/resources/js/admin_v2.js new file mode 100644 index 0000000..ab7249d --- /dev/null +++ b/Neutron-trunk/resources/js/admin_v2.js @@ -0,0 +1,14 @@ +// noinspection JSUnresolvedFunction + +Array.from(document.getElementsByClassName("inner-item")).forEach((item) => { + item.onclick = () => { + if (item.getAttribute("data-item-href").startsWith("parent://")) { + window.open("https://" + item.getAttribute("data-item-href").substr("parent://".length)); + } else if (item.getAttribute("data-item-href").startsWith("top://")) { + window.parent.location.href = item.getAttribute("data-item-href").substr("top://".length); + } else { + $(document.body).fadeOut(75); + location.href = item.getAttribute("data-item-href") + } + } +})
\ No newline at end of file diff --git a/Neutron-trunk/resources/js/ckeditor5/ckeditor.js b/Neutron-trunk/resources/js/ckeditor5/ckeditor.js index ca2af1e..ca2af1e 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/ckeditor.js +++ b/Neutron-trunk/resources/js/ckeditor5/ckeditor.js diff --git a/Neutron-trunk/resources/js/ckeditor5/ckeditor.js.map b/Neutron-trunk/resources/js/ckeditor5/ckeditor.js.map index daf6407..daf6407 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/ckeditor.js.map +++ b/Neutron-trunk/resources/js/ckeditor5/ckeditor.js.map diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/af.js b/Neutron-trunk/resources/js/ckeditor5/translations/af.js index edfd946..edfd946 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/af.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/af.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/ar.js b/Neutron-trunk/resources/js/ckeditor5/translations/ar.js index 6aebba2..6aebba2 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/ar.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/ar.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/ast.js b/Neutron-trunk/resources/js/ckeditor5/translations/ast.js index c224570..c224570 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/ast.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/ast.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/az.js b/Neutron-trunk/resources/js/ckeditor5/translations/az.js index c75bddc..c75bddc 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/az.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/az.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/bg.js b/Neutron-trunk/resources/js/ckeditor5/translations/bg.js index f30a04f..f30a04f 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/bg.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/bg.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/ca.js b/Neutron-trunk/resources/js/ckeditor5/translations/ca.js index 3bba530..3bba530 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/ca.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/ca.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/cs.js b/Neutron-trunk/resources/js/ckeditor5/translations/cs.js index ad44ed9..ad44ed9 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/cs.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/cs.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/da.js b/Neutron-trunk/resources/js/ckeditor5/translations/da.js index 185522d..185522d 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/da.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/da.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/de-ch.js b/Neutron-trunk/resources/js/ckeditor5/translations/de-ch.js index 639e8c9..639e8c9 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/de-ch.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/de-ch.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/de.js b/Neutron-trunk/resources/js/ckeditor5/translations/de.js index c76a291..c76a291 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/de.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/de.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/el.js b/Neutron-trunk/resources/js/ckeditor5/translations/el.js index a3de100..a3de100 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/el.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/el.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/en-au.js b/Neutron-trunk/resources/js/ckeditor5/translations/en-au.js index db68971..db68971 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/en-au.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/en-au.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/en-gb.js b/Neutron-trunk/resources/js/ckeditor5/translations/en-gb.js index 42c4c1a..42c4c1a 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/en-gb.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/en-gb.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/eo.js b/Neutron-trunk/resources/js/ckeditor5/translations/eo.js index 3605df6..3605df6 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/eo.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/eo.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/es.js b/Neutron-trunk/resources/js/ckeditor5/translations/es.js index cb483bf..cb483bf 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/es.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/es.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/et.js b/Neutron-trunk/resources/js/ckeditor5/translations/et.js index 378af2a..378af2a 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/et.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/et.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/eu.js b/Neutron-trunk/resources/js/ckeditor5/translations/eu.js index 2535a59..2535a59 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/eu.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/eu.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/fa.js b/Neutron-trunk/resources/js/ckeditor5/translations/fa.js index 8d34172..8d34172 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/fa.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/fa.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/fi.js b/Neutron-trunk/resources/js/ckeditor5/translations/fi.js index 32e880d..32e880d 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/fi.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/fi.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/fr.js b/Neutron-trunk/resources/js/ckeditor5/translations/fr.js index f71ddfc..f71ddfc 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/fr.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/fr.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/gl.js b/Neutron-trunk/resources/js/ckeditor5/translations/gl.js index 6a245e2..6a245e2 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/gl.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/gl.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/gu.js b/Neutron-trunk/resources/js/ckeditor5/translations/gu.js index 0a3f927..0a3f927 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/gu.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/gu.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/he.js b/Neutron-trunk/resources/js/ckeditor5/translations/he.js index 772f9b8..772f9b8 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/he.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/he.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/hr.js b/Neutron-trunk/resources/js/ckeditor5/translations/hr.js index 64cba19..64cba19 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/hr.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/hr.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/hu.js b/Neutron-trunk/resources/js/ckeditor5/translations/hu.js index 50fb29a..50fb29a 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/hu.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/hu.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/id.js b/Neutron-trunk/resources/js/ckeditor5/translations/id.js index 0582be3..0582be3 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/id.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/id.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/it.js b/Neutron-trunk/resources/js/ckeditor5/translations/it.js index aaa619f..aaa619f 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/it.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/it.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/ja.js b/Neutron-trunk/resources/js/ckeditor5/translations/ja.js index a88ac82..a88ac82 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/ja.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/ja.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/km.js b/Neutron-trunk/resources/js/ckeditor5/translations/km.js index 5286cbd..5286cbd 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/km.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/km.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/kn.js b/Neutron-trunk/resources/js/ckeditor5/translations/kn.js index 7d6a1ac..7d6a1ac 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/kn.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/kn.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/ko.js b/Neutron-trunk/resources/js/ckeditor5/translations/ko.js index 7ee3e9f..7ee3e9f 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/ko.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/ko.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/ku.js b/Neutron-trunk/resources/js/ckeditor5/translations/ku.js index 22b814a..22b814a 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/ku.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/ku.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/lt.js b/Neutron-trunk/resources/js/ckeditor5/translations/lt.js index 0c9e950..0c9e950 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/lt.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/lt.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/lv.js b/Neutron-trunk/resources/js/ckeditor5/translations/lv.js index 3966b32..3966b32 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/lv.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/lv.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/ms.js b/Neutron-trunk/resources/js/ckeditor5/translations/ms.js index 8f0f795..8f0f795 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/ms.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/ms.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/nb.js b/Neutron-trunk/resources/js/ckeditor5/translations/nb.js index b7a2cc3..b7a2cc3 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/nb.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/nb.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/ne.js b/Neutron-trunk/resources/js/ckeditor5/translations/ne.js index dca9e8f..dca9e8f 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/ne.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/ne.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/nl.js b/Neutron-trunk/resources/js/ckeditor5/translations/nl.js index e381d61..e381d61 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/nl.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/nl.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/no.js b/Neutron-trunk/resources/js/ckeditor5/translations/no.js index 52cc7fd..52cc7fd 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/no.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/no.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/oc.js b/Neutron-trunk/resources/js/ckeditor5/translations/oc.js index c13b31f..c13b31f 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/oc.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/oc.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/pl.js b/Neutron-trunk/resources/js/ckeditor5/translations/pl.js index 0913671..0913671 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/pl.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/pl.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/pt-br.js b/Neutron-trunk/resources/js/ckeditor5/translations/pt-br.js index 56fd5d6..56fd5d6 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/pt-br.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/pt-br.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/pt.js b/Neutron-trunk/resources/js/ckeditor5/translations/pt.js index f838b02..f838b02 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/pt.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/pt.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/ro.js b/Neutron-trunk/resources/js/ckeditor5/translations/ro.js index 0351b52..0351b52 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/ro.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/ro.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/ru.js b/Neutron-trunk/resources/js/ckeditor5/translations/ru.js index 3212203..3212203 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/ru.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/ru.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/si.js b/Neutron-trunk/resources/js/ckeditor5/translations/si.js index 26e074b..26e074b 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/si.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/si.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/sk.js b/Neutron-trunk/resources/js/ckeditor5/translations/sk.js index 641ecac..641ecac 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/sk.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/sk.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/sl.js b/Neutron-trunk/resources/js/ckeditor5/translations/sl.js index a3c95c0..a3c95c0 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/sl.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/sl.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/sq.js b/Neutron-trunk/resources/js/ckeditor5/translations/sq.js index 205ddd2..205ddd2 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/sq.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/sq.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/sr-latn.js b/Neutron-trunk/resources/js/ckeditor5/translations/sr-latn.js index bbab9f8..bbab9f8 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/sr-latn.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/sr-latn.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/sr.js b/Neutron-trunk/resources/js/ckeditor5/translations/sr.js index ca917f9..ca917f9 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/sr.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/sr.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/sv.js b/Neutron-trunk/resources/js/ckeditor5/translations/sv.js index b79c3ff..b79c3ff 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/sv.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/sv.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/th.js b/Neutron-trunk/resources/js/ckeditor5/translations/th.js index 070e584..070e584 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/th.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/th.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/tr.js b/Neutron-trunk/resources/js/ckeditor5/translations/tr.js index 36f76da..36f76da 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/tr.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/tr.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/tt.js b/Neutron-trunk/resources/js/ckeditor5/translations/tt.js index 3086dcd..3086dcd 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/tt.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/tt.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/ug.js b/Neutron-trunk/resources/js/ckeditor5/translations/ug.js index a8857c4..a8857c4 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/ug.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/ug.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/uk.js b/Neutron-trunk/resources/js/ckeditor5/translations/uk.js index eb05aa3..eb05aa3 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/uk.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/uk.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/vi.js b/Neutron-trunk/resources/js/ckeditor5/translations/vi.js index 5b3e716..5b3e716 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/vi.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/vi.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/zh-cn.js b/Neutron-trunk/resources/js/ckeditor5/translations/zh-cn.js index 02242ca..02242ca 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/zh-cn.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/zh-cn.js diff --git a/Neutron-trunk/resources/js/ckeditor5/translations/zh.js b/Neutron-trunk/resources/js/ckeditor5/translations/zh.js index 0de57a7..0de57a7 100755..100644 --- a/Neutron-trunk/resources/js/ckeditor5/translations/zh.js +++ b/Neutron-trunk/resources/js/ckeditor5/translations/zh.js diff --git a/Neutron-trunk/resources/js/jquery.js b/Neutron-trunk/resources/js/jquery.js index a1c07fd..a1c07fd 100755..100644 --- a/Neutron-trunk/resources/js/jquery.js +++ b/Neutron-trunk/resources/js/jquery.js diff --git a/Neutron-trunk/resources/js/setup-ui.js.php b/Neutron-trunk/resources/js/setup-ui.js.php index 449b66a..d6183aa 100755..100644 --- a/Neutron-trunk/resources/js/setup-ui.js.php +++ b/Neutron-trunk/resources/js/setup-ui.js.php @@ -163,9 +163,7 @@ document.title = '<?= $lang["setup"]["steps"][6] . " - " . $lang["setup"]["ititl function switchPage(from, to) { $("#" + from).fadeOut(200); - setTimeout(() => { - $("#" + to).fadeIn(200); - }, 200) + $("#" + to).fadeIn(200); } function reloadPage() { diff --git a/Neutron-trunk/resources/js/spotlight.js b/Neutron-trunk/resources/js/spotlight.js index 6b013c2..e11b6eb 100755..100644 --- a/Neutron-trunk/resources/js/spotlight.js +++ b/Neutron-trunk/resources/js/spotlight.js @@ -230,7 +230,7 @@ class SpotlightItem { if (window.parent !== window) { window.parent.location.hash = this.href; } else { - window.location.href = sysroot + "/cms-special/admin/" + this.href.substr(2); + window.location.href = sysroot + "/cms-special/admin-v2/" + this.href.substr(2); } } diff --git a/Neutron-trunk/resources/js/sticky.js b/Neutron-trunk/resources/js/sticky.js index 9fc0a26..9fc0a26 100755..100644 --- a/Neutron-trunk/resources/js/sticky.js +++ b/Neutron-trunk/resources/js/sticky.js diff --git a/Neutron-trunk/resources/lib/license.html b/Neutron-trunk/resources/lib/license.html index 7c25d86..945b8b2 100755..100644 --- a/Neutron-trunk/resources/lib/license.html +++ b/Neutron-trunk/resources/lib/license.html @@ -2,7 +2,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>GNU General Public License v3.0 - GNU Project - Free Software Foundation (FSF)</title> - <link rel="alternate" type="application/rdf+xml" href="http://www.gnu.org/licenses/gpl-3.0.rdf"> + <link rel="alternate" type="application/rdf+xml" href="http://www.gnu.org/licenses/gpl-3.0.rdf"> + <style>*{color:white;}</style> </head> <body> <h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3> diff --git a/Neutron-trunk/resources/lib/material/iconfont.css b/Neutron-trunk/resources/lib/material/iconfont.css index 1691243..1691243 100755..100644 --- a/Neutron-trunk/resources/lib/material/iconfont.css +++ b/Neutron-trunk/resources/lib/material/iconfont.css diff --git a/Neutron-trunk/resources/lib/material/material-classic.woff2 b/Neutron-trunk/resources/lib/material/material-classic.woff2 Binary files differindex 2546ee6..2546ee6 100755..100644 --- a/Neutron-trunk/resources/lib/material/material-classic.woff2 +++ b/Neutron-trunk/resources/lib/material/material-classic.woff2 diff --git a/Neutron-trunk/resources/lib/material/material-components-web.min.css b/Neutron-trunk/resources/lib/material/material-components-web.min.css index e9b7f76..e9b7f76 100755..100644 --- a/Neutron-trunk/resources/lib/material/material-components-web.min.css +++ b/Neutron-trunk/resources/lib/material/material-components-web.min.css diff --git a/Neutron-trunk/resources/lib/material/material-components-web.min.css.map b/Neutron-trunk/resources/lib/material/material-components-web.min.css.map index 553f6a0..553f6a0 100755..100644 --- a/Neutron-trunk/resources/lib/material/material-components-web.min.css.map +++ b/Neutron-trunk/resources/lib/material/material-components-web.min.css.map diff --git a/Neutron-trunk/resources/lib/material/material-components-web.min.js b/Neutron-trunk/resources/lib/material/material-components-web.min.js index 8ed3bbf..8ed3bbf 100755..100644 --- a/Neutron-trunk/resources/lib/material/material-components-web.min.js +++ b/Neutron-trunk/resources/lib/material/material-components-web.min.js diff --git a/Neutron-trunk/resources/lib/material/material-outlined.woff2 b/Neutron-trunk/resources/lib/material/material-outlined.woff2 Binary files differindex 24c382e..24c382e 100755..100644 --- a/Neutron-trunk/resources/lib/material/material-outlined.woff2 +++ b/Neutron-trunk/resources/lib/material/material-outlined.woff2 diff --git a/Neutron-trunk/resources/lib/pushbar.js/library-info.json b/Neutron-trunk/resources/lib/pushbar.js/library-info.json index 2045ce8..2045ce8 100755..100644 --- a/Neutron-trunk/resources/lib/pushbar.js/library-info.json +++ b/Neutron-trunk/resources/lib/pushbar.js/library-info.json diff --git a/Neutron-trunk/resources/lib/pushbar.js/library.css b/Neutron-trunk/resources/lib/pushbar.js/library.css index e5c1734..e5c1734 100755..100644 --- a/Neutron-trunk/resources/lib/pushbar.js/library.css +++ b/Neutron-trunk/resources/lib/pushbar.js/library.css diff --git a/Neutron-trunk/resources/lib/pushbar.js/library.js b/Neutron-trunk/resources/lib/pushbar.js/library.js index 4d50246..4d50246 100755..100644 --- a/Neutron-trunk/resources/lib/pushbar.js/library.js +++ b/Neutron-trunk/resources/lib/pushbar.js/library.js diff --git a/Neutron-trunk/resources/logo.png b/Neutron-trunk/resources/logo.png Binary files differnew file mode 100644 index 0000000..fb0c300 --- /dev/null +++ b/Neutron-trunk/resources/logo.png diff --git a/Neutron-trunk/resources/logo.svg b/Neutron-trunk/resources/logo.svg index ad65280..ad65280 100755..100644 --- a/Neutron-trunk/resources/logo.svg +++ b/Neutron-trunk/resources/logo.svg diff --git a/Neutron-trunk/resources/private/.htaccess b/Neutron-trunk/resources/private/.htaccess index 2c73686..2c73686 100755..100644 --- a/Neutron-trunk/resources/private/.htaccess +++ b/Neutron-trunk/resources/private/.htaccess diff --git a/Neutron-trunk/resources/private/CodeEditor$2.php b/Neutron-trunk/resources/private/CodeEditor$2.php index ec4abe9..ec4abe9 100755..100644 --- a/Neutron-trunk/resources/private/CodeEditor$2.php +++ b/Neutron-trunk/resources/private/CodeEditor$2.php diff --git a/Neutron-trunk/resources/private/CodeEditor$3.php b/Neutron-trunk/resources/private/CodeEditor$3.php index 83b0fa8..83b0fa8 100755..100644 --- a/Neutron-trunk/resources/private/CodeEditor$3.php +++ b/Neutron-trunk/resources/private/CodeEditor$3.php diff --git a/Neutron-trunk/resources/private/CodeEditor.php b/Neutron-trunk/resources/private/CodeEditor.php index 9a915ed..9a915ed 100755..100644 --- a/Neutron-trunk/resources/private/CodeEditor.php +++ b/Neutron-trunk/resources/private/CodeEditor.php diff --git a/Neutron-trunk/resources/private/VisualEditor$2.php b/Neutron-trunk/resources/private/VisualEditor$2.php index e22b9d4..e22b9d4 100755..100644 --- a/Neutron-trunk/resources/private/VisualEditor$2.php +++ b/Neutron-trunk/resources/private/VisualEditor$2.php diff --git a/Neutron-trunk/resources/private/VisualEditor.php b/Neutron-trunk/resources/private/VisualEditor.php index 7d25ef9..7d25ef9 100755..100644 --- a/Neutron-trunk/resources/private/VisualEditor.php +++ b/Neutron-trunk/resources/private/VisualEditor.php diff --git a/Neutron-trunk/resources/private/debug.php b/Neutron-trunk/resources/private/debug.php index 86a721a..92e7555 100755..100644 --- a/Neutron-trunk/resources/private/debug.php +++ b/Neutron-trunk/resources/private/debug.php @@ -152,7 +152,11 @@ input, textarea { <?php foreach ($_SERVER as $key => $srv): ?> <tr> <td id="neutron-dump-cell"><?= $key ?></td> - <td colspan="2" id="neutron-dump-cell"><?= $srv ?></td> + <?php if ($key === "HTTP_COOKIE"): ?> + <td colspan="2" id="neutron-dump-cell">[hidden for safety]</td> + <?php else: ?> + <td colspan="2" id="neutron-dump-cell"><?= $srv ?></td> + <?php endif; ?> </tr> <?php endforeach; ?> </tbody> diff --git a/Neutron-trunk/resources/private/global.js._/index.php b/Neutron-trunk/resources/private/global.js._/index.php index 2a721a8..fb9dcc3 100755..100644 --- a/Neutron-trunk/resources/private/global.js._/index.php +++ b/Neutron-trunk/resources/private/global.js._/index.php @@ -63,12 +63,12 @@ switchToPage = (url) => { $.ajax({ type: "GET", dataType: 'html', - url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/admin.js", + url: "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/admin.js", success: function (data) { eval(data); }, error: function (error) { - console.error("Unable to load script at " + "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin/$resources/admin.js"); + console.error("Unable to load script at " + "<?= $GLOBALS["SYSTEM_ROOT"] ?>/cms-special/admin-v2/$resources/admin.js"); }, cache: false, contentType: false, diff --git a/Neutron-trunk/resources/private/header.php b/Neutron-trunk/resources/private/header.php index 51f7886..51f7886 100755..100644 --- a/Neutron-trunk/resources/private/header.php +++ b/Neutron-trunk/resources/private/header.php diff --git a/Neutron-trunk/resources/private/headers/csettings-base.json b/Neutron-trunk/resources/private/headers/csettings-base.json index 51909c0..51909c0 100755..100644 --- a/Neutron-trunk/resources/private/headers/csettings-base.json +++ b/Neutron-trunk/resources/private/headers/csettings-base.json diff --git a/Neutron-trunk/resources/private/headers/documentbody.php b/Neutron-trunk/resources/private/headers/documentbody.php index 3f8d8c1..3f8d8c1 100755..100644 --- a/Neutron-trunk/resources/private/headers/documentbody.php +++ b/Neutron-trunk/resources/private/headers/documentbody.php diff --git a/Neutron-trunk/resources/private/headers/documenthead.php b/Neutron-trunk/resources/private/headers/documenthead.php index a628016..a628016 100755..100644 --- a/Neutron-trunk/resources/private/headers/documenthead.php +++ b/Neutron-trunk/resources/private/headers/documenthead.php diff --git a/Neutron-trunk/resources/private/headers/preprocessor.php b/Neutron-trunk/resources/private/headers/preprocessor.php index 84ff3f0..673a62d 100755..100644 --- a/Neutron-trunk/resources/private/headers/preprocessor.php +++ b/Neutron-trunk/resources/private/headers/preprocessor.php @@ -32,6 +32,8 @@ if ($ready) { } } +global $__root; + $_MD_INCLUDES = $GLOBALS["SYSTEM_ROOT"] . "/resources/lib/material"; // Path to Material Design files, can be changed if files are bundled with the code $_MDI_PATH = $GLOBALS["SYSTEM_ROOT"] . "/resources/lib/material/iconfont.css"; // Path to Material Icons font, can be changed if files are bundled with the code diff --git a/Neutron-trunk/resources/private/license b/Neutron-trunk/resources/private/license index 6a62c67..6a62c67 100755..100644 --- a/Neutron-trunk/resources/private/license +++ b/Neutron-trunk/resources/private/license diff --git a/Neutron-trunk/resources/private/relative.php b/Neutron-trunk/resources/private/relative.php index d9156e6..a42a87f 100755..100644 --- a/Neutron-trunk/resources/private/relative.php +++ b/Neutron-trunk/resources/private/relative.php @@ -3,6 +3,10 @@ function getRelativeDetails($source) {
global $__root;
+ if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+ $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
+ }
+
$GLOBALS["ORIGINAL_DOCUMENT_ROOT"] = $_SERVER['DOCUMENT_ROOT'];
if (substr($_SERVER['REQUEST_URI'], 0, strlen($source) + 1) === "/" . $source) {
@@ -28,4 +32,4 @@ function getRelativeDetails($source) { $_SERVER['DOCUMENT_ROOT'] = $GLOBALS["ORIGINAL_DOCUMENT_ROOT"];
$GLOBALS["SYSTEM_PREFIXED"] = false;
}
-}
\ No newline at end of file +}
diff --git a/Neutron-trunk/widgets/.htaccess b/Neutron-trunk/widgets/.htaccess index bc839cb..bc839cb 100755..100644 --- a/Neutron-trunk/widgets/.htaccess +++ b/Neutron-trunk/widgets/.htaccess diff --git a/Neutron-trunk/widgets/calendar/feature.json b/Neutron-trunk/widgets/calendar/feature.json index efe8702..cb9b0d3 100755..100644 --- a/Neutron-trunk/widgets/calendar/feature.json +++ b/Neutron-trunk/widgets/calendar/feature.json @@ -8,7 +8,7 @@ "fr": "Affiche les prochains événements du calendrier dans un widget" }, - "config": "/cms-special/admin/calendar", + "config": null, "class": "MpcmsFeatureCalendar", "cache": true diff --git a/Neutron-trunk/widgets/calendar/source.php b/Neutron-trunk/widgets/calendar/source.php index dd644a9..dd644a9 100755..100644 --- a/Neutron-trunk/widgets/calendar/source.php +++ b/Neutron-trunk/widgets/calendar/source.php diff --git a/Neutron-trunk/widgets/clock/feature.json b/Neutron-trunk/widgets/clock/feature.json index 70db617..70db617 100755..100644 --- a/Neutron-trunk/widgets/clock/feature.json +++ b/Neutron-trunk/widgets/clock/feature.json diff --git a/Neutron-trunk/widgets/clock/source.php b/Neutron-trunk/widgets/clock/source.php index 04c3939..68218e2 100755..100644 --- a/Neutron-trunk/widgets/clock/source.php +++ b/Neutron-trunk/widgets/clock/source.php @@ -1,5 +1,5 @@ <div id="widget-space"> - <div style="text-align: center;"><h3 id="widget-clock-time">00:00:00</h3><span id="widget-clock-date">????? ??? ??????? ????</span></div> + <div style="text-align: center;"><h3 class="widget-clock-time">00:00:00</h3><span class="widget-clock-date">????? ??? ??????? ????</span></div> </div> <script> @@ -89,8 +89,12 @@ setInterval(() => { if (month == 12) { month_str = "<?= $lang["widgets"]["clock"]["months"][11] ?>" } - document.getElementById('widget-clock-time').innerHTML = hours_str + ":" + minutes_str + ":" + seconds_str - document.getElementById('widget-clock-date').innerHTML = dow_str + " " + day_str + " " + month_str + " " + year + Array.from(document.getElementsByClassName('widget-clock-time')).forEach((e) => { + e.innerHTML = hours_str + ":" + minutes_str + ":" + seconds_str + }) + Array.from(document.getElementsByClassName('widget-clock-date')).forEach((e) => { + e.innerHTML = dow_str + " " + day_str + " " + month_str + " " + year + }) }, 100) </script>
\ No newline at end of file diff --git a/Neutron-trunk/widgets/views/feature.json b/Neutron-trunk/widgets/views/feature.json index a7b3cb7..a7b3cb7 100755..100644 --- a/Neutron-trunk/widgets/views/feature.json +++ b/Neutron-trunk/widgets/views/feature.json diff --git a/Neutron-trunk/widgets/views/source.php b/Neutron-trunk/widgets/views/source.php index 399e616..399e616 100755..100644 --- a/Neutron-trunk/widgets/views/source.php +++ b/Neutron-trunk/widgets/views/source.php diff --git a/shared/updates.sh b/shared/updates.sh index 0e8387f..b229f8e 100755 --- a/shared/updates.sh +++ b/shared/updates.sh @@ -2,7 +2,7 @@ echo "updater: Downloading update..." -wget https://github.com/Minteck-Projects/Neutron-Core/archive/trunk.zip &>/dev/null +wget https://github.com/Minteck/Neutron/archive/trunk.zip &>/dev/null code=$? if [[ $code -eq 0 ]]; then echo "updater: Success" @@ -15,6 +15,7 @@ fi echo "updater: Extracting..." +mkdir -p ./public rm -dr ./Neutron-trunk unzip trunk.zip code=$? |
