Selaa lähdekoodia

Modified some important files. No functionality changes.

Iñigo Valentin 9 vuotta sitten
vanhempi
sitoutus
482496e976
6 muutettua tiedostoa jossa 624 lisäystä ja 476 poistoa
  1. 14 29
      www/.htaccess
  2. 65 51
      www/footer.php
  3. 324 254
      www/functions.php
  4. 24 20
      www/header.php
  5. 5 5
      www/index.php
  6. 192 117
      www/sitemap.php

+ 14 - 29
www/.htaccess

@@ -21,42 +21,27 @@ RewriteRule ^sitemap.xml$ /sitemap.php [NC]
 RewriteRule ^imgmap.xml$ /sitemap-image.php [NC]
 RewriteRule ^rss.xml$ /rss.php [NC]
 
-RewriteRule ^blog/buscar/([A-Za-z0-9]+)/([A-Za-z0-9]+)$ /blog/buscar.php?where=$1&query=$2 [NC]
-RewriteRule ^blog/buscar/([A-Za-z0-9]+)/([A-Za-z0-9]+)/$ /blog/buscar.php?where=$1&query=$2 [NC]
-RewriteRule ^blog/([A-Z\-a-z0-9]{3,}+)$ /blog/post.php?perm=$1 [NC]
-RewriteRule ^blog/([A-Z\-a-z0-9]{3,}+)/$ /blog/post.php?perm=$1 [NC]
-RewriteRule ^blog/([0-9]+)$ /blog/index.php?o=$1 [NC]
-RewriteRule ^blog/([0-9]+)/$ /blog/index.php?o=$1 [NC]
-
-RewriteRule ^lablanca/([0-9]+)$ /lablanca/index.php?year=$1 [NC]
+RewriteRule ^blog/buscar/([A-Za-z0-9]+)/([A-Za-z0-9]+)[\/]?$ /blog/buscar.php?where=$1&query=$2 [NC]
+RewriteRule ^blog/([A-Z\-a-z0-9]{3,}+)[\/]?$ /blog/post.php?perm=$1 [NC]
+
+RewriteRule ^lablanca/([0-9]+)[\/]?$ /lablanca/index.php?year=$1 [NC]
 RewriteRule ^lablanca/programa[\/]?$ /lablanca/programa.php?gm=1 [NC]
 RewriteRule ^lablanca/programa/([A-Za-z]+)[\/]?$ /lablanca/programa.php?gm=$1 [NC]
 RewriteRule ^lablanca/programa/([A-Za-z]+)/([0-9]+)[\/]?$ /lablanca/programa.php?gm=$1&year=$2 [NC]
 
-RewriteRule ^archivo/([A-Z\-a-z0-9]{3,}+)$ /archivo/index.php?file=$1 [NC]
-RewriteRule ^archivo/([A-Z\-a-z0-9]{3,}+)/$ /archivo/index.php?file=$1 [NC]
+RewriteRule ^archivo/([A-Z\-a-z0-9]{3,}+)[\/]?$ /archivo/index.php?file=$1 [NC]
 
-RewriteRule ^actividades/search/([A-Za-z0-9]+)/([A-Za-z0-9]+)$ /actividades/buscar.php?where=$1&query=$2 [NC]
-RewriteRule ^actividades/search/([A-Za-z0-9]+)/([A-Za-z0-9]+)/$ /actividades/buscar.php?where=$1&query=$2 [NC]
-RewriteRule ^actividades/([A-Z\-a-z0-9{3,}]+)$ /actividades/actividad.php?perm=$1 [NC]
-RewriteRule ^actividades/([A-Z\-a-z0-9{3,}]+)/$ /actividades/actividad.php?perm=$1 [NC]
-RewriteRule ^actividades/([0-9]+)$ /actividades/index.php?o=$1 [NC]
-RewriteRule ^actividades/([0-9]+)/$ /actividades/index.php?o=$1 [NC]
+RewriteRule ^actividades/search/([A-Za-z0-9]+)/([A-Za-z0-9]+)[\/]?$ /actividades/buscar.php?where=$1&query=$2 [NC]
+RewriteRule ^actividades/([A-Z\-a-z0-9{3,}]+)[\/]?$ /actividades/actividad.php?perm=$1 [NC]
 
-RewriteRule ^ayuda$ /ayuda/index.php [NC]
-RewriteRule ^ayuda/$ /ayuda/index.php [NC]
+RewriteRule ^ayuda[\/]?$ /ayuda/index.php [NC]
 
-RewriteRule ^galeria/upload$ /galeria/upload.php [NC]
-RewriteRule ^galeria/upload/$ /galeria/upload.php [NC]
-RewriteRule ^galeria/([A-Z\-a-z0-9{3,}]+)$ /galeria/album.php?perm=$1 [NC]
-RewriteRule ^galeria/([A-Z\-a-z0-9{3,}]+)/$ /galeria/album.php?perm=$1 [NC]
-RewriteRule ^galeria/([A-Z\-a-z0-9{3,}]+)/([A-Z\-a-z0-9{3,}]+)$ /galeria/photo.php?album=$2&perm=$1 [NC]
-RewriteRule ^galeria/([A-Z\-a-z0-9{3,}]+)/([A-Z\-a-z0-9{3,}]+)/$ /galeria/photo.php?album=$2&perm=$1 [NC]
+RewriteRule ^galeria/upload[\/]?$ /galeria/upload.php [NC]
+RewriteRule ^galeria/([A-Z\-a-z0-9{3,}]+)[\/]?$ /galeria/album.php?perm=$1 [NC]
+RewriteRule ^galeria/([A-Z\-a-z0-9{3,}]+)/([A-Z\-a-z0-9{3,}]+)[\/]?$ /galeria/photo.php?album=$2&perm=$1 [NC]
 
-RewriteRule ^traducir/eu$ /traducir/index.php?l=eu [NC]
-RewriteRule ^traducir/eu/$ /traducir/index.php?l=eu [NC]
-RewriteRule ^traducir/en$ /traducir/index.php?l=en [NC]
-RewriteRule ^traducir/en/$ /traducir/index.php?l=en [NC]
+RewriteRule ^traducir/eu[\/]?$ /traducir/index.php?l=eu [NC]
+RewriteRule ^traducir/en[\/]?$ /traducir/index.php?l=en [NC]
 
 #API redirections
 #TODO: This changes the url in the browser
@@ -115,5 +100,5 @@ RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
 # Limit the size of the cache to 1 Megabyte
 #MCacheSize 1024
 
-#CacheFile footer.php toolbar.php img/*/* project/*/render/* project/*/render/*/preview/* project/*/render/*/miniature/*
+#CacheFile footer.php header.php img/*/*/*.jpg 
 

+ 65 - 51
www/footer.php

@@ -2,67 +2,81 @@
     <div id="footer_table">
         <div class="tr">
             <div class="td" id="footer_left">
-                <span id="footer_follow" class="desktop"><?php echo $lng['footer_follow']?></span><br/>
-                <a title="Facebook" target="_blank" href="https://www.facebook.com/gmargolariak"><img class="footer_social_icon" src="<?php echo $proto . $_SERVER['HTTP_HOST']; ?>/img/social/facebook.gif" alt="Facebook"/></a>
-                <a title="Twitter" target="_blank" href="https://twitter.com/gmargolariak"><img class="footer_social_icon" src="<?php echo $proto . $_SERVER['HTTP_HOST']; ?>/img/social/twitter.gif" alt="Twitter"/></a>
-                <a title="Google+" target="_blank" href="https://plus.google.com/106661466029005469492"><img class="footer_social_icon" src="<?php echo $proto . $_SERVER['HTTP_HOST']; ?>/img/social/googleplus.gif" alt="Google+"/></a>
+                <span id="footer_follow" class="desktop"><?=$lng["footer_follow"]?></span>
+                <br/>
+                <a title="Facebook" target="_blank" href="https://www.facebook.com/gmargolariak">
+                    <img class="footer_social_icon" src="<?=$server?>/img/social/facebook.gif" alt="Facebook"/>
+                </a>
+                <a title="Twitter" target="_blank" href="https://twitter.com/gmargolariak">
+                    <img class="footer_social_icon" src="<?=$server?>/img/social/twitter.gif" alt="Twitter"/>
+                </a>
+                <a title="Google+" target="_blank" href="https://plus.google.com/106661466029005469492">
+                    <img class="footer_social_icon" src="<?=$server?>/img/social/googleplus.gif" alt="Google+"/>
+                </a>
                 <br class="desktop"/>
