Updated APM, and page, and misc errors

Author: n0nag0n

app/controllers/DocsController.php

@@ -156,6 +156,16 @@ public function pluginGet(string $language, string $version, string $plugin_name
     public function singlePageGet(string $language, string $version) {
         $app = $this->app;
 
+		// Check if the language is valid
+		if ($this->DocsLogic->checkValidLanguage($language) === false) {
+			$language = 'en';
+		}
+
+		// Check if the version is valid
+		if ($this->DocsLogic->checkValidVersion($version) === false) {
+			$version = 'v3';
+		}
+
         // recursively look through all the content files, and pull out each section and render it
         $sections = [];
         $language_directory = self::CONTENT_DIR . '/' . $version . '/' . $language . '/';

app/utils/DocsLogic.php

@@ -5,10 +5,24 @@
 use app\middleware\HeaderSecurityMiddleware;
 use DOMDocument;
 use DOMXPath;
-use flight\core\EventDispatcher;
 
 class DocsLogic {
 
+	const AVAILABLE_LANGUAGES = [
+		'en',
+		'es',
+		'fr',
+		'lv',
+		'pt',
+		'de',
+		'ru',
+		'zh',
+		'ja',
+		'ko',
+		'uk',
+		'id'
+	];
+
 	/**
 	 * DocsLogic constructor.
 	 *
@@ -64,6 +78,16 @@ public function setupTranslatorService(string $language, string $version): Trans
     public function compileSinglePage(string $language, string $version, string $section) {
         $app = $this->app;
 
+		// Check if the language is valid
+		if ($this->checkValidLanguage($language) === false) {
+			$language = 'en';
+		}
+
+		// Check if the version is valid
+		if ($this->checkValidVersion($version) === false) {
+			$version = 'v3';
+		}
+
 		$Translator = $this->setupTranslatorService($language, $version);
 
 		$cacheStartTime = microtime(true);
@@ -99,6 +123,16 @@ public function compileSinglePage(string $language, string $version, string $sec
     public function compileScrollspyPage(string $language, string $version, string $section, string $sub_section) {
         $app = $this->app;
 
+		// Check if the language is valid
+		if ($this->checkValidLanguage($language) === false) {
+			$language = 'en';
+		}
+
+		// Check if the version is valid
+		if ($this->checkValidVersion($version) === false) {
+			$version = 'v3';
+		}
+
 		$Translator = $this->setupTranslatorService($language, $version);
 
 		$section_file_path = str_replace('_', '-', $section);
@@ -213,4 +247,24 @@ protected function wrapContentInDiv(string $html): string {
 
         return $d;
     }
+
+	/**
+	 * Checks if the provided language is valid.
+	 * 
+	 * @param string $language The language code to check.
+	 * @return bool True if the language is valid, false otherwise.
+	 */
+	public function checkValidLanguage(string $language): bool {
+		return in_array($language, self::AVAILABLE_LANGUAGES, true) === true;
+	}
+
+	/**
+	 * Checks if the provided version is valid.
+	 * 
+	 * @param string $version The version code to check.
+	 * @return bool True if the version is valid, false otherwise.
+	 */
+	public function checkValidVersion(string $version): bool {
+		return in_array($version, ['v3', 'v2'], true) === true;
+	}
 }

app/views/links.latte

@@ -15,7 +15,7 @@
 <link
     rel="stylesheet"
     href="https://cdn.jsdelivr.net/npm/@tarekraafat/[email protected]/dist/css/autoComplete.min.css" />
-<link rel="stylesheet" href="./css/style.css?version=7" />
+<link rel="stylesheet" href="/css/style.css?version=7" />
 
 {foreach ['en', 'fr', 'es', 'pt', 'lv', 'de', 'ru', 'zh', 'ja', 'ko', 'uk', 'id'] as $lang}
 <link rel="alternate" hreflang="{$lang}" href="./?lang={$lang}" />
@@ -26,4 +26,4 @@
 <!-- to prevent page flash -->
 <script
     nonce="{$nonce}"
-    src="./js/color-mode-toggler.js"></script>
+    src="/js/color-mode-toggler.js"></script>

app/views/scripts.latte

@@ -1,6 +1,6 @@
 <script
     nonce="{$nonce}"
-    src="./js/color-mode-toggler.js"></script>
+    src="/js/color-mode-toggler.js"></script>
 <script async defer src="https://buttons.github.io/buttons.js"></script>
 <script
     src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
@@ -10,7 +10,7 @@
 
 <!-- Google tag (gtag.js) -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=G-3C36SDZ8FE"></script>
-<script nonce="{$nonce}" src="./js/gtag.js"></script>
+<script nonce="{$nonce}" src="/js/gtag.js"></script>
 
 <script
     src="https://cdn.jsdelivr.net/npm/@tarekraafat/[email protected]/dist/autoComplete.min.js"></script>

composer.lock

@@ -72,6 +72,8 @@ php vendor/bin/runway apm:init
   }
   ```
 
+> This process will also ask if you want to run the migrations for this setup. If you're setting this up for your first time, the answer is yes.
+
 **Why two locations?**
 Raw metrics pile up fast (think unfiltered logs). The worker processes them into a structured destination for the dashboard. Keeps things tidy!
 
@@ -255,6 +257,17 @@ php vendor/bin/runway apm:worker --daemon --batch_size 100 --timeout 3600
 ```
 Runs for an hour, processing 100 metrics at a time.
 
+## Upgrading
+
+If you are upgrading to a newer version of the APM, there is a chance that there are database migrations that need to be run. You can do this by running the following command:
+
+```bash
+php vendor/bin/runway apm:migrate
+```
+This will run any migrations that are needed to update the database schema to the latest version.
+
+**Note:** If you're APM database is large in size, these migrations may take some time to run. You may want to run this command during off-peak hours.
+
 ## Troubleshooting
 
 Stuck? Try these:

content/v3/en/awesome-plugins/apm.md

@@ -63,7 +63,7 @@
         $messages = [
             [
                 "role" => "system",
-                "content" => "You are a gifted translator focusing on the tech space. Today you are translating documentation for a PHP Framework called Flight (so please never translate the word 'Flight' as it's the name of the framework). You are going to receive content that is like a markdown file. When you receive the content you'll translate it from english to the two letter language code that is specified. When you generate a response, you are going to ONLY send back the translated markdown content, no other replies or 'here is your translated markdown' type statements back, only the translated markdown content in markdown format. If you get a follow up response, you need to continue to markdown translation from the very character you left off at and complete the translation until the full page is done. THIS NEXT ITEM IS VERY IMPORTANT! Make sure that when you are translating any code in the markdown file that you ONLY translate the comments of the code and not the classes/methods/variables/links/urls/etc. Please don't translate any URLs or you will break my app and I will lose my job if this is not done correctly!"
+                "content" => "You are a gifted translator focusing on the tech space. Today you are translating documentation for a PHP Framework called Flight (so please never translate the word 'Flight' as it's the name of the framework). You are going to receive content that is a markdown file. When you receive the content you'll translate it from english to the two letter language code that is specified. When you generate a response, you are going to ONLY send back the translated markdown content, no other replies or 'here is your translated markdown' type statements back, only the translated markdown content in markdown format. If you get a follow up response, you need to continue to markdown translation from the very character you left off at and complete the translation until the full page is done. THIS NEXT ITEM IS VERY IMPORTANT! Make sure that when you are translating any code in the markdown file that you ONLY translate the comments of the code and not the classes/methods/variables/links/urls/etc. This next part is also incredibly important or it will break the entire page!!!! Please don't translate any URLs or you will break my app and I will lose my job if this is not done correctly!!!!"
             ],
             [
                 "role" => "user",