Merge branch 'master' of https://code.tupale.co/qwerty/milfs

funciones/conex.php

@@ -14,7 +14,7 @@ function Conectarse(){
    		}
 
 
-   if (!($link=mysqli_connect($servidor,$usuario,$password,$db)))
+   if (!($link=mysqli_connect('p:'.$servidor,$usuario,$password,$db)))
    {
       echo " Error conectando a la base de datos.  ";
       exit();
@@ -50,9 +50,9 @@ function Conectarse_recursivo(){
    		}
    		}
 
-   if (!($link=mysqli_connect($servidor,$usuario,$password,$db)))
+   if (!($link=mysqli_connect('p:'.$servidor,$usuario,$password,$db)))
    {
-      echo "Error conectando a la base de datos. $servidor,$usuario,$password,$db  ";
+      echo "Error conectando a la base de datos.  ";
       exit();
    }
  /*  if (!mysqli_select_db($db,$link))

funciones/funciones.php

@@ -15084,7 +15084,7 @@ $fila=0;
 	//$resultado .="$consulta";
 $respuesta->addAssign("resultados_encabezado","innerHTML",$encabezado);
 $respuesta->addAssign($div,"innerHTML",$resultado);
-
+ mysqli_close($link);
 return $respuesta;
 } $xajax->registerFunction("matriz_formulario");
 
@@ -15124,6 +15124,7 @@ $resultado[] = @mysqli_result($sql,0,"equipo"); //8
 										$resultado[7] = NULL;
 										$resultado[8] = NULL;
 										}
+	 mysqli_close($link);									
 return $resultado;
 }
 
@@ -15137,6 +15138,7 @@ function mysqli_result($res,$row=0,$col=0){
         }
     }
     return false;
+    
 }
 function remplacetas_orden($tabla,$campo,$valor,$por,$and,$orden){
 

index.php

@@ -43,6 +43,30 @@ if (isset($_REQUEST['t'])) {$t = $_REQUEST['t'];} else {$t = "";}
 
      <?php
      $xajax->printJavascript("xajax/");
+      if(!isset($_REQUEST['experimental'])){
+	 
+	 $bootstrap= "
+	 
+	 <script
+  src='https://code.jquery.com/jquery-3.3.1.min.js'
+  integrity='sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8='
+  crossorigin='anonymous'></script>
+    <script src='https://code.jquery.com/jquery-3.3.1.slim.min.js' integrity='sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo' crossorigin='anonymous'></script>
+	<script src='https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js' integrity='sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1' crossorigin='anonymous'></script>
+	<script src='https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js' integrity='sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM' crossorigin='anonymous'></script>
+<link rel='stylesheet' href='https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css' integrity='sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T' crossorigin='anonymous'>
+<link href='https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css' rel='stylesheet'>
+
+	 ";
+	 
+	 }else{
+	$bootstrap="
+	<script src='../librerias/jquery/jquery-2.1.4.min.js'></script>
+	<script src='../librerias/bootstrap/js/bootstrap.min.js'></script>
+	<link href='../librerias/bootstrap/css/bootstrap.min.css' rel='stylesheet' type='text/css'>
+	";	 
+		 
+		 }
      //	$xajax->debugOn();
 		//$xajax->statusMessagesOn();
       ?>