فهرست منبع

Merge branch 'master' into newui

seavenois 9 سال پیش
والد
کامیت
75810a3a49

+ 5 - 0
www/.htaccess

@@ -53,6 +53,10 @@ RewriteRule ^galeria/([A-Z\-a-z0-9{3,}]+)/([A-Z\-a-z0-9{3,}]+)/$ /galeria/photo.
 RewriteRule ^API/V([{0-9}]+)/help/([A-Z\-a-z0-9{3,}]+)$ /API/V$1/help/$2.php [NC,QSA,L]
 RewriteRule ^API/V([{0-9}]+)/help/([A-Z\-a-z0-9{3,}]+)/$ /API/V$1/help/$2.php [L,NC]
 
+#Force https TODO
+#RewriteCond %{HTTPS} !=on
+#RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+
 # BEGIN Cache-Control Headers
 <IfModule mod_expires.c>
 	ExpiresActive on
@@ -102,3 +106,4 @@ RewriteRule ^API/V([{0-9}]+)/help/([A-Z\-a-z0-9{3,}]+)/$ /API/V$1/help/$2.php [L
 #MCacheSize 1024
 
 #CacheFile footer.php toolbar.php img/*/* project/*/render/* project/*/render/*/preview/* project/*/render/*/miniature/*
+

+ 311 - 1
www/API/v1/comment.php

@@ -1 +1,311 @@
- 
+<?php
+	// Gasteizko Margolariak API v1 //
+	
+	//Posible comment target
+	define('TARGET_PHOTO', 'photo');
+	define('TARGET_POST', 'post');
+	define('TARGET_ACTIVITY', 'activity');
+	
+	//Default target
+	define('DEF_TARGET', TARGET_ALL);
+		
+	//$_GET valid parameters
+	define('GET_CLIENT', 'client');
+	define('GET_USER', 'user');
+	define('GET_TARGET', 'target');
+	define('GET_ID', 'id');
+	define('GET_PERMALINK', 'permalink');
+	define('GET_TEXT', 'text');
+	define('GET_USERNAME', 'username');
+	
+	/****************************************************
+	* 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.        *
+	*                                                   *
+	* @return: (db connection): The connection handler. *
+	****************************************************/
+	function startdb(){
+		//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';
+		?>
+		*/
+		include('../../.htpasswd');
+		
+		//Connect to to database
+		$con = mysqli_connect($host, $username_rw, $pass_rw, $db_name);
+		
+		//Set encoding options
+		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;
+	}
+	
+	//Connect to the database
+	$con = startdb('rw');
+	
+	//Get data from URL
+	$client = mysqli_real_escape_string($con, $_GET[GET_CLIENT]);
+	$user = mysqli_real_escape_string($con, $_GET[GET_USER]);
+	$target = strtolower(mysqli_real_escape_string($con, $_GET[GET_TARGET]));
+	$id = strtolower(mysqli_real_escape_string($con, $_GET[GET_ID]));
+	$permalink = strtolower(mysqli_real_escape_string($con, $_GET[GET_PERMALINK]));
+	$ink = strtolower(mysqli_real_escape_string($con, $_GET[GET_PERMALINK]));
+	$permalink = strtolower(mysqli_real_escape_string($con, $_GET[GET_PERMALINK]));
+	$username = mysqli_real_escape_string($con, $_GET[GET_USERNAME]);
+	$text = mysqli_real_escape_string($con, $_GET[GET_TEXT]);
+	
+	//Validate data
+	if (strlen($client) < 1){
+		//Bad request
+		http_response_code(400);
+		exit();
+	}
+	if (strlen($user) < 1){
+		$user = '';
+	}
+	if (strlen($target) < 1){
+		//Bad request
+		http_response_code(400);
+		exit();
+	}
+	if ($target != TARGET_PHOTO && $target != TARGET_POST && $target != TARGET_ACTIVITY){
+		//Bad request
+		http_response_code(400);
+		exit();
+	}
+	if (strlen($username) < 1){
+		//Bad request
+		http_response_code(400);
+		exit();
+	}
+	
+	
+	//Check id and/or permalink. Several cases:
+	
+	//1st case: id and permalink empty: Error.
+	if (strlen($id) < 1 && strlen($permalink) < 1){
+		//Bad request
+		http_response_code(400);
+		exit();
+	}
+	
+	//2nd case: Comment for post, permalink and no id.
+	elseif ($target == TARGET_POST && strlen($id) < 1 && strlen($permalink) >= 1){
+	
+		//Check if post exists...
+		$q = mysqli_query($con, "SELECT id, comments FROM post WHERE visible = 1 AND permalink = '$permalink';");
+		if (mysqli_num_rows($q) == 0){
+			//Bad request
+			http_response_code(400);
+			exit();
+		}
+		else{
+		
+			//... and if it does, check if can be commented.
+			$r = mysqli_fetch_array($q);
+			$item_id = $r['id'];
+			if ($r['comments'] != 1){
+				//'Forbidden' status code
+				http_response_code(403);
+				exit();
+			}
+		}
+	}
+	
+	//3rd case: Comment for post, id and no permalink.
+	elseif ($target == TARGET_POST && strlen($id) >= 1 && strlen($permalink) < 1){
+	
+		//Check if post exists...
+		$q = mysqli_query($con, "SELECT id, comments FROM post WHERE visible = 1 AND id = $id;");
+		if (mysqli_num_rows($q) == 0){
+			//Bad request
+			http_response_code(400);
+			exit();
+		}
+		else{
+		
+			//... and if it does, check if can be commented.
+			$r = mysqli_fetch_array($q);
+			$item_id = $r['id'];
+			if ($r['comments'] != 1){
+				//'Forbidden' status code
+				http_response_code(403);
+				exit();
+			}
+		}
+	}
+	
+	//4th case: Comment for post, permalink and id.
+	elseif ($target == TARGET_POST && strlen($id) >= 1 && strlen($permalink) >= 1){
+	
+		//Check if post exists...
+		$q = mysqli_query($con, "SELECT id, comments FROM post WHERE visible = 1 AND permalink = '$permalink' AND id = $id ;");
+		if (mysqli_num_rows($q) == 0){
+			//Bad request
+			http_response_code(400);
+			exit();
+		}
+		else{
+		
+			//... and if it does, check if can be commented.
+			$r = mysqli_fetch_array($q);
+			$item_id = $r['id'];
+			if ($r['comments'] != 1){
+				//'Forbidden' status code
+				http_response_code(403);
+				exit();
+			}
+		}
+	}
+	
+	//5th case: Comment for photo, permalink and no id.
+	elseif ($target == TARGET_PHOTO && strlen($id) < 1 && strlen($permalink) >= 1){
+	
+		//Check if photo exists.
+		$q = mysqli_query($con, "SELECT id FROM photo WHERE approved = 1 AND permalink = '$permalink';");
+		if (mysqli_num_rows($q) == 0){
+			//Bad request
+			http_response_code(400);
+			exit();
+		}
+		else{
+			$item_id = $r['id'];
+		}
+	}
+	
+	//6th case: Comment for photo, id and no permalink.
+	elseif ($target == TARGET_PHOTO && strlen($id) >= 1 && strlen($permalink) < 1){
+	
+		//Check if photo exists.
+		$q = mysqli_query($con, "SELECT id FROM photo WHERE approved = 1 AND id = $id;");
+		if (mysqli_num_rows($q) == 0){
+			//Bad request
+			http_response_code(400);
+			exit();
+		}
+		else{
+			$item_id = $r['id'];
+		}
+	}
+	
+	//7th case: Comment for photo, permalink and id.
+	elseif ($target == TARGET_PHOTO && strlen($id) >= 1 && strlen($permalink) >= 1){
+	
+		//Check if photo exists.
+		$q = mysqli_query($con, "SELECT id FROM photo WHERE approved = 1 AND permalink = '$permalink' AND id = $id;");
+		if (mysqli_num_rows($q) == 0){
+			//Bad request
+			http_response_code(400);
+			exit();
+		}
+		else{
+			$item_id = $r['id'];
+		}
+	}
+	
+	//8nd case: Comment for activity, permalink and no id.
+	elseif ($target == TARGET_ACTIVITY && strlen($id) < 1 && strlen($permalink) >= 1){
+	
+		//Check if activity exists...
+		$q = mysqli_query($con, "SELECT id, comments FROM activity WHERE visible = 1 AND permalink = '$permalink';");
+		if (mysqli_num_rows($q) == 0){
+			//Bad request
+			http_response_code(400);
+			exit();
+		}
+		else{
+		
+			//... and if it does, check if can be commented.
+			$r = mysqli_fetch_array($q);
+			$item_id = $r['id'];
+			if ($r['comments'] != 1){
+				//'Forbidden' status code
+				http_response_code(403);
+				exit();
+			}
+		}
+	}
+	
+	//9rd case: Comment for activity, id and no permalink.
+	elseif ($target == TARGET_ACTIVITY && strlen($id) >= 1 && strlen($permalink) < 1){
+	
+		//Check if activity exists...
+		$q = mysqli_query($con, "SELECT id, comments FROM activity WHERE visible = 1 AND id = $id;");
+		if (mysqli_num_rows($q) == 0){
+			//Bad request
+			http_response_code(400);
+			exit();
+		}
+		else{
+		
+			//... and if it does, check if can be commented.
+			$r = mysqli_fetch_array($q);
+			$item_id = $r['id'];
+			if ($r['comments'] != 1){
+				//'Forbidden' status code
+				http_response_code(403);
+				exit();
+			}
+		}
+	}
+	
+	//10th case: Comment for activity, permalink and id.
+	elseif ($target == TARGET_ACTIVITY && strlen($id) >= 1 && strlen($permalink) >= 1){
+	
+		//Check if activity exists...
+		$q = mysqli_query($con, "SELECT id, comments FROM activity WHERE visible = 1 AND permalink = '$permalink' AND id = $id ;");
+		if (mysqli_num_rows($q) == 0){
+			//Bad request
+			http_response_code(400);
+			exit();
+		}
+		else{
+		
+			//... and if it does, check if can be commented.
+			$r = mysqli_fetch_array($q);
+			$item_id = $r['id'];
+			if ($r['comments'] != 1){
+				//'Forbidden' status code
+				http_response_code(403);
+				exit();
+			}
+		}
+	}
+	
+	//If code gets here, there were no errors. Build query.
+	$query = "INSERT INTO ";
+	$section = "";
+	switch ($target){
+		case TARGET_POST:
+			$query = $query . "post_comment (post";
+			$section = "blog";
+			break;
+		case TARGET_PHOTO:
+			$query = $query . "photo_comment (photo";
+			$section = "gallery";
+			break;
+		case TARGET_ACTIVITY:
+			$query = $query . "activity_comment (activity";
+			$section = "activity";
+			break;
+	}
+	$query = $query . ", text, username, app) VALUES ($item_id, \"$text\", \"$username\", \"client\");";
+	//echo($query);
+	mysqli_query($con, $query);
+	mysqli_query($con, "UPDATE version SET version = version + 1 WHERE section = '$section';");
+
+?>

+ 82 - 0
www/API/v1/location.php

@@ -0,0 +1,82 @@
+<?php
+	// Gasteizko Margolariak API v1 //
+		
+	//List of available data formatting
+	define('FOR_JSON', 'json');
+	
+	//Default info format
+	define('DEF_FORMAT', FOR_JSON);
+	
+	//Errors
+	define('ERR_FORMAT', '-FORMAT:');
+	
+	/****************************************************
+	* 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.        *
+	*                                                   *
+	* @return: (db connection): The connection handler. *
+	****************************************************/
+	function startdb(){
+		//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';
+		?>
+		*/
+		include('../../.htpasswd');
+		
+		//Connect to to database
+		$con = mysqli_connect($host, $username_rw, $pass_rw, $db_name);
+		
+		//Set encoding options
+		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;
+	}
+	
+	//Connect to the database
+	$con = startdb('rw');
+	
+	//Get data from the url
+	$format = strtolower(mysqli_real_escape_string($con, $_GET[GET_FORMAT]));
+	
+	//Validate input
+	if (strlen($format) < 1){
+		$format = DEF_FORMAT;
+	}
+	if ($format != FOR_JSON){
+		//Bad request
+		http_response_code(400);
+		$error = $error . ERR_FORMAT . mysqli_real_escape_string($con, $_GET[GET_FORMAT]);
+	}
+	
+	//Get location
+	$q = mysqli_query($con, "SELECT lat, lon, dtime FROM location WHERE action = 'report' AND dtime > NOW() - INTERVAL 30 MINUTE ORDER BY dtime DESC LIMIT 1;");
+	if (mysqli_num_rows($q) > 0){
+		$r = mysqli_fetch_array($q);
+		switch ($format){
+			case FOR_JSON:
+				echo("[{\"lat\":\"$r[lat]\",\"lon\":\"$r[lon]\",\"dtime\":\"$r[dtime]\"}]");
+				break;
+			default:
+				http_response_code(400);
+			$error = $error . ERR_FORMAT . mysqli_real_escape_string($con, $_GET[GET_FORMAT]);
+		}
+	}
+	else{
+		//No content
+		http_response_code(204);
+	}
+?>

+ 130 - 0
www/API/v1/notifications.php

@@ -0,0 +1,130 @@
+<?php
+	// Gasteizko Margolariak API v1 //
+		
+	//List of available data formatting
+	define('FOR_JSON', 'json');
+	
+	//Default info format
+	define('DEF_FORMAT', FOR_JSON);
+	
+	//Posible notification target
+	define('TARGET_ALL', 'all');
+	define('TARGET_GM', 'gm');
+	
+	//Default target
+	define('DEF_TARGET', TARGET_ALL);
+		
+	//$_GET valid parameters
+	define('GET_CLIENT', 'client');
+	define('GET_USER', 'user');
+	define('GET_TARGET', 'target');
+	define('GET_FORMAT', 'json');
+	
+	//Error messages
+	define('ERR_TARGET', '-TARGET:');
+	define('ERR_FORMAT', '-FORMAT:');
+	
+	/****************************************************
+	* 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.        *
+	*                                                   *
+	* @return: (db connection): The connection handler. *
+	****************************************************/
+	function startdb(){
+		//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';
+		?>
+		*/
+		include('../../.htpasswd');
+		
+		//Connect to to database
+		$con = mysqli_connect($host, $username_rw, $pass_rw, $db_name);
+		
+		//Set encoding options
+		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;
+	}
+	
+	function show_notifications($con, $target = DEF_TARGET, $format = DEF_FORMAT){
+		if ($target == TARGET_GM){
+			$query = "SELECT id, title_es, title_en, title_eu, text_es, text_en, text_eu, dtime, internal AS gm, duration, action, 0 AS seen FROM notification WHERE internal = 1 AND dtime > NOW() - INTERVAL duration MINUTE ORDER BY dtime DESC";
+		}
+		else{
+			$query = "SELECT id, title_es, title_en, title_eu, text_es, text_en, text_eu, dtime, internal AS gm, duration, action, 0 AS seen FROM notification WHERE dtime > NOW() - INTERVAL duration MINUTE ORDER BY dtime DESC";
+		}
+		$q = mysqli_query($con, $query);
+		if (mysqli_num_rows($q) == 0){
+			http_response_code(204);
+		}
+		else{
+			switch ($format){
+				case FOR_JSON:
+					//Create result array
+					$rows = array();
+					while($r = mysqli_fetch_assoc($q)) {
+						$rows[] = $r;
+					}
+					return(json_encode($rows));
+					break;
+			}
+		}
+	}
+	
+	//Connect to the database
+	$con = startdb('rw');
+	
+	//Get data from URL
+	$client = mysqli_real_escape_string($con, $_GET[GET_CLIENT]);
+	$user = mysqli_real_escape_string($con, $_GET[GET_USER]);
+	$target = strtolower(mysqli_real_escape_string($con, $_GET[GET_TARGET]));
+	$format = strtolower(mysqli_real_escape_string($con, $_GET[GET_FORMAT]));
+	
+	//Initialize some variables
+	$error = '';
+	
+	//Validate data
+	if (strlen($client) < 1){
+		$client = '';
+	}
+	if (strlen($user) < 1){
+		$user = '';
+	}
+	if (strlen($target) < 1){
+		$target = DEF_TARGET;
+	}
+	if ($target != TARGET_ALL && $action != TARGET_GM){
+		//Bad request
+		http_response_code(400);
+		$error = $error . ERR_TARGET . mysqli_real_escape_string($con, $_GET[GET_TARGET]);
+	}
+	if (strlen($format) < 1){
+		$format = DEF_FORMAT;
+	}
+	if ($format != FOR_JSON){
+		//Bad request
+		http_response_code(400);
+		$error = $error . ERR_FORMAT . mysqli_real_escape_string($con, $_GET[GET_FORMAT]);
+	}
+	
+	
+	//If there has not been an error, procede
+	if (strlen($error) == 0){
+		echo(show_notifications($con, $target, $format));
+	}
+
+?>

+ 7 - 4
www/API/v1/sync.php

@@ -202,7 +202,7 @@
 				$q = mysqli_query($con, "SELECT id, permalink, date, city, title_es, title_en, title_eu, text_es, text_eu, text_en, after_es, after_en, after_eu, price, inscription, max_people, album FROM activity WHERE visible = 1;");
 				break;
 			case "activity_comment":
-				$q = mysqli_query($con, "SELECT activity_comment.id AS id, activity, text, dtime, CONCAT(user.username, user) AS user, lang FROM activity_comment, user WHERE activity_comment.user = user.id AND approved = 1;");
+				$q = mysqli_query($con, "SELECT id, activity, text, dtime, username, lang FROM activity_comment WHERE approved = 1;");
 				break;
 			case "album":
 				$q = mysqli_query($con, "SELECT id, permalink, title_es, title_en, title_eu, description_es, description_en, description_eu, open FROM album;");
@@ -211,10 +211,13 @@
 				$q = mysqli_query($con, "SELECT photo.id AS id, file, permalink, title_es, title_en, title_eu, description_es, description_en, description_eu, uploaded, place, width, height, size, CONCAT(photo.username, user) AS username FROM photo, user WHERE user.id = photo.user AND approved = 1;");
 				break;
 			case "post":
-				$q = mysqli_query($con, "SELECT post.id AS id, permalink, title_es, title_en, title_eu, text_es, text_en, text_eu, username, dtime FROM post, user WHERE user.id = user AND visible = 1;");
+				$q = mysqli_query($con, "SELECT post.id AS id, permalink, title_es, title_en, title_eu, text_es, text_en, text_eu, comments, username, dtime FROM post, user WHERE user.id = user AND visible = 1;");
 				break;
 			case "post_comment":
-				$q = mysqli_query($con, "SELECT post_comment.id AS id, post, text, dtime, CONCAT(user.username, user) AS user, lang FROM post_comment, user WHERE post_comment.user = user.id AND approved = 1;");
+				$q = mysqli_query($con, "SELECT post_comment.id AS id, post, text, dtime, username, lang FROM post_comment WHERE approved = 1;");
+				break;
+			case "photo_comment":
+				$q = mysqli_query($con, "SELECT photo_comment.id AS id, post, text, dtime, username, lang FROM photo_comment WHERE approved = 1;");
 				break;
 			case "sponsor":
 				$q = mysqli_query($con, "SELECT id, name_es, name_en, name_eu, text_es, text_en, text_eu, image, address_es, address_en, address_eu, link, lat, lon FROM sponsor;");
@@ -381,7 +384,7 @@
 			//If the client needs an update
 			else{
 				$out = sync($con, $section);
-				$out = str_replace('\"', '\u0022s', $out);
+				$out = str_replace('\"', '\u0022', $out);
 				$out = str_replace(':""', ':null', $out);
 				$out = "{\"sync\":$out}";
 				echo($out);

+ 18 - 17
www/actividades/actividad.php

@@ -3,6 +3,7 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -14,7 +15,7 @@
 	$perm = mysqli_real_escape_string($con, $_GET['perm']);
 	$q = mysqli_query($con, "SELECT id, permalink, title_$lang AS title, text_$lang AS text, after_$lang AS after, price, inscription, people, max_people, user, date, DATE_FORMAT(date, '%Y-%m-%d %T') AS cdate, DATE_FORMAT(date, '%Y-%m-%d') AS isodate, DATE_FORMAT(date,'%b %d, %Y') as fdate, dtime, comments, city FROM activity WHERE permalink = '$perm' AND visible = 1;");
 	if (mysqli_num_rows($q) == 0){
-		header("Location: http://$http_host/actividades/");
+		header("Location: $proto$http_host/actividades/");
 		exit(-1);
 	}
 	$r = mysqli_fetch_array($q);
@@ -26,7 +27,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><?php echo $r["title"] . " - Gasteizko Margolariak"; ?></title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -49,20 +50,20 @@
 			?>
 		</script>
 		<!-- Meta tags -->
-		<link rel="canonical" href="<?php echo "http://$http_host/actividades/" . $r['permalink']; ?>"/>
-		<link rel="author" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="publisher" href="<?php echo "http://$http_host"; ?>"/>
+		<link rel="canonical" href="<?php echo "$proto$http_host/actividades/" . $r['permalink']; ?>"/>
+		<link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
 		<meta name="description" content="<?php echo strip_tags($r["text"]);?>"/>
 		<meta property="og:title" content="<?php echo $r["title"] . " - Gasteizko Margolariak"; ?>"/>
-		<meta property="og:url" content="<?php echo "http://$http_host/actividades/" . $r['permalink']; ?>"/>
+		<meta property="og:url" content="<?php echo "$proto$http_host/actividades/" . $r['permalink']; ?>"/>
 		<meta property="og:description" content="<?php echo strip_tags($r["text"]);?>"/>
 		<?php
 			$q_i = mysqli_query($con, "SELECT image FROM activity_image WHERE activity = $id ORDER BY idx;");
 			if (mysqli_num_rows($q_i) == 0)
-				$img = "http://$http_host/img/logo/cover.png";
+				$img = "$proto$http_host/img/logo/cover.png";
 			else{
 				$r_i = mysqli_fetch_array($q_i);
-				$img = "http://$http_host/img/actividades/preview/" . $r_i['image'];
+				$img = "$proto$http_host/img/actividades/preview/" . $r_i['image'];
 			}
 		?>
 		<meta property="og:image" content="<?php echo $img;?>"/>
@@ -85,7 +86,7 @@
 		<meta name="twitter:title" content="<?php echo $r["title"] . " - Gasteizko Margolariak";?>"/>
 		<meta name="twitter:description" content="<?php echo strip_tags($r["text"]);?>"/>
 		<meta name="twitter:image" content="<?php echo $img;?>"/>
-		<meta name="twitter:url" content="<?php echo "http://$http_host/actividades/$r[permalink]"; ?>"/>
+		<meta name="twitter:url" content="<?php echo "$proto$http_host/actividades/$r[permalink]"; ?>"/>
 		<meta name="robots" content="index follow"/>
 	</head>
 	<body>
@@ -107,7 +108,7 @@
 					<div class="entry" itemscope itemtype='http://schema.org/Event'>
 						<?php
 						
-							echo "<meta itemprop='url' href='http://$http_host/actividades/$r[permalink]'/>\n";
+							echo "<meta itemprop='url' href='$proto$http_host/actividades/$r[permalink]'/>\n";
 							echo "<meta itemprop='inLanguage' content='$lang'/>\n";
 							echo "<meta itemprop='name' content='$r[title]'/>\n";
 							echo "<meta itemprop='description' content='$r[text]'/>\n";
@@ -116,15 +117,15 @@
 							echo "<div class='hidden' itemprop='organizer' itemscope itemtype='http://schema.org/Organization'>\n";
 							echo "<meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>\n";
 							echo "<meta itemprop='name' content='Gasteizko Margolariak'/>\n";
-							echo "<meta itemprop='logo' content='http://$http_host/img/logo/logo.png'/>\n";
+							echo "<meta itemprop='logo' content='$proto$http_host/img/logo/logo.png'/>\n";
 							echo "<meta itemprop='foundingDate' content='03-02-2013'/>\n";
 							echo "<meta itemprop='telephone' content='+34637140371'/>\n";
-							echo "<meta itemprop='url' content='http://$http_host'/>\n";
+							echo "<meta itemprop='url' content='$proto$http_host'/>\n";
 							echo "</div>\n";
 						
 							if (mysqli_num_rows($q_i) > 0){
-								echo "<meta itemprop='image' content='http://$http_host/img/actividades/$r_i[image]'/>\n";
-								echo "<div id='activity_image'><img src='http://$http_host/img/actividades/preview/$r_i[image]'/></div>\n";
+								echo "<meta itemprop='image' content='$proto$http_host/img/actividades/$r_i[image]'/>\n";
+								echo "<div id='activity_image'><img src='$proto$http_host/img/actividades/preview/$r_i[image]'/></div>\n";
 							}
 							echo "<div id='activity_description'><p>\n";
 							if ($future == false && strlen($r['after']) > 0){
@@ -201,18 +202,18 @@
 							$res_year = mysqli_query($con, "SELECT year(date) AS year FROM activity WHERE visible = 1 GROUP BY year(date) ORDER BY year DESC;");
 							while($row_year = mysqli_fetch_array($res_year)){
 								echo "<div class='year pointer' onClick=\"toggleElement('year_$row_year[year]');\">";
-								echo("<img class='slid' id='slid_year_$row_year[year]' src='http://$http_host/img/misc/slid-right.png' alt=' '/><span class='fake_a'>$row_year[year]</span>");
+								echo("<img class='slid' id='slid_year_$row_year[year]' src='$proto$http_host/img/misc/slid-right.png' alt=' '/><span class='fake_a'>$row_year[year]</span>");
 								echo "</div>\n";
 								echo "<div class='list_year pointer' id='list_year_$row_year[year]'>\n";
 								$res_month = mysqli_query($con, "SELECT month(date) AS month FROM activity WHERE visible = 1 AND year(date) = $row_year[year] GROUP BY month(date) ORDER BY month DESC;");
 								while($row_month = mysqli_fetch_array($res_month)){
 									echo "<div class='month pointer' onClick=\"toggleElement('month_$row_year[year]_$row_month[month]');\">";
-									echo("<img class='slid' id='slid_month_$row_year[year]_$row_month[month]' src='http://$http_host/img/misc/slid-right.png' alt=' '/><span class='fake_a'>" . $lng['months'][$row_month['month'] - 1] . "</span>");
+									echo("<img class='slid' id='slid_month_$row_year[year]_$row_month[month]' src='$proto$http_host/img/misc/slid-right.png' alt=' '/><span class='fake_a'>" . $lng['months'][$row_month['month'] - 1] . "</span>");
 									echo "</div>\n";
 									echo "<ul id='list_month_$row_year[year]_$row_month[month]' class='activity_list'>\n";
 									$res_title = mysqli_query($con, "SELECT id, permalink, title_$lang AS title FROM activity WHERE visible = 1 AND year(date) = $row_year[year] AND month(date) = '$row_month[month]' ORDER BY date DESC;");
 									while($row_title = mysqli_fetch_array($res_title))
-										echo "<li><a href='http://$http_host/actividades/" . $row_title['permalink']  . "'>$row_title[title]</a></li>\n";
+										echo "<li><a href='$proto$http_host/actividades/" . $row_title['permalink']  . "'>$row_title[title]</a></li>\n";
 									echo "</ul>\n";
 								}
 								echo "</div>\n";

+ 23 - 22
www/actividades/index.php

@@ -3,6 +3,7 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -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><?php echo $lng['activities_title'];?></title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -40,22 +41,22 @@
 			?>
 		</script>
 		<!-- Meta tags -->
-		<link rel="canonical" href="<?php echo "http://$http_host/actividades/"; ?>"/>
-		<link rel="author" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="publisher" href="<?php echo "http://$http_host"; ?>"/>
+		<link rel="canonical" href="<?php echo "$proto$http_host/actividades/"; ?>"/>
+		<link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
 		<meta name="description" content="<?php echo $lng['activities_description'];?>"/>
 		<meta property="og:title" content="<?php echo $lng['activities_title'];?>"/>
-		<meta property="og:url" content="<?php echo "http://$http_host/activities/"; ?>"/>
+		<meta property="og:url" content="<?php echo "$proto$http_host/activities/"; ?>"/>
 		<meta property="og:description" content="<?php echo $lng['activities_description'];?>"/>
-		<meta property="og:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
+		<meta property="og:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
 		<meta property="og:site_name" content="<?php echo $lng['index_title'];?>"/>
 		<meta property="og:type" content="website"/>
 		<meta property="og:locale" content="<?php echo $lang; ?>"/>
 		<meta name="twitter:card" content="summary"/>
 		<meta name="twitter:title" content="<?php echo $lng['activities_title'];?>"/>
 		<meta name="twitter:description" content="<?php echo $lng['activities_description'];?>"/>
-		<meta name="twitter:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
-		<meta name="twitter:url" content="<?php echo"http://$http_host"; ?>"/>
+		<meta name="twitter:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
+		<meta name="twitter:url" content="<?php echo"$proto$http_host"; ?>"/>
 		<meta name="robots" content="index follow"/>
 	</head>
 	<body>
@@ -77,13 +78,13 @@
 					echo "<div class='hidden' itemprop='organizer' itemscope itemtype='http://schema.org/Organization'>\n";
 					echo "<meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>\n";
 					echo "<meta itemprop='name' content='Gasteizko Margolariak'/>\n";
-					echo "<meta itemprop='logo' content='http://$http_host/img/logo/logo.png'/>\n";
+					echo "<meta itemprop='logo' content='$proto$http_host/img/logo/logo.png'/>\n";
 					echo "<meta itemprop='foundingDate' content='03-02-2013'/>\n";
 					echo "<meta itemprop='telephone' content='+34637140371'/>\n";
-					echo "<meta itemprop='url' content='http://$http_host'/>\n";
+					echo "<meta itemprop='url' content='$proto$http_host'/>\n";
 					echo "</div>\n";
 					echo "<div id='upcoming_text'>\n";
-					echo "<h3><a itemprop='url' href='http://$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a><span class='title_date'> - " . formatDate($r_activity['date'], $lang, false) . "</span></h3>\n";
+					echo "<h3><a itemprop='url' href='$proto$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a><span class='title_date'> - " . formatDate($r_activity['date'], $lang, false) . "</span></h3>\n";
 					//Table with details
 					echo "<table class='future_details'><tr>\n";
 					//If image, show it
@@ -91,9 +92,9 @@
 					if (mysqli_num_rows($q_activity_image) > 0){
 						$r_activity_image = mysqli_fetch_array($q_activity_image);
 						echo "<td><div id='upcoming_image'>\n";
-						echo "<a href='http://$http_host/actividades/$r_activity[permalink]'>\n";
-						echo "<meta itemprop='image' content='http://$http_host/img/actividades/view/$r_activity_image[image]'/>\n";
-						echo "<img src='http://$http_host/img/actividades/preview/$r_activity_image[image]' alt='$r_activity[title]'/>\n";
+						echo "<a href='$proto$http_host/actividades/$r_activity[permalink]'>\n";
+						echo "<meta itemprop='image' content='$proto$http_host/img/actividades/view/$r_activity_image[image]'/>\n";
+						echo "<img src='$proto$http_host/img/actividades/preview/$r_activity_image[image]' alt='$r_activity[title]'/>\n";
 						echo "</a>\n";
 						echo "</div></td>\n";
 					}
@@ -115,11 +116,11 @@
 					//Show link to schedule (if any)
 					$q_itinerary = mysqli_query($con, "SELECT id FROM activity_itinerary WHERE activity = $r_activity[id];");
 					if (mysqli_num_rows($q_itinerary) > 0){
-						echo "<tr><td></td><td><a href='http://$http_host/actividades/$r_activity[permalink]'>$lng[activities_see_itinerary]</a></td></tr>\n";
+						echo "<tr><td></td><td><a href='$proto$http_host/actividades/$r_activity[permalink]'>$lng[activities_see_itinerary]</a></td></tr>\n";
 					}
 					echo "</table>";
 					echo "</td></tr></table>\n";
-					echo "<p>". cutText($r_activity['text'], 300, "$lng[index_read_more]", "http://$http_host/actividades/$r_activity[permalink]") . "</p>\n";
+					echo "<p>". cutText($r_activity['text'], 300, "$lng[index_read_more]", "$proto$http_host/actividades/$r_activity[permalink]") . "</p>\n";
 					echo "</div>\n";
 				}
 				echo "</div>\n";
@@ -145,11 +146,11 @@
 					echo "<div class='entry past_activity'>\n";
 					$q_activity_image = mysqli_query($con, "SELECT image FROM activity_image WHERE activity = $r_past[id] ORDER BY idx LIMIT 1;");
 					if ($i == 0 && mysqli_num_rows($q_upcoming) == 0){
-						echo "<h3><img id='slid_past_activity_$r_past[id]' class='slid' src='/img/misc/slid-down.png' onclick=\"showPastActivity('$r_past[id]')\"/>&nbsp;&nbsp;<a href='http://$http_host/actividades/$r_past[permalink]'>$r_past[title]</a><span class='title_date'> - " . formatDate($r_past['date'], $lang, false) . "</span></h3>\n"; //TODO clickable TODO Slider onClick
+						echo "<h3><img id='slid_past_activity_$r_past[id]' class='slid' src='/img/misc/slid-down.png' onclick=\"showPastActivity('$r_past[id]')\"/>&nbsp;&nbsp;<a href='$proto$http_host/actividades/$r_past[permalink]'>$r_past[title]</a><span class='title_date'> - " . formatDate($r_past['date'], $lang, false) . "</span></h3>\n"; //TODO clickable TODO Slider onClick
 						echo "<div class='past_activity_details past_activity_details_first' id='past_activity_details_$r_past[id]'>\n";
 					}
 					else{
-						echo "<h3><img id='slid_past_activity_$r_past[id]' class='slid' src='/img/misc/slid-right.png' onclick=\"showPastActivity('$r_past[id]')\"/>&nbsp;&nbsp;<a href='http://$http_host/actividades/$r_past[permalink]'>$r_past[title]</a><span class='title_date'> - " . formatDate($r_past['date'], $lang, false) . "</span></h3>\n"; //TODO clickable TODO Slider onClick
+						echo "<h3><img id='slid_past_activity_$r_past[id]' class='slid' src='/img/misc/slid-right.png' onclick=\"showPastActivity('$r_past[id]')\"/>&nbsp;&nbsp;<a href='$proto$http_host/actividades/$r_past[permalink]'>$r_past[title]</a><span class='title_date'> - " . formatDate($r_past['date'], $lang, false) . "</span></h3>\n"; //TODO clickable TODO Slider onClick
 						echo "<div class='past_activity_details' id='past_activity_details_$r_past[id]'>\n";
 					}
 					$i ++;
@@ -157,17 +158,17 @@
 					if (mysqli_num_rows($q_activity_image) > 0){
 						$r_activity_image = mysqli_fetch_array($q_activity_image);
 						echo "<td><div class='past_image'>\n";
-						echo "<a href='http://$http_host/actividades/$r_past[permalink]'>\n";
-						echo "<img src='http://$http_host/img/actividades/miniature/$r_activity_image[image]' alt='$r_past[title]'/>\n"; 
+						echo "<a href='$proto$http_host/actividades/$r_past[permalink]'>\n";
+						echo "<img src='$proto$http_host/img/actividades/miniature/$r_activity_image[image]' alt='$r_past[title]'/>\n"; 
 						echo "</a>\n";
 						echo "</div></td>\n";
 					}
 					echo "<td><div class='past_text'>\n";
 					if (strlen($r_past['text']) > 0){
-						echo "<p>". cutText($r_past['text'], 300, "$lng[index_read_more]", "http://$http_host/actividades/$r_past[permalink]") . "</p>\n";
+						echo "<p>". cutText($r_past['text'], 300, "$lng[index_read_more]", "$proto$http_host/actividades/$r_past[permalink]") . "</p>\n";
 					}
 					else{
-						echo "<p>". cutText($r_past['alt_text'], 300, "$lng[index_read_more]", "http://$http_host/actividades/$r_past[permalink]") . "</p>\n";
+						echo "<p>". cutText($r_past['alt_text'], 300, "$lng[index_read_more]", "$proto$http_host/actividades/$r_past[permalink]") . "</p>\n";
 					}
 					echo "</div></td></tr></table>\n";
 					//TODO show footer with price, maxpeople, etc

+ 9 - 8
www/ayuda/index.php

@@ -3,6 +3,7 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -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><?php echo $lng['us_title'];?></title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -39,22 +40,22 @@
 			?>
 		</script>
 		<!-- Meta tags -->
-		<link rel="canonical" href="<?php echo "http://$http_host/us/"; ?>"/>
-		<link rel="author" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="publisher" href="<?php echo "http://$http_host"; ?>"/>
+		<link rel="canonical" href="<?php echo "$proto$http_host/us/"; ?>"/>
+		<link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
 		<meta name="description" content="<?php echo $lng['us_description'];?>"/>
 		<meta property="og:title" content="<?php echo $lng['us_title'];?>"/>
-		<meta property="og:url" content="<?php echo "http://$http_host"; ?>"/>
+		<meta property="og:url" content="<?php echo "$proto$http_host"; ?>"/>
 		<meta property="og:description" content="<?php echo $lng['us_description'];?>"/>
-		<meta property="og:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
+		<meta property="og:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
 		<meta property="og:site_name" content="<?php echo $lng['us_title'];?>"/>
 		<meta property="og:type" content="website"/>
 		<meta property="og:locale" content="<?php echo $lang; ?>"/>
 		<meta name="twitter:card" content="summary"/>
 		<meta name="twitter:title" content="<?php echo $lng['us_title'];?>"/>
 		<meta name="twitter:description" content="<?php echo $lng['us_description'];?>"/>
-		<meta name="twitter:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
-		<meta name="twitter:url" content="<?php echo"http://$http_host"; ?>"/>
+		<meta name="twitter:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
+		<meta name="twitter:url" content="<?php echo"$proto$http_host"; ?>"/>
 		<meta name="robots" content="index follow"/>
 	</head>
 	<body>

+ 20 - 19
www/blog/buscar.php

@@ -3,6 +3,7 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -14,7 +15,7 @@
 	$search_field = mysqli_real_escape_string($con, $_GET['where']);
 	$search_term = strtolower(mysqli_real_escape_string($con, $_GET['query']));
 	if ($search_field == '' || $search_term == ''){
-		header("Location: http://$http_host/blog/");
+		header("Location: $proto$http_host/blog/");
 		exit(-1);
 	}
 	
@@ -27,7 +28,7 @@
 			$q = mysqli_query($con, "SELECT id, permalink, title_$lang AS title, text_$lang AS text, DATE_FORMAT(dtime, '%Y-%m-%dT%T') AS isodate, dtime, comments FROM post WHERE id IN (SELECT post FROM post_tag WHERE tag like '$search_term') ORDER BY dtime DESC;");
 			break;
 		default:
-			header("Location: http://$http_host/blog/");
+			header("Location: $proto$http_host/blog/");
 			exit(-1);
 	}
 	
@@ -39,7 +40,7 @@
 		<meta charset="utf-8"/>
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
 		<title><?php echo $lng['blog_title'];?></title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -62,22 +63,22 @@
 			?>
 		</script>
 		<!-- Meta tags -->
-		<link rel="canonical" href="<?php echo "http://$http_host/blog"; ?>"/>
-		<link rel="author" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="publisher" href="<?php echo "http://$http_host"; ?>"/>
+		<link rel="canonical" href="<?php echo "$proto$http_host/blog"; ?>"/>
+		<link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
 		<meta name="description" content="<?php echo $lng['blog_descrption'];?>"/>
 		<meta property="og:title" content="<?php echo $lng['blog_title'];?>"/>
-		<meta property="og:url" content="<?php echo "http://$http_host/blog"; ?>"/>
+		<meta property="og:url" content="<?php echo "$proto$http_host/blog"; ?>"/>
 		<meta property="og:description" content="<?php echo $lng['blog_description'];?>"/>
-		<meta property="og:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
+		<meta property="og:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
 		<meta property="og:site_name" content="<?php echo $lng['index_title'];?>"/>
 		<meta property="og:type" content="website"/>
 		<meta property="og:locale" content="<?php echo $lang; ?>"/>
 		<meta name="twitter:card" content="summary"/>
 		<meta name="twitter:title" content="<?php echo $lng['blog_title'];?>"/>
 		<meta name="twitter:description" content="<?php echo $lng['blog_description'];?>"/>
-		<meta name="twitter:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
-		<meta name="twitter:url" content="<?php echo"http://$http_host"; ?>"/>
+		<meta name="twitter:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
+		<meta name="twitter:url" content="<?php echo"$proto$http_host"; ?>"/>
 		<meta name="robots" content="no-index no-follow"/>
 	</head>
 	<body>
@@ -106,16 +107,16 @@
 							echo "<meta itemprop='datePublished dateModified' content='$r[isodate]'/>\n";
 							echo "<meta itemprop='headline name' content='$r[title]'/>\n";
 							echo "<meta itemprop='articleBody text' content='$r[text]'/>\n";
-							echo "<meta itemprop='mainEntityOfPage' content='http://$http_host'/>\n";
+							echo "<meta itemprop='mainEntityOfPage' content='$proto$http_host'/>\n";
 							echo "<div class='hidden' itemprop='author publisher' itemscope itemtype='http://schema.org/Organization'>\n";
 							echo "<meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>\n";
 							echo "<meta itemprop='name' content='Gasteizko Margolariak'/>\n";
-							echo "<meta itemprop='logo' content='http://$http_host/img/logo/logo.png'/>\n";
+							echo "<meta itemprop='logo' content='$proto$http_host/img/logo/logo.png'/>\n";
 							echo "<meta itemprop='foundingDate' content='03-02-2013'/>\n";
 							echo "<meta itemprop='telephone' content='+34637140371'/>\n";
-							echo "<meta itemprop='url' content='http://$http_host'/>\n";
+							echo "<meta itemprop='url' content='$proto$http_host'/>\n";
 							echo "</div>\n";
-							echo "<h2 class='post_search_title'><a itemprop='url' href='http://$http_host/blog/$r[permalink]'>$r[title]</a></h2>\n";
+							echo "<h2 class='post_search_title'><a itemprop='url' href='$proto$http_host/blog/$r[permalink]'>$r[title]</a></h2>\n";
 							# Tags (if any) and date
 							echo "<table class='post_footer post_footer_search'><tr>\n";
 							$q_tag = mysqli_query($con, "SELECT tag FROM post_tag WHERE post= $r[id];");
@@ -123,7 +124,7 @@
 								$tag_string = "<span class='tags desktop'>Tags: ";
 								$tag_raw = "";
 								while ($r_tag = mysqli_fetch_array($q_tag)){
-									$tag_string = $tag_string . "<a href='http://$http_host/blog/buscar/tag/$r_tag[tag]'>$r_tag[tag]</a>, ";
+									$tag_string = $tag_string . "<a href='$proto$http_host/blog/buscar/tag/$r_tag[tag]'>$r_tag[tag]</a>, ";
 									$tag_raw = $tag_raw . "$r_tag[tag],";
 								}
 								$tag_string = substr($tag_string, 0, strlen($tag_string) - 2);
@@ -140,12 +141,12 @@
 							$q_image = mysqli_query($con, "SELECT image FROM post_image WHERE post = $r[id] ORDER BY idx LIMIT 1;");
 							if (mysqli_num_rows($q_image) > 0){
 								$r_image = mysqli_fetch_array($q_image);
-								echo "<a href='http://$http_host/blog/$r[permalink]'>\n";
-								echo "<meta itemprop='image' content='http://$http_host/img/blog/$r_image[image]'/>\n";
-								echo "<img class='post_search_image alt='$r[title]' src='http://$http_host/img/blog/preview/$r_image[image]'/>\n";
+								echo "<a href='$proto$http_host/blog/$r[permalink]'>\n";
+								echo "<meta itemprop='image' content='$proto$http_host/img/blog/$r_image[image]'/>\n";
+								echo "<img class='post_search_image alt='$r[title]' src='$proto$http_host/img/blog/preview/$r_image[image]'/>\n";
 								echo "</a>\n";
 							}
-							echo "<p class='post_search_text'>" . cutText($r['text'], 150, $lng['blog_read_more'], "http://$http_host/blog/$r[permalink]/") . "</p>\n";
+							echo "<p class='post_search_text'>" . cutText($r['text'], 150, $lng['blog_read_more'], "$proto$http_host/blog/$r[permalink]/") . "</p>\n";
 							echo "<br/>\n";
 							echo "</div>\n";
 						}

+ 1 - 1
www/blog/common/leftpanel.php

@@ -19,7 +19,7 @@
 				$q_tag = mysqli_query($con, "SELECT tag, count(post) AS count FROM post_tag GROUP BY tag;");
 				while($r_tag = mysqli_fetch_array($q_tag)){
 					$size = round(60 + 100 * $r_tag['count'] / $max);	//TEST: Relativize
-					echo "<a href='http://$http_host/blog/buscar/tag/$r_tag[tag]'><span style='font-size: $size%'>$r_tag[tag]</span></a>\n";
+					echo "<a href='$proto$http_host/blog/buscar/tag/$r_tag[tag]'><span style='font-size: $size%'>$r_tag[tag]</span></a>\n";
 				}
 			?>
 		</div>

+ 3 - 3
www/blog/common/rightpanel.php

@@ -6,18 +6,18 @@
 				$q_year = mysqli_query($con, "SELECT year(dtime) AS year FROM post WHERE visible = 1 GROUP BY year(dtime) ORDER BY year DESC;");
 				while($r_year = mysqli_fetch_array($q_year)){
 					echo "<div class='year pointer' onClick=\"toggleElement('year_$r_year[year]');\">";
-					echo ("<img class='slid' id='slid_year_$r_year[year]' src='http://$http_host/img/misc/slid-right.png' alt=' '/><span class='fake_a'>$r_year[year]</span>");
+					echo ("<img class='slid' id='slid_year_$r_year[year]' src='$proto$http_host/img/misc/slid-right.png' alt=' '/><span class='fake_a'>$r_year[year]</span>");
 					echo "</div>\n";
 					echo "<div class='list_year pointer' id='list_year_$r_year[year]'>\n";
 					$q_month = mysqli_query($con, "SELECT month(dtime) AS month FROM post WHERE visible = 1 AND year(dtime) = $r_year[year] GROUP BY month(dtime) ORDER BY month DESC;");
 					while($r_month = mysqli_fetch_array($q_month)){
 						echo "<div class='month pointer' onClick=\"toggleElement('month_$r_year[year]_$r_month[month]');\">";
-						echo ("<img class='slid' id='slid_month_$r_year[year]_$r_month[month]' src='http://$http_host/img/misc/slid-right.png' alt=' '/><span class='fake_a'>" . $lng['months'][$r_month['month'] - 1] . "</span>");
+						echo ("<img class='slid' id='slid_month_$r_year[year]_$r_month[month]' src='$proto$http_host/img/misc/slid-right.png' alt=' '/><span class='fake_a'>" . $lng['months'][$r_month['month'] - 1] . "</span>");
 						echo "</div>\n";
 						echo "<ul id='list_month_$r_year[year]_$r_month[month]' class='post_list'>\n";
 						$q_title = mysqli_query($con, "SELECT id, permalink, title_$lang AS title FROM post WHERE visible = 1 AND year(dtime) = $r_year[year] AND month(dtime) = '$r_month[month]' ORDER BY dtime DESC;");
 						while($r_title = mysqli_fetch_array($q_title))
-							echo "<li><a href='http://$http_host/blog/" . $r_title['permalink']  . "'>$r_title[title]</a></li>\n";
+							echo "<li><a href='$proto$http_host/blog/" . $r_title['permalink']  . "'>$r_title[title]</a></li>\n";
 						echo "</ul>\n";
 					}
 					echo "</div>\n";

+ 23 - 22
www/blog/index.php

@@ -3,6 +3,7 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -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><?php echo $lng['blog_title'];?></title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -40,22 +41,22 @@
 			?>
 		</script>
 		<!-- Meta tags -->
-		<link rel="canonical" href="<?php echo "http://$http_host/blog"; ?>"/>
-		<link rel="author" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="publisher" href="<?php echo "http://$http_host"; ?>"/>
+		<link rel="canonical" href="<?php echo "$proto$http_host/blog"; ?>"/>
+		<link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
 		<meta name="description" content="<?php echo $lng['blog_descrption'];?>"/>
 		<meta property="og:title" content="<?php echo $lng['blog_title'];?>"/>
-		<meta property="og:url" content="<?php echo "http://$http_host/blog"; ?>"/>
+		<meta property="og:url" content="<?php echo "$proto$http_host/blog"; ?>"/>
 		<meta property="og:description" content="<?php echo $lng['blog_description'];?>"/>
-		<meta property="og:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
+		<meta property="og:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
 		<meta property="og:site_name" content="<?php echo $lng['index_title'];?>"/>
 		<meta property="og:type" content="website"/>
 		<meta property="og:locale" content="<?php echo $lang; ?>"/>
 		<meta name="twitter:card" content="summary"/>
 		<meta name="twitter:title" content="<?php echo $lng['blog_title'];?>"/>
 		<meta name="twitter:description" content="<?php echo $lng['blog_description'];?>"/>
-		<meta name="twitter:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
-		<meta name="twitter:url" content="<?php echo"http://$http_host"; ?>"/>
+		<meta name="twitter:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
+		<meta name="twitter:url" content="<?php echo"$proto$http_host"; ?>"/>
 		<meta name="robots" content="index follow"/>
 	</head>
 	<body>
@@ -73,27 +74,27 @@
 						echo "<meta itemprop='datePublished dateModified' content='$r[isodate]'/>\n";
 						echo "<meta itemprop='headline name' content='$r[title]'/>\n";
 						echo "<meta itemprop='articleBody text' content='$r[text]'/>\n";
-						echo "<meta itemprop='mainEntityOfPage' content='http://$http_host'/>\n";
+						echo "<meta itemprop='mainEntityOfPage' content='$proto$http_host'/>\n";
 						echo "<div class='hidden' itemprop='author publisher' itemscope itemtype='http://schema.org/Organization'>\n";
 						echo "<meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>\n";
 						echo "<meta itemprop='name' content='Gasteizko Margolariak'/>\n";
-						echo "<meta itemprop='logo' content='http://$http_host/img/logo/logo.png'/>\n";
+						echo "<meta itemprop='logo' content='$proto$http_host/img/logo/logo.png'/>\n";
 						echo "<meta itemprop='foundingDate' content='03-02-2013'/>\n";
 						echo "<meta itemprop='telephone' content='+34637140371'/>\n";
-						echo "<meta itemprop='url' content='http://$http_host'/>\n";
+						echo "<meta itemprop='url' content='$proto$http_host'/>\n";
 						echo "</div>\n";
-						echo "<h2><a itemprop='url' href='http://$http_host/blog/$r[permalink]'>$r[title]</a></h2>\n";
+						echo "<h2><a itemprop='url' href='$proto$http_host/blog/$r[permalink]'>$r[title]</a></h2>\n";
 						$q_image = mysqli_query($con, "SELECT image FROM post_image WHERE post = $r[id] ORDER BY idx LIMIT 1;");
 						if (mysqli_num_rows($q_image) > 0){
 							$r_image = mysqli_fetch_array($q_image);
 							echo "<div class='post_list_image_container'>\n";
-							echo "<a href='http://$http_host/blog/$r[permalink]'>\n";
-							echo "<meta itemprop='image' content='http://$http_host/img/blog/view/$r_image[image]'/>\n";
-							echo "<img class='post_list_image alt='$r[title]' src='http://$http_host/img/blog/miniature/$r_image[image]'/>\n";
+							echo "<a href='$proto$http_host/blog/$r[permalink]'>\n";
+							echo "<meta itemprop='image' content='$proto$http_host/img/blog/view/$r_image[image]'/>\n";
+							echo "<img class='post_list_image alt='$r[title]' src='$proto$http_host/img/blog/miniature/$r_image[image]'/>\n";
 							echo "</a>\n";
 							echo "</div>\n";
 						}
-						echo "<p>" . cutText($r['text'], 800, $lng['blog_read_more'], "http://$http_host/blog/$r[permalink]/") . "</p>\n";
+						echo "<p>" . cutText($r['text'], 800, $lng['blog_read_more'], "$proto$http_host/blog/$r[permalink]/") . "</p>\n";
 						# Tags (if any), date, and comment counter
 						echo "<hr><table class='post_footer'><tr>\n";
 						$q_tag = mysqli_query($con, "SELECT tag FROM post_tag WHERE post= $r[id];");
@@ -101,7 +102,7 @@
 							$tag_string = "<span class='tags desktop'>Tags: ";
 							$tag_raw = "";
 							while ($r_tag = mysqli_fetch_array($q_tag)){
-								$tag_string = $tag_string . "<a href='http://$http_host/blog/buscar/tag/$r_tag[tag]'>$r_tag[tag]</a>, ";
+								$tag_string = $tag_string . "<a href='$proto$http_host/blog/buscar/tag/$r_tag[tag]'>$r_tag[tag]</a>, ";
 								$tag_raw = $tag_raw . "$r_tag[tag],";
 							}
 							$tag_string = substr($tag_string, 0, strlen($tag_string) - 2);
@@ -137,22 +138,22 @@
 						$max_page ++;
 					echo "<div id='pager'><table id='pager'><tr>\n";
 					if ($cur_page > 4){
-						echo "<td><div class='entry'><a href='http://$http_host/blog/0'>1</a></div></td><td class='pager_ellipse'><div class='entry'>...</div></td>\n";
+						echo "<td><div class='entry'><a href='$proto$http_host/blog/0'>1</a></div></td><td class='pager_ellipse'><div class='entry'>...</div></td>\n";
 						for ($i = $cur_page - 2; $i < $cur_page; $i ++)
-							echo "<td><div class='entry'><a href='http://$http_host/blog/" . (5 * $i - 5) . "'>" . $i . "</a></div></td>\n";
+							echo "<td><div class='entry'><a href='$proto$http_host/blog/" . (5 * $i - 5) . "'>" . $i . "</a></div></td>\n";
 					}
 					else
 						for ($i = 1; $i < $cur_page; $i ++)
-							echo "<td><div class='entry'><a href='http://$http_host/blog/" . (5 * $i - 5) . "'>" . $i . "</a></div></td>\n";
+							echo "<td><div class='entry'><a href='$proto$http_host/blog/" . (5 * $i - 5) . "'>" . $i . "</a></div></td>\n";
 					echo "<td class='pager_current'><div class='entry'>$cur_page</div></td>\n";
 					if ($cur_page + 4 < $max_page){
 						for ($i = $cur_page + 1; $i < $cur_page + 3; $i ++)
-							echo "<td><div class='entry'><a href='http://$http_host/blog/" . (5 * $i - 5) . "'>" . $i . "</div></a></td>";
+							echo "<td><div class='entry'><a href='$proto$http_host/blog/" . (5 * $i - 5) . "'>" . $i . "</div></a></td>";
 						echo "<td class='pager_ellipse'><div class='entry'>...</div></td><td><div class='entry'><a href='/blog/" . ($max_page * 5 - 5) . "'>$max_page</a></div></td>";
 					}
 					else
 						for ($i = $cur_page + 1; $i <= $max_page; $i ++)
-							echo "<td><div class='entry'><a href='http://$http_host/blog/" . (5 * $i - 5) . "'>" . $i . "</a></div></td>";
+							echo "<td><div class='entry'><a href='$proto$http_host/blog/" . (5 * $i - 5) . "'>" . $i . "</a></div></td>";
 					echo "</tr></table></div>\n";
 				?>
 			</div>

+ 21 - 20
www/blog/post.php

@@ -2,6 +2,7 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -13,7 +14,7 @@
 	$perm = mysqli_real_escape_string($con, $_GET['perm']);
 	$q = mysqli_query($con, "SELECT id, permalink, title_$lang AS title, text_$lang AS text, DATE_FORMAT(dtime, '%Y-%m-%dT%T') AS isodate, DATE_FORMAT(dtime,'%b %d, %Y T%T') as dtime, comments FROM post WHERE permalink = '$perm' AND visible = 1;");
 	if (mysqli_num_rows($q) == 0){
-		header("Location: http://$http_host/blog/");
+		header("Location: $proto$http_host/blog/");
 		exit(-1);
 	}
 	$r = mysqli_fetch_array($q);
@@ -25,7 +26,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><?php echo $r["title"] . " - Gasteizko Margolariak"; ?></title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -48,20 +49,20 @@
 			?>
 		</script>
 		<!-- Meta tags -->
-		<link rel="canonical" href="<?php echo "http://$http_host/blog/" . $r['permalink']; ?>"/>
-		<link rel="author" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="publisher" href="<?php echo "http://$http_host"; ?>"/>
+		<link rel="canonical" href="<?php echo "$proto$http_host/blog/" . $r['permalink']; ?>"/>
+		<link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
 		<meta name="description" content="<?php echo strip_tags($r["text"]);?>"/>
 		<meta property="og:title" content="<?php echo $r["title"] . " - Gasteizko Margolariak"; ?>"/>
-		<meta property="og:url" content="<?php echo "http://$http_host/blog/" . $r['permalink']; ?>"/>
+		<meta property="og:url" content="<?php echo "$proto$http_host/blog/" . $r['permalink']; ?>"/>
 		<meta property="og:description" content="<?php echo strip_tags($r["text_$lang"]);?>"/>
 		<?php
 			$q_image = mysqli_query($con, "SELECT image FROM post_image WHERE post = $id ORDER BY idx;");
 			if (mysqli_num_rows($q_image) == 0)
-				$img = "http://$http_host/img/logo/cover.png";
+				$img = "$proto$http_host/img/logo/cover.png";
 			else{
 				$r_image = mysqli_fetch_array($q_image);
-				$img = "http://$http_host/img/blog/preview/" . $r_image['image'];
+				$img = "$proto$http_host/img/blog/preview/" . $r_image['image'];
 			}
 		?>
 		<meta property="og:image" content="<?php echo $img;?>"/>
@@ -84,7 +85,7 @@
 		<meta name="twitter:title" content="<?php echo $r["title"] . " - Gasteizko Margolariak";?>"/>
 		<meta name="twitter:description" content="<?php echo strip_tags($r["text"]);?>"/>
 		<meta name="twitter:image" content="<?php echo $img;?>"/>
-		<meta name="twitter:url" content="<?php echo "http://$http_host/blog/$r[permalink]"; ?>"/>
+		<meta name="twitter:url" content="<?php echo "$proto$http_host/blog/$r[permalink]"; ?>"/>
 		<meta name="robots" content="index follow"/>
 	</head>
 	<body>
@@ -97,20 +98,20 @@
 					echo "<meta itemprop='inLanguage' content='$lang'/>\n";
 					echo "<meta itemprop='datePublished dateModified' content='$r[isodate]'/>\n";
 					echo "<meta itemprop='headline name' content='$r[title]'/>\n";
-					echo "<meta itemprop='mainEntityOfPage' content='http://$http_host'/>\n";
+					echo "<meta itemprop='mainEntityOfPage' content='$proto$http_host'/>\n";
 					echo "<div class='hidden' itemprop='author publisher' itemscope itemtype='http://schema.org/Organization'>\n";
 					echo "<meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>\n";
 					echo "<meta itemprop='name' content='Gasteizko Margolariak'/>\n";
-					echo "<meta itemprop='logo' content='http://$http_host/img/logo/logo.png'/>\n";
+					echo "<meta itemprop='logo' content='$proto$http_host/img/logo/logo.png'/>\n";
 					echo "<meta itemprop='foundingDate' content='03-02-2013'/>\n";
 					echo "<meta itemprop='telephone' content='+34637140371'/>\n";
-					echo "<meta itemprop='url' content='http://$http_host'/>\n";
+					echo "<meta itemprop='url' content='$proto$http_host'/>\n";
 					echo "</div>\n";
 					echo "<div class='entry'>\n";
 					echo "<h2>$r[title]</h2>\n";
 					if ($r_image != null){
 						echo "<div class='image_container'>\n";
-						echo "<meta itemprop='image' content='http://$http_host/img/blog/$r_image[image]'/>\n";
+						echo "<meta itemprop='image' content='$proto$http_host/img/blog/$r_image[image]'/>\n";
 						echo "<img class='post_image post_image_large' alt='$r[title]' src='/img/blog/preview/$r_image[image]'/>\n";
 						echo "</div>\n";
 					}
@@ -119,7 +120,7 @@
 					if ($r_image != null){
 						echo "<table id='secondary_images'><tr>\n";
 						while ($r_image = mysqli_fetch_array($q_image)){
-							echo "<meta itemprop='image' content='http://$http_host/img/blog/$r_image[image]'/>\n";
+							echo "<meta itemprop='image' content='$proto$http_host/img/blog/$r_image[image]'/>\n";
 							echo "<td><img src='/img/blog/preview/$r_image[image]'/></td>\n";
 						}
 						echo "</tr></table>\n";
@@ -146,12 +147,12 @@
 					#Share
 					echo "<td class='r_share'><span class='share'><span class='desktop'>$lng[blog_share]</span>\n";
 					$title = urlencode("$r[title] - $http_host");
-					$url_f = htmlspecialchars("https://www.facebook.com/sharer/sharer.php?u=http://$http_host$_SERVER[REQUEST_URI]");
-					$url_t = htmlspecialchars("https://twitter.com/share?url=http://$http_host$_SERVER[REQUEST_URI]&text=$title");
-					$url_g = htmlspecialchars("https://plus.google.com/share?url=http://$http_host$_SERVER[REQUEST_URI]");
-					echo "<a href='$url_f' target='_blank'><img class='share_icon' alt='Facebook' src='http://$http_host/img/social/facebook.gif'/></a>\n";
-					echo "<a href='$url_t' target='_blank'><img class='share_icon' alt='Twitter' src='http://$http_host/img/social/twitter.gif'/></a>\n";
-					echo "<a href='$url_g' target='_blank'><img class='share_icon' src='http://$http_host/img/social/googleplus.gif' alt='Google+'/></a>\n";
+					$url_f = htmlspecialchars("https://www.facebook.com/sharer/sharer.php?u=$proto$http_host$_SERVER[REQUEST_URI]");
+					$url_t = htmlspecialchars("https://twitter.com/share?url=$proto$http_host$_SERVER[REQUEST_URI]&text=$title");
+					$url_g = htmlspecialchars("https://plus.google.com/share?url=$proto$http_host$_SERVER[REQUEST_URI]");
+					echo "<a href='$url_f' target='_blank'><img class='share_icon' alt='Facebook' src='$proto$http_host/img/social/facebook.gif'/></a>\n";
+					echo "<a href='$url_t' target='_blank'><img class='share_icon' alt='Twitter' src='$proto$http_host/img/social/twitter.gif'/></a>\n";
+					echo "<a href='$url_g' target='_blank'><img class='share_icon' src='$proto$http_host/img/social/googleplus.gif' alt='Google+'/></a>\n";
 					echo "</span></td>\n";
 					echo "</tr></table>\n";
 					#Comments

+ 3 - 2
www/error/404.php

@@ -2,6 +2,7 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -15,7 +16,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><?php echo $lng['error_title'] ?> - Gasteizko Margolariak</title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -102,7 +103,7 @@
 						<a href="javascript: history.go(-1);"><?php echo $lng['error_404_solution_0']; ?></a>
 					</li>
 					<li>
-						<a href="<?php echo "http://$http_host/";?>"><?php echo $lng['error_404_solution_1']; ?></a>
+						<a href="<?php echo "$proto$http_host/";?>"><?php echo $lng['error_404_solution_1']; ?></a>
 					</li>
 					<li>
 						<a target='_blank' href="https://www.youtube.com/results?search_query=cats"><?php echo $lng['error_404_solution_2']; ?></a>

+ 7 - 7
www/footer.php

@@ -3,13 +3,13 @@
 		<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="http://<?php echo $_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="http://<?php echo $_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="http://<?php echo $_SERVER['HTTP_HOST']; ?>/img/social/googleplus.gif" alt="Google+"/></a>
+				<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>
 				<br class="desktop"/>
-				<a title="Youtube" target="_blank" href="https://www.youtube.com/user/GasteizkoMargolariak"><img class="footer_social_icon" src="http://<?php echo $_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="http://<?php echo $_SERVER['HTTP_HOST']; ?>/img/social/instagram.gif" alt="nstagram"/></a>
-<!--  				<a title="RSS" href="http://<?php echo $_SERVER['HTTP_HOST']; ?>/rss.xml"><img class="footer_social_icon" src="http://<?php echo $_SERVER['HTTP_HOST']; ?>/img/social/rss.gif" alt="RSS"/></a> -->
+				<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>
 			<div class="td" id="footer_center">
@@ -41,7 +41,7 @@
 				<br class="mobile"/><br class="mobile"/><br class="mobile"/>
 			</div>
 			<div  class="td" id="footer_right" class="desktop">
-				<a href="<?php echo "http://$_SERVER[HTTP_HOST]/ayuda/";?>"><?php echo $lng['footer_help']; ?></a>&nbsp;&nbsp;&nbsp;<a href="<?php echo "http://$_SERVER[HTTP_HOST]/ayuda/#section_privacy";?>"><?php echo $lng['footer_privacy'];?></a>
+				<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>
 				<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; ?>");'/>

+ 10 - 0
www/functions.php

@@ -50,6 +50,16 @@
 		//Return the db connection
 		return $con;
 	}
+	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://';
+		}
+		else {
+			$protocol = 'http://';
+		}
+		return $protocol;
+	}
+
 	
 	/****************************************************
 	* This function selects the language the page will  *

+ 10 - 9
www/galeria/album.php

@@ -3,6 +3,7 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -28,7 +29,7 @@
 		<meta charset="utf-8"/>
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
 		<title><?php echo $r['title'];?></title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -51,22 +52,22 @@
 			?>
 		</script>
 		<!-- Meta tags -->
-		<link rel="canonical" href="<?php echo "http://$http_host/galeria/$perm"; ?>"/>
-		<link rel="author" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="publisher" href="<?php echo "http://$http_host"; ?>"/>
+		<link rel="canonical" href="<?php echo "$proto$http_host/galeria/$perm"; ?>"/>
+		<link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
 		<meta name="description" content="<?php echo strip_tags($r['description']);?>"/>
 		<meta property="og:title" content="<?php echo $l['title'];?>"/>
-		<meta property="og:url" content="<?php echo "http://$http_host/galeria/$perm"; ?>"/>
+		<meta property="og:url" content="<?php echo "$proto$http_host/galeria/$perm"; ?>"/>
 		<meta property="og:description" content="<?php echo strip_tags($r['description']); ?>"/>
-		<meta property="og:image" content="<?php  echo "http://$http_host/img/logo/logo.png";?>"/> 
+		<meta property="og:image" content="<?php  echo "$proto$http_host/img/logo/logo.png";?>"/> 
 		<meta property="og:site_name" content="Gasteizko Margolariak"/>
 		<meta property="og:type" content="website"/>
 		<meta property="og:locale" content="<?php echo $lang; ?>"/>
 		<meta name="twitter:card" content="summary"/>
 		<meta name="twitter:title" content="<?php echo $l['title'];?>"/>
 		<meta name="twitter:description" content="<?php echo strip_tags($r['description']); ?>"/>
-		<meta name="twitter:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
-		<meta name="twitter:url" content="<?php echo "http://$http_host/galeria/$perm"; ?>"/>
+		<meta name="twitter:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
+		<meta name="twitter:url" content="<?php echo "$proto$http_host/galeria/$perm"; ?>"/>
 		<meta name="robots" content="index follow"/>
 	</head>
 	<body onLoad="populatePhotos();" onkeypress="keyDown(event);">
@@ -96,7 +97,7 @@
 						}
 						//Count comments
 						$q_comments = mysqli_query($con, "SELECT id FROM photo_comment WHERE photo = $r_photo[id];");
-						echo "<span class='comment_counter'>" . mysqli_num_rows($q_comments) . "<img src='http://$http_host/img/misc/comment.png' alt=' '/></span>\n"; //TODO: icon
+						echo "<span class='comment_counter'>" . mysqli_num_rows($q_comments) . "<img src='$proto$http_host/img/misc/comment.png' alt=' '/></span>\n"; //TODO: icon
 						echo "\n</div>\n";
 					}
 				?>

+ 13 - 12
www/galeria/index.php

@@ -3,6 +3,7 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -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><?php echo $lng['gallery_title'];?></title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -39,22 +40,22 @@
 			?>
 		</script>
 		<!-- Meta tags -->
-		<link rel="canonical" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="author" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="publisher" href="<?php echo "http://$http_host"; ?>"/>
+		<link rel="canonical" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
 		<meta name="description" content="<?php echo $lng['gallery_description'];?>"/>
 		<meta property="og:title" content="<?php echo $lng['gallery_title'];?>"/>
-		<meta property="og:url" content="<?php echo "http://$http_host"; ?>"/>
+		<meta property="og:url" content="<?php echo "$proto$http_host"; ?>"/>
 		<meta property="og:description" content="<?php echo $lng['gallery_description'];?>"/>
-		<meta property="og:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
+		<meta property="og:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
 		<meta property="og:site_name" content="<?php echo $lng['gallery_title'];?>"/>
 		<meta property="og:type" content="website"/>
 		<meta property="og:locale" content="<?php echo $lang; ?>"/>
 		<meta name="twitter:card" content="summary"/>
 		<meta name="twitter:title" content="<?php echo $lng['gallery_title'];?>"/>
 		<meta name="twitter:description" content="<?php echo $lng['gallery_description'];?>"/>
-		<meta name="twitter:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
-		<meta name="twitter:url" content="<?php echo"http://$http_host"; ?>"/>
+		<meta name="twitter:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
+		<meta name="twitter:url" content="<?php echo"$proto$http_host"; ?>"/>
 		<meta name="robots" content="index follow"/>
 	</head>
 	<body>
@@ -78,7 +79,7 @@
 							$i = 0;
 							$q_photo = mysqli_query($con, "SELECT * FROM photo, photo_album WHERE id = photo AND album = $r[album] ORDER BY rand() LIMIT 4;");
 							while ($r_photo = mysqli_fetch_array($q_photo)){
-								echo "<td><a href='http://$http_host/galeria/$r[permalink]'><img src='http://$http_host/img/galeria/miniature/$r_photo[file]'/></a></td>\n";
+								echo "<td><a href='$proto$http_host/galeria/$r[permalink]'><img src='$proto$http_host/img/galeria/miniature/$r_photo[file]'/></a></td>\n";
 								$i ++;
 								if ($i == 2)
 									echo "</tr>\n<tr>";
@@ -86,11 +87,11 @@
 							echo "</tr>\n</table>\n";
 							$q_count = mysqli_query($con, "SELECT album FROM photo_album WHERE album = $r[id];");
 							if (mysqli_num_rows($q_count) == 1)
-								echo "<h4><a href='http://$http_host/galeria/$r[permalink]'>$r[title]</a> - 1 $lng[gallery_photos_singular]</h4>\n";
+								echo "<h4><a href='$proto$http_host/galeria/$r[permalink]'>$r[title]</a> - 1 $lng[gallery_photos_singular]</h4>\n";
 							else
-								echo "<h4><a href='http://$http_host/galeria/$r[permalink]'>$r[title]</a> - " . mysqli_num_rows($q_count) . " $lng[gallery_photos_plural]</h4>\n";
+								echo "<h4><a href='$proto$http_host/galeria/$r[permalink]'>$r[title]</a> - " . mysqli_num_rows($q_count) . " $lng[gallery_photos_plural]</h4>\n";
 							if (strlen($r['description']) > 0){
-								echo "<p>". cutText($r['description'], 100, "$lng[gallery_read_more]", "http://$http_host/galeria/$r[permalink]") . "</p>\n";
+								echo "<p>". cutText($r['description'], 100, "$lng[gallery_read_more]", "$proto$http_host/galeria/$r[permalink]") . "</p>\n";
 							}
 						echo "</div>\n";
 					}

+ 4 - 3
www/galeria/load_photo.php

@@ -2,6 +2,7 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -20,9 +21,9 @@
 		echo "</br>\n";
 		//Arrows
 		echo "<div id='viewer_controls'>\n";
-		echo "<img id='viewer_arrow_left' class='pointer' alt=' ' src='http://$http_host/img/misc/slid-left.png' onClick='scrollPhoto(-1);'/>\n";
-		echo "<img id='viewer_arrow_right' class='pointer' alt=' ' src='http://$http_host/img/misc/slid-right.png' onClick='scrollPhoto(1);'/>\n";
-		echo "<img id='viewer_close' class='pointer mobile' alt=' ' src='http://$http_host/img/misc/close.png' onClick='closeViewer();'/>\n";
+		echo "<img id='viewer_arrow_left' class='pointer' alt=' ' src='$proto$http_host/img/misc/slid-left.png' onClick='scrollPhoto(-1);'/>\n";
+		echo "<img id='viewer_arrow_right' class='pointer' alt=' ' src='$proto$http_host/img/misc/slid-right.png' onClick='scrollPhoto(1);'/>\n";
+		echo "<img id='viewer_close' class='pointer mobile' alt=' ' src='$proto$http_host/img/misc/close.png' onClick='closeViewer();'/>\n";
 		echo "</div>\n"; //viewer_controls
 		echo "</div>\n"; //cell
 		echo "<div class='viewer_cell' id='cell_details'>\n";

+ 9 - 8
www/galeria/upload.php

@@ -3,6 +3,7 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -19,7 +20,7 @@
 		<meta charset="utf-8"/>
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
 		<title><?php echo $lng['gallery_title'];?></title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -42,22 +43,22 @@
 			?>
 		</script>
 		<!-- Meta tags -->
-		<link rel="canonical" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="author" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="publisher" href="<?php echo "http://$http_host"; ?>"/>
+		<link rel="canonical" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
 		<meta name="description" content="<?php echo $lng['gallery_description'];?>"/>
 		<meta property="og:title" content="<?php echo $lng['gallery_title'];?>"/>
-		<meta property="og:url" content="<?php echo "http://$http_host"; ?>"/>
+		<meta property="og:url" content="<?php echo "$proto$http_host"; ?>"/>
 		<meta property="og:description" content="<?php echo $lng['gallery_description'];?>"/>
-		<meta property="og:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
+		<meta property="og:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
 		<meta property="og:site_name" content="<?php echo $lng['gallery_title'];?>"/>
 		<meta property="og:type" content="website"/>
 		<meta property="og:locale" content="<?php echo $lang; ?>"/>
 		<meta name="twitter:card" content="summary"/>
 		<meta name="twitter:title" content="<?php echo $lng['gallery_title'];?>"/>
 		<meta name="twitter:description" content="<?php echo $lng['gallery_description'];?>"/>
-		<meta name="twitter:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
-		<meta name="twitter:url" content="<?php echo"http://$http_host"; ?>"/>
+		<meta name="twitter:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
+		<meta name="twitter:url" content="<?php echo"$proto$http_host"; ?>"/>
 		<meta name="robots" content="noindex nofollow"/>
 	</head>
 	<body>

+ 18 - 18
www/header.php

@@ -5,14 +5,14 @@
 		<div id="header_menu">
 			<table>
 				<tr>
-					<td><a href="http://<?php echo $http_host; ?>/"><?php echo $lng['header_home'];?></a></td>
-					<td><a href="http://<?php echo $http_host; ?>/lablanca/"><?php echo $lng['header_lablanca'];?></a></td>
-					<td><a href="http://<?php echo $http_host; ?>/actividades/"><?php echo $lng['header_activities'];?></a></td>
-					<td><a href="http://<?php echo $http_host; ?>/blog/"><?php echo $lng['header_blog'];?></a></td>
-					<td><a href="http://<?php echo $http_host; ?>/nosotros/"><?php echo $lng['header_whoarewe'];?></a></td>
-					<td><a href="http://<?php echo $http_host; ?>/galeria/"><?php echo $lng['header_gallery'];?></a></td>
-	<!-- 				<td><a href="http://<?php echo $http_host; ?>/prensa/"><?php echo $lng['header_press'];?></a></td> -->
-<!-- 					<td><a href="http://<?php echo $http_host; ?>/unete/"><?php echo $lng['header_join'];?></a></td> -->
+					<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> -->
 				</tr>
 			</table>
 		</div>
@@ -21,16 +21,16 @@
 <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='http://<?php echo $http_host; ?>/img/misc/slid-menu.png'/>&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $cur_section; ?></span></div>
-		<div class='header_m_link'><a href="http://<?php echo $http_host; ?>/"><?php echo $lng['header_home'];?></a></div>
-		<div class='header_m_link'><a href="http://<?php echo $http_host; ?>/lablanca/"><?php echo $lng['header_lablanca'];?></a></div>
-		<div class='header_m_link'><a href="http://<?php echo $http_host; ?>/actividades/"><?php echo $lng['header_activities'];?></a></div>
-		<div class='header_m_link'><a href="http://<?php echo $http_host; ?>/blog/"><?php echo $lng['header_blog'];?></a></div>
-		<div class='header_m_link'><a href="http://<?php echo $http_host; ?>/nosotros/"><?php echo $lng['header_whoarewe'];?></a></div>
-		<div class='header_m_link'><a href="http://<?php echo $http_host; ?>/galeria/"><?php echo $lng['header_gallery'];?></a></div>
-<!-- 		<div class='header_m_link'><a href="http://<?php echo $http_host; ?>/prensa/"><?php echo $lng['header_press'];?></a></div> -->
-<!-- 		<div class='header_m_link'><a href="http://<?php echo $http_host; ?>/unete/"><?php echo $lng['header_join'];?></a></div> -->
-		<div id='header_m_slider' onClick='closeMobileMenu();' class='pointer'><span><img src='http://<?php echo $http_host; ?>/img/misc/slid-top.png'/></span></div>
+		<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>
 

+ 54 - 51
www/index.php

@@ -1,7 +1,10 @@
 <?php
 	session_start();
+	#$proto = $_SERVER['SERVER_PROTOCOL'];
+	#$proto = strtolower(substr($_SERVER["SERVER_PROTOCOL"],0,strpos( $_SERVER["SERVER_PROTOCOL"],'/'))).'://';
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("functions.php");
+	$proto = getProtocol();
 	$con = startdb();
 	
 	//Language
@@ -17,7 +20,7 @@
 		<meta charset="utf-8"/>
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
 		<title><?php echo $lng['index_title'];?></title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -37,22 +40,22 @@
 			<?php include("script/ui.js"); ?>
 		</script>
 		<!-- Meta tags -->
-		<link rel="canonical" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="author" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="publisher" href="<?php echo "http://$http_host"; ?>"/>
+		<link rel="canonical" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
 		<meta name="description" content="<?php echo $lng['index_description'];?>"/>
 		<meta property="og:title" content="<?php echo $lng['index_title'];?>"/>
-		<meta property="og:url" content="<?php echo "http://$http_host"; ?>"/>
+		<meta property="og:url" content="<?php echo "$proto$http_host"; ?>"/>
 		<meta property="og:description" content="<?php echo $lng['index_description'];?>"/>
-		<meta property="og:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
+		<meta property="og:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
 		<meta property="og:site_name" content="<?php echo $lng['index_title'];?>"/>
 		<meta property="og:type" content="website"/>
 		<meta property="og:locale" content="<?php echo $lang; ?>"/>
 		<meta name="twitter:card" content="summary"/>
 		<meta name="twitter:title" content="<?php echo $lng['index_title'];?>"/>
 		<meta name="twitter:description" content="<?php echo $lng['index_description'];?>"/>
-		<meta name="twitter:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
-		<meta name="twitter:url" content="<?php echo"http://$http_host"; ?>"/>
+		<meta name="twitter:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
+		<meta name="twitter:url" content="<?php echo"$proto$http_host"; ?>"/>
 		<meta name="robots" content="index follow"/>
 	</head>
 	<body>
@@ -64,13 +67,13 @@
 				$q_settings = mysqli_query($con, "SELECT value FROM settings WHERE name = 'festivals';");
 				$r_settings = mysqli_fetch_array($q_settings);
 				if ($r_settings['value'] == 1){
-					echo "<div class='section' id='festivales' itemscope itemtype='http://schema.org/Event'>\n";
+					echo "<div class='section' id='festivales' itemscope itemtype='$protoschema.org/Event'>\n";
 					echo "<meta itemprop='inLanguage' content='$lang'/>\n";
 					echo "<meta itemprop='name' content='$lng[index_festivals_header] $year'/>\n";
 					echo "<meta itemprop='description' content='$lng[index_festivals_header] $year'/>\n";
 					echo "<meta itemprop='startDate' content='$year-08-04'/>\n";
 					echo "<meta itemprop='endDate' content='$year-08-09'/>\n";
-					echo "<meta itemprop='url' content='http://$http_host/lablanca/'/>\n";
+					echo "<meta itemprop='url' content='$proto$http_host/lablanca/'/>\n";
 					echo("<span class='hidden' itemprop='location' itemscope itemtype='http://schema.org/Place'><meta itemprop='address name' content='Vitoria-Gasteiz'/></span>\n");
 					echo "<h3 class='section_title'>$lng[index_festivals_header] $year</h3>\n";
 					echo "<table class='festival_section_table'><tr>\n";
@@ -81,16 +84,16 @@
 						echo "<td><div class='entry' id='festivals_summary'>\n";
 						$r_festivals = mysqli_fetch_array($q_festivals);
 						if ($r_festivals['img'] != ''){
-							echo "<meta itemprop='image' content='http://$http_host/img/fiestas/$r_festivals[img]'/>\n";
-							echo "<img id='festivals_image' alt=' ' src='http://$http_host/img/fiestas/$r_festivals[img]'/>\n";
+							echo "<meta itemprop='image' content='$proto$http_host/img/fiestas/$r_festivals[img]'/>\n";
+							echo "<img id='festivals_image' alt=' ' src='$proto$http_host/img/fiestas/$r_festivals[img]'/>\n";
 						}
 						if ($r_festivals['summary'] != ''){
 							echo "<span id='festivals_summary_text'><br/>$r_festivals[summary]</span>\n";
-							echo "<br/><br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='http://$http_host/lablanca/'>$lng[index_festivals_link]</a>\n";
+							echo "<br/><br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='$proto$http_host/lablanca/'>$lng[index_festivals_link]</a>\n";
 						}
 						else{
-							echo "<span id='festivals_summary_text'><br/>" . cutText($r_festivals['text'], 300, "$lng[index_read_more]", "http://$http_host/lablanca/") . "</span>\n";
-							//echo "<br/><br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='http://$http_host/lablanca/'>$lng[index_festivals_link]</a>\n";
+							echo "<span id='festivals_summary_text'><br/>" . cutText($r_festivals['text'], 300, "$lng[index_read_more]", "$proto$http_host/lablanca/") . "</span>\n";
+							//echo "<br/><br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='$proto$http_host/lablanca/'>$lng[index_festivals_link]</a>\n";
 						}
 						echo "</div></td>\n";
 					}
@@ -132,7 +135,7 @@
 								echo "<meta itemprop='description' content='$r_sch_curr[description]'/>\n";
 							}
 							echo "<table class='location'><tr>\n";
-							echo "<td><a target='_blank' href='http://maps.google.com/maps?q=$r_sch_curr[lat],$r_sch_curr[lon]+(My+Point)&z=14&ll=$r_sch_curr[lat],$r_sch_curr[lon]'><img alt=' ' src='http://$http_host/img/misc/pinpoint.png'/></a></td>\n"; 
+							echo "<td><a target='_blank' href='http://maps.google.com/maps?q=$r_sch_curr[lat],$r_sch_curr[lon]+(My+Point)&z=14&ll=$r_sch_curr[lat],$r_sch_curr[lon]'><img alt=' ' src='$proto$http_host/img/misc/pinpoint.png'/></a></td>\n"; 
 							//If name and address are the same, show only name
 							if ($r_sch_curr['place'] == $r_sch_curr['address']){
 								echo "<td>$r_sch_curr[place]</td></tr></table>\n";
@@ -159,7 +162,7 @@
 								echo "<meta itemprop='description' content='$r_sch_next[description]'/>\n";
 							}
 							echo "<table class='location'><tr>\n";
-							echo "<td><a target='_blank' href='http://maps.google.com/maps?q=$r_sch_next[lat],$r_sch_next[lon]+(My+Point)&z=14&ll=$r_sch_next[lat],$r_sch_next[lon]'><img alt=' ' src='http://$http_host/img/misc/pinpoint.png'/></a></td>\n"; 
+							echo "<td><a target='_blank' href='http://maps.google.com/maps?q=$r_sch_next[lat],$r_sch_next[lon]+(My+Point)&z=14&ll=$r_sch_next[lat],$r_sch_next[lon]'><img alt=' ' src='$proto$http_host/img/misc/pinpoint.png'/></a></td>\n"; 
 							//If name and address are the same, show only name
 							if ($r_sch_next['place'] == $r_sch_next['address']){
 								echo "<td>$r_sch_next[place]</td></tr></table>\n";
@@ -195,7 +198,7 @@
 								echo "<meta itemprop='description' content='$r_sch_curr[description]'/>\n";
 							}
 							echo "<table class='location'><tr>\n";
-							echo "<td><a target='_blank' href='http://maps.google.com/maps?q=$r_sch_curr[lat],$r_sch_curr[lon]+(My+Point)&z=14&ll=$r_sch_curr[lat],$r_sch_curr[lon]'><img alt=' ' src='http://$http_host/img/misc/pinpoint.png'/></a></td>\n"; 
+							echo "<td><a target='_blank' href='http://maps.google.com/maps?q=$r_sch_curr[lat],$r_sch_curr[lon]+(My+Point)&z=14&ll=$r_sch_curr[lat],$r_sch_curr[lon]'><img alt=' ' src='$proto$http_host/img/misc/pinpoint.png'/></a></td>\n"; 
 							//If name and address are the same, show only name
 							if ($r_sch_curr['place'] == $r_sch_curr['address']){
 								echo "<td>$r_sch_curr[place]</td></tr></table>\n";
@@ -222,7 +225,7 @@
 								echo "<meta itemprop='description' content='$r_sch_next[description]'/>\n";
 							}
 							echo "<table class='location'><tr>\n";
-							echo "<td><a target='_blank' href='http://maps.google.com/maps?q=$r_sch_next[lat],$r_sch_next[lon]+(My+Point)&z=14&ll=$r_sch_next[lat],$r_sch_next[lon]'><img alt=' ' src='http://$http_host/img/misc/pinpoint.png'/></a></td>\n"; 
+							echo "<td><a target='_blank' href='http://maps.google.com/maps?q=$r_sch_next[lat],$r_sch_next[lon]+(My+Point)&z=14&ll=$r_sch_next[lat],$r_sch_next[lon]'><img alt=' ' src='$proto$http_host/img/misc/pinpoint.png'/></a></td>\n"; 
 							//If name and address are the same, show only name
 							if ($r_sch_next['place'] == $r_sch_next['address']){
 								echo "<td>$r_sch_next[place]</td></tr></table>\n";
@@ -235,7 +238,7 @@
 						echo "</div></td>\n"; //close city schedule entry;
 					}
 					echo "</tr></table>\n";
-					echo "<a class='go_to_section' href='http://$http_host/lablanca/'>$lng[index_festivals_link]</a><br/>\n";
+					echo "<a class='go_to_section' href='$proto$http_host/lablanca/'>$lng[index_festivals_link]</a><br/>\n";
 					echo "</div>\n";
 				}
 			
@@ -253,11 +256,11 @@
 					echo "<meta itemprop='description' content='$r_activity[text]'/>\n";
 					echo "<meta itemprop='startDate endDate' content='$r_activity[isodate]'/>\n";
 					echo("<span class='hidden' itemprop='location' itemscope itemtype='http://schema.org/Place'><meta itemprop='address name' content='$r_activity[city]'/></span>\n");
-					echo "<meta itemprop='url' content='http://$http_host/actividades/$r_activity[permalink]'/>\n";
+					echo "<meta itemprop='url' content='$proto$http_host/actividades/$r_activity[permalink]'/>\n";
 					echo "<div class='hidden' itemprop='organizer' itemscope itemtype='http://schema.org/Organization'>\n";
 					echo "<meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>\n";
 					echo "<meta itemprop='name' content='Gasteizko Margolariak'/>\n";
-					echo "<meta itemprop='logo' content='http://$http_host/img/logo/logo.png'/>\n";
+					echo "<meta itemprop='logo' content='$proto$http_host/img/logo/logo.png'/>\n";
 					echo "<meta itemprop='foundingDate' content='2013-02-03'/>\n";
 					echo "<meta itemprop='telephone' content='+34637140371'/>\n";
 					echo "</div>\n";
@@ -268,15 +271,15 @@
 					if (mysqli_num_rows($q_activity_image) > 0){
 						$r_activity_image = mysqli_fetch_array($q_activity_image);
 						echo "<div class='td'><div id='upcoming_image'>\n";
-						echo "<a href='http://$http_host/actividades/$r_activity[permalink]'>\n";
-						echo "<meta itemprop='image' content='http://$http_host/img/actividades/$r_activity_image[image]'/>\n";
-						echo "<img src='http://$http_host/img/actividades/miniature/$r_activity_image[image]' alt='$r_activity[title]'/>\n";
+						echo "<a href='$proto$http_host/actividades/$r_activity[permalink]'>\n";
+						echo "<meta itemprop='image' content='$proto$http_host/img/actividades/$r_activity_image[image]'/>\n";
+						echo "<img src='$proto$http_host/img/actividades/miniature/$r_activity_image[image]' alt='$r_activity[title]'/>\n";
 						echo "</a>\n";
 						echo "</div></div>\n";
 					}
 					echo "<div class='td'><div id='upcoming_text'>\n";
-					echo "<h3><a itemprop='url' href='http://$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a></h3>\n";
-					echo "<p>". cutText($r_activity['text'], 250, "$lng[index_read_more]", "http://$http_host/actividades/$r_activity[permalink]") . "</p>\n";
+					echo "<h3><a itemprop='url' href='$proto$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a></h3>\n";
+					echo "<p>". cutText($r_activity['text'], 250, "$lng[index_read_more]", "$http_host/actividades/$r_activity[permalink]") . "</p>\n";
 					echo "</div></div>\n";
 					echo "<div class='td'><div id='upcoming_details'>\n";
 					echo "<table>\n";
@@ -287,7 +290,7 @@
 					echo "<td>$lng[index_upcoming_activity_price]</td>";
 					if ($r_activity['price'] == 0){
 						echo "<td itemprop='offers' itemscope itemtype='http://schema.org/Offer'>$lng[index_upcoming_activity_free]\n";
-						echo "<meta itemprop='priceCurrency' content='EUR'/><meta itemprop='price' content='0'/><meta itemprop='url' content='http://$http_host/actividades/$r_activity[permalink]'/>\n</td>\n";
+						echo "<meta itemprop='priceCurrency' content='EUR'/><meta itemprop='price' content='0'/><meta itemprop='url' content='$proto$http_host/actividades/$r_activity[permalink]'/>\n</td>\n";
 						echo "</tr><tr>\n";
 						echo "<td>$lng[index_upcoming_activity_inscription]</td>";
 						if ($r_activity['inscription'] == 1)
@@ -304,11 +307,11 @@
 						echo "<tr><td>$lng[index_upcoming_activity_max_people]</td><td>$r_activity[max_people]</td></tr>\n";
 					}
 					echo "</table>\n";
-					echo "<a href='http://$http_host/actividades/$r_activity[permalink]'>$lng[index_upcoming_activity_see]</a><br/><br/>\n";
+					echo "<a href='$proto$http_host/actividades/$r_activity[permalink]'>$lng[index_upcoming_activity_see]</a><br/><br/>\n";
 					
 					echo "</div></div></div></div>\n";
 					echo "</div>\n";//Entry
-					echo "<a class='go_to_section' href='http://$http_host/actividades/'>$lng[index_upcoming_activity_see_all]</a><br/>\n";
+					echo "<a class='go_to_section' href='$proto$http_host/actividades/'>$lng[index_upcoming_activity_see_all]</a><br/>\n";
 					echo "</div>\n";//Section
 				}
 			?>
@@ -329,27 +332,27 @@
 										echo "<meta itemprop='datePublished dateModified' content='$r_post[isodate]'/>\n";
 										echo "<meta itemprop='headline name' content='$r_post[title]'/>\n";
 										echo "<meta itemprop='articleBody text' content='$r_post[text]'/>\n";
-										echo "<meta itemprop='mainEntityOfPage' content='http://$http_host'/>\n";
+										echo "<meta itemprop='mainEntityOfPage' content='$proto$http_host'/>\n";
 										echo "<div class='hidden' itemprop='author publisher' itemscope itemtype='http://schema.org/Organization'>\n";
 										echo "<meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>\n";
 										echo "<meta itemprop='name' content='Gasteizko Margolariak'/>\n";
-										echo "<meta itemprop='logo' content='http://$http_host/img/logo/logo.png'/>\n";
+										echo "<meta itemprop='logo' content='$proto$http_host/img/logo/logo.png'/>\n";
 										echo "<meta itemprop='foundingDate' content='03-02-2013'/>\n";
 										echo "<meta itemprop='telephone' content='+34637140371'/>\n";
-										echo "<meta itemprop='url' content='http://$http_host'/>\n";
+										echo "<meta itemprop='url' content='$proto$http_host'/>\n";
 										echo "</div>\n";
 										$q_post_image = mysqli_query($con, "SELECT image FROM post_image WHERE post = $r_post[id] ORDER BY idx LIMIT 1;");
 										if (mysqli_num_rows($q_post_image) > 0){
 											$r_post_image = mysqli_fetch_array($q_post_image);
-											echo "<meta itemprop='image' content='http://$http_host/img/blog/preview/$r_post_image[image]'/>\n";
-											echo "<a href='http://$http_host/blog/$r_post[permalink]'><img src='http://$http_host/img/blog/miniature/$r_post_image[image]'/></a>\n";
+											echo "<meta itemprop='image' content='$proto$http_host/img/blog/preview/$r_post_image[image]'/>\n";
+											echo "<a href='$proto$http_host/blog/$r_post[permalink]'><img src='$proto$http_host/img/blog/miniature/$r_post_image[image]'/></a>\n";
 										}
-										echo "<h3><a itemprop='url' href='http://$http_host/blog/$r_post[permalink]'>$r_post[title]</a></h3>\n";
-										echo "<p>". cutText($r_post['text'], 100, "$lng[index_read_more]", "http://$http_host/blog/$r_post[permalink]") . "</p>\n";
+										echo "<h3><a itemprop='url' href='$proto$http_host/blog/$r_post[permalink]'>$r_post[title]</a></h3>\n";
+										echo "<p>". cutText($r_post['text'], 100, "$lng[index_read_more]", "$proto$http_host/blog/$r_post[permalink]") . "</p>\n";
 										echo "<span>" . formatDate($r_post['dtime'], $lang, false) . "</span>\n";
 										echo "</div>\n";
 									}
-								echo "<a class='go_to_section' href='http://$http_host/blog/'>$lng[index_see_all_posts]</a><br/>\n";
+								echo "<a class='go_to_section' href='$proto$http_host/blog/'>$lng[index_see_all_posts]</a><br/>\n";
 								}
 							?>
 						</div>
@@ -373,9 +376,9 @@
 										$r_album = mysqli_fetch_array($q_album);
 										echo "<td itemscope itemtype='http://schema.org/Photograph'>\n";
 										echo "<meta itemprop='datePublished' content='$r_photos[isodate]'/>\n";
-										echo "<a href='http://$http_host/galeria/$r_album[permalink]'>\n";
+										echo "<a href='$proto$http_host/galeria/$r_album[permalink]'>\n";
 										echo "<meta itemprop='image' content='http://$http_host/img/galeria/$r_photos[file]'/>\n";
-										echo "<img src='http://$http_host/img/galeria/miniature/$r_photos[file]' alt='$r_photos[title]' /></a></td>\n";
+										echo "<img src='$proto$http_host/img/galeria/miniature/$r_photos[file]' alt='$r_photos[title]' /></a></td>\n";
 										$i ++;
 										if ($i % 2 == 0)
 										echo "</tr><tr>";
@@ -383,7 +386,7 @@
 									echo "</tr>\n";
 									echo "</table>\n";
 									echo "</div>\n";
-									echo "<a class='go_to_section' href='http://$http_host/galeria/'>$lng[index_see_all_photos]</a><br/>\n";
+									echo "<a class='go_to_section' href='$proto$http_host/galeria/'>$lng[index_see_all_photos]</a><br/>\n";
 								}
 							?>
 						</div>
@@ -406,35 +409,35 @@
 							echo "<div class='hidden' itemprop='organizer' itemscope itemtype='http://schema.org/Organization'>\n";
 							echo "<meta itemprop='legalName' content='Asociaci&oacute;n Cultural Recreativa Gasteizko Margolariak'/>\n";
 							echo "<meta itemprop='name' content='Gasteizko Margolariak'/>\n";
-							echo "<meta itemprop='logo' content='http://$http_host/img/logo/logo.png'/>\n";
+							echo "<meta itemprop='logo' content='$proto$http_host/img/logo/logo.png'/>\n";
 							echo "<meta itemprop='foundingDate' content='03-02-2013'/>\n";
 							echo "<meta itemprop='telephone' content='+34637140371'/>\n";
-							echo "<meta itemprop='url' content='http://$http_host'/>\n";
+							echo "<meta itemprop='url' content='$proto$http_host'/>\n";
 							echo "</div>\n";
-							echo "<h3><a itemprop='url' href='http://$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a></h3>\n";
+							echo "<h3><a itemprop='url' href='$proto$http_host/actividades/$r_activity[permalink]'>$r_activity[title]</a></h3>\n";
 							echo "<table class='latest_activity'><tr>\n";
 							$q_activity_image = mysqli_query($con, "SELECT image FROM activity_image WHERE activity = $r_activity[id] ORDER BY idx LIMIT 1;");
 							if (mysqli_num_rows($q_activity_image) > 0){
 								$r_activity_image = mysqli_fetch_array($q_activity_image);
-								echo "<td class='latest_activity_image'><a href='http://$http_host/actividades/$r_activity[permalink]'>\n";
-								echo "<meta itemprop='image' content='http://$http_host/img/actividades/$r_activity_image[image]'/>\n";
-								echo "<img src='http://$http_host/img/actividades/miniature/$r_activity_image[image]' alt='$r_activity[title]'/>\n";
+								echo "<td class='latest_activity_image'><a href='$proto$http_host/actividades/$r_activity[permalink]'>\n";
+								echo "<meta itemprop='image' content='$proto$http_host/img/actividades/$r_activity_image[image]'/>\n";
+								echo "<img src='$proto$http_host/img/actividades/miniature/$r_activity_image[image]' alt='$r_activity[title]'/>\n";
 								echo "</a></td>\n";
 							}
 							//echo "<div class='activity_text'>\n";
-							//echo "<p>". cutText($r_activity['text'], 300, "$lng[index_read_more]", "http://$http_host/actividades/$r_activity[permalink]") . "</p>\n";
+							//echo "<p>". cutText($r_activity['text'], 300, "$lng[index_read_more]", "$proto$http_host/actividades/$r_activity[permalink]") . "</p>\n";
 							if ($r_activity['after'] == ''){
-								echo "<td class='latest_activity_text'>" . cutText($r_activity['text'], 300, "$lng[index_read_more]", "http://$http_host/actividades/$r_activity[permalink]") . "</td>\n";
+								echo "<td class='latest_activity_text'>" . cutText($r_activity['text'], 300, "$lng[index_read_more]", "$proto$http_host/actividades/$r_activity[permalink]") . "</td>\n";
 							}
 							else{
-								echo "<td class='latest_activity_text'>" . cutText($r_activity['after'], 300, "$lng[index_read_more]", "http://$http_host/actividades/$r_activity[permalink]") . "</td>\n";
+								echo "<td class='latest_activity_text'>" . cutText($r_activity['after'], 300, "$lng[index_read_more]", "$proto$http_host/actividades/$r_activity[permalink]") . "</td>\n";
 							}
 							echo "</tr></table>\n";
 							//echo "</div>\n";
 							//echo "</div>\n";
 							echo "</div>\n";
 						}
-						echo "<a class='go_to_section' href='http://$http_host/actividades/'>$lng[index_upcoming_activity_see_all]</a><br/>\n";
+						echo "<a class='go_to_section' href='$proto$http_host/actividades/'>$lng[index_upcoming_activity_see_all]</a><br/>\n";
 						echo "</div>";
 						
 					}

+ 4 - 4
www/lablanca/fiestas.php

@@ -7,7 +7,7 @@
 		if (mysqli_num_rows($q_f) > 0){
 			$r_f = mysqli_fetch_array($q_f);
 			if (strlen($r_f['img']) > 0){
-				echo "<img id='festivals_image' src='http://$http_host/img/festival/$r_f[img]'>\n";
+				echo "<img id='festivals_image' src='$proto$http_host/img/festival/$r_f[img]'>\n";
 			}
 			echo $r_f["text_$lang"] . "\n";
 		}
@@ -24,7 +24,7 @@
 						while ($r_days = mysqli_fetch_array($q_days)){
 							echo "<div class='entry'>\n";
 							echo "<div onClick='expandDay($r_days[id]);' class='day_title pointer'>\n";
-							echo "<h4><img class='slid' src='http://$http_host/img/misc/slid-right.png' id='slid_day_$r_days[id]'/>\n";
+							echo "<h4><img class='slid' src='$proto$http_host/img/misc/slid-right.png' id='slid_day_$r_days[id]'/>\n";
 							echo formatFestivalDate($r_days['date']) . " - $r_days[name]</h4>\n";
 							echo "</div>\n";
 							echo "<div class='day_schedule' id='day_schedule_$r_days[id]'>\n";
@@ -32,7 +32,7 @@
 							if (mysqli_num_rows($q_sch) > 0){
 								echo "<table class='schedule'>\n";
 								while ($r_sch = mysqli_fetch_array($q_sch)){
-									echo "<tr><td><span class='time'>$r_sch[st]</span></td><td class='timeline'><img class='timeline_dot' alt=' ' src='http://$http_host/img/misc/schedule-point.png'/></td>\n";
+									echo "<tr><td><span class='time'>$r_sch[st]</span></td><td class='timeline'><img class='timeline_dot' alt=' ' src='$proto$http_host/img/misc/schedule-point.png'/></td>\n";
 									echo "<td><span class='title'>$r_sch[title]\n";
 									//if (strlen($r_sch['end']) > 0){
 									//	echo " ($r_sch[st] - $r_sch[end])\n";
@@ -43,7 +43,7 @@
 									}
 									echo "<table class='location'><tr>\n";
 									//TODO: td for image, if any
-									echo "<td><a target='_blank' href='http://maps.google.com/maps?q=$r_sch[lat],$r_sch[lon]+(My+Point)&z=14&ll=$r_sch[lat],$r_sch[lon]'><img alt=' ' src='http://$http_host/img/misc/pinpoint.png'/></a></td>\n"; 
+									echo "<td><a target='_blank' href='http://maps.google.com/maps?q=$r_sch[lat],$r_sch[lon]+(My+Point)&z=14&ll=$r_sch[lat],$r_sch[lon]'><img alt=' ' src='$proto$http_host/img/misc/pinpoint.png'/></a></td>\n"; 
 									//If name and address are the same, show only name
 									if ($r_sch['place'] == $r_sch['address']){
 										echo "<td>$r_sch[place]</td></tr></table>\n";

+ 10 - 9
www/lablanca/index.php

@@ -2,6 +2,7 @@
 	session_start();
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -53,7 +54,7 @@
 				}
 			?>
 		</title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -76,9 +77,9 @@
 			?>
 		</script>
 		<!-- Meta tags -->
-		<link rel="canonical" href="<?php echo "http://$http_host/lablanca/"; ?>"/>
-		<link rel="author" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="publisher" href="<?php echo "http://$http_host"; ?>"/>
+		<link rel="canonical" href="<?php echo "$proto$http_host/lablanca/"; ?>"/>
+		<link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
 		<meta name="description" content="<?php echo $lng['lablanca_description'];?>"/>
 		<meta property="og:title" 
 			content="<?php
@@ -90,9 +91,9 @@
 				}
 			?>"
 		/>
-		<meta property="og:url" content="<?php echo "http://$http_host"; ?>"/>
+		<meta property="og:url" content="<?php echo "$proto$http_host"; ?>"/>
 		<meta property="og:description" content="<?php echo $lng['lablanca_description'];?>"/>
-		<meta property="og:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
+		<meta property="og:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
 		<meta property="og:site_name" content="<?php echo $lng['lablanca_title'];?>"/>
 		<meta property="og:type" content="website"/>
 		<meta property="og:locale" content="<?php echo $lang; ?>"/>
@@ -108,8 +109,8 @@
 			?>"
 		/>
 		<meta name="twitter:description" content="<?php echo $lng['lablanca_description'];?>"/>
-		<meta name="twitter:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
-		<meta name="twitter:url" content="<?php echo"http://$http_host"; ?>"/>
+		<meta name="twitter:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
+		<meta name="twitter:url" content="<?php echo"$proto$http_host"; ?>"/>
 		<meta name="robots" content="index follow"/>
 	</head>
 	<body>
@@ -140,7 +141,7 @@
 					echo("<h3 class='section_title'>$lng[lablanca_past_title]</h3>\n");
 					echo("<div class='entry'><ul>\n");
 					while ($r_years = mysqli_fetch_array($q_years)){
-						echo("<li><a href='http://$http_host/lablanca/$r_years[year]'>$lng[lablanca_past_link] $r_years[year]</a></li>\n");
+						echo("<li><a href='$proto$http_host/lablanca/$r_years[year]'>$lng[lablanca_past_link] $r_years[year]</a></li>\n");
 					}		
 					echo("</ul></div>\n");
 					echo("</div>\n");

+ 1 - 1
www/lablanca/nofiestas.php

@@ -1,4 +1,4 @@
-<?php //TODO: Revisiti this file. I dont know what does it do ?>
+<?php //TODO: Revisit this file.?>
 <div class="section">
 	<h3><?php echo($lng['lablanca_no_intro']); ?></h3>
 	<div class="entry">

+ 9 - 8
www/nosotros/index.php

@@ -3,6 +3,7 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("../functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	
 	//Language
 	$lang = selectLanguage();
@@ -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><?php echo $lng['us_title'];?></title>
-		<link rel="shortcut icon" href="<?php echo "http://$http_host/img/logo/favicon.ico";?>">
+		<link rel="shortcut icon" href="<?php echo "$proto$http_host/img/logo/favicon.ico";?>">
 		<!-- CSS files -->
 		<style>
 			<?php 
@@ -39,22 +40,22 @@
 			?>
 		</script>
 		<!-- Meta tags -->
-		<link rel="canonical" href="<?php echo "http://$http_host/nosotros/"; ?>"/>
-		<link rel="author" href="<?php echo "http://$http_host"; ?>"/>
-		<link rel="publisher" href="<?php echo "http://$http_host"; ?>"/>
+		<link rel="canonical" href="<?php echo "$proto$http_host/nosotros/"; ?>"/>
+		<link rel="author" href="<?php echo "$proto$http_host"; ?>"/>
+		<link rel="publisher" href="<?php echo "$proto$http_host"; ?>"/>
 		<meta name="description" content="<?php echo $lng['us_description'];?>"/>
 		<meta property="og:title" content="<?php echo $lng['us_title'];?>"/>
-		<meta property="og:url" content="<?php echo "http://$http_host"; ?>"/>
+		<meta property="og:url" content="<?php echo "$proto$http_host"; ?>"/>
 		<meta property="og:description" content="<?php echo $lng['us_description'];?>"/>
-		<meta property="og:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
+		<meta property="og:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
 		<meta property="og:site_name" content="<?php echo $lng['us_title'];?>"/>
 		<meta property="og:type" content="website"/>
 		<meta property="og:locale" content="<?php echo $lang; ?>"/>
 		<meta name="twitter:card" content="summary"/>
 		<meta name="twitter:title" content="<?php echo $lng['us_title'];?>"/>
 		<meta name="twitter:description" content="<?php echo $lng['us_description'];?>"/>
-		<meta name="twitter:image" content="<?php echo "http://$http_host/img/logo/logo.png";?>"/>
-		<meta name="twitter:url" content="<?php echo"http://$http_host"; ?>"/>
+		<meta name="twitter:image" content="<?php echo "$proto$http_host/img/logo/logo.png";?>"/>
+		<meta name="twitter:url" content="<?php echo"$proto$http_host"; ?>"/>
 		<meta name="robots" content="index follow"/>
 	</head>
 	<body>

+ 18 - 17
www/sitemap.php

@@ -3,13 +3,14 @@
 	$http_host = $_SERVER['HTTP_HOST'];
 	include("functions.php");
 	$con = startdb();
+	$proto = getProtocol();
 	echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 ?>
 <urlset
 	xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
 	xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
 	<url>
-		<loc>http://<?php echo $http_host; ?>/</loc>
+		<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);
@@ -17,28 +18,28 @@
 		<changefreq>weekly</changefreq>
 		<priority>0.8</priority>
 		<image:image>
-			<image:loc>http://<?php echo $http_host; ?>/img/logo/GasteizkoMargolariak.png</image:loc>
+			<image:loc><?php echo $proto$http_host; ?>/img/logo/GasteizkoMargolariak.png</image:loc>
 			<image:caption>Gasteizko Margolariak</image:caption>
 			<image:title>Gasteizko Margolariak</image:title>
 		</image:image>
 		<image:image>
-			<image:loc>http://<?php echo $http_host; ?>/img/logo/GasteizkoMargolariak-0.png</image:loc>
+			<image:loc><?php echo $proto$http_host; ?>/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>http://<?php echo $http_host; ?>/help/</loc>
+		<loc><?php echo $proto$http_host; ?>/ayuda/</loc>
 		<changefreq>monthly</changefreq>
 		<priority>0.5</priority>
 	</url>
 	<url>
-		<loc>http://<?php echo $http_host; ?>/nosotros/</loc>
+		<loc><?php echo $proto$http_host; ?>/nosotros/</loc>
 		<changefreq>monthly</changefreq>
 		<priority>0.6</priority>
 	</url>
 	<url>
-		<loc>http://<?php echo $http_host; ?>/blog/</loc>
+		<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);
@@ -51,14 +52,14 @@
 		$priority = 0.75;
 		while ($row_post = mysqli_fetch_array($res_post)){
 			echo "\t<url>\n";
-			echo "\t\t<loc>http://$http_host/blog/$row_post[permalink]</loc>\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";
 			$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>http://$http_host/img/blog/view/$r_i[image]</image:loc>\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");
 			} 
@@ -69,7 +70,7 @@
 		}
 	?>
 	<url>
-		<loc>http://<?php echo $http_host; ?>/actividades/</loc>
+		<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);
@@ -82,14 +83,14 @@
 		$priority = 0.95;
 		while ($row = mysqli_fetch_array($res)){
 			echo "\t<url>\n";
-			echo "\t\t<loc>http://$http_host/actividades/$row[permalink]</loc>\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";
 			$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>http://$http_host/img/actividades/view/$r_i[image]</image:loc>\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");
 			} 
@@ -100,7 +101,7 @@
 		}
 	?>
 	<url>
-		<loc>http://<?php echo $http_host; ?>/galeria/</loc>
+		<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);
@@ -113,14 +114,14 @@
 		$priority = 0.75;
 		while ($row = mysqli_fetch_array($res)){
 			echo "\t<url>\n";
-			echo "\t\t<loc>http://$http_host/galeria/$row[permalink]</loc>\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";
 			$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>http://$http_host/img/galeria/view/$r_i[file]</image:loc>\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");
 				}
@@ -136,7 +137,7 @@
 		}
 	?>
 	<url>
-		<loc>http://<?php echo $http_host; ?>/lablanca/</loc>
+		<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){
@@ -162,12 +163,12 @@
 		$priority = 0.55;
 		while ($row_years = mysqli_fetch_array($res_years)){
 			echo "\t<url>\n";
-			echo "\t\t<loc>http://$http_host/lablanca/$row_years[year]</loc>\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>http://$http_host/img/fiestas/view/$row_years[img]</image:loc>\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");
 			}