From 91893e3056912e9c735722d062dd1ff07e279778 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sun, 28 Oct 2018 11:14:46 -0500 Subject: [PATCH 01/18] =?UTF-8?q?actualizaci=C3=B3n=20de=20upstream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index 7da8027..434df34 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 7da802721f833958604f274dfd1ceb242fd4c8cb +Subproject commit 434df34e0458f6372b526a34eb2146d99fbca21e -- 2.30.2 From 2c497c474113eae69c63725a9a79f4a1ae770956 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Thu, 1 Nov 2018 12:01:46 -0500 Subject: [PATCH 02/18] actualizando upstream --- index.php | 28 ++++++++++++++-------------- milfs | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/index.php b/index.php index fa21953..6f28724 100644 --- a/index.php +++ b/index.php @@ -36,7 +36,7 @@ if(isset($_REQUEST['debug'])) { - @@ -684,7 +684,7 @@ if('serviceWorker' in navigator) {

- +
@@ -706,12 +706,12 @@ if('serviceWorker' in navigator) { $estadisticas = portal_listado_campos("$form"); $acciones= formulario_acciones("$form","aplicacion"); $no_mostrar="display:none; "; - + $footer=" "; @@ -758,7 +758,7 @@ if('serviceWorker' in navigator) {

-
+
$titulos @@ -1011,7 +1011,7 @@ $aplicacion_pie=" $banner - +
+
@@ -711,25 +706,9 @@ if('serviceWorker' in navigator) { $estadisticas = portal_listado_campos("$form"); $acciones= formulario_acciones("$form","aplicacion"); $no_mostrar="display:none; "; - + $footer=" -<<<<<<< HEAD - "; -======= "; ->>>>>>> a38f633d21b1810df3d48cf254a1544b496d0861 @@ -790,7 +768,7 @@ $acciones

-
+
$titulos @@ -1043,7 +1021,7 @@ $aplicacion_pie=" $banner - +
+
@@ -706,7 +706,7 @@ if('serviceWorker' in navigator) { $estadisticas = portal_listado_campos("$form"); $acciones= formulario_acciones("$form","aplicacion"); $no_mostrar="display:none; "; - + $footer="
+
$titulos @@ -1021,7 +1021,7 @@ $aplicacion_pie=" $banner - +
- - - -
-
-
- - - "; - } - - if($geo[0] != "") { - $mapa = " - - - - "; - }else {$mapa = "";} - $estadisticas = portal_listado_campos("$form"); - $acciones= formulario_acciones("$form","aplicacion"); - $no_mostrar="display:none; "; - - $footer=" - - "; - - - - $onload=" - -
-
-
- -

$titulo[0]

-

$descripcion[0]

-
-

$razon_social[0]

-

$slogan[0]

-
- Tupale.co -
- - $galeria -
- - $estadisticas - -
-
- $mapa -
-
-
-
-
-
- -$titulos - - -
-
-
-
-
-
-
$footer"; - //$onload = "$footer $aplicacion "; - -======= $onload = vista_aplicacion($form); ->>>>>>> c119b18641256b0d142514cd0030b24aa799685a } elseif($v[0] =='g') { /// g=FORMULARIO EMBEBIDO $no_mostrar ="display:none; "; $form =$v[1]; - if($form =="" ){ header ("Location:./"); } + if($form =="" ){ + + + er ("Location:./"); } $empresa = remplacetas('form_id','id',$form,'id_empresa',"") ; $razon_social_portal = remplacetas('empresa','id',"1",'razon_social','') ; $id_empresa = $empresa[0]; @@ -1828,7 +1701,7 @@ $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) { -