Преглед на файлове

Pages adapted to the multilanguage system.

Iñigo Valentin преди 9 години
родител
ревизия
f8af8daa53
променени са 20 файла, в които са добавени 157 реда и са изтрити 203 реда
  1. 3 3
      sql/text.sql
  2. 11 10
      www/.htaccess
  3. 16 15
      www/blog/index.php
  4. 8 7
      www/blog/post.php
  5. 0 72
      www/contact/index.php
  6. 0 0
      www/css/m/profile.css
  7. 0 0
      www/css/profile.css
  8. 3 2
      www/error/403.php
  9. 3 2
      www/error/404.php
  10. 4 3
      www/error/500.php
  11. 11 7
      www/footer.php
  12. 30 19
      www/functions.php
  13. 9 9
      www/header.php
  14. 7 6
      www/help/index.php
  15. 0 0
      www/img/icon/profile.gif
  16. 8 7
      www/index.php
  17. 17 16
      www/profile/index.php
  18. 11 10
      www/project/index.php
  19. 16 15
      www/project/project.php
  20. 0 0
      www/script/profile.css

+ 3 - 3
sql/text.sql

@@ -64,15 +64,15 @@ INSERT INTO text VALUES ('DAY_7', 'eu', 'DATE', 'igandea');
 
 -- HEADER
 INSERT INTO text VALUES ('HEADER_HOME',     'es', 'HEADER', 'Inicio');
-INSERT INTO text VALUES ('HEADER_ME',       'es', 'HEADER', 'Yo');
+INSERT INTO text VALUES ('HEADER_PROFILE',  'es', 'HEADER', 'Yo');
 INSERT INTO text VALUES ('HEADER_PROJECTS', 'es', 'HEADER', 'Proyectos');
 INSERT INTO text VALUES ('HEADER_BLOG',     'es', 'HEADER', 'Blog');
 INSERT INTO text VALUES ('HEADER_HOME',     'en', 'HEADER', 'Home');
-INSERT INTO text VALUES ('HEADER_ME',       'en', 'HEADER', 'Me');
+INSERT INTO text VALUES ('HEADER_PROFILE',  'en', 'HEADER', 'Me');
 INSERT INTO text VALUES ('HEADER_PROJECTS', 'en', 'HEADER', 'Projects');
 INSERT INTO text VALUES ('HEADER_BLOG',     'en', 'HEADER', 'Blog');
 INSERT INTO text VALUES ('HEADER_HOME',     'eu', 'HEADER', 'Hasiera');
-INSERT INTO text VALUES ('HEADER_ME',       'eu', 'HEADER', 'Ni');
+INSERT INTO text VALUES ('HEADER_PROFILE',  'eu', 'HEADER', 'Ni');
 INSERT INTO text VALUES ('HEADER_PROJECTS', 'eu', 'HEADER', 'Proiektuak');
 INSERT INTO text VALUES ('HEADER_BLOG',     'eu', 'HEADER', 'Blog');
 

+ 11 - 10
www/.htaccess

