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 c2c13ed..7c1ec58 100644 --- a/app/models/connect.php +++ b/app/models/connect.php @@ -2,13 +2,13 @@ date_default_timezone_set('America/Bogota'); //BASE DE DATOS ADMINISTRACION - // $connect = mysqli_connect("3.227.233.203", "wtredata", "password", "ournorth2021") or die("No conecta"); + // $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "ournorth2021") or die("No conecta"); $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021"); - // $connect = mysqli_connect("3.227.233.203", "wtredata", "password", "prueba_astellas"); + // $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "prueba_astellas"); mysqli_set_charset($connect,"utf8"); setlocale(LC_TIME,"es_ES"); - $url = 'https://'.$_SERVER['SERVER_NAME']; + $url = 'http://'.$_SERVER['SERVER_NAME']; $api = $url.'/api/'; $recursos = $url.'/recursos/'; $prueba = false; 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 c2c13ed..7c1ec58 100644 --- a/app/models/connect.php +++ b/app/models/connect.php @@ -2,13 +2,13 @@ date_default_timezone_set('America/Bogota'); //BASE DE DATOS ADMINISTRACION - // $connect = mysqli_connect("3.227.233.203", "wtredata", "password", "ournorth2021") or die("No conecta"); + // $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "ournorth2021") or die("No conecta"); $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021"); - // $connect = mysqli_connect("3.227.233.203", "wtredata", "password", "prueba_astellas"); + // $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "prueba_astellas"); mysqli_set_charset($connect,"utf8"); setlocale(LC_TIME,"es_ES"); - $url = 'https://'.$_SERVER['SERVER_NAME']; + $url = 'http://'.$_SERVER['SERVER_NAME']; $api = $url.'/api/'; $recursos = $url.'/recursos/'; $prueba = false; diff --git a/views/auditorio.php b/views/auditorio.php index 7e515ba..7466b83 100644 --- a/views/auditorio.php +++ b/views/auditorio.php @@ -10,7 +10,7 @@ $id = $pagina[1]; ?> -

La transmisión del evento inicia el 21 de Abril

+ -

Los salones se abrirán el 20 de Abril

+
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 c2c13ed..7c1ec58 100644 --- a/app/models/connect.php +++ b/app/models/connect.php @@ -2,13 +2,13 @@ date_default_timezone_set('America/Bogota'); //BASE DE DATOS ADMINISTRACION - // $connect = mysqli_connect("3.227.233.203", "wtredata", "password", "ournorth2021") or die("No conecta"); + // $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "ournorth2021") or die("No conecta"); $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021"); - // $connect = mysqli_connect("3.227.233.203", "wtredata", "password", "prueba_astellas"); + // $connect = mysqli_connect("35.168.59.98", "wtredata", "password", "prueba_astellas"); mysqli_set_charset($connect,"utf8"); setlocale(LC_TIME,"es_ES"); - $url = 'https://'.$_SERVER['SERVER_NAME']; + $url = 'http://'.$_SERVER['SERVER_NAME']; $api = $url.'/api/'; $recursos = $url.'/recursos/'; $prueba = false; diff --git a/views/auditorio.php b/views/auditorio.php index 7e515ba..7466b83 100644 --- a/views/auditorio.php +++ b/views/auditorio.php @@ -10,7 +10,7 @@ $id = $pagina[1]; ?> -

La transmisión del evento inicia el 21 de Abril

+ -

Los salones se abrirán el 20 de Abril

+
diff --git a/views/speakers.php b/views/speakers.php index 8466703..a503d77 100644 --- a/views/speakers.php +++ b/views/speakers.php @@ -145,4 +145,10 @@ $(this).find(".descripcion").fadeTo("slow", 0); } ); + + + \ No newline at end of file