Updated metatags.php

luca-vogels · luca-vogels · commit c0a1f6e0010c · 2023-01-29T13:17:17.000+01:00
diff --git a/config.php b/config.php
@@ -4,6 +4,8 @@
 // Gets included before every PHP file and can be used to define custom constants or functions.
 // All variables of the framework are already available here e.g.:
 
+define('DOMAIN', implode(".", array_slice(explode(".", $_SERVER['SERVER_NAME']), -2, 2)));
+
 define('NAME', 'LupCode'); // can be removed, just for example
 
 ?>
diff --git a/scripts/metatags.php b/scripts/metatags.php
@@ -22,7 +22,13 @@
 <meta http-equiv="content-language" content="<?php echo LANGUAGE_CODE; ?>">
 <?php
 
+    echo '<link rel="canonical" href="https://'.DOMAIN.PROJECT_ROOT.LANGUAGE_CODE.'/'.REQUEST.'" />';
+
     foreach(SUPPORTED_LANGUAGES as $lang)
-        echo '<link rel="alternate" href="https://'.$_SERVER['SERVER_NAME'].PROJECT_ROOT.$lang.'/'.REQUEST.'" hreflang="'.$lang.'" />';
+        echo '<link rel="alternate" href="https://'.DOMAIN.PROJECT_ROOT.$lang.'/'.REQUEST.'" hreflang="'.$lang.'" />';
 
+    foreach(scandir(STATICS.'css/fonts/') as $fontFile){
+        if($fontFile[0] === '.') continue; // ignore files starting with '.'
+        echo '<link rel="preload" as="font" href="'.CSS.'fonts/'.$fontFile.'">';
+    }
 ?>
diff --git a/static/css/fonts/.gitkeep b/static/css/fonts/.gitkeep
diff --git a/views/error/index.php b/views/error/index.php
@@ -4,7 +4,7 @@
 noCache();
 
 ?><!DOCTYPE html>
-<html>
+<html lang="<?php echo LANGUAGE_CODE; ?>">
     <head>
         <title>Example error page</title>
         <?php include(SCRIPTS.'metatags.php'); ?>
diff --git a/views/language-editor/index.php b/views/language-editor/index.php
@@ -125,7 +125,7 @@ function languageEditorUnchanged(){
         if(form) form.reset();
     }
 </script>
-<html>
+<html lang="<?php echo LANGUAGE_CODE; ?>">
     <head>
         <title>Language Editor - PHP Framework by LupCode</title>
         <?php include(SCRIPTS.'metatags.php'); ?>
diff --git a/views/start/index.php b/views/start/index.php
@@ -4,7 +4,7 @@
 noCache();
 
 ?><!DOCTYPE html>
-<html>
+<html lang="<?php echo LANGUAGE_CODE; ?>">
     <head>
         <title><?php echo TEXT['pageTitleStart']; ?></title>
         <?php include(SCRIPTS.'metatags.php'); ?>

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ function languageEditorUnchanged(){`
`125`	`125`	`if(form) form.reset();`
`126`	`126`	`}`
`127`	`127`	`</script>`
`128`		`-<html>`
	`128`	`+<html lang="<?php echo LANGUAGE_CODE; ?>">`
`129`	`129`	`<head>`
`130`	`130`	`<title>Language Editor - PHP Framework by LupCode</title>`
`131`	`131`	`<?php include(SCRIPTS.'metatags.php'); ?>`