-                <a title="Youtube" target="_blank" href="https://www.youtube.com/user/GasteizkoMargolariak"><img class="footer_social_icon" src="<?php echo $proto . $_SERVER['HTTP_HOST']; ?>/img/social/youtube.gif" alt="Youtube"/></a>
-                <a title="Instagram" target="_blank" href="https://instagram.com/gmargolariak/"><img class="footer_social_icon" src="<?php echo $proto . $_SERVER['HTTP_HOST']; ?>/img/social/instagram.gif" alt="nstagram"/></a>
-<!--                  <a title="RSS" href="<?php echo $proto.$_SERVER['HTTP_HOST']; ?>/rss.xml"><img class="footer_social_icon" src="<?php echo $proto . $_SERVER['HTTP_HOST']; ?>/img/social/rss.gif" alt="RSS"/></a> -->
-                <br/><span id="footer_info" class='desktop'><?php echo($lng['footer_info']); ?></span>
-            </div>
+                <a title="Youtube" target="_blank" href="https://www.youtube.com/user/GasteizkoMargolariak">
+                    <img class="footer_social_icon" src="<?=$server?>/img/social/youtube.gif" alt="Youtube"/>
+                </a>
+                <a title="Instagram" target="_blank" href="https://instagram.com/gmargolariak/">
+                    <img class="footer_social_icon" src="<?=$server?>/img/social/instagram.gif" alt="Instagram"/>
+                </a>
+                <br/>
+                <span id="footer_info" class='desktop'><?=$lng["footer_info"]?></span>
+            </div> <!-- #footer_left-->
             <div class="td" id="footer_center">
                 <br class="mobile"/><br class="mobile"/>
-                <?php
-                    $q = mysqli_query($con, "SELECT id, name_$lang AS name, image, link FROM sponsor WHERE image != '' ORDER BY ammount DESC;");
-                    $ad_static = Array();
-                    if (mysqli_num_rows($q) > 0){
-                        echo("<span class='desktop'>$lng[footer_sponsors]</span></br class='desktop'>\n");
-                        //$idx = 0;
-                        while ($r = mysqli_fetch_array($q)){
-                            
-                            array_push($ad_static, $r['id']);
-                        
-                            //if ($idx == 0){
-                            //    echo("<a target='_blank' href='$r[link]'><span class='desktop'>$r[name]</span><img src='/img/spo/miniature/$r[image]'/></a>");
-                            //}
-                            //elseif ($idx == 1){
-                            //    echo("&nbsp;&nbsp;&nbsp;<a target='_blank' href='$r[link]'><img src='/img/spo/thumb/$r[image]'/><span class='desktop'>$r[name]</span></a></br class='desktop'>");
-                            //}
-                            //else{
-                                echo("<a target='_blank' href='$r[link]'><img src='/img/spo/thumb/$r[image]'/></a>");
-                            //}
-                            //$idx ++;
-                        }
-                        
+<?php
+                $q = mysqli_query($con, "SELECT id, name_$lang AS name, image, link FROM sponsor WHERE image != '' ORDER BY ammount DESC;");
+                $ad_static = Array();
+                if (mysqli_num_rows($q) > 0){
+?>
+                    <span class='desktop'><?=$lng["footer_sponsors"]?></span>
+                    </br class='desktop'>
+<?php
+                    while ($r = mysqli_fetch_array($q)){
+                        array_push($ad_static, $r["id"]);
+?>
+                        <a target='_blank' href='<?=$r["link"]?>'>
+                            <img src='<?=$server?>/img/spo/thumb/<?=$r["image"]?>'/>
+                        </a>
+<?php
                     }
-                ?>
+                }
+?>
                 <br class="mobile"/><br class="mobile"/><br class="mobile"/>
-            </div>
+            </div> <!-- #footer_center -->
             <div  class="td" id="footer_right" class="desktop">
-                <a href="<?php echo "$proto$_SERVER[HTTP_HOST]/ayuda/";?>"><?php echo $lng['footer_help']; ?></a>&nbsp;&nbsp;&nbsp;<a href="<?php echo "$proto$_SERVER[HTTP_HOST]/ayuda/#section_privacy";?>"><?php echo $lng['footer_privacy'];?></a>
+                <a href="<?=$server?>/ayuda/"><?=$lng["footer_help"]?></a>&nbsp;&nbsp;&nbsp;
+                <a href="<?=$server?>/ayuda/#section_privacy"><?=$lng["footer_privacy"]?></a>
                 <br/><br class='mobile'/>
-                <img class='lang' alt='Espanol' src='/img/lang/es.gif' onClick='changeLanguage("es", "<?php echo $http_host; ?>");'/>
-                <img class='lang' alt='English' src='/img/lang/en.gif' onClick='changeLanguage("en", "<?php echo $http_host; ?>");'/>
-                <img class='lang' alt='Euskara' src='/img/lang/eu.gif' onClick='changeLanguage("eu", "<?php echo $http_host; ?>");'/>
+                <img class='lang' alt='Espa&ntilde;ol' src='/img/lang/es.gif' onClick='changeLanguage("es", "<?=$server?>");'/>
+                <img class='lang' alt='English' src='/img/lang/en.gif' onClick='changeLanguage("en", "<?=$server?>");'/>
+                <img class='lang' alt='Euskara' src='/img/lang/eu.gif' onClick='changeLanguage("eu", "<?=$server?>");'/>
                 <br class='desktop'/>
-                <a title="Google Play" href="https://play.google.com/store/apps/details?id=com.ivalentin.margolariak"><img class='app' alt="<?php echo $lng['footer_app_google']; ?>" src='/img/app/android.gif' /></a>
-								<br class='desktop'/>
-                <a title="App Store" href="https://itunes.apple.com/us/app/gasteizko-margolariak/id1227846624"><img class='app' alt="<?php echo $lng['footer_app_apple']; ?>" src='/img/app/ios.gif' /></a>
-            </div>
-        </div>
-    </div>
-</div>
+                <a title="Google Play" href="https://play.google.com/store/apps/details?id=com.ivalentin.margolariak">
+                    <img class='app' alt="<?=$lng["footer_app_google"]?>" src='/img/app/android.gif'/>
+                </a>
+                <br class='desktop'/>
+                <a title="App Store" href="https://itunes.apple.com/us/app/gasteizko-margolariak/id1227846624">
+                    <img class='app' alt="<?=$lng["footer_app_apple"]?>" src='/img/app/ios.gif'/>
+                </a>
+            </div> <!-- #footer_right -->
+        </div> <!-- .tr -->
+    </div> <!-- #footer_table -->
+</div> <!-- footer -->
 <?php
-    //header('Cache-control: private');
-    if (isSet($_COOKIE['cookie']) == false){
+
+if (isSet($_COOKIE["cookie"]) == false){
 ?>
-<div id='cookie_popup'>
-    <span id='message'><?php echo $lng['cookie_message']; ?></span><br/><br/>
-    <span class='button pointer' style="cursor:pointer" id='button_ok'><a onClick="dismissCookiePopUp('<?php echo $http_host; ?>', false);" ><?php echo $lng['cookie_ok']; ?></a></span>
-    <span class='button pointer' style="cursor:pointer" id='button_more'><a onClick="dismissCookiePopUp('<?php echo $http_host; ?>', true);" ><?php echo $lng['cookie_more']; ?></a></span>
-</div>
+    <div id='cookie_popup'>
+        <span id='message'><?=$lng["cookie_message"]?></span><br/><br/>
+        <span class='button pointer' style="cursor:pointer" id='button_ok'>
+            <a onClick="dismissCookiePopUp('<?=$server?>', false);" ><?=$lng["cookie_ok"]?></a>
+        </span>
+        <span class='button pointer' style="cursor:pointer" id='button_more'>
+            <a onClick="dismissCookiePopUp('<?=$server?>', true);" ><?=$lng["cookie_more"]?></a>
+        </span>
+    </div>
 <?php
 }
 ?>

+ 324 - 254
www/functions.php

@@ -1,126 +1,139 @@
 <?php
 
-    /****************************************************
-    * This function is called from almost everywhere at *
-    * the beggining of the page. It initializes the     *
-    * session variables, connect to the db, enabling    *
-    * the variable $con for futher use everywhere in    *
-    * the php code, and populates the arrays $user      *
-    * and $permission, with info about the user.        *
-    * @params:                                          *
-    *    mode: (string) Indicates required permissions  *
-    *          on database. 'ro' gives read             *
-    *          permissions, and 'rw' read and write     *
-    *          permissions. Other values will result in *
-    *          errors.                                  *
-    * @return: (db connection): The connection handler. *
-    ****************************************************/
-    function startdb($mode = 'ro'){
+
+    /*****************************************************
+     * This function is called from almost everywhere at *
+     * the beggining of the page. It initializes the     *
+     * session variables, connect to the db, enabling    *
+     * the variable $con for futher use everywhere in    *
+     * the php code, and populates the arrays $user      *
+     * and $permission, with info about the user.        *
+     * @params:                                          *
+     *    mode: (string) Indicates required permissions  *
+     *          on database. "ro" gives read             *
+     *          permissions, and "rw" read and write     *
+     *          permissions. Other values will result in *
+     *          errors.                                  *
+     * @return: (db connection): The connection handler. *
+     *****************************************************/
+    function startdb($mode = "ro"){
         //Include the db configuration file. It's somehow like this
         /*
         <?php
-            $host = 'XXXX';
-            $db_name = 'XXXX';
-            $username_ro = 'XXXX';
-            $username_rw = 'XXXX';
-            $pass_ro = 'XXXX';
-            $pass_rw = 'XXXX';
+            $host = "XXXX";
+            $db_name = "XXXX";
+            $username_ro = "XXXX";
+            $username_rw = "XXXX";
+            $pass_ro = "XXXX";
+            $pass_rw = "XXXX";
         ?>
         */
-        include('.htpasswd');
-        
+        include(".htpasswd");
+
         //Connect to to database
-        if ($mode == 'ro')
+        if ($mode == "ro"){
             $con = mysqli_connect($host, $username_ro, $pass_ro, $db_name);
-        else if ($mode == 'rw'){
+        }
+        else if ($mode == "rw"){
             $con = mysqli_connect($host, $username_rw, $pass_rw, $db_name);
         }
-            
+        else{
+            $con = mysqli_connect("error", "error", "error", "error");
+        }
+
         // Check connection
         if (mysqli_connect_errno()){
             error_log("Failed to connect to database: " . mysqli_connect_error());
             return -1;
         }
-        
+
         //Set encoding options
-        mysqli_set_charset($con, 'utf-8');
-        header('Content-Type: text/html; charset=utf8');
-        mysqli_query($con, 'SET NAMES utf8;');
-        
+        mysqli_set_charset($con, "utf-8");
+        header("Content-Type: text/html; charset=utf8");
+        mysqli_query($con, "SET NAMES utf8;");
+
         //Return the db connection
         return $con;
     }
+
+
+    /*****************************************************
+     * Finds out the protocol the user is connecting to  *
+     * the site with (http or https)                     *
+     * @return: (string): "http://" or "https://".       *
+     ****************************************************/
     function getProtocol(){
-        if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1) || isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
-            $protocol = 'https://';
+        if (isset($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] == "on" || $_SERVER["HTTPS"] == 1) || isset($_SERVER["HTTP_X_FORWARDED_PROTO"]) && $_SERVER["HTTP_X_FORWARDED_PROTO"] == "https") {
+            $protocol = "https://";
         }
         else {
-            $protocol = 'http://';
+            $protocol = "http://";
         }
         return $protocol;
     }
 
-    
-    /****************************************************
-    * This function selects the language the page will  *
-    * be displayed inf the page. Several methods are    *
-    * used: cookie detection, and browser language      *
-    * preferences.                                      *
-    * @return: (string): Language code.                 *
-    ****************************************************/
+
+    /*****************************************************
+     * This function selects the language the page will  *
+     * be displayed inf the page. Several methods are    *
+     * used: cookie detection, and browser language      *
+     * preferences.                                      *
+     * @return: (string): Language code.                 *
+     *****************************************************/
     function selectLanguage(){
         //Try to read cookie.
-        header('Cache-control: private');
-        if (isSet($_COOKIE['lang'])){
-            $lang = $_COOKIE['lang'];
-            if ($lang == 'es' || $lang == 'en' || $lang == 'eu'){
+        header("Cache-control: private");
+        if (isSet($_COOKIE["lang"])){
+            $lang = $_COOKIE["lang"];
+            if ($lang == "es" || $lang == "en" || $lang == "eu"){
                 return $lang;
             }
             else{
-                return 'es';
+                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';
+            if ($lang != "es" && $lang != "en" && $lang != "eu"){
+                return "es";
             }
             else{
-                return $langs[0]; //TODO test this
+                return $langs[0];
             }
         }
     }
-    
-    /****************************************************
-    * This function parses the language prefrences of   *
-    * the client broser, comparing them to th languages *
-    * offered by the site.                              *
-    * the variable $con for futher use everywhere in    *
-    * the php code, and populates the arrays $user      *
-    * and $permission, with info about the user.        *
-    * @params:                                          *
-    *    available_languages: (string array) Contains   *
-    *                         a list of strins offered  *
-    *                         by the site.              *
-    *    http_accept_language: (string) Raw header with *
-    *                          info about client        *
-    *                          language preferences.    *
-    * @return: (string array) List of the languages     *
-    *          offered, sorted by prefference.          *
-    ****************************************************/
+
+
+    /*****************************************************
+     * This function parses the language prefrences of   *
+     * the client broser, comparing them to th languages *
+     * offered by the site.                              *
+     * the variable $con for futher use everywhere in    *
+     * the php code, and populates the arrays $user      *
+     * and $permission, with info about the user.        *
+     * @params:                                          *
+     *    available_languages: (string array) Contains   *
+     *                         a list of strins offered  *
+     *                         by the site.              *
+     *    http_accept_language: (string) Raw header with *
+     *                          info about client        *
+     *                          language preferences.    *
+     * @return: (string array) List of the languages     *
+     *          offered, sorted by prefference.          *
+     *****************************************************/
     function prefered_language(array $available_languages, $http_accept_language) {
 
         $available_languages = array_flip($available_languages);
 
         $langs;
-        preg_match_all('~([\w-]+)(?:[^,\d]+([\d.]+))?~', strtolower($http_accept_language), $matches, PREG_SET_ORDER);
+        preg_match_all("~([\w-]+)(?:[^,\d]+([\d.]+))?~", strtolower($http_accept_language), $matches, PREG_SET_ORDER);
         foreach($matches as $match) {
 
-            list($a, $b) = explode('-', $match[1]) + array('', '');
+            list($a, $b) = explode("-", $match[1]) + array("", "");
             $value = isset($match[2]) ? (float) $match[2] : 1.0;
 
             if(isset($available_languages[$match[1]])) {
@@ -138,34 +151,35 @@
         return $langs;
     }
 
-    /****************************************************
-    * This function turns a date string into a human    *
-    * readable string, deppending o the specified       * 
-    * language.                                         *
-    * @params:                                          *
-    *    strdate: (string): Date string.                *
-    *    lang: (string): Language code (es, en, eu).    *
-    *    http_accept_language: (string) Raw header with *
-    *                          info about client        *
-    *                          language preferences.    *
-    *    time: (boolean): Append the time at the end.   *
-    * @return: (string array) List of the languages     *
-    *          offered, sorted by prefference.          *
-    ****************************************************/    
+
+    /*****************************************************
+     * This function turns a date string into a human    *
+     * readable string, deppending o the specified       *
+     * language.                                         *
+     * @params:                                          *
+     *    strdate: (string): Date string.                *
+     *    lang: (string): Language code (es, en, eu).    *
+     *    http_accept_language: (string) Raw header with *
+     *                          info about client        *
+     *                          language preferences.    *
+     *    time: (boolean): Append the time at the end.   *
+     * @return: (string array) List of the languages     *
+     *          offered, sorted by prefference.          *
+     *****************************************************/
     function formatDate($strdate, $lang, $time = true){
         $date = strtotime($strdate);
-        $year = date('o', $date);
-        $month = date('n', $date);
+        $year = date("o", $date);
+        $month = date("n", $date);
         $month --;
-        $day = date('j', $date);
-        $wday = date('N', $date);
+        $day = date("j", $date);
+        $wday = date("N", $date);
         $wday --;
-        $hour = date('H', $date);
-        $minute = date('i', $date);
+        $hour = date("H", $date);
+        $minute = date("i", $date);
         switch ($lang){
-            case 'en':
-                $week = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
-                $months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+            case "en":
+                $week = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
+                $months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
                 if ($time){
                     $str = "$week[$wday], $months[$month] $day, $year at $hour:$minute";
                 }
@@ -173,9 +187,9 @@
                     $str = "$week[$wday], $months[$month] $day, $year";
                 }
                 break;
-            case 'eu':
-                $week = ['astelehena', 'asteartea', 'asteazkena', 'osteguna', 'ostirala', 'larumbata', 'igandea'];
-                $months = ['urtarrilaren', 'otsailaren', 'martxoaren', 'apirilaren', 'maiatzaren', 'ekainaren', 'uztailaren', 'abuztuaren', 'irailaren', 'urriaren', 'azaroaren', 'abenduaren'];
+            case "eu":
+                $week = ["astelehena", "asteartea", "asteazkena", "osteguna", "ostirala", "larumbata", "igandea"];
+                $months = ["urtarrilaren", "otsailaren", "martxoaren", "apirilaren", "maiatzaren", "ekainaren", "uztailaren", "abuztuaren", "irailaren", "urriaren", "azaroaren", "abenduaren"];
                 if ($time){
                     $str = $year . "ko $months[$month] $day" . "an, $week[$wday], $hour:$minute";
                 }
@@ -184,8 +198,8 @@
                 }
                 break;
             default:
-                $week = ['Lunes', 'Martes', 'Mi&eacute;rcoles', 'Jueves', 'Viernes', 'S&aacute;bado', 'Domingo'];
-                $months = ['enero', ' febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'];
+                $week = ["Lunes", "Martes", "Mi&eacute;rcoles", "Jueves", "Viernes", "S&aacute;bado", "Domingo"];
+                $months = ["enero", " febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"];
                 if ($time){
                     $str = "$week[$wday] $day de $months[$month] de $year a las $hour:$minute";
                 }
@@ -195,72 +209,76 @@
         }
         return $str;
     }
-    
-    /****************************************************
-    * This function turns a date string into a human    *
-    * readable string, deppending o the specified       * 
-    * language. It is designed to be used for festival  *
-    * days only, since it doesnt return the weekday.    *
-    * @params:                                          *
-    *    strdate: (string): Date string.                *
-    *    lang: (string): Language code (es, en, eu).    *
-    *    http_accept_language: (string) Raw header with *
-    *                          info about client        *
-    *                          language preferences.    *
-    * @return: (string array) List of the languages     *
-    *          offered, sorted by prefference.          *
-    ****************************************************/    
+
+
+    /*****************************************************
+     * This function turns a date string into a human    *
+     * readable string, deppending o the specified       *
+     * language. It is designed to be used for festival  *
+     * days only, since it doesnt return the weekday.    *
+     * @params:                                          *
+     *    strdate: (string): Date string.                *
+     *    lang: (string): Language code (es, en, eu).    *
+     *    http_accept_language: (string) Raw header with *
+     *                          info about client        *
+     *                          language preferences.    *
+     * @return: (string array) List of the languages     *
+     *          offered, sorted by prefference.          *
+     *****************************************************/
     function formatFestivalDate($strdate, $lang){
         $date = strtotime($strdate);
-        $month = date('n', $date);
+        $month = date("n", $date);
         $month --;
-        $day = date('j', $date);
+        $day = date("j", $date);
         switch ($lang){
-            case 'en':
-                $months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+            case "en":
+                $months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
                 $str = "$months[$month] $day";
                 break;
-            case 'eu':
-                $months = ['urtarrilaren', 'otsailaren', 'martxoaren', 'apirilaren', 'maiatzaren', 'ekainaren', 'uztailaren', 'abuztuaren', 'irailaren', 'urriaren', 'azaroaren', 'abenduaren'];
+            case "eu":
+                $months = ["urtarrilaren", "otsailaren", "martxoaren", "apirilaren", "maiatzaren", "ekainaren", "uztailaren", "abuztuaren", "irailaren", "urriaren", "azaroaren", "abenduaren"];
                 $str = "$months[$month] $day";
                 break;
             default:
-                $months = ['enero', ' febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'];
+                $months = ["enero", " febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"];
                 $str = "$day de $months[$month]";
         }
         return $str;
     }
-    
-    /****************************************************
-    * Generates a URL-valid string from a regular one.  *
-    *                                                   *
-    * @params:                                          *
-    *    text: (string): Original string.               *
-    * @return: (string): URL-valid string.              *
-    ****************************************************/
+
+
+    /*****************************************************
+     * Generates a URL-valid string from a regular one.  *
+     *                                                   *
+     * @params:                                          *
+     *    text: (string): Original string.               *
+     * @return: (string): URL-valid string.              *
+     *****************************************************/
     function permalink($text){
-        $unwanted_array = array('Š'=>'S', 'š'=>'s', 'Ž'=>'Z', 'ž'=>'z', 'À'=>'A', 'Á'=>'A', 'Â'=>'A', 'Ã'=>'A', 'Ä'=>'A', 'Å'=>'A', 'Æ'=>'A', 'Ç'=>'C', 'È'=>'E', 'É'=>'E',
-                            'Ê'=>'E', 'Ë'=>'E', 'Ì'=>'I', 'Í'=>'I', 'Î'=>'I', 'Ï'=>'I', 'Ñ'=>'N', 'Ò'=>'O', 'Ó'=>'O', 'Ô'=>'O', 'Õ'=>'O', 'Ö'=>'O', 'Ø'=>'O', 'Ù'=>'U',
-                            'Ú'=>'U', 'Û'=>'U', 'Ü'=>'U', 'Ý'=>'Y', 'Þ'=>'B', 'ß'=>'Ss', 'à'=>'a', 'á'=>'a', 'â'=>'a', 'ã'=>'a', 'ä'=>'a', 'å'=>'a', 'æ'=>'a', 'ç'=>'c',
-                            'è'=>'e', 'é'=>'e', 'ê'=>'e', 'ë'=>'e', 'ì'=>'i', 'í'=>'i', 'î'=>'i', 'ï'=>'i', 'ð'=>'o', 'ñ'=>'n', 'ò'=>'o', 'ó'=>'o', 'ô'=>'o', 'õ'=>'o',
-                            'ö'=>'o', 'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'ý'=>'y', 'þ'=>'b', 'ÿ'=>'y' );
+        $unwanted_array = array("Š"=>"S", "š"=>"s", "Ž"=>"Z", "ž"=>"z", "À"=>"A", "Á"=>"A", "Â"=>"A", "Ã"=>"A", "Ä"=>"A", "Å"=>"A", "Æ"=>"A", "Ç"=>"C", "È"=>"E", "É"=>"E",
+                            "Ê"=>"E", "Ë"=>"E", "Ì"=>"I", "Í"=>"I", "Î"=>"I", "Ï"=>"I", "Ñ"=>"N", "Ò"=>"O", "Ó"=>"O", "Ô"=>"O", "Õ"=>"O", "Ö"=>"O", "Ø"=>"O", "Ù"=>"U",
+                            "Ú"=>"U", "Û"=>"U", "Ü"=>"U", "Ý"=>"Y", "Þ"=>"B", "ß"=>"Ss", "à"=>"a", "á"=>"a", "â"=>"a", "ã"=>"a", "ä"=>"a", "å"=>"a", "æ"=>"a", "ç"=>"c",
+                            "è"=>"e", "é"=>"e", "ê"=>"e", "ë"=>"e", "ì"=>"i", "í"=>"i", "î"=>"i", "ï"=>"i", "ð"=>"o", "ñ"=>"n", "ò"=>"o", "ó"=>"o", "ô"=>"o", "õ"=>"o",
+                            "ö"=>"o", "ø"=>"o", "ù"=>"u", "ú"=>"u", "û"=>"u", "ý"=>"y", "þ"=>"b", "ÿ"=>"y" );
         $str = strtr( $text, $unwanted_array );
-        $str = preg_replace('/[^\da-zA-Z ]/i', '', $str);
-        $str = str_replace(' ', '-', $str);
+        $str = preg_replace("/[^\da-zA-Z ]/i", "", $str);
+        $str = str_replace(" ", "-", $str);
         return $str;
     }
-    
-    /****************************************************
-    * This function closes all the opened HTML tags in  *
-    * a given string.                                   * 
-    *                                                   *
-    * @params:                                          *
-    *    html: (string): The string with HTML tags      *
-     ****************************************************/
+
+
+    /*****************************************************
+     * This function closes all the opened HTML tags in  *
+     * a given string.                                   *
+     *                                                   *
+     * @params:                                          *
+     *    html: (string): The string with HTML tags.      *
+     * @return: (string): HTML with closed tags.         *
+     *****************************************************/
     function closeTags($html) {
-        preg_match_all('#<(?!meta|img|br|hr|input\b)\b([a-z]+)(?: .*)?(?<![/|/ ])>#iU', $html, $result);
+        preg_match_all("#<(?!meta|img|br|hr|input\b)\b([a-z]+)(?: .*)?(?<![/|/ ])>#iU", $html, $result);
         $openedtags = $result[1];
-        preg_match_all('#</([a-z]+)>#iU', $html, $result);
+        preg_match_all("#</([a-z]+)>#iU", $html, $result);
         $closedtags = $result[1];
         $len_opened = count($openedtags);
         if (count($closedtags) == $len_opened) {
@@ -269,26 +287,28 @@
         $openedtags = array_reverse($openedtags);
         for ($i=0; $i < $len_opened; $i++) {
             if (!in_array($openedtags[$i], $closedtags)) {
-                $html .= '</'.$openedtags[$i].'>';
+                $html .= "</".$openedtags[$i].">";
             } else {
                 unset($closedtags[array_search($openedtags[$i], $closedtags)]);
             }
         }
         return $html;
     }
-    
-    /****************************************************
-    * Text shortener. Given a string, it trims in the   *
-    * proximity of the desired string, ut to the next   * 
-    * white character. If indicated, it will append a   *
-    * link to the full text.                            *
-    *                                                   *
-    * @params:                                          *
-    *    text: (string): The text to shorten.           *
-    *    length: (int): The desired length.             *
-    *    linktext: (string): Text fot the link.         *
-    *    link: (string): URI of the full text.          *
-     ****************************************************/
+
+
+    /*****************************************************
+     * Text shortener. Given a string, it trims in the   *
+     * proximity of the desired string, ut to the next   *
+     * white character. If indicated, it will append a   *
+     * link to the full text.                            *
+     *                                                   *
+     * @params:                                          *
+     *    text: (string): The text to shorten.           *
+     *    length: (int): The desired length.             *
+     *    linktext: (string): Text fot the link.         *
+     *    link: (string): URI of the full text.          *
+     * @return: (string): Cutted text.                   *
+     *****************************************************/
      function cutText($text, $length, $linktext, $link){
         if (strlen($text) < $length){
             return $text;
@@ -304,17 +324,25 @@
         return $cut;
     }
 
+
     /*****************************************************
      * Shows an ad at random. It does that one in three  *
      * times, and only one per session (inserts a cookie *
      * to know if the ad has been shown. A sponsor has   *
      * more chances of having his ad popping the more it *
      * contributes with Gasteizko Margolariak.           *
+     * @params:                                          *
+     *    con: (Mysql connectrion): DB connection.       *
+     *    lang: (string): Two-letter language code.      *
+     *    lng: (string array): Literal array for the     *
+     *         user language.                            *
+     * @return: (int) Id of the shown sponsor, null if   *
+     *          none was shown.                          *
      *****************************************************/
     function ad($con, $lang, $lng){
         $id = -1;
-        //If the user hasn't still see an add on this session
-        if (isset($_SESSION['ad']) == false){
+        //If the user hasn"t still see an add on this session
+        if (isset($_SESSION["ad"]) == false){
             //25% chance of seeing an add
             if (rand (0, 3) == 0){
                 //Create an array with weighted values
@@ -325,57 +353,77 @@
                 $total = 0;
                 $sponsors = array();
                 while ($r = mysqli_fetch_array($q)){
-                    $times = $r['value'];
-                    $id = $r['id'];
+                    $times = $r["value"];
+                    $id = $r["id"];
                     for ($i = 0; $i < $times; $i ++) {
                         array_push($sponsors, $id);
                         $total ++;
                     }
                 }
-                
+
                 //Get a random id from the array
                 $id = $sponsors[rand (0, $total - 1)];
-                
+
                 //Get sponsor data
-                $q = mysqli_query($con, "SELECT name_$lang AS name, text_$lang AS text, image, address_$lang AS address, link, lat, lon FROM sponsor WHERE id = $id;");
+                $q = mysqli_query($con, "SELECT name_$lang AS name, text_$lang AS text, image, local, address_$lang AS address, link, lat, lon FROM sponsor WHERE id = $id;");
                 $r = mysqli_fetch_array($q);
-                echo("<div id='ad' class='section'>\n");
-                echo("<h3 class='section_title'><a target='_blank' href='$r[link]'>$r[name]</a></h3>\n");
-                echo("<div class='entry'>\n");
-                echo("<div id='ad_details'>\n");
-                echo($lng['ad_title']);
-                echo("<img class='pointer' src='/img/misc/slid-close.png' onClick='closeAd();' />\n");
-                echo("</div>\n");
-                if (strlen($r['image']) > 0){
-                    echo("<div id='ad_image_container'>\n");
-                    echo("<img src='/img/spo/miniature/$r[image]'/>\n");
-                    echo("</div>\n");
-                }
-                echo($r['text']);
-                if(strlen($r["address"]) > 0){
-                    echo("<br/><br/><a target='_blank' href='https://www.google.es/maps/@$r[lat],$r[lon],14z'><img id='ad_pinpoint' src='/img/misc/pinpoint.png'\>$r[address]</a>\n");
-                }
-                echo("<br/><br/><br class='mobile'/><br class='mobile'/>");
-                echo("<div id='ad_policy'>\n");
-                echo("<a target='_blank' href='$proto$http_host/ayuda/#section_ads'>" . $lng['help_ad_title'] . "</a>\n");
-                echo("</div>\n");
-                echo("</div>\n");
-                echo("</div>\n");
-                echo("<script type='text/javascript'>showAd();</script>\n");
-                
+?>
+                <div id='ad' class='section'>
+                    <h3 class='section_title'>
+                        <a target='_blank' href='<?=$r["link"]?>'><?=$r["name"]?></a>
+                    </h3>
+                    <div class='entry'>
+                        <div id='ad_details'>
+                            <?=$lng["ad_title"]?>
+                            <img class='pointer' src='/img/misc/slid-close.png' onClick='closeAd();' />
+                        </div>
+<?php
+                        if (strlen($r["image"]) > 0){
+?>
+                            <div id='ad_image_container'>
+                                <img src='/img/spo/miniature/<?=$r["image"]?>'/>
+                            </div>
+<?php
+                        }
+?>
+                        <?=$r["text"]?>
+<?php
+                        if($r["local"] == 1 && strlen($r["address"]) > 0){
+?>
+                            <br/><br/>
+                            <a target='_blank' href='https://www.google.es/maps/@<?=$r["lat"]?>,<?=$r["lon"]?>,14z'>
+                                <img id='ad_pinpoint' src='/img/misc/pinpoint.png'\>
+                                <?=$r["address"]?>
+                            </a>
+<?php
+                        }
+?>
+                        <br/><br/><br class='mobile'/><br class='mobile'/>
+                        <div id='ad_policy'>
+                            <a target='_blank' href='/ayuda/#section_ads'><?=$lng["help_ad_title"]?></a>
+                        </div>
+                    </div> <!-- .entry -->
+                </div> <!-- .section -->
+                <script type='text/javascript'>showAd();</script>
+<?php
                 //Set ad as seen
-                $_SESSION['ad'] = 1;
-            }
-            
-        }
+                $_SESSION["ad"] = 1;
+            } // if (rand (0, 3) == 0)
+
+        } // if (isset($_SESSION["ad"]) == false)
         return $id;
     }
-    
-    // Function to get visitor ip
+
+
+    /*****************************************************
+     * Finds out the IP address of the client.           *
+     *                                                   *
+     * @return: (String): Client IP address.             *
+     *****************************************************/
     function getUserIP(){
-        $client  = @$_SERVER['HTTP_CLIENT_IP'];
-        $forward = @$_SERVER['HTTP_X_FORWARDED_FOR'];
-        $remote  = $_SERVER['REMOTE_ADDR'];
+        $client  = @$_SERVER["HTTP_CLIENT_IP"];
+        $forward = @$_SERVER["HTTP_X_FORWARDED_FOR"];
+        $remote  = $_SERVER["REMOTE_ADDR"];
         if(filter_var($client, FILTER_VALIDATE_IP)){
             $ip = $client;
         }
@@ -387,58 +435,72 @@
         }
         return $ip;
     }
-    
+
+
+    /*****************************************************
+     * Registers the page viewed by the user. If it is   *
+     * first page shown in his visit, it also registers  *
+     * the visit. It will also increase the ad views     *
+     * count (if any was shown).                         *
+     *                                                   *
+     * @params:                                          *
+     *    ad: (int): ID of the shown sponsor, or null.   *
+     *    ad_static: (int array): List of the IDs of the *
+     *               sponsors with statis ads.           *
+     *    section: (string): Site section being visited. *
+     *    id: (int): ID of the entri being visited       *
+     *****************************************************/
     function stats($ad, $ad_static, $section, $id){
-        
+
         // Get client data
         $ip = getUserIP();
         $browser_data = get_browser(null, true);
-        $os = $browser_data['platform'];
-        $browser = $browser_data['browser'];
-        $uagent = $browser_data['browser_name_pattern'];
+        $os = $browser_data["platform"];
+        $browser = $browser_data["browser"];
+        $uagent = $browser_data["browser_name_pattern"];
         //If bot, do nothing
         $bot_kw = Array();
-        $bot_kw[0] = 'bot';
-        $bot_kw[1] = 'spider';
-        $bot_kw[2] = 'crawl';
-        $bot_kw[3] = '.com';
-        $bot_kw[4] = '.ru';
-        $bot_kw[5] = 'baidu';
-        $bot_kw[6] = 'survey';
-        $bot_kw[7] = 'scan';
-        $bot_kw[8] = 'feed';
-        $bot_kw[9] = 'bing';
-        $bot_kw[10] = 'yahoo';
-        $bot_kw[11] = 'engine';
-        $bot_kw[12] = 'preview';
-        $bot_kw[13] = 'checker';
-        $bot_kw[14] = 'catalog';
-        $bot_kw[15] = 'accelerator';
-        $bot_kw[16] = 'python';
-        $bot_kw[14] = 'qt';
-        $bot_kw[15] = 'webdav';
-        $bot_kw[16] = 'http';
-        $bot_kw[17] = 'url';
-        $bot_kw[18] = 'fake';
-        $bot_kw[19] = 'library';
-        $bot_kw[20] = 'commerce';
-        $bot_kw[21] = 'htmlbot';
-        $bot_kw[22] = 'fetch';
-        $bot_kw[23] = 'googleb';
-        $bot_kw[24] = 'facebook';
-        $bot_kw[25] = 'whatsapp';
-        $bot_kw[26] = 'pinterest';
-        $bot_kw[27] = 'scrapy';
-        $bot_kw[28] = 'libwww';
-        $bot_kw[29] = 'java standard library';
-        $bot_kw[30] = 'default browser';
-        $bot_kw[31] = 'twingly recon';
-        $bot_kw[32] = 'siteexplorer';
-        $bot_kw[33] = 'yandex';
-        $bot_kw[34] = 'wotbox';
-        $bot_kw[35] = 'apache synapse';
-        $bot_kw[36] = 'catexplorador';
-        $bot_kw[37] = 'internet archive';
+        $bot_kw[0] = "bot";
+        $bot_kw[1] = "spider";
+        $bot_kw[2] = "crawl";
+        $bot_kw[3] = ".com";
+        $bot_kw[4] = ".ru";
+        $bot_kw[5] = "baidu";
+        $bot_kw[6] = "survey";
+        $bot_kw[7] = "scan";
+        $bot_kw[8] = "feed";
+        $bot_kw[9] = "bing";
+        $bot_kw[10] = "yahoo";
+        $bot_kw[11] = "engine";
+        $bot_kw[12] = "preview";
+        $bot_kw[13] = "checker";
+        $bot_kw[14] = "catalog";
+        $bot_kw[15] = "accelerator";
+        $bot_kw[16] = "python";
+        $bot_kw[14] = "qt";
+        $bot_kw[15] = "webdav";
+        $bot_kw[16] = "http";
+        $bot_kw[17] = "url";
+        $bot_kw[18] = "fake";
+        $bot_kw[19] = "library";
+        $bot_kw[20] = "commerce";
+        $bot_kw[21] = "htmlbot";
+        $bot_kw[22] = "fetch";
+        $bot_kw[23] = "googleb";
+        $bot_kw[24] = "facebook";
+        $bot_kw[25] = "whatsapp";
+        $bot_kw[26] = "pinterest";
+        $bot_kw[27] = "scrapy";
+        $bot_kw[28] = "libwww";
+        $bot_kw[29] = "java standard library";
+        $bot_kw[30] = "default browser";
+        $bot_kw[31] = "twingly recon";
+        $bot_kw[32] = "siteexplorer";
+        $bot_kw[33] = "yandex";
+        $bot_kw[34] = "wotbox";
+        $bot_kw[35] = "apache synapse";
+        $bot_kw[36] = "catexplorador";
+        $bot_kw[37] = "internet archive";
 
         $i = 0;
         while ($i < sizeof($bot_kw)) {
@@ -452,9 +514,9 @@
             mysqli_close($con);
             return;
         }
-        
+
         //Look for a visit with the same IP in the last 30 mins.
-        $con = startdb('rw');
+        $con = startdb("rw");
         $q = mysqli_query($con, "SELECT stat_visit.id AS visitid FROM stat_view, stat_visit WHERE visit = stat_visit.id AND dtime > DATE_SUB(now(), INTERVAL 30 MINUTE) AND ip = '$ip' AND uagent = '$uagent';");
         if (mysqli_num_rows($q) == 0){
             mysqli_query($con, "INSERT INTO stat_visit (ip, uagent, os, browser) VALUES ('$ip', '$uagent', '$os', '$browser');");
@@ -463,12 +525,12 @@
         $r = mysqli_fetch_array($q);
         $visit = $r['visitid'];
         mysqli_query($con, "INSERT INTO stat_view (visit, section, entry) VALUES ($visit, '$section', '$id');");
-        
+
         //Increase pop ad advertiser count
         if ($ad > 0){
             mysqli_query($con, "UPDATE sponsor SET print = print + 1 WHERE id = $ad;");
         }
-        
+
         if (is_array($ad_static)){
             foreach ($ad_static as $sponsor) {
                 mysqli_query($con, "UPDATE sponsor SET print_static = print_static + 1 WHERE id = $sponsor;");
@@ -476,8 +538,16 @@
         }
     }
 
+
+    /*****************************************************
+     * Recalculates the global count of statistics.      *
+     *                                                   *
+     * @params:                                          *
+     *    day: (data): Do it for the specified day, or   *
+     *         all the stats if it is null.              *
+     *****************************************************/
     function recalculateStats($day = null){
-        $con = startdb('rw');
+        $con = startdb("rw");
 
         // Visit count
         $s = "SELECT date(dtime) AS day, count(stat_visit.id) AS visit FROM stat_view, stat_visit where stat_visit.id = stat_view.visit";
@@ -516,7 +586,7 @@
                 mysqli_query($con, "INSERT INTO stat_daily_visit_browser (day, os, browser, visit) VALUES (str_to_date('$day', '%Y-%m-%d'), $r[os], $[browser], $r[visit])");
             }
         }
-        
+
     }
 ?>
-    
+

+ 24 - 20
www/header.php

@@ -1,18 +1,15 @@
-<?php $http_host = $_SERVER['HTTP_HOST']; ?>
 <div id="header" class="desktop">
     <div id="header_content">
         <img src="/img/logo/logo.png"/>
         <div id="header_menu">
             <table>
                 <tr>
-                    <td><a href="<?php echo $proto . $http_host; ?>/"><?php echo $lng['header_home'];?></a></td>
-                    <td><a href="<?php echo $proto . $http_host; ?>/lablanca/"><?php echo $lng['header_lablanca'];?></a></td>
-                    <td><a href="<?php echo $proto . $http_host; ?>/actividades/"><?php echo $lng['header_activities'];?></a></td>
-                    <td><a href="<?php echo $proto . $http_host; ?>/blog/"><?php echo $lng['header_blog'];?></a></td>
-                    <td><a href="<?php echo $proto . $http_host; ?>/nosotros/"><?php echo $lng['header_whoarewe'];?></a></td>
-                    <td><a href="<?php echo $proto . $http_host; ?>/galeria/"><?php echo $lng['header_gallery'];?></a></td>
-    <!--                 <td><a href="<?php echo $proto . $http_host; ?>/prensa/"><?php echo $lng['header_press'];?></a></td> -->
-<!--                     <td><a href="<?php echo $proto . $http_host; ?>/unete/"><?php echo $lng['header_join'];?></a></td> -->
+                    <td><a href="<?=$server?>/"><?=$lng["header_home"]?></a></td>
+                    <td><a href="<?=$server?>/lablanca/"><?=$lng["header_lablanca"]?></a></td>
+                    <td><a href="<?=$server?>/actividades/"><?=$lng["header_activities"]?></a></td>
+                    <td><a href="<?=$server?>/blog/"><?=$lng["header_blog"]?></a></td>
+                    <td><a href="<?=$server?>/nosotros/"><?=$lng["header_whoarewe"]?></a></td>
+                    <td><a href="<?=$server?>/galeria/"><?=$lng["header_gallery"]?></a></td>
                 </tr>
             </table>
         </div>
@@ -21,16 +18,23 @@
 <div id="header_m" class="mobile">
     <img src="/img/logo/logo.png" onClick='toggleMobileMenu();' id='mobile_logo'/>
     <div id="header_menu_m">
-        <div id='header_m_title' onClick='openMobileMenu();' class='pointer'><span><img src='<?php echo $proto . $http_host; ?>/img/misc/slid-menu.png'/>&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $cur_section; ?></span></div>
-        <div class='header_m_link'><a href="<?php echo($proto . $http_host); ?>/"><?php echo $lng['header_home'];?></a></div>
-        <div class='header_m_link'><a href="<?php echo($proto . $http_host); ?>/lablanca/"><?php echo $lng['header_lablanca'];?></a></div>
-        <div class='header_m_link'><a href="<?php echo($proto . $http_host); ?>/actividades/"><?php echo $lng['header_activities'];?></a></div>
-        <div class='header_m_link'><a href="<?php echo($proto . $http_host); ?>/blog/"><?php echo $lng['header_blog'];?></a></div>
-        <div class='header_m_link'><a href="<?php echo($proto . $http_host); ?>/nosotros/"><?php echo $lng['header_whoarewe'];?></a></div>
-        <div class='header_m_link'><a href="<?php echo($proto . $http_host); ?>/galeria/"><?php echo $lng['header_gallery'];?></a></div>
-<!--         <div class='header_m_link'><a href="<?php echo($proto . $http_host); ?>/prensa/"><?php echo $lng['header_press'];?></a></div> -->
-<!--         <div class='header_m_link'><a href="<?php echo($proto . $http_host); ?>/unete/"><?php echo $lng['header_join'];?></a></div> -->
-        <div id='header_m_slider' onClick='closeMobileMenu();' class='pointer'><span><img src='<?php echo($proto . $http_host); ?>/img/misc/slid-top.png'/></span></div>
-    </div><br/><br/>
+        <div id='header_m_title' onClick='openMobileMenu();' class='pointer'>
+            <span>
+                <img src='<?=$server?>/img/misc/slid-menu.png'/>&nbsp;&nbsp;&nbsp;&nbsp;<?=$cur_section?>
+            </span>
+        </div>
+        <div class='header_m_link'><a href="<?=$server?>/"><?=$lng["header_home"]?></a></div>
+        <div class='header_m_link'><a href="<?=$server?>/lablanca/"><?=$lng["header_lablanca"]?></a></div>
+        <div class='header_m_link'><a href="<?=$server?>/actividades/"><?=$lng["header_activities"]?></a></div>
+        <div class='header_m_link'><a href="<?=$server?>/blog/"><?=$lng["header_blog"]?></a></div>
+        <div class='header_m_link'><a href="<?=$server?>/nosotros/"><?=$lng["header_whoarewe"]?></a></div>
+        <div class='header_m_link'><a href="<?=$server?>/galeria/"><?=$lng["header_gallery"]?></a></div>
+        <div id='header_m_slider' onClick='closeMobileMenu();' class='pointer'>
+            <span>
+                <img src='<?=$server?>/img/misc/slid-top.png'/>
+            </span>
+        </div>
+    </div>
+    <br/><br/>
 </div>
 

+ 5 - 5
www/index.php

@@ -388,7 +388,7 @@
                                 </div> <!-- festivals_schedule_cell -->
                             </div> <!-- festivals_schedule_row -->
                         </div> <!-- festivals_schedule_table -->
-                        <a class='go_to_section' href='<?=server?>/lablanca/'><?=$lng['index_festivals_link']?></a>
+                        <a class='go_to_section' href='<?=$server?>/lablanca/'><?=$lng["index_festivals_link"]?></a>
                         <br/>
                     </div> <!-- festivals - section-->
 <?php
@@ -552,9 +552,9 @@
 ?>
                                         <div class='entry post' itemscope itemtype='http://schema.org/BlogPosting'>
                                             <meta itemprop='inLanguage' content='<?=$lang?>'/>
-                                            <meta itemprop='datePublished dateModified' content='<?=$r_post['isodate']?>'/>
-                                            <meta itemprop='headline name' content='<?=$r_post['title']?>'/>
-                                            <meta itemprop='articleBody text' content='<?=$r_post[text]?>'/>
+                                            <meta itemprop='datePublished dateModified' content='<?=$r_post["isodate"]?>'/>
+                                            <meta itemprop='headline name' content='<?=$r_post["title"]?>'/>
+                                            <meta itemprop='articleBody text' content='<?=$r_post["text"]?>'/>
                                             <meta itemprop='mainEntityOfPage' content='<?=$server?>'/>
                                             <div class='hidden' itemprop='author publisher' itemscope itemtype='http://schema.org/Organization'>
                                                 <meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>
@@ -617,7 +617,7 @@
                                                     <td itemscope itemtype='http://schema.org/Photograph'>
                                                         <meta itemprop='datePublished' content='<?=$r_photos['isodate']?>'/>
                                                         <a href='$server/galeria/<?=$r_album['permalink']?>'>
-                                                            <meta itemprop='image' content='<?=$serve?>/img/galeria/<?=$r_photos['file']?>'/>
+                                                            <meta itemprop='image' content='<?=$server?>/img/galeria/<?=$r_photos["file"]?>'/>
                                                             <img src='<?=$server?>/img/galeria/miniature/<?=$r_photos['file']?>' alt='<?=$r_photos['title']?>' />
                                                         </a>
                                                     </td>

+ 192 - 117
www/sitemap.php

@@ -4,178 +4,253 @@
     include("functions.php");
     $con = startdb();
     $proto = getProtocol();
-    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    $server = "$proto$http_host";
 ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <urlset
     xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
     xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
     <url>
-        <loc><?php echo $proto$http_host; ?>/</loc>
-        <?php
-            $res_date = mysqli_query($con, "(SELECT DATE_FORMAT(dtime, '%Y-%m-%d') AS cdate FROM post) UNION (SELECT DATE_FORMAT(dtime, '%Y-%m-%d') AS cdate FROM activity) UNION (SELECT DATE_FORMAT(uploaded, '%Y-%m-%d') AS cdate FROM photo) ORDER BY cdate DESC LIMIT 1;");
-            $row_date = mysqli_fetch_array($res_date);
-        ?><lastmod><?php echo $row_date['cdate']; ?></lastmod>
+        <loc><?=$server?>/</loc>
+<?php
+        $res_date = mysqli_query($con, "(SELECT DATE_FORMAT(dtime, '%Y-%m-%d') AS cdate FROM post) UNION (SELECT DATE_FORMAT(dtime, '%Y-%m-%d') AS cdate FROM activity) UNION (SELECT DATE_FORMAT(uploaded, '%Y-%m-%d') AS cdate FROM photo) ORDER BY cdate DESC LIMIT 1;");
+        $row_date = mysqli_fetch_array($res_date);
+?>
+        <lastmod><?=$row_date["cdate"]?></lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
         <image:image>
-            <image:loc><?php echo $proto$http_host; ?>/img/logo/GasteizkoMargolariak.png</image:loc>
+            <image:loc><?=$server?>/img/logo/GasteizkoMargolariak.png</image:loc>
             <image:caption>Gasteizko Margolariak</image:caption>
             <image:title>Gasteizko Margolariak</image:title>
         </image:image>
         <image:image>
-            <image:loc><?php echo $proto$http_host; ?>/img/logo/GasteizkoMargolariak-0.png</image:loc>
+            <image:loc><?=$server?>/img/logo/GasteizkoMargolariak-0.png</image:loc>
             <image:caption>Gasteizko Margolariak Original</image:caption>
             <image:title>Gasteizko Margolariak Original</image:title>
         </image:image>
     </url>
     <url>
-        <loc><?php echo $proto$http_host; ?>/ayuda/</loc>
+        <loc><?=$server?>/ayuda/</loc>
         <changefreq>monthly</changefreq>
         <priority>0.5</priority>
     </url>
     <url>
-        <loc><?php echo $proto$http_host; ?>/nosotros/</loc>
+        <loc><?=$server?>/nosotros/</loc>
         <changefreq>monthly</changefreq>
         <priority>0.6</priority>
     </url>
     <url>
-        <loc><?php echo $proto$http_host; ?>/blog/</loc>
-        <?php
-            $res_date = mysqli_query($con, "SELECT DATE_FORMAT(dtime, '%Y-%m-%d') AS cdate FROM post ORDER BY cdate DESC LIMIT 1;");
-            $row_date = mysqli_fetch_array($res_date);
-        ?><lastmod><?php echo $row_date['cdate']; ?></lastmod>
+        <loc><?=$server?>/blog/</loc>
+<?php
+        $res_date = mysqli_query($con, "SELECT DATE_FORMAT(dtime, '%Y-%m-%d') AS cdate FROM post ORDER BY cdate DESC LIMIT 1;");
+        $row_date = mysqli_fetch_array($res_date);
+?>
+        <lastmod><?=$row_date["cdate"]?></lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
-    <?php
-        $res_post = mysqli_query($con, "SELECT id, title_es, permalink, DATE_FORMAT(dtime, '%Y-%m-%d') AS cdate FROM post WHERE visible = 1 ORDER BY cdate DESC;");
-        $priority = 0.75;
-        while ($row_post = mysqli_fetch_array($res_post)){
-            echo "\t<url>\n";
-            echo "\t\t<loc>$proto$http_host/blog/$row_post[permalink]</loc>\n";
-            echo "\t\t<lastmod>$row_post[cdate]</lastmod>\n";
-            echo "\t\t<changefreq>weekly</changefreq>\n";
-            echo "\t\t<priority>$priority</priority>\n";
+<?php
+    $res_post = mysqli_query($con, "SELECT id, title_es, permalink, DATE_FORMAT(dtime, '%Y-%m-%d') AS cdate FROM post WHERE visible = 1 ORDER BY cdate DESC;");
+    $priority = 0.75;
+    while ($row_post = mysqli_fetch_array($res_post)){
+?>
+        <url>
+            <loc><?=$server?>/blog/<?=$row_post["permalink"]?></loc>
+            <lastmod><?=$row_post["cdate"]?></lastmod>
+            <changefreq>weekly</changefreq>
+            <priority><?=$priority?></priority>
+<?php
             $q_i = mysqli_query($con, "SELECT image FROM post_image WHERE post = $row_post[id] ORDER BY idx;");
             while ($r_i = mysqli_fetch_array($q_i)){
-                echo("\t\t<image:image>\n");
-                echo("\t\t\t<image:loc>$proto$http_host/img/blog/view/$r_i[image]</image:loc>\n");
-                echo("\t\t\t<image:title>$row_post[title_es]</image:title>\n");
-                echo("\t\t</image:image>\n");
-            } 
-            echo "\t</url>\n";
-            $priority = $priority - 0.05;
-            if ($priority < 0.45)
-                $priority = 0.45;
+?>
+                <image:image>
+                    <image:loc><?=$server?>/img/blog/view/<?=$r_i["image"]?></image:loc>
+                    <image:title><?=$row_post["title_es"]?></image:title>
+                </image:image>
+<?php
+            }
+?>
+        </url>
+<?php
+        $priority = $priority - 0.05;
+        if ($priority < 0.45){
+            $priority = 0.45;
         }
-    ?>
+    }
+?>
     <url>
-        <loc><?php echo $proto$http_host; ?>/actividades/</loc>
-        <?php
-            $res_date = mysqli_query($con, "SELECT DATE_FORMAT(dtime, '%Y-%m-%d') AS cdate FROM activity ORDER BY cdate DESC LIMIT 1;");
-            $row_date = mysqli_fetch_array($res_date);
-        ?><lastmod><?php echo $row_date['cdate']; ?></lastmod>
+        <loc><?=$server?>/actividades/</loc>
+<?php
+        $res_date = mysqli_query($con, "SELECT DATE_FORMAT(dtime, '%Y-%m-%d') AS cdate FROM activity ORDER BY cdate DESC LIMIT 1;");
+        $row_date = mysqli_fetch_array($res_date);
+?>
+        <lastmod><?=$row_date["cdate"]?></lastmod>
         <changefreq>weekly</changefreq>
         <priority>1</priority>
     </url>
-    <?php
-        $res = mysqli_query($con, "SELECT title_es, id, permalink, DATE_FORMAT(dtime, '%Y-%m-%d') AS cdate FROM activity WHERE visible = 1 ORDER BY cdate DESC;");
-        $priority = 0.95;
-        while ($row = mysqli_fetch_array($res)){
-            echo "\t<url>\n";
-            echo "\t\t<loc>$proto$http_host/actividades/$row[permalink]</loc>\n";
-            echo "\t\t<lastmod>$row[cdate]</lastmod>\n";
-            echo "\t\t<changefreq>weekly</changefreq>\n";
-            echo "\t\t<priority>$priority</priority>\n";
+<?php
+    $res = mysqli_query($con, "SELECT title_es, id, permalink, DATE_FORMAT(dtime, '%Y-%m-%d') AS cdate FROM activity WHERE visible = 1 ORDER BY cdate DESC;");
+    $priority = 0.95;
+    while ($row = mysqli_fetch_array($res)){
+?>
+        <url>
+            <loc><?=$server?>/actividades/<?=$row["permalink"]?></loc>
+            <lastmod><?=$row["cdate"]?></lastmod>
+            <changefreq>weekly</changefreq>
+            <priority><?=$priority?></priority>
+<?php
             $q_i = mysqli_query($con, "SELECT image FROM activity_image WHERE activity = $row[id] ORDER BY idx;");
             while ($r_i = mysqli_fetch_array($q_i)){
-                echo("\t\t<image:image>\n");
-                echo("\t\t\t<image:loc>$proto$http_host/img/actividades/view/$r_i[image]</image:loc>\n");
-                echo("\t\t\t<image:title>$row[title_es]</image:title>\n");
-                echo("\t\t</image:image>\n");
-            } 
-            echo "\t</url>\n";
-            $priority = $priority - 0.05;
-            if ($priority < 0.65)
-                $priority = 0.65;
+?>
+                <image:image>
+                    <image:loc><?=$server?>/img/actividades/view/<?=$r_i["image"]?></image:loc>
+                    <image:title><?=$row_post["title_es"]?></image:title>
+                </image:image>
+<?php
+            }
+?>
+        </url>
+<?php
+        $priority = $priority - 0.05;
+        if ($priority < 0.65){
+            $priority = 0.65;
         }
-    ?>
+    }
+?>
     <url>
-        <loc><?php echo $proto$http_host; ?>/galeria/</loc>
-        <?php
-            $res_date = mysqli_query($con, "SELECT DATE_FORMAT(uploaded, '%Y-%m-%d') AS cdate FROM photo ORDER BY cdate DESC LIMIT 1;");
-            $row_date = mysqli_fetch_array($res_date);
-        ?><lastmod><?php echo $row_date['cdate']; ?></lastmod>
+        <loc><?=$server?>/galeria/</loc>
+<?php
+        $res_date = mysqli_query($con, "SELECT DATE_FORMAT(uploaded, '%Y-%m-%d') AS cdate FROM photo ORDER BY cdate DESC LIMIT 1;");
+        $row_date = mysqli_fetch_array($res_date);
+?>
+        <lastmod><?=$row_date["cdate"]?></lastmod>
         <changefreq>weekly</changefreq>
         <priority>0.8</priority>
     </url>
-    <?php
-        $res = mysqli_query($con, "SELECT DISTINCT album.id AS albumid, album.title_es AS title, album.permalink AS permalink, DATE_FORMAT(uploaded, '%Y-%m-%d') AS cdate FROM photo, album, photo_album WHERE photo = photo.id AND album = album.id ORDER BY cdate DESC;");
-        $priority = 0.75;
-        while ($row = mysqli_fetch_array($res)){
-            echo "\t<url>\n";
-            echo "\t\t<loc>$proto$http_host/galeria/$row[permalink]</loc>\n";
-            echo "\t\t<lastmod>$row[cdate]</lastmod>\n";
-            echo "\t\t<changefreq>weekly</changefreq>\n";
-            echo "\t\t<priority>$priority</priority>\n";
+<?php
+    $res = mysqli_query($con, "SELECT DISTINCT album.id AS albumid, album.title_es AS title, album.permalink AS permalink, DATE_FORMAT(uploaded, '%Y-%m-%d') AS cdate FROM photo, album, photo_album WHERE photo = photo.id AND album = album.id ORDER BY cdate DESC;");
+    $priority = 0.75;
+    while ($row = mysqli_fetch_array($res)){
+?>
+        <url>
+            <loc><?=$server?>/galeria/<?=$row["permalink"]?></loc>
+            <lastmod><?=$row["cdate"]?></lastmod>
+            <changefreq>weekly</changefreq>
+            <priority><?=$priority?></priority>
+<?php
             $q_i = mysqli_query($con, "SELECT file, title_es FROM photo, photo_album WHERE id = photo AND album = $row[albumid];");
             while ($r_i = mysqli_fetch_array($q_i)){
-                echo("\t\t<image:image>\n");
-                echo("\t\t\t<image:loc>$proto$http_host/img/galeria/view/$r_i[file]</image:loc>\n");
-                if (strlen($r_i['title_es']) > 0){
-                    echo("\t\t\t<image:title>$r_i[title_es]</image:title>\n");
-                }
-                else{
-                    echo("\t\t\t<image:title>$row[title]</image:title>\n");
-                }
-                echo("\t\t</image:image>\n");
-            } 
-            echo "\t</url>\n";
-            $priority = $priority - 0.05;
-            if ($priority < 0.45)
-                $priority = 0.45;
+?>
+                <image:image>
+                <image:loc><?=$server?>/img/galeria/view/<?=$r_i["file"]?></image:loc>
+<?php
+                    if (strlen($r_i['title_es']) > 0){
+?>
+                        <image:title><?=$r_i["title_es"]?></image:title>
+<?php
+                    }
+                    else{
+?>
+                        <image:title><?=$row["title"]?></image:title>
+<?php
+                    }
+?>
+                </image:image>
+<?php
+            }
+?>
+        </url>
+<?php
+        $priority = $priority - 0.05;
+        if ($priority < 0.45){
+            $priority = 0.45;
         }
-    ?>
+    }
+?>
     <url>
-        <loc><?php echo $proto$http_host; ?>/lablanca/</loc>
-        <?php
-            $res_lb = mysqli_query($con, 'SELECT value FROM settings WHERE name= "festivals";');
-            if (mysqli_num_rows($res_lb) > 0){
-                $r_lb = mysqli_fetch_array($res_lb);
-                if ($r_lb['value'] == 1){
-                    echo "<changefreq>daily</changefreq>\n";
-                    echo "\t\t<priority>1</priority>\n";
-                }
-                else{
-                    echo "<changefreq>monthly</changefreq>\n";
-                    echo "\t\t<priority>0.5</priority>\n";
-                }
+        <loc><?=$server?>/lablanca/</loc>
+<?php
+        $res_lb = mysqli_query($con, 'SELECT value FROM settings WHERE name= "festivals";');
+        if (mysqli_num_rows($res_lb) > 0){
+            $r_lb = mysqli_fetch_array($res_lb);
+            if ($r_lb["value"] == 1){
+?>
+                <changefreq>daily</changefreq>
+                <priority>1</priority>
+<?php
             }
             else{
-                echo "<changefreq>monthly</changefreq>\n";
-                echo "\t\t<priority>0.5</priority>\n";
+?>
+                <changefreq>monthly</changefreq>
+                <priority>0.5</priority>
+<?php
             }
-        ?>
+        }
+        else{
+?>
+            <changefreq>monthly</changefreq>
+            <priority>0.5</priority>
+<?php
+        }
+?>
     </url>
-    <?php
+<?php
         $year = date("Y");
         $res_years = mysqli_query($con, "SELECT img, year FROM festival ORDER BY year DESC;");
         $priority = 0.55;
         while ($row_years = mysqli_fetch_array($res_years)){
-            echo "\t<url>\n";
-            echo "\t\t<loc>$proto$http_host/lablanca/$row_years[year]</loc>\n";
-            echo "\t\t<changefreq>yearly</changefreq>\n";
-            echo "\t\t<priority>$priority</priority>\n";
-            if (strlen($row_years['img']) > 0){
-                echo("\t\t<image:image>\n");
-                echo("\t\t\t<image:loc>$proto$http_host/img/fiestas/view/$row_years[img]</image:loc>\n");
-                echo("\t\t\t<image:title>La Blanca $row_years[year]</image:title>\n");
-                echo("\t\t</image:image>\n");
+?>
+            <url>
+                <loc><?=$server?>/lablanca/<?=$row_years["year"]?></loc>
+                <changefreq>yearly</changefreq>
+                <priority><?=$priority?></priority>
+<?php
+                if (strlen($row_years["img"]) > 0){
+?>
+                    <image:image>
+                        <image:loc><?=$server?>/img/fiestas/view/<?$row_years["img"]?></image:loc>
+                        <image:title>La Blanca <?=$row_years["year"]?></image:title>
+                    </image:image>
+<?php
+            }
+?>
+            </url>
+            <url>
+                <loc><?=$server?>/lablanca/programa/margolariak/<?=$row_years["year"]?></loc>
+                <changefreq>yearly</changefreq>
+                <priority><?=($priority + 0.3)?></priority>
+<?php
+                if (strlen($row_years["img"]) > 0){
+?>
+                    <image:image>
+                        <image:loc><?=$server?>/img/fiestas/view/<?=$row_years["img"]?></image:loc>
+                        <image:title>La Blanca <?=$row_years["year"]?></image:title>
+                    </image:image>
+<?php
+            }
+?>
+            </url>
+            <url>
+                <loc><?=$server?>/lablanca/programa/municipal/<?=$row_years["year"]?></loc>
+                <changefreq>yearly</changefreq>
+                <priority><?=($priority + 0.1)?></priority>
+<?php
+                if (strlen($row_years["img"]) > 0){
+?>
+                    <image:image>
+                        <image:loc><?=$server?>/img/fiestas/view/<?=$row_years["img"]?></image:loc>
+                        <image:title>La Blanca <?=$row_years["year"]?></image:title>
+                    </image:image>
+<?php
             }
-            echo "\t</url>\n";
+?>
+            </url>
+<?php
             $priority = $priority - 0.05;
-            if ($priority < 0.40)
+            if ($priority < 0.40){
                 $priority = 0.40;
-        }
-    ?>
+            }
+        } // while ($row_years = mysqli_fetch_array($res_years))
+?>
 </urlset>