diff --git a/.htaccess b/.htaccess index 66b405d..1258958 100644 --- a/.htaccess +++ b/.htaccess @@ -11,7 +11,7 @@ RewriteEngine On RewriteCond %{SERVER_PORT} 80 - #RewriteRule ^(.*)$ https://%{SERVER_NAME}/$1 [R,L] + RewriteRule ^(.*)$ https://%{SERVER_NAME}/$1 [R,L] diff --git a/.htaccess b/.htaccess index 66b405d..1258958 100644 --- a/.htaccess +++ b/.htaccess @@ -11,7 +11,7 @@ RewriteEngine On RewriteCond %{SERVER_PORT} 80 - #RewriteRule ^(.*)$ https://%{SERVER_NAME}/$1 [R,L] + RewriteRule ^(.*)$ https://%{SERVER_NAME}/$1 [R,L] diff --git a/app/models/connect.php b/app/models/connect.php index 582c327..78a1a40 100644 --- a/app/models/connect.php +++ b/app/models/connect.php @@ -3,16 +3,16 @@ //BASE DE DATOS ADMINISTRACION // $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "ournorth2021") or die("No conecta"); - // $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021"); - $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "prueba_astellas"); + $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021"); + // $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "prueba_astellas"); // $connect = mysqli_connect("localhost", "wtredata", "password", "prueba_astellas"); mysqli_set_charset($connect,"utf8"); setlocale(LC_TIME,"es_ES"); - $url = 'http://'.$_SERVER['SERVER_NAME']; + $url = 'https://'.$_SERVER['SERVER_NAME']; $api = $url.'/api/'; $recursos = $url.'/recursos/'; - $prueba = true; + $prueba = false; $dia_hoy = ""; ?> diff --git a/.htaccess b/.htaccess index 66b405d..1258958 100644 --- a/.htaccess +++ b/.htaccess @@ -11,7 +11,7 @@ RewriteEngine On RewriteCond %{SERVER_PORT} 80 - #RewriteRule ^(.*)$ https://%{SERVER_NAME}/$1 [R,L] + RewriteRule ^(.*)$ https://%{SERVER_NAME}/$1 [R,L] diff --git a/app/models/connect.php b/app/models/connect.php index 582c327..78a1a40 100644 --- a/app/models/connect.php +++ b/app/models/connect.php @@ -3,16 +3,16 @@ //BASE DE DATOS ADMINISTRACION // $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "ournorth2021") or die("No conecta"); - // $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021"); - $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "prueba_astellas"); + $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021"); + // $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "prueba_astellas"); // $connect = mysqli_connect("localhost", "wtredata", "password", "prueba_astellas"); mysqli_set_charset($connect,"utf8"); setlocale(LC_TIME,"es_ES"); - $url = 'http://'.$_SERVER['SERVER_NAME']; + $url = 'https://'.$_SERVER['SERVER_NAME']; $api = $url.'/api/'; $recursos = $url.'/recursos/'; - $prueba = true; + $prueba = false; $dia_hoy = ""; ?> diff --git a/views/auditorio.php b/views/auditorio.php index 08e4724..3b380e5 100644 --- a/views/auditorio.php +++ b/views/auditorio.php @@ -79,15 +79,15 @@ - - + -
+
diff --git a/.htaccess b/.htaccess index 66b405d..1258958 100644 --- a/.htaccess +++ b/.htaccess @@ -11,7 +11,7 @@ RewriteEngine On RewriteCond %{SERVER_PORT} 80 - #RewriteRule ^(.*)$ https://%{SERVER_NAME}/$1 [R,L] + RewriteRule ^(.*)$ https://%{SERVER_NAME}/$1 [R,L] diff --git a/app/models/connect.php b/app/models/connect.php index 582c327..78a1a40 100644 --- a/app/models/connect.php +++ b/app/models/connect.php @@ -3,16 +3,16 @@ //BASE DE DATOS ADMINISTRACION // $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "ournorth2021") or die("No conecta"); - // $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021"); - $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "prueba_astellas"); + $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021"); + // $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "prueba_astellas"); // $connect = mysqli_connect("localhost", "wtredata", "password", "prueba_astellas"); mysqli_set_charset($connect,"utf8"); setlocale(LC_TIME,"es_ES"); - $url = 'http://'.$_SERVER['SERVER_NAME']; + $url = 'https://'.$_SERVER['SERVER_NAME']; $api = $url.'/api/'; $recursos = $url.'/recursos/'; - $prueba = true; + $prueba = false; $dia_hoy = ""; ?> diff --git a/views/auditorio.php b/views/auditorio.php index 08e4724..3b380e5 100644 --- a/views/auditorio.php +++ b/views/auditorio.php @@ -79,15 +79,15 @@
- - + -
+
diff --git a/views/stand.php b/views/stand.php index baaec1d..0a8a431 100644 --- a/views/stand.php +++ b/views/stand.php @@ -324,12 +324,12 @@ - + - +