Merge branch 'V3' of https://github.com/GasteizkoMargolariak/GasteizkoMargolariakWeb into V3

www-admin/estadisticas/web/index.php

@@ -56,8 +56,8 @@
                             <h3 class='section_title'>Gr&aacute;fico</h3>
                             <div class='entry'>
 <?php
-                                $q_section = mysqli_query($con, "SELECT COUNT(visit) v, section FROM stat_view WHERE section != 'error' AND entry = '' GROUP BY section ORDER BY COUNT(visit)")
-                                $q_blog = mysqli_query($con, "SELECT COUNT(visit) v, section, entry FROM stat_view WHERE section = 'blog' AND entry IS NOT null GROUP section, entry ORDER BY count(visit) DESC LIMIT 4")
+                                $q_section = mysqli_query($con, "SELECT COUNT(visit) v, section FROM stat_view WHERE section != 'error' AND entry = '' GROUP BY section ORDER BY COUNT(visit)");
+                                $q_blog = mysqli_query($con, "SELECT COUNT(visit) v, section, entry FROM stat_view WHERE section = 'blog' AND entry IS NOT null GROUP section, entry ORDER BY count(visit) DESC LIMIT 4");
 ?>
                             </div> <!-- .entry -->
                         </div> <!-- .section -->

www/API/v3/sync.php

@@ -373,9 +373,17 @@
             $str = rtrim($str, ",");
             $str = $str . "}";
             $str = str_replace(",,", ",", $str);
-            echo($str);
+            if (strlen($str) > 0){
+                log_sync($con, $user, $synced);
+                echo($str);
+                http_response_code(200);
+            }
+            else{
+                http_response_code(204);
+            }
             return true;
         }
+        http_response_code(204);
         return false;
     }
 
@@ -472,7 +480,4 @@
     $v_server = get_server_versions($con);
     $tables = select_tables($v_user, $v_server);
     $synced = sync($con, $tables);
-
-    //Log the sync in the database
-    log_sync($con, $user, $synced);
 ?>

www/actividades/index.php

@@ -160,7 +160,7 @@
                                                     <tr>
                                                         <td></td>
                                                         <td>
-                                                            <a href='<?=$server?>/actividades/<?$r_activity["permalink"]?>'><?=$lng["activities_see_itinerary"]?></a>
+                                                            <a href='<?=$server?>/actividades/<?=$r_activity["permalink"]?>'><?=$lng["activities_see_itinerary"]?></a>
                                                         </td>
                                                     </tr>
 <?php

www/lablanca/programa.php

@@ -96,7 +96,7 @@
             <div class='section' id='schedule'>
                 <h3 class='section_title'><?=str_replace('#', $year, $lng["lablanca_schedule_year_" . $schi])?></h3>
 <?php
-                $q_days = mysqli_query($con, "SELECT DISTINCT date(DATE_SUB(start, INTERVAL 6 HOUR)) AS date, DATE_FORMAT(DATE_SUB(start, INTERVAL 6 HOUR), '%Y-%m-%d') AS isodate, (SELECT name_$lang FROM festival_day WHERE date = date(DATE_SUB(start, INTERVAL 6 HOUR))) AS name FROM festival_event_$schi WHERE year(start) = 2017 ORDER BY date");
+                $q_days = mysqli_query($con, "SELECT DISTINCT date(DATE_SUB(start, INTERVAL 6 HOUR)) AS date, DATE_FORMAT(DATE_SUB(start, INTERVAL 6 HOUR), '%Y-%m-%d') AS isodate, (SELECT name_$lang FROM festival_day WHERE date = date(DATE_SUB(start, INTERVAL 6 HOUR))) AS name FROM festival_event_$schi WHERE year(start) = 2018 ORDER BY date");
                 $i=0;
                 while ($r_days = mysqli_fetch_array($q_days)){
 ?>