@@ -37,6 +37,17 @@ Options -MultiViews
 	RewriteCond %{THE_REQUEST} ^GET\ (.*)\.(php|html)([#?][^\ ]*)?\ HTTP
 	RewriteRule ^(.*)\.(php|html)$ $1 [R=301]
 
+	# Redirect permalinks.
+        RewriteRule ^project/([A-Z\-a-z0-9]{3,}+)[\/]?$ /project/project.php?permalink=$1 [NC]
+        RewriteRule ^blog/([A-Z\-a-z0-9]{3,}+)[\/]?$ /blog/post.php?permalink=$1 [NC]
+        RewriteRule ^help[\/]?$ /help/index.php [NC]
+        RewriteRule ^(perfil|xprofile|profila)[\/]?$ /profile/index.php [NC]
+
+        # PHP to xml.
+        RewriteRule ^sitemap.xml$ /sitemap.php [NC]
+        RewriteRule ^imgmap.xml$ /sitemap-image.php [NC]
+        RewriteRule ^rss.xml$ /rss.php
+
 	# Language as GET param.
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteCond %{REQUEST_FILENAME} !-f
@@ -49,16 +60,6 @@ Options -MultiViews
 	RewriteCond %{REQUEST_FILENAME}.php -f
 	RewriteRule ^(.*)$ $1\.php [L]
 
-	# Redirect permalinks.
-	RewriteRule ^project/([A-Z\-a-z0-9]{3,}+)[\/]?$ /project/project.php?permalink=$1 [NC]
-	RewriteRule ^blog/([A-Z\-a-z0-9]{3,}+)[\/]?$ /blog/post.php?permalink=$1 [NC]
-	RewriteRule ^help[\/]?$ /help/index.php [NC]
-	RewriteRule ^(perfil|profile|profila)[\/]?$ /profile/index.php [NC]
-
-	# PHP to xml.
-	RewriteRule ^sitemap.xml$ /sitemap.php [NC]
-	RewriteRule ^imgmap.xml$ /sitemap-image.php [NC]
-	RewriteRule ^rss.xml$ /rss.php
 </ifModule>
 
 

+ 16 - 15
www/blog/index.php

@@ -7,6 +7,7 @@
     $con = start_db();
     $server = $proto . $http_host;
     $lang = select_language();
+    $lserver = $server . "/" . $lang;
     $cur_section = "blog";
     $cur_entry = "";
 
@@ -18,7 +19,7 @@
         <meta charset='utf-8'/>
         <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'/>
         <title><?=text($con, "BLOG_TITLE", $lang)?> - I&ntilde;igo Valentin</title>
-        <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'/>
+        <link rel='shortcut icon' href='<?=$lserver?>/img/logo/favicon.ico'/>
         <!-- CSS files -->
         <style>
 <?php
@@ -41,22 +42,22 @@
 ?>
         </script>
         <!-- Meta tags -->
-        <link rel='canonical' href='<?=$server?>/blog/'/>
-        <link rel='author' href='<?=$server?>'/>
-        <link rel='publisher' href='<?=$server?>'/>
+        <link rel='canonical' href='<?=$lserver?>/blog/'/>
+        <link rel='author' href='<?=$lserver?>'/>
+        <link rel='publisher' href='<?=$lserver?>'/>
         <meta name='description' content='<?=text($con, "BLOG_DESCRIPTION", $lang)?>'/>
         <meta property='og:title' content='<?=text($con, "BLOG_TITLE", $lang)?> - I&ntilde;igo Valentin'/>
-        <meta property='og:url' content='<?=$server?>/blog/'/>
+        <meta property='og:url' content='<?=$lserver?>/blog/'/>
         <meta property='og:description' content='<?=text($con, "BLOG_DESCRIPTION", $lang)?>'/>
-        <meta property='og:image' content='<?=$server?>/img/logo/favicon.ico'/>
+        <meta property='og:image' content='<?=$lserver?>/img/logo/favicon.ico'/>
         <meta property='og:site_name' content='I&ntilde;igo Valentin'/>
         <meta property='og:type' content='website'/>
         <meta property='og:locale' content='<?=$lang?>'/>
         <meta name='twitter:card' content='summary'/>
         <meta name='twitter:title' content='<?=text($con, "BLOG_TITLE", $lang)?> - I&ntilde;igo Valentin'/>
         <meta name='twitter:description' content='<?=text($con, "BLOG_DESCRIPTION", $lang)?>'/>
-        <meta name='twitter:image' content='<?=$server?>/img/logo/favicon.ico'/>
-        <meta name='twitter:url' content='<?=$server?>/project/'/>
+        <meta name='twitter:image' content='<?=$lserver?>/img/logo/favicon.ico'/>
+        <meta name='twitter:url' content='<?=$lserver?>/project/'/>
         <meta name='robots' content='index follow'/>
     </head>
     <body>
@@ -77,9 +78,9 @@
                                     <meta itemprop='datePublished dateModified' content='<?=$r_blog["isodate"]?>'/>
                                     <meta itemprop='headline name' content='<?=text($con, $r_blog["title"], $lang)?>'/>
                                     <meta itemprop='articleBody text' content='<?=text($con, $r_blog["text"], $lang)?>'/>
-                                    <meta itemprop='mainEntityOfPage' content='<?=$server?>'/>
+                                    <meta itemprop='mainEntityOfPage' content='<?=$lserver?>'/>
                                     <h3 class='entry_title'>
-                                        <a itemprop='url' href='<?=$server?>/blog/<?=$r_blog["permalink"]?>'><?=$r_blog["title"]?></a>
+                                        <a itemprop='url' href='<?=$lserver?>/blog/<?=$r_blog["permalink"]?>'><?=$r_blog["title"]?></a>
                                     </h3>
 <?php
                                     $q_image = mysqli_query($con, "SELECT image FROM post_image WHERE post = $r_blog[id] ORDER BY idx LIMIT 1;");
@@ -87,15 +88,15 @@
                                         $r_image = mysqli_fetch_array($q_image);
 ?>
                                         <div class='post_list_image_container'>
-                                            <a href='<?=$server?>/blog/<?=$r_blog["permalink"]?>'>
-                                                <meta itemprop='image' content='<?=$server?>/img/blog/view/<?=$r_image["image"]?>'/>
-                                                <img class='post_list_image alt='<?=$r_blog["title"]?>' src='<?=$server?>/img/blog/miniature/<?=$r_image["image"]?>'/>
+                                            <a href='<?=$lserver?>/blog/<?=$r_blog["permalink"]?>'>
+                                                <meta itemprop='image' content='<?=$lserver?>/img/blog/view/<?=$r_image["image"]?>'/>
+                                                <img class='post_list_image alt='<?=$r_blog["title"]?>' src='<?=$lserver?>/img/blog/miniature/<?=$r_image["image"]?>'/>
                                             </a>
                                         </div>
 <?php
                                     }
 ?>
-                                    <p><?=cutText($r_blog["text"], 800, text($con, "BLOG_MORE", $lang), "$server/blog/$r_blog[permalink]/")?></p>
+                                    <p><?=cutText($r_blog["text"], 800, text($con, "BLOG_MORE", $lang), "$lserver/blog/$r_blog[permalink]/")?></p>
                                     <hr/>
                                     <table class='post_footer'>
                                         <tr>
@@ -186,7 +187,7 @@
                             while($r_tag = mysqli_fetch_array($q_tag)){
                                 $size = round(60 + 100 * $r_tag['count'] / $max);
 ?>
-                                <a href='<?=$server?>/blog/search/tag/<?=$r_tag["tag"]?>'>
+                                <a href='<?=$lserver?>/blog/search/tag/<?=$r_tag["tag"]?>'>
                                     <span style='font-size: <?=$size?>%'><?=text($con, $r_tag["tag"], $lang)?></span>
                                 </a>
 <?php

+ 8 - 7
www/blog/post.php

@@ -1,12 +1,13 @@
 <?php
     session_start();
     $http_host = $_SERVER["HTTP_HOST"];
-    $doc_root = $_SERVER["DOCUMENT_ROOT"]; 
+    $doc_root = $_SERVER["DOCUMENT_ROOT"];
     include $doc_root . "functions.php";
     $proto = get_protocol();
     $con = start_db();
     $server = $proto . $http_host;
     $lang = select_language();
+    $lserver = $server . "/" . $lang;
     $cur_section = "";
     $cur_entry = "";
 ?>
@@ -17,7 +18,7 @@
         <meta charset='utf-8'/>
         <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'/>
         <title>I&ntilde;igo Valentin</title>
-        <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'/>
+        <link rel='shortcut icon' href='<?=$lserver?>/img/logo/favicon.ico'/>
         <!-- CSS files -->
         <style>
 <?php
@@ -39,12 +40,12 @@
 ?>
         </script>
         <!-- Meta tags -->
-        <link rel='canonical' href='<?=$server?>'/>
-        <link rel='author' href='<?=$server?>'/>
-        <link rel='publisher' href='<?=$server?>'/>
+        <link rel='canonical' href='<?=$lserver?>'/>
+        <link rel='author' href='<?=$lserver?>'/>
+        <link rel='publisher' href='<?=$lserver?>'/>
         <meta name='description' content=''/>
         <meta property='og:title' content='I&ntilde;igo Valentin'/>
-        <meta property='og:url' content='<?=$server?>'/>
+        <meta property='og:url' content='<?=$lserver?>'/>
         <meta property='og:description' content=''/>
         <meta property='og:image' content=''/>
         <meta property='og:site_name' content='I&ntilde;igo Valentin'/>
@@ -54,7 +55,7 @@
         <meta name='twitter:title' content='I&ntilde;igo Valentin'/>
         <meta name='twitter:description' content=''/>
         <meta name='twitter:image' content=''/>
-        <meta name='twitter:url' content='<?=$server?>'/>
+        <meta name='twitter:url' content='<?=$lserver?>'/>
         <meta name='robots' content='index follow'/>
     </head>
     <body>

+ 0 - 72
www/contact/index.php

@@ -1,72 +0,0 @@
-<?php
-    session_start();
-    $http_host = $_SERVER["HTTP_HOST"];
-    $doc_root = $_SERVER["DOCUMENT_ROOT"]; 
-    include $doc_root . "functions.php";
-    $proto = get_protocol();
-    $con = start_db();
-    $server = $proto . $http_host;
-    $lang = select_language();
-    $cur_section = "";
-    $cur_entry = "";
-?>
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta content='text/html; charset=utf-8' http-equiv='content-type'/>
-        <meta charset='utf-8'/>
-        <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'/>
-        <title>I&ntilde;igo Valentin</title>
-        <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'/>
-        <!-- CSS files -->
-        <style>
-<?php
-            include $doc_root . "css/ui.css";
-            include $doc_root . "css/home.css";
-?>
-        </style>
-        <!-- CSS for mobile version -->
-        <style media='(max-width : 990px)'>
-<?php
-            include $doc_root . "css/m/ui.css";
-            include $doc_root . "css/m/home.css";
-?>
-        </style>
-        <!-- Script files -->
-        <script type='text/javascript'>
-<?php
-            include $doc_root . "script/ui.js";
-?>
-        </script>
-        <!-- Meta tags -->
-        <link rel='canonical' href='<?=$server?>'/>
-        <link rel='author' href='<?=$server?>'/>
-        <link rel='publisher' href='<?=$server?>'/>
-        <meta name='description' content=''/>
-        <meta property='og:title' content='I&ntilde;igo Valentin'/>
-        <meta property='og:url' content='<?=$server?>'/>
-        <meta property='og:description' content=''/>
-        <meta property='og:image' content=''/>
-        <meta property='og:site_name' content='I&ntilde;igo Valentin'/>
-        <meta property='og:type' content='website'/>
-        <meta property='og:locale' content='<?=$lang?>'/>
-        <meta name='twitter:card' content='summary'/>
-        <meta name='twitter:title' content='I&ntilde;igo Valentin'/>
-        <meta name='twitter:description' content=''/>
-        <meta name='twitter:image' content=''/>
-        <meta name='twitter:url' content='<?=$server?>'/>
-        <meta name='robots' content='index follow'/>
-    </head>
-    <body>
-<?php
-        include $doc_root . "header.php";
-?>
-        <div id='content'>
-
-        </div> <!-- #content -->
-<?php
-        include $doc_root . "footer.php";
-        stats($con, $cur_section, $cur_entry);
-?>
-    </body>
-</html>

+ 0 - 0
www/css/m/me.css → www/css/m/profile.css


+ 0 - 0
www/css/me.css → www/css/profile.css


+ 3 - 2
www/error/403.php

@@ -7,6 +7,7 @@
     $con = start_db();
     $server = $proto . $http_host;
     $lang = select_language();
+    $lserver = $server . "/" . $lang;
     $cur_section = "error";
     $cur_entry = "403";
 ?>
@@ -16,7 +17,7 @@
         <meta content='text/html; charset=windows-1252' http-equiv='content-type'/>
         <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'>
         <title>Error - I&ntilde;igo Valentin</title>
-        <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'>
+        <link rel='shortcut icon' href='<?=$lserver?>/img/logo/favicon.ico'>
         <!-- CSS files -->
         <link rel='stylesheet' type='text/css' href='/css/ui.css'/>
         <style>
@@ -87,7 +88,7 @@
                         <a href='javascript: history.go(-1);'>Go to the previous page.</a>
                     </li>
                     <li>
-                        <a href='<?=$server?>/'>Go to the main page</a>
+                        <a href='<?=$lserver?>/'>Go to the main page</a>
                     </li>
                 </ul>
             </div> <!-- #error_message -->

+ 3 - 2
www/error/404.php

@@ -7,6 +7,7 @@
     $con = start_db();
     $server = $proto . $http_host;
     $lang = select_language();
+    $lserver = $server . "/" . $lang;
     $cur_section = "error";
     $cur_entry = "404";
 ?>
@@ -16,7 +17,7 @@
         <meta content='text/html; charset=windows-1252' http-equiv='content-type'/>
         <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'>
         <title>Error - I&ntilde;igo Valentin</title>
-        <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'>
+        <link rel='shortcut icon' href='<?=$lserver?>/img/logo/favicon.ico'>
         <!-- CSS files -->
         <link rel='stylesheet' type='text/css' href='/css/ui.css'/>
         <style>
@@ -87,7 +88,7 @@
                         <a href='javascript: history.go(-1);'>Go to the previous page.</a>
                     </li>
                     <li>
-                        <a href='<?=$server?>/'>Go to the main page</a>
+                        <a href='<?=$lserver?>/'>Go to the main page</a>
                     </li>
                 </ul>
             </div> <!-- #error_message -->

+ 4 - 3
www/error/500.php

@@ -1,12 +1,13 @@
 <?php
     session_start();
     $http_host = $_SERVER["HTTP_HOST"];
-    $doc_root = $_SERVER["DOCUMENT_ROOT"]; 
+    $doc_root = $_SERVER["DOCUMENT_ROOT"];
     include $doc_root . "functions.php";
     $proto = get_protocol();
     $con = start_db();
     $server = $proto . $http_host;
     $lang = select_language();
+    $lserver = $server . "/" . $lang;
     $cur_section = "error";
     $cur_entry = "500";
 ?>
@@ -16,7 +17,7 @@
         <meta content='text/html; charset=windows-1252' http-equiv='content-type'/>
         <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'>
         <title>Error - I&ntilde;igo Valentin</title>
-        <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'>
+        <link rel='shortcut icon' href='<?=$lserver?>/img/logo/favicon.ico'>
         <!-- CSS files -->
         <link rel='stylesheet' type='text/css' href='/css/ui.css'/>
         <style>
@@ -87,7 +88,7 @@
                         <a href='javascript: history.go(-1);'>Go to the previous page.</a>
                     </li>
                     <li>
-                        <a href='<?=$server?>/'>Go to the main page</a>
+                        <a href='<?=$lserver?>/'>Go to the main page</a>
                     </li>
                 </ul>
             </div> <!-- #error_message -->

+ 11 - 7
www/footer.php

@@ -4,21 +4,25 @@
         <tr>
             <td id='footer_left'>
                 <span id='footer_follow' class='desktop'><?=text($con, "FOOTER_FOLLOW", $lang);?></span>
-                <a title='Github' href='https://www.github.com/u/Seavenois'><img class='footer_social_icon' src='<?=$server?>/img/social/github.gif' alt='Github'/></a>
-                <a title='Facebook' href='https://www.facebook.com/ivalentin'><img class='footer_social_icon' src='<?=$server?>/img/social/facebook.gif' alt='Facebook'/></a>
-                <a title='Google+' href='https://plus.google.com/108048773942421710294/'><img class='footer_social_icon' src='<?=$server?>/img/social/googleplus.gif' alt='Google+'/></a>
-                <a title='RSS' href='<?=$server?>/feed/'><img class='footer_social_icon' src='<?=$server?>/img/social/rss.gif' alt='RSS'/></a>
+                <a title='Github' href='https://www.github.com/u/Seavenois'><img class='footer_social_icon' src='<?=$lserver?>/img/social/github.gif' alt='Github'/></a>
+                <a title='Facebook' href='https://www.facebook.com/ivalentin'><img class='footer_social_icon' src='<?=$lserver?>/img/social/facebook.gif' alt='Facebook'/></a>
+                <a title='Google+' href='https://plus.google.com/108048773942421710294/'><img class='footer_social_icon' src='<?=$lserver?>/img/social/googleplus.gif' alt='Google+'/></a>
+                <a title='RSS' href='<?=$lserver?>/feed/'><img class='footer_social_icon' src='<?=$lserver?>/img/social/rss.gif' alt='RSS'/></a>
             </td>
             <td id='footer_center'><?=text($con, "FOOTER_COPY", $lang);?></td>
             <td id='footer_right'>
-                <a href='<?=$server?>/help/'><?=text($con, "FOOTER_HELP", $lang);?></a>
+                <a href='<?=$lserver?>/help/'><?=text($con, "FOOTER_HELP", $lang);?></a>
                 <br/><br/>
 <?php
                 $q_lang = mysqli_query($con, "SELECT * FROM lang WHERE active = 1;");
                 while ($r = mysqli_fetch_array($q_lang)){
-                    // TODO: href
+                    $uri = $_SERVER["REQUEST_URI"];
+                    if (substr($uri, 3, 1) == '/'){
+                        $uri = substr($uri, 3);
+                    }
+                    $dest = $server . "/" . $r["code"] . $uri;
 ?>
-                    <a class='lang' href='#'><img src='<?=$server?>/img/lang/<?=$r["code"]?>.gif' alt='<?=$r['name']?>' /></a>
+                    <a class='lang' href='<?=$dest?>'><img src='<?=$lserver?>/img/lang/<?=$r["code"]?>.gif' alt='<?=$r['name']?>' /></a>
 <?php
                 }
 ?>

+ 30 - 19
www/functions.php

@@ -66,35 +66,46 @@
      *****************************************************/
     // TODO: Redo using database
     function select_language(){
-        // Is passed on the URL?
-        $lang = $_GET["lang"];
+
+        // Check for language in uri
+        $lang = substr($_SERVER['REQUEST_URI'], 1, 2);
         if ($lang == "es" || $lang == "en" || $lang == "eu"){
             return $lang;
         }
-
-        // Try to read cookie.
-        header("Cache-control: private");
-        if (isSet($_COOKIE["lang"])){
-            $lang = $_COOKIE["lang"];
+        else{
+            // Language is not in url. Find it out and redirect
+            // Is passed on the URL?
+            $lang = $_GET["lang"];
             if ($lang == "es" || $lang == "en" || $lang == "eu"){
+                header("Location: " . get_protocol() . $_SERVER["HTTP_HOST"] . "/" . $lang . $_SERVER["REQUEST_URI"]);
                 return $lang;
             }
-            else{
-                return "es";
-            }
-        }
 
-        //If no cookie, select from client browser preferences.
-        else{
-            $available_languages = array("en", "eu", "es");
-            $langs = prefered_language($available_languages, $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
-            $lang = $langs[0];
-            if ($lang != "es" && $lang != "en" && $lang != "eu"){
-                return "es";
+            // Try to read cookie.
+            header("Cache-control: private");
+            if (isSet($_COOKIE["lang"])){
+                $lang = $_COOKIE["lang"];
+                if ($lang == "es" || $lang == "en" || $lang == "eu"){
+                    header("Location: " . get_protocol() . $_SERVER["HTTP_HOST"] . "/" . $lang . $_SERVER["REQUEST_URI"]);
+                    return $lang;
+                }
             }
+
+            //If no cookie, select from client browser preferences.
             else{
-                return $langs[0];
+                $available_languages = array("en", "eu", "es");
+                $langs = prefered_language($available_languages, $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
+                $lang = $langs[0];
+                if ($lang == "es" || $lang == "en" || $lang == "eu"){
+                    header("Location: " . get_protocol() . $_SERVER["HTTP_HOST"] . "/" . $lang . $_SERVER["REQUEST_URI"]);
+                    return $lang;
+                }
             }
+
+            // If no method was succesfull, default language
+            $lang = "es";
+            header("Location: " . get_protocol() . $_SERVER["HTTP_HOST"] . "/" . $lang . $_SERVER["REQUEST_URI"]);
+            return $lang;
         }
     }
 

+ 9 - 9
www/header.php

@@ -1,29 +1,29 @@
 <div id='header_parent'>
     <nav id='header'>
-        <a href='<?=$server?>/'>
+        <a href='<?=$lserver?>/'>
             <span class='header_container'>
-                <span class='header_icon_container'><img class='header_icon' alt='<?=text($con, "HEADER_HOME", $lang);?>' src='<?=$server?>/img/icon/home.gif'/></span>
+                <span class='header_icon_container'><img class='header_icon' alt='<?=text($con, "HEADER_HOME", $lang);?>' src='<?=$lserver?>/img/icon/home.gif'/></span>
                 <?=text($con, "HEADER_HOME", $lang);?>
             </span>
         </a>
         <span class='link_separator desktop'></span>
-        <a href='<?=$server?>/me/'>
+        <a href='<?=$lserver?>/profile/'>
             <span class='header_container'>
-                <span class='header_icon_container'><img class='header_icon' alt='<?=text($con, "HEADER_ME", $lang);?>' src='<?=$server?>/img/icon/me.gif'/></span>
-                <?=text($con, "HEADER_ME", $lang);?>
+                <span class='header_icon_container'><img class='header_icon' alt='<?=text($con, "HEADER_ME", $lang);?>' src='<?=$lserver?>/img/icon/profile.gif'/></span>
+                <?=text($con, "HEADER_PROFILE", $lang);?>
             </span>
         </a>
         <span class='link_separator desktop'></span>
-        <a href='<?=$server?>/projects/'>
+        <a href='<?=$lserver?>/projects/'>
             <span class='header_container'>
-                <span class='header_icon_container'><img class='header_icon' alt='<?=text($con, "HEADER_PROJECTS", $lang);?>' src='<?=$server?>/img/icon/projects.gif'/></span>
+                <span class='header_icon_container'><img class='header_icon' alt='<?=text($con, "HEADER_PROJECTS", $lang);?>' src='<?=$lserver?>/img/icon/projects.gif'/></span>
                 <?=text($con, "HEADER_PROJECTS", $lang);?>
             </span>
         </a>
         <span class='link_separator desktop'></span>
-        <a href='<?=$server?>/blog/'>
+        <a href='<?=$lserver?>/blog/'>
             <span class='header_container'>
-                <span class='header_icon_container'><img class='header_icon' alt='<?=text($con, "HEADER_BLOG", $lang);?>' src='<?=$server?>/img/icon/blog.gif'/></span>
+                <span class='header_icon_container'><img class='header_icon' alt='<?=text($con, "HEADER_BLOG", $lang);?>' src='<?=$lserver?>/img/icon/blog.gif'/></span>
                 <?=text($con, "HEADER_BLOG", $lang);?>
             </span>
         </a>

+ 7 - 6
www/help/index.php

@@ -7,6 +7,7 @@
     $con = start_db();
     $server = $proto . $http_host;
     $lang = select_language();
+    $lserver = $server . "/" . $lang;
     $cur_section = "";
     $cur_entry = "";
 ?>
@@ -17,7 +18,7 @@
         <meta charset='utf-8'/>
         <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'/>
         <title>I&ntilde;igo Valentin</title>
-        <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'/>
+        <link rel='shortcut icon' href='<?=$lserver?>/img/logo/favicon.ico'/>
         <!-- CSS files -->
         <style>
 <?php
@@ -39,12 +40,12 @@
 ?>
         </script>
         <!-- Meta tags -->
-        <link rel='canonical' href='<?=$server?>'/>
-        <link rel='author' href='<?=$server?>'/>
-        <link rel='publisher' href='<?=$server?>'/>
+        <link rel='canonical' href='<?=$lserver?>'/>
+        <link rel='author' href='<?=$lserver?>'/>
+        <link rel='publisher' href='<?=$lserver?>'/>
         <meta name='description' content=''/>
         <meta property='og:title' content='I&ntilde;igo Valentin'/>
-        <meta property='og:url' content='<?=$server?>'/>
+        <meta property='og:url' content='<?=$lserver?>'/>
         <meta property='og:description' content=''/>
         <meta property='og:image' content=''/>
         <meta property='og:site_name' content='I&ntilde;igo Valentin'/>
@@ -54,7 +55,7 @@
         <meta name='twitter:title' content='I&ntilde;igo Valentin'/>
         <meta name='twitter:description' content=''/>
         <meta name='twitter:image' content=''/>
-        <meta name='twitter:url' content='<?=$server?>'/>
+        <meta name='twitter:url' content='<?=$lserver?>'/>
         <meta name='robots' content='index follow'/>
     </head>
     <body>

+ 0 - 0
www/img/icon/me.gif → www/img/icon/profile.gif


+ 8 - 7
www/index.php

@@ -7,6 +7,7 @@
     $con = start_db();
     $server = $proto . $http_host;
     $lang = select_language();
+    $lserver = $server . "/" . $lang;
     $cur_section = "";
     $cur_entry = "";
 ?>
@@ -17,7 +18,7 @@
         <meta charset='utf-8'/>
         <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'/>
         <title>I&ntilde;igo Valentin</title>
-        <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'/>
+        <link rel='shortcut icon' href='<?=$lserver?>/img/logo/favicon.ico'/>
         <!-- CSS files -->
         <style>
 <?php
@@ -39,12 +40,12 @@
 ?>
         </script>
         <!-- Meta tags -->
-        <link rel='canonical' href='<?=$server?>'/>
-        <link rel='author' href='<?=$server?>'/>
-        <link rel='publisher' href='<?=$server?>'/>
+        <link rel='canonical' href='<?=$lserver?>'/>
+        <link rel='author' href='<?=$lserver?>'/>
+        <link rel='publisher' href='<?=$lserver?>'/>
         <meta name='description' content=''/>
         <meta property='og:title' content='I&ntilde;igo Valentin'/>
-        <meta property='og:url' content='<?=$server?>'/>
+        <meta property='og:url' content='<?=$lserver?>'/>
         <meta property='og:description' content=''/>
         <meta property='og:image' content=''/>
         <meta property='og:site_name' content='I&ntilde;igo Valentin'/>
@@ -54,12 +55,12 @@
         <meta name='twitter:title' content='I&ntilde;igo Valentin'/>
         <meta name='twitter:description' content=''/>
         <meta name='twitter:image' content=''/>
-        <meta name='twitter:url' content='<?=$server?>'/>
+        <meta name='twitter:url' content='<?=$lserver?>'/>
         <meta name='robots' content='index follow'/>
     </head>
     <body>
         <div id='logo'>
-            <img id='logo' src='<?=$server?>/img/logo/inigovalentin.png' alt='I&ntilde;igo Valentin'/>
+            <img id='logo' src='<?=$lserver?>/img/logo/inigovalentin.png' alt='I&ntilde;igo Valentin'/>
         </div>
 <?php
         include $doc_root . "header.php";

+ 17 - 16
www/me/index.php → www/profile/index.php

@@ -1,12 +1,13 @@
 <?php
     session_start();
     $http_host = $_SERVER["HTTP_HOST"];
-    $doc_root = $_SERVER["DOCUMENT_ROOT"]; 
+    $doc_root = $_SERVER["DOCUMENT_ROOT"];
     include $doc_root . "functions.php";
     $proto = get_protocol();
     $con = start_db();
     $server = $proto . $http_host;
     $lang = select_language();
+    $lserver = $server . "/" . $lang;
     $cur_section = "me";
     $cur_entry = "";
 ?>
@@ -16,8 +17,8 @@
         <meta content='text/html; charset=utf-8' http-equiv='content-type'/>
         <meta charset='utf-8'/>
         <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'/>
-        <title><?=text($con, "ME_TITLE", $lang)?> - I&ntilde;igo Valentin</title>
-        <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'/>
+        <title><?=text($con, "PROFILE_TITLE", $lang)?> - I&ntilde;igo Valentin</title>
+        <link rel='shortcut icon' href='<?=$lserver?>/img/logo/favicon.ico'/>
         <!-- CSS files -->
         <style>
 <?php
@@ -40,22 +41,22 @@
 ?>
         </script>
         <!-- Meta tags -->
-        <link rel='canonical' href='<?=$server?>/me/'/>
-        <link rel='author' href='<?=$server?>'/>
-        <link rel='publisher' href='<?=$server?>'/>
-        <meta name='description' content='<?=text($con, "ME_DESCRIPTION", $lang)?>'/>
-        <meta property='og:title' content='<?=text($con, "ME_TITLE", $lang)?> - I&ntilde;igo Valentin'/>
-        <meta property='og:url' content='<?=$server?>/me'/>
-        <meta property='og:description' content='<?=text($con, "ME_DESCRIPTION", $lang)?>'/>
-        <meta property='og:image' content='<?=$server?>/img/logo/favicon.ico''/>
+        <link rel='canonical' href='<?=$lserver?>/me/'/>
+        <link rel='author' href='<?=$lserver?>'/>
+        <link rel='publisher' href='<?=$lserver?>'/>
+        <meta name='description' content='<?=text($con, "PROFILE_DESCRIPTION", $lang)?>'/>
+        <meta property='og:title' content='<?=text($con, "PROFILE_TITLE", $lang)?> - I&ntilde;igo Valentin'/>
+        <meta property='og:url' content='<?=$lserver?>/me'/>
+        <meta property='og:description' content='<?=text($con, "PROFILE_DESCRIPTION", $lang)?>'/>
+        <meta property='og:image' content='<?=$lserver?>/img/logo/favicon.ico''/>
         <meta property='og:site_name' content='I&ntilde;igo Valentin'/>
         <meta property='og:type' content='website'/>
         <meta property='og:locale' content='<?=$lang?>'/>
         <meta name='twitter:card' content='summary'/>
-        <meta name='twitter:title' content='<?=text($con, "ME_TITLE", $lang)?> - I&ntilde;igo Valentin'/>
-        <meta name='twitter:description' content='<?=text($con, "ME_DESCRIPTION", $lang)?>'/>
-        <meta name='twitter:image' content='<?=$server?>/img/logo/favicon.ico''/>
-        <meta name='twitter:url' content='<?=$server?>'/>
+        <meta name='twitter:title' content='<?=text($con, "PROFILE_TITLE", $lang)?> - I&ntilde;igo Valentin'/>
+        <meta name='twitter:description' content='<?=text($con, "PROFILE_DESCRIPTION", $lang)?>'/>
+        <meta name='twitter:image' content='<?=$lserver?>/img/logo/favicon.ico''/>
+        <meta name='twitter:url' content='<?=$lserver?>'/>
         <meta name='robots' content='index follow'/>
     </head>
     <body>
@@ -67,7 +68,7 @@
                 <div class='entry' id='profile'>
                     <div class='table_row'>
                         <div class='table_cell'>
-                            <img id='profile' src='<?=$server?>/img/profile/preview/0.png' alt='I&ntilde;igo Valentin' title='I&ntilde;igo Valentin' />
+                            <img id='profile' src='<?=$lserver?>/img/profile/preview/0.png' alt='I&ntilde;igo Valentin' title='I&ntilde;igo Valentin' />
                         </div> <!-- .table_cell -->
                         <div class='table_cell'>
                             <h3 id='name'>I&ntilde;igo Valentin</h3>

+ 11 - 10
www/project/index.php

@@ -7,6 +7,7 @@
     $con = start_db();
     $server = $proto . $http_host;
     $lang = select_language();
+    $lserver = $server . "/" . $lang;
     $cur_section = "project";
     $cur_entry = "";
 
@@ -18,7 +19,7 @@
         <meta charset='utf-8'/>
         <meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1'/>
         <title><?=text($con, "PROJECT_TITLE", $lang)?> - I&ntilde;igo Valentin</title>
-        <link rel='shortcut icon' href='<?=$server?>/img/logo/favicon.ico'/>
+        <link rel='shortcut icon' href='<?=$lserver?>/img/logo/favicon.ico'/>
         <!-- CSS files -->
         <style>
 <?php
@@ -41,22 +42,22 @@
 ?>
         </script>
         <!-- Meta tags -->
-        <link rel='canonical' href='<?=$server?>/project/'/>
-        <link rel='author' href='<?=$server?>'/>
-        <link rel='publisher' href='<?=$server?>'/>
+        <link rel='canonical' href='<?=$lserver?>/project/'/>
+        <link rel='author' href='<?=$lserver?>'/>
+        <link rel='publisher' href='<?=$lserver?>'/>
         <meta name='description' content='<?=text($con, "PROJECT_DESCRIPTION", $lang)?>'/>
         <meta property='og:title' content='<?=text($con, "PROJECT_TITLE", $lang)?> - I&ntilde;igo Valentin'/>
-        <meta property='og:url' content='<?=$server?>/project/'/>
+        <meta property='og:url' content='<?=$lserver?>/project/'/>
         <meta property='og:description' content='<?=text($con, "PROJECT_DESCRIPTION", $lang)?>'/>
-        <meta property='og:image' content='<?=$server?>/img/logo/favicon.ico'/>
+        <meta property='og:image' content='<?=$lserver?>/img/logo/favicon.ico'/>
         <meta property='og:site_name' content='I&ntilde;igo Valentin'/>
         <meta property='og:type' content='website'/>
         <meta property='og:locale' content='<?=$lang?>'/>
         <meta name='twitter:card' content='summary'/>
         <meta name='twitter:title' content='<?=text($con, "PROJECT_TITLE", $lang)?> - I&ntilde;igo Valentin'/>
         <meta name='twitter:description' content='<?=text($con, "PROJECT_DESCRIPTION", $lang)?>'/>
-        <meta name='twitter:image' content='<?=$server?>/img/logo/favicon.ico'/>
-        <meta name='twitter:url' content='<?=$server?>/project/'/>
+        <meta name='twitter:image' content='<?=$lserver?>/img/logo/favicon.ico'/>
+        <meta name='twitter:url' content='<?=$lserver?>/project/'/>
         <meta name='robots' content='index follow'/>
     </head>
     <body>
@@ -77,7 +78,7 @@
 <?php
                                 if (strlen($r_project["logo"]) > 0){
 ?>
-                                    <img title='<?=text($con, $r_project["title"], $lang)?>' src='<?=$server?>/img/project/logo/<?=$r_project["logo"]?>'/>
+                                    <img title='<?=text($con, $r_project["title"], $lang)?>' src='<?=$lserver?>/img/project/logo/<?=$r_project["logo"]?>'/>
 <?php
                                 }
 ?>
@@ -94,7 +95,7 @@
                             <input type='text' placeholder='<?=text($con, "PROJECT_SEARCH", $lang)?>' name='text'/>
                             <input type='hidden' id='advanced_search_indicator' value='0'/>
                             <div class='pointer' onClick='showAdvancedSearch();'>
-                                <img class='slider' id='advanced_search_slider' src='<?=$server?>/img/misc/slid-right.png'/>
+                                <img class='slider' id='advanced_search_slider' src='<?=$lserver?>/img/misc/slid-right.png'/>
                                 <?=text($con, "PROJECT_SEARCH_ADVANCED", $lang)?>
                             </div>
                             <div id='advanced_search'>

+ 16 - 15
www/project/project.php

@@ -7,12 +7,13 @@
     $con = start_db();
     $server = $proto . $http_host;
     $lang = select_language();
+    $lserver = $server . "/" . $lang;
 
     // Get project data
     $permalink = mysqli_real_escape_string($con, $_GET["permalink"]);
     $q_project = mysqli_query($con, "SELECT * FROM project WHERE permalink = '$permalink' AND visible = 1;");
     if (mysqli_num_rows($q_project) == 0){
-        header("Location: $server/project/");
+        header("Location: $lserver/project/");
         exit(-1);
     }
     $r_project = mysqli_fetch_array($q_project);
@@ -34,12 +35,12 @@
 <?php
         if (strlen($r_project["logo"]) > 0){
 ?>
-            <link rel="shortcut icon" href="<?=$server?>/img/logo/favicon.ico"/>
+            <link rel="shortcut icon" href="<?=$lserver?>/img/logo/favicon.ico"/>
 <?php
         }
         else{
 ?>
-            <link rel="shortcut icon" href="<?=$server?>/img/project/icon/<?=$r_project["logo"]?>"/>
+            <link rel="shortcut icon" href="<?=$lserver?>/img/project/icon/<?=$r_project["logo"]?>"/>
 <?php
         }
 ?>
@@ -65,22 +66,22 @@
 ?>
         </script>
         <!-- Meta tags -->
-        <link rel="canonical" href="<?=$server?>/project/<?=$r_project["permalink"]?>"/>
-        <link rel="author" href="<?=$server?>"/>
-        <link rel="publisher" href="<?=$server?>"/>
+        <link rel="canonical" href="<?=$lserver?>/project/<?=$r_project["permalink"]?>"/>
+        <link rel="author" href="<?=$lserver?>"/>
+        <link rel="publisher" href="<?=$lserver?>"/>
         <meta name="description" content="<?=$summary?>"/>
         <meta property="og:title" content="<?=$title?> - I&ntilde;igo Valentin"/>
-        <meta property="og:url" content="<?=$server?>/project/<?=$r_project["permalink"]?>"/>
+        <meta property="og:url" content="<?=$lserver?>/project/<?=$r_project["permalink"]?>"/>
         <meta property="og:description" content="<?=$summary?>"/>
 <?php
         if (strlen($r_project["logo"]) > 0){
 ?>
-            <meta property="og:image" content="<?=$server?>/img/logo/favicon.ico"/>
+            <meta property="og:image" content="<?=$lserver?>/img/logo/favicon.ico"/>
 <?php
         }
         else{
 ?>
-            <meta property="og:image" content="<?=$server?>/img/project/icon/<?=$r_project["logo"]?>"/>
+            <meta property="og:image" content="<?=$lserver?>/img/project/icon/<?=$r_project["logo"]?>"/>
 <?php
         }
 ?>
@@ -93,16 +94,16 @@
 <?php
         if (strlen($r_project["logo"]) > 0){
 ?>
-            <meta name="twitter:image" content="<?=$server?>/img/logo/favicon.ico"/>
+            <meta name="twitter:image" content="<?=$lserver?>/img/logo/favicon.ico"/>
 <?php
         }
         else{
 ?>
-            <meta name="twitter:image" content="<?=$server?>/img/project/icon/<?=$r_project["logo"]?>"/>
+            <meta name="twitter:image" content="<?=$lserver?>/img/project/icon/<?=$r_project["logo"]?>"/>
 <?php
         }
 ?>
-        <meta name="twitter:url" content="<?=$server?>/project/<?=$r_project["permalink"]?>"/>
+        <meta name="twitter:url" content="<?=$lserver?>/project/<?=$r_project["permalink"]?>"/>
         <meta name="robots" content="index follow"/>
     </head>
     <body>
@@ -122,7 +123,7 @@
 ?>
                                 <br/><br/>
                                 <div class='iframe_container'>
-                                    <iframe class='project_embed' onload='resizeIframe(this);' src='<?=$server?><?=$r_embed["url"]?>'></iframe>
+                                    <iframe class='project_embed' onload='resizeIframe(this);' src='<?=$lserver?><?=$r_embed["url"]?>'></iframe>
                                 </div>
 <?php
                             }
@@ -142,7 +143,7 @@
 <?php
                                         if (strlen($r_url["logo"]) > 0){
 ?>
-                                            <img title='<?=text($con, $r_url["title"], $lang);?>' src='<?=$server?>/img/url/<?=$r_url["logo"]?>'/>
+                                            <img title='<?=text($con, $r_url["title"], $lang);?>' src='<?=$lserver?>/img/url/<?=$r_url["logo"]?>'/>
 <?php
                                         }
 ?>
@@ -161,7 +162,7 @@
                             <span class='hidden' id='license_id'><?=$r_license["id"]?></span>
                             <span class='hidden' id='license_text'><?=$r_license["summary"]?></span>
                             <span class='fakelink pointer' onClick='showLicense();'>
-                                <img title='<?=$r_license["id"]?>' src='<?=$server?>/img/license/icon/<?=$r_license["logo"]?>' />
+                                <img title='<?=$r_license["id"]?>' src='<?=$lserver?>/img/license/icon/<?=$r_license["logo"]?>' />
                             <span>
                             <br/>
                             <br/>

+ 0 - 0
www/script/me.js → www/script/profile.css