inconsistencias entre versiones

This commit is contained in:
Hacky Purple 2018-10-13 21:10:43 -05:00
parent 4dd54bdcb7
commit 3c6495d529
2 changed files with 133 additions and 86 deletions

View File

@ -41,7 +41,7 @@ h1, h2, h3, h4, h5, h6 {
#contenedor_cabecera{ #contenedor_cabecera{
padding-top: 22em; padding-top: 17em;
} }

217
index.php
View File

@ -1,33 +1,61 @@
<?php <?php
session_start(); session_start();
if($_SESSION['grupo'] != "administrador") { if ($_SESSION['grupo'] != "administrador") {
// header("Location: ../"); // header("Location: ../");
}
if (isset($_REQUEST['debug'])) {
ini_set('display_errors', 'On');
} }
if(isset($_REQUEST['debug'])) {ini_set('display_errors', 'On');} require('xajax/xajax.inc.php');
require ('xajax/xajax.inc.php');
$xajax = new xajax(); $xajax = new xajax();
//$xajax = new xajax("https://tupale.co/milfs/index.php"); //$xajax = new xajax("https://tupale.co/milfs/index.php");
require ('funciones/funciones.php'); require('funciones/funciones.php');
//require ('funciones/convert.php'); //require ('funciones/convert.php');
require ('funciones/login.php'); require('funciones/login.php');
require ("includes/markdown.php"); require("includes/markdown.php");
require ("includes/simple_html_dom.php"); require("includes/simple_html_dom.php");
require ("funciones/conex.php"); require("funciones/conex.php");
$xajax->processRequests(); $xajax->processRequests();
$embebido =0; $embebido =0;
if (isset($_REQUEST['form'])) { if (isset($_REQUEST['form'])) {
$form = $_REQUEST['form']; $form = $_REQUEST['form'];
$opciones["formato"]= $_REQUEST['formato']; $opciones["formato"]= $_REQUEST['formato'];
} else {$form = "";} } else {
if($form !='') {$embebido = 1;} $form = "";
if (isset($_REQUEST['identificador'])) {$identificador = $_REQUEST['identificador'];} else {$identificador = "";} }
if($identificador !='') {$embebido = 1;} if ($form !='') {
if (isset($_REQUEST['id'])) {$id = $_REQUEST['id'];} else {$id = "";} $embebido = 1;
if (isset($_REQUEST['campo'])) {$campo = $_REQUEST['campo'];} else {$campo = "";} }
if (isset($_REQUEST['consulta'])) {$consulta = $_REQUEST['consulta'];} else {$consulta = "";} if (isset($_REQUEST['identificador'])) {
if (isset($_REQUEST['t'])) {$t = $_REQUEST['t'];} else {$t = "";} $identificador = $_REQUEST['identificador'];
} else {
$identificador = "";
}
if ($identificador !='') {
$embebido = 1;
}
if (isset($_REQUEST['id'])) {
$id = $_REQUEST['id'];
} else {
$id = "";
}
if (isset($_REQUEST['campo'])) {
$campo = $_REQUEST['campo'];
} else {
$campo = "";
}
if (isset($_REQUEST['consulta'])) {
$consulta = $_REQUEST['consulta'];
} else {
$consulta = "";
}
if (isset($_REQUEST['t'])) {
$t = $_REQUEST['t'];
} else {
$t = "";
}
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -37,20 +65,20 @@ if (isset($_REQUEST['t'])) {$t = $_REQUEST['t'];} else {$t = "";}
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content=""> <meta name="description" content="">
<?php <?php
$xajax->printJavascript("xajax/"); $xajax->printJavascript("xajax/");
// $xajax->debugOn(); // $xajax->debugOn();
//$xajax->statusMessagesOn(); //$xajax->statusMessagesOn();
?> ?>
<link rel="shortcut icon" href="favicon-152.png"> <link rel="shortcut icon" href="favicon-152.png">
<link rel="apple-touch-icon-precomposed" href="favicon-152.png"> <link rel="apple-touch-icon-precomposed" href="favicon-152.png">
<!-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha256-k2/8zcNbxVIh5mnQ52A0r3a6jAgMGxFJFE2707UxGCk= sha512-ZV9KawG2Legkwp3nAlxLIVFudTauWuBpC10uEafMHYL0Sarrz5A7G79kXh5+5+woxQ5HM559XX2UZjMJ36Wplg==" crossorigin="anonymous"> --> <!-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha256-k2/8zcNbxVIh5mnQ52A0r3a6jAgMGxFJFE2707UxGCk= sha512-ZV9KawG2Legkwp3nAlxLIVFudTauWuBpC10uEafMHYL0Sarrz5A7G79kXh5+5+woxQ5HM559XX2UZjMJ36Wplg==" crossorigin="anonymous"> -->
<?php if($form !='') { <?php if ($form !='') {
//echo "<link href='css/embebidoXXX.css' rel='stylesheet'>"; //echo "<link href='css/embebidoXXX.css' rel='stylesheet'>";
}else{ } else {
//echo "<link href='css/estilos.php?dd' rel='stylesheet'>"; //echo "<link href='css/estilos.php?dd' rel='stylesheet'>";
} ?> } ?>
<link rel="stylesheet" type="text/css" media="screen" href="css/milfs.css"> <link rel="stylesheet" type="text/css" media="screen" href="css/milfs.css">
<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap.css"> <link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap.css">
<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.css"> <link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.css">
@ -59,7 +87,7 @@ if (isset($_REQUEST['t'])) {$t = $_REQUEST['t'];} else {$t = "";}
<style> <style>
#map {width: 500px;height:200px;} #map {width: 500px;height:200px;}
</style> </style>
@ -67,19 +95,25 @@ if (isset($_REQUEST['t'])) {$t = $_REQUEST['t'];} else {$t = "";}
<?php <?php
if($id !=''){$onload ="<script type=\"text/javascript\"> xajax_formulario_listado('','contenido','$id')</script>";} if ($id !='') {
elseif($campo !=''){$onload ="<script type=\"text/javascript\"> xajax_formulario_crear_campo('','$campo','contenido')</script>";} $onload ="<script type=\"text/javascript\"> xajax_formulario_listado('','contenido','$id')</script>";
elseif($consulta !=''){$onload ="<script type=\"text/javascript\"> xajax_consultar_formulario('$consulta','','','modal')</script>";} } elseif ($campo !='') {
else{} $onload ="<script type=\"text/javascript\"> xajax_formulario_crear_campo('','$campo','contenido')</script>";
} elseif ($consulta !='') {
if( isset($_REQUEST['psi'])){$onload ="<script type=\"text/javascript\"> xajax_mostrar_psi()</script>";} $onload ="<script type=\"text/javascript\"> xajax_consultar_formulario('$consulta','','','modal')</script>";
} else {
}
if (isset($_REQUEST['psi'])) {
$onload ="<script type=\"text/javascript\"> xajax_mostrar_psi()</script>";
}
?> ?>
<!-- <script src="js/jquery.min.js"></script> <!-- <script src="js/jquery.min.js"></script>
<script src="js/bootstrap.js"></script> --> <script src="js/bootstrap.js"></script> -->
<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> --> <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> -->
<script src="js/jquery-2.1.4.min.js"></script> <script src="js/jquery-2.1.4.min.js"></script>
<!-- UPLOAD --> <!-- UPLOAD -->
<script src="plugins/upload/js/vendor/jquery.ui.widget.js"></script> <script src="plugins/upload/js/vendor/jquery.ui.widget.js"></script>
<script src="plugins/upload/js/jquery.iframe-transport.js"></script> <script src="plugins/upload/js/jquery.iframe-transport.js"></script>
@ -89,7 +123,7 @@ if (isset($_REQUEST['t'])) {$t = $_REQUEST['t'];} else {$t = "";}
<!-- The Canvas to Blob plugin is included for image resizing functionality --> <!-- The Canvas to Blob plugin is included for image resizing functionality -->
<script src="plugins/upload/js/canvas-to-blob.min.js"></script> <script src="plugins/upload/js/canvas-to-blob.min.js"></script>
<script src="plugins/upload/js/jquery.fileupload-process.js"></script> <script src="plugins/upload/js/jquery.fileupload-process.js"></script>
<script src="plugins/upload/js/jquery.fileupload-image.js"></script> <script src="plugins/upload/js/jquery.fileupload-image.js"></script>
<script src="plugins/upload/js/jquery.fileupload-audio.js"></script> <script src="plugins/upload/js/jquery.fileupload-audio.js"></script>
<script src="plugins/upload/js/jquery.fileupload-video.js"></script> <script src="plugins/upload/js/jquery.fileupload-video.js"></script>
<script src="plugins/upload/js/jquery.fileupload-validate.js"></script> <script src="plugins/upload/js/jquery.fileupload-validate.js"></script>
@ -100,7 +134,7 @@ if (isset($_REQUEST['t'])) {$t = $_REQUEST['t'];} else {$t = "";}
<link rel="stylesheet" href="plugins/upload/css/jquery.fileupload.css"> <link rel="stylesheet" href="plugins/upload/css/jquery.fileupload.css">
<!-- <link rel="stylesheet" href="plugins/upload/css/style.css"> --> <!-- <link rel="stylesheet" href="plugins/upload/css/style.css"> -->
<!-- JavaScript used to call the fileupload widget to upload files --> <!-- JavaScript used to call the fileupload widget to upload files -->
<!-- UPLOAD --> <!-- UPLOAD -->
<!-- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script> --> <!-- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script> -->
@ -109,7 +143,7 @@ if (isset($_REQUEST['t'])) {$t = $_REQUEST['t'];} else {$t = "";}
<script src="js/to-markdown.js"></script> <script src="js/to-markdown.js"></script>
<script src="js/bootstrap-markdown.js"></script> <script src="js/bootstrap-markdown.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
<!-- include codemirror (codemirror.css, codemirror.js, xml.js, formatting.js) --> <!-- include codemirror (codemirror.css, codemirror.js, xml.js, formatting.js) -->
<link rel="stylesheet" type="text/css" href="../librerias/codemirror/codemirror.css"> <link rel="stylesheet" type="text/css" href="../librerias/codemirror/codemirror.css">
<link rel="stylesheet" type="text/css" href="../librerias/codemirror/monokai.css"> <link rel="stylesheet" type="text/css" href="../librerias/codemirror/monokai.css">
@ -122,11 +156,11 @@ if (isset($_REQUEST['t'])) {$t = $_REQUEST['t'];} else {$t = "";}
<link href="../librerias/summernote/summernote.css" rel="stylesheet"> <link href="../librerias/summernote/summernote.css" rel="stylesheet">
<script type="text/javascript"> <script type="text/javascript">
//Recoger elemento arrastrable// //Recoger elemento arrastrable//
function evdragstart(ev,el) { //ev= el evento, el=elemento arrastrado. function evdragstart(ev,el) { //ev= el evento, el=elemento arrastrado.
cont1=el.parentNode; //guardamos el elemento padre del elemento en una variable. cont1=el.parentNode; //guardamos el elemento padre del elemento en una variable.
ev.dataTransfer.setData("text",ev.target.id); //guardamos datos del elemento. ev.dataTransfer.setData("text",ev.target.id); //guardamos datos del elemento.
} }
//mientras se arrastra: //mientras se arrastra:
function evdragover (ev) { //ev=el evento. function evdragover (ev) { //ev=el evento.
@ -134,7 +168,7 @@ function evdragover (ev) { //ev=el evento.
} }
//Al soltar el elemento arrastrado //Al soltar el elemento arrastrado
function evdrop(ev,el) { //ev=el evento; el=receptor de soltado function evdrop(ev,el) { //ev=el evento; el=receptor de soltado
ev.stopPropagation(); //impedir otras acciones ev.stopPropagation(); //impedir otras acciones
ev.preventDefault(); //quitar comportamiento por defecto ev.preventDefault(); //quitar comportamiento por defecto
var data=ev.dataTransfer.getData("text"); //recogemos datos del elemento var data=ev.dataTransfer.getData("text"); //recogemos datos del elemento
mielem=ev.target.appendChild(document.getElementById(data)); //obtenemos el elemento arrastrado mielem=ev.target.appendChild(document.getElementById(data)); //obtenemos el elemento arrastrado
@ -163,13 +197,13 @@ legend.legend-area {
border-bottom:none; border-bottom:none;
} }
.modal-dialog { .modal-dialog {
width: 95% !important; width: 95% !important;
height: auto; height: auto;
padding: 0; padding: 0;
} }
.modal-lg { .modal-lg {
width: 95% !important; width: 95% !important;
height: auto; height: auto;
padding: 0; padding: 0;
} }
@ -185,18 +219,21 @@ legend.legend-area {
</style> </style>
</head> </head>
<body > <body >
<?php if($embebido ==1) { <?php if ($embebido ==1) {
if($form!=''){ echo formulario_embebido($form,$opciones);} if ($form!='') {
elseif($identificador !='') { echo mostrar_identificador($identificador,$id);} echo formulario_embebido($form, $opciones);
//elseif($_REQUEST['psi'] !='') { include("psi.php") ; echo $aviso;} } elseif ($identificador !='') {
else{} echo mostrar_identificador($identificador, $id);
}
}else{ //elseif($_REQUEST['psi'] !='') { include("psi.php") ; echo $aviso;}
else {
?> }
} else {
?>
<?php echo @$onload; ?> <?php echo @$onload; ?>
<?php <?php
if ( isset ( $_SESSION['id'] ) ) { ?> if (isset($_SESSION['id'])) {
?>
<div class="navbar navbar-inverse navbar-fixed-top " role="navigation"> <div class="navbar navbar-inverse navbar-fixed-top " role="navigation">
<div class="container-fluid"> <div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
@ -213,9 +250,11 @@ else{}
<?php echo milfs() ?> <?php echo milfs() ?>
</div><!-- /.container-fluid --> </div><!-- /.container-fluid -->
</div> </div>
<?php }else{ } ?>
<?php
} else {
} ?>
<div id='debug'></div> <div id='debug'></div>
@ -223,26 +262,33 @@ else{}
<div id='contenido'> <div id='contenido'>
<div class='row'> <div class='row'>
<div id='' class='col-sm-6'> <div id='' class='col-sm-6'>
<?php
///echo adjuntar_basico('33');
if(!isset($_SESSION['id_empresa'])) {$id_empresa_portada='1';} else{$id_empresa_portada = $_SESSION['id_empresa'];} <?php
$encabezado = empresa_datos("$id_empresa_portada",'encabezado'); ///echo adjuntar_basico('33');
if (!isset($_SESSION['id_empresa'])) {
$pie = empresa_datos("$id_empresa_portada",'pie'); $id_empresa_portada='1';
echo "$encabezado"; } else {
//if(isset($_SESSION['id_empresa'])) {$id_empresa_portada='1'; echo panel_aplicaciones('1',"");} $id_empresa_portada = $_SESSION['id_empresa'];
echo " </div> }
$encabezado = empresa_datos("$id_empresa_portada", 'encabezado');
$pie = empresa_datos("$id_empresa_portada", 'pie');
echo "$encabezado";
if (isset($_SESSION['id_empresa'])) {
$id_empresa_portada='1';
echo panel_aplicaciones('1', "");
}
echo " </div>
<div id='div_login' class='col-sm-6'>"; <div id='div_login' class='col-sm-6'>";
if(isset($_REQUEST['change'])){ if (isset($_REQUEST['change'])) {
echo cambiar_password_formato("$_REQUEST[change]"); echo cambiar_password_formato("$_REQUEST[change]");
} }
revisar_ingreso(''); revisar_ingreso('');
echo "</div>"; echo "</div>";
echo $pie; ?> echo $pie; ?>
<img class='img-responsive center-block' src="images/logo.png" alt="MILFS"> <img class='img-responsive center-block' src="images/logo.png" alt="MILFS">
</div> </div>
</div> </div>
@ -257,16 +303,16 @@ echo "</div>";
<div class='modal-content'> <div class='modal-content'>
<button type='button' class='close' data-dismiss='modal' aria-hidden='true'><i class='fa fa-times-circle'></i></button> <button type='button' class='close' data-dismiss='modal' aria-hidden='true'><i class='fa fa-times-circle'></i></button>
<div class='modal-header' > <div class='modal-header' >
<h4 class='modal-title' id='myModalLabel_info'><div id='titulo_modal'></div></h4> <h4 class='modal-title' id='myModalLabel_info'><div id='titulo_modal'></div></h4>
</div> </div>
<div class='modal-body'> <div class='modal-body'>
<?php include("psi.php") ;?> <?php include("psi.php") ; ?>
<div id='muestra_form'></div> <div id='muestra_form'></div>
</div> </div>
<div class='modal-footer' id='pie_modal'> <div class='modal-footer' id='pie_modal'>
</div> </div>
</div> </div>
</div> </div>
@ -279,15 +325,16 @@ echo "</div>";
<div class="container"> <div class="container">
<a href='http://QWERTY.co/milfs'>&copy; MILFS Un proyecto de http://QWERTY.co</a> Se distribuye bajo licencia GPL V3 <a href='http://QWERTY.co/milfs'>&copy; MILFS Un proyecto de http://QWERTY.co</a> Se distribuye bajo licencia GPL V3
<a href="?psi" target="_psi"><i class="fa fa-smile-o "></i> Políticas de privacidad y protección de datos.</a> <a href="?psi" target="_psi"><i class="fa fa-smile-o "></i> Políticas de privacidad y protección de datos.</a>
</div> </div>
</div> </div>
<?php } ?> <?php
} ?>
<script type="text/javascript"> <script type="text/javascript">
$(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) { $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) {
event.preventDefault(); event.preventDefault();
$(this).ekkoLightbox(); $(this).ekkoLightbox();
}); });
//// wysiwyg //// wysiwyg
var edit = function() { var edit = function() {
@ -304,6 +351,6 @@ $(document).ready(function() {
$('.wysiwyg_auto').summernote({dialogsInBody: true}); $('.wysiwyg_auto').summernote({dialogsInBody: true});
}); });
</script> </script>
</body> </body>
</html> </html>