Gabriel/Inventario_material_v1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

version local-servidor

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-15 20:28:24 -06:00
parent 65214f4613
commit c2425d35e4
8 changed files with 126 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+54 -51
View File
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="" />
<list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/conexion.php" beforeDir="false" afterPath="$PROJECT_DIR$/conexion.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/js/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/main.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/login.php" beforeDir="false" afterPath="$PROJECT_DIR$/login.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/admin.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/admin.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/usuario/usuario.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/usuario.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -13,8 +21,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/login.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="638">
<caret line="29" column="37" lean-forward="true" selection-start-line="29" selection-start-column="37" selection-end-line="29" selection-end-column="37" />
<state relative-caret-position="242">
<caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
</state>
</provider>
</entry>
@@ -22,8 +30,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
<state relative-caret-position="374">
<caret line="17" column="64" selection-start-line="17" selection-start-column="64" selection-end-line="17" selection-end-column="64" />
</state>
</provider>
</entry>
@@ -31,8 +39,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="39" lean-forward="true" selection-start-line="14" selection-start-column="39" selection-end-line="14" selection-end-column="39" />
<state relative-caret-position="176">
<caret line="8" column="44" selection-start-line="8" selection-start-column="44" selection-end-line="8" selection-end-column="44" />
</state>
</provider>
</entry>
@@ -40,8 +48,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
<state relative-caret-position="528">
<caret line="52" column="57" selection-start-line="52" selection-start-column="57" selection-end-line="52" selection-end-column="57" />
</state>
</provider>
</entry>
@@ -49,8 +57,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="9" lean-forward="true" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
<state relative-caret-position="572">
<caret line="58" column="15" selection-start-line="58" selection-start-column="15" selection-end-line="58" selection-end-column="15" />
</state>
</provider>
</entry>
@@ -88,11 +96,12 @@
<option value="$PROJECT_DIR$/footer.php" />
<option value="$PROJECT_DIR$/header.php" />
<option value="$PROJECT_DIR$/conexion.php" />
<option value="$PROJECT_DIR$/destroy.php" />
<option value="$PROJECT_DIR$/js/main.js" />
<option value="$PROJECT_DIR$/index.php" />
<option value="$PROJECT_DIR$/login.php" />
<option value="$PROJECT_DIR$/sitio/admin/admin.php" />
<option value="$PROJECT_DIR$/js/main.js" />
<option value="$PROJECT_DIR$/sitio/usuario/usuario.php" />
<option value="$PROJECT_DIR$/sitio/admin/admin.php" />
</list>
</option>
</component>
@@ -125,18 +134,6 @@
<item name="Inventario" type="462c0819:PsiDirectoryNode" />
<item name="sitio" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Inventario" type="b2602c69:ProjectViewProjectNode" />
<item name="Inventario" type="462c0819:PsiDirectoryNode" />
<item name="sitio" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Inventario" type="b2602c69:ProjectViewProjectNode" />
<item name="Inventario" type="462c0819:PsiDirectoryNode" />
<item name="sitio" type="462c0819:PsiDirectoryNode" />
<item name="usuario" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
@@ -190,18 +187,19 @@
<workItem from="1547503840895" duration="2199000" />
<workItem from="1547508488120" duration="8644000" />
<workItem from="1547590167863" duration="2217000" />
<workItem from="1547594014414" duration="9631000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="51107000" />
<option name="totallyTimeSpent" value="60738000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Favorites" order="0" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.20226537" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.20550162" />
<window_info id="Structure" order="2" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Terminal" order="0" weight="0.3295325" />
<window_info anchor="bottom" id="Database Changes" order="1" />
@@ -250,9 +248,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../base/node_modules/sshpk/lib/formats/openssh-cert.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/../../base/node_modules/sshpk/lib/formats/openssh-cert.js" />
<entry file="file://$PROJECT_DIR$/footer.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
@@ -260,52 +256,59 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/header.php">
<entry file="file://$PROJECT_DIR$/destroy.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
<state relative-caret-position="110">
<caret line="10" column="34" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" column="101" selection-start-line="1" selection-start-column="101" selection-end-line="1" selection-end-column="101" />
<state relative-caret-position="484">
<caret line="24" column="2" lean-forward="true" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
<entry file="file://$PROJECT_DIR$/header.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="39" lean-forward="true" selection-start-line="14" selection-start-column="39" selection-end-line="14" selection-end-column="39" />
<state relative-caret-position="924">
<caret line="42" column="51" selection-start-line="42" selection-start-column="51" selection-end-line="42" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
<state relative-caret-position="374">
<caret line="17" column="64" selection-start-line="17" selection-start-column="64" selection-end-line="17" selection-end-column="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="44" selection-start-line="8" selection-start-column="44" selection-end-line="8" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/login.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="638">
<caret line="29" column="37" lean-forward="true" selection-start-line="29" selection-start-column="37" selection-end-line="29" selection-end-column="37" />
<state relative-caret-position="242">
<caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="52" column="57" selection-start-line="52" selection-start-column="57" selection-end-line="52" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="9" lean-forward="true" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
<state relative-caret-position="572">
<caret line="58" column="15" selection-start-line="58" selection-start-column="15" selection-end-line="58" selection-end-column="15" />
</state>
</provider>
</entry>
conexion.php
+20 -1
View File
@@ -1,5 +1,24 @@
<?php
$mysqli = new mysqli("132.248.80.194","usr_inv_material","tint4sBond","P_orion_inventario_material");
/*
* conexion a viper
* */
/*
* $mysqli = new mysqli("132.248.80.194",
"usr_inv_material",
"tint4sBond",
"P_orion_inventario_material");
*/
/*
* conexion local
* */
$mysqli = new mysqli("localhost",
"blender",
"avatares1",
"inventario");
if($mysqli->connect_errno):
echo "Error al conectarse con MYSQL por el error " .$mysqli->connect_error;
endif;
destroy.php
+12
View File
@@ -0,0 +1,12 @@
<?php
/**
* Created by PhpStorm.
* User: Gabriel Fuentes
* Date: 15/01/2019
* Time: 05:59 PM
*/
session_start();
session_destroy();
header('Location: index.php');
?>
index.php
+18 -1
View File
@@ -1,7 +1,24 @@
<?php include("header.php") ?>
<?php
session_start();
if (isset($_SESSION['usuario'])){
if ($_SESSION['usuario']['perfil'] == 'Jefatura')
{
header('Location: sitio/admin/admin.php');
}
else if($_SESSION['usuario']['perfil'] == 'Area')
{
header('Location: sitio/usuario/usuario.php');
}
}
?>
<?php include("header.php") ?>
<div class="container" style="margin-top: 1%;">
<h1>Iniciar sesión</h1>
<br>
<div class="error container badge badge-danger" style="display: none;">
<span style="font-size: 18px;">Los Datos ingresados no válidos, intentalo nuevamente.</span>
</div>
js/main.js
+1 -1
View File
@@ -16,10 +16,10 @@ jQuery(document).on('submit','#formlg',function(event){
if (respuesta.perfil == 'Jefatura')
{
location.href = 'sitio/admin/admin.php';
}
else if (respuesta.perfil == 'Area')
{
console.log("Area");
location.href = 'sitio/usuario/usuario.php';
}
}
login.php
+7 -4
View File
@@ -1,17 +1,15 @@
<?php
if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest'){
require 'conexion.php';
sleep(1.2);
session_start();
$mysqli->set_charset('utf8');
$usuario = $mysqli->real_escape_string($_POST['usuariolg']);
$pass = $mysqli->real_escape_string($_POST['passlg']);
if ($nueva_consulta = $mysqli->prepare("SELECT nombre, perfil
FROM cat_usuario
FROM cat_usuario
WHERE usuario = ?
AND contrasena = ?")){
@@ -21,13 +19,18 @@
if ($resultado->num_rows == 1){
$datos = $resultado->fetch_assoc();
$_SESSION['cat_usuario'] = $datos;
$_SESSION['usuario'] = $datos;
echo json_encode(array('error' => false, 'perfil' => $datos['perfil']));
//session_start();
//$_SESSION['usuario']['perfil'] = $datos['perfil'];
//$_SESSION['usuario']['nombre'] = $datos['nombre'];
}
else{
echo json_encode(array('error' => true));
}
$nueva_consulta->close();
}
$mysqli->close();
}
sitio/admin/admin.php
+9 -7
View File
@@ -1,14 +1,16 @@
<?php
session_start();
print_r($_SESSION['usuario']);
if (isset($_SESSION['usuario'])){
if ($_SESSION['usuario']['perfil'] != "admin"){
header('Location: ../../usuario/');
if ($_SESSION['usuario']['perfil'] != "Jefatura"){
header("Location: ../usuario/usuario.php");
}
}
else{
header('Location: admin.php');
else
{
header("Location: ../../index.php");
}
?>
<!doctype html>
@@ -51,12 +53,12 @@
<ul class="navbar-nav mr-auto">
<li class="nav-item dropdown my-2 mr-3">
<a class="nav-link-white" href="index.php" role="button" >
<a class="nav-link-white" href="#" role="button" >
Inicio
</a>
</li>
<li class="nav-item dropdown my-2 mr-3">
<a class="nav-link-white" href="index.php" role="button" >
<a class="nav-link-white" href="../../destroy.php" role="button" >
Cerrar sesion
</a>
</li>
sitio/usuario/usuario.php
+5 -6
View File
@@ -2,11 +2,10 @@
session_start();
if (isset($_SESSION['usuario'])){
if ($_SESSION['usuario']['perfil'] != "Area"){
header('Location: ../admin/');
header("Location: ../admin/admin.php");
}
}
else {
header('Location: usuario.php');
} else{
header("Location ../../index.php");
}
?>
@@ -51,12 +50,12 @@
<ul class="navbar-nav mr-auto">
<li class="nav-item dropdown my-2 mr-3">
<a class="nav-link-white" href="index.php" role="button" >
<a class="nav-link-white" href="#" role="button" >
Inicio
</a>
</li>
<li class="nav-item dropdown my-2 mr-3">
<a class="nav-link-white" href="index.php" role="button" >
<a class="nav-link-white" href="../../destroy.php" role="button" >
Cerrar sesion
</a>
</li>