diff --git a/.htaccess b/.htaccess index 1258958..66b405d 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 1258958..66b405d 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 9c6f508..7cb3c23 100644 --- a/app/models/connect.php +++ b/app/models/connect.php @@ -4,11 +4,12 @@ //BASE DE DATOS ADMINISTRACION // $connect = mysqli_connect("192.168.100.53", "userYca", "&/%(KnowOut3415", "ournorth2021") or die("No conecta"); // $connect = mysqli_connect("3.227.233.203", "wtredata", "password", "ournorth2021") or die("No conecta"); - $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021") or die("No conecta"); + // $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021") or die("No conecta"); + $connect = mysqli_connect("3.227.233.203", "wtredata", "password", "prueba_astellas") or die("No conecta"); 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/'; ?> diff --git a/.htaccess b/.htaccess index 1258958..66b405d 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 9c6f508..7cb3c23 100644 --- a/app/models/connect.php +++ b/app/models/connect.php @@ -4,11 +4,12 @@ //BASE DE DATOS ADMINISTRACION // $connect = mysqli_connect("192.168.100.53", "userYca", "&/%(KnowOut3415", "ournorth2021") or die("No conecta"); // $connect = mysqli_connect("3.227.233.203", "wtredata", "password", "ournorth2021") or die("No conecta"); - $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021") or die("No conecta"); + // $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021") or die("No conecta"); + $connect = mysqli_connect("3.227.233.203", "wtredata", "password", "prueba_astellas") or die("No conecta"); 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/'; ?> diff --git a/index.php b/index.php index 79a14a4..74f4b91 100644 --- a/index.php +++ b/index.php @@ -4,9 +4,9 @@ include("app/models/functions.php"); include("app/models/arrays.php"); $pagina = "home"; - /* if (isset($_SESSION['id_user']) && $_SESSION['id_user'] != "") { + if (isset($_SESSION['id_user']) && $_SESSION['id_user'] != "") { $pagina ="lobby"; - } */ + } if($_GET["pg"] != ""){ $pagina = explode( "/", $_GET["pg"] ); } diff --git a/.htaccess b/.htaccess index 1258958..66b405d 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 9c6f508..7cb3c23 100644 --- a/app/models/connect.php +++ b/app/models/connect.php @@ -4,11 +4,12 @@ //BASE DE DATOS ADMINISTRACION // $connect = mysqli_connect("192.168.100.53", "userYca", "&/%(KnowOut3415", "ournorth2021") or die("No conecta"); // $connect = mysqli_connect("3.227.233.203", "wtredata", "password", "ournorth2021") or die("No conecta"); - $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021") or die("No conecta"); + // $connect = mysqli_connect("localhost", "wtredata", "password", "ournorth2021") or die("No conecta"); + $connect = mysqli_connect("3.227.233.203", "wtredata", "password", "prueba_astellas") or die("No conecta"); 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/'; ?> diff --git a/index.php b/index.php index 79a14a4..74f4b91 100644 --- a/index.php +++ b/index.php @@ -4,9 +4,9 @@ include("app/models/functions.php"); include("app/models/arrays.php"); $pagina = "home"; - /* if (isset($_SESSION['id_user']) && $_SESSION['id_user'] != "") { + if (isset($_SESSION['id_user']) && $_SESSION['id_user'] != "") { $pagina ="lobby"; - } */ + } if($_GET["pg"] != ""){ $pagina = explode( "/", $_GET["pg"] ); } diff --git a/views/home.php b/views/home.php index 534c99c..bd40dc1 100644 --- a/views/home.php +++ b/views/home.php @@ -46,17 +46,13 @@
- + - - - + -