diff options
Diffstat (limited to 'Neutron-trunk/api')
70 files changed, 37 insertions, 40 deletions
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 |
