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

probando conexion3

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-14 19:08:32 -06:00
parent 6f51aa4d9f
commit d829bcd006
3 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+33 -33
View File
@@ -3,6 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="">
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -12,7 +13,7 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
@@ -24,8 +25,17 @@
<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="220">
<caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" />
<state relative-caret-position="154">
<caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
</file>
<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="484">
<caret line="22" column="48" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
</state>
</provider>
</entry>
@@ -39,15 +49,6 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="24" column="66" selection-start-line="24" selection-start-column="66" selection-end-line="24" selection-end-column="66" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -77,12 +78,12 @@
<option value="$PROJECT_DIR$/estilos.css" />
<option value="$PROJECT_DIR$/SQL/conexion.php" />
<option value="$PROJECT_DIR$/footer.php" />
<option value="$PROJECT_DIR$/login.php" />
<option value="$PROJECT_DIR$/index.php" />
<option value="$PROJECT_DIR$/header.php" />
<option value="$PROJECT_DIR$/sitio/usuario/usuario.php" />
<option value="$PROJECT_DIR$/sitio/admin/admin.php" />
<option value="$PROJECT_DIR$/conexion.php" />
<option value="$PROJECT_DIR$/login.php" />
<option value="$PROJECT_DIR$/js/main.js" />
</list>
</option>
@@ -114,13 +115,12 @@
<path>
<item name="Inventario" type="b2602c69:ProjectViewProjectNode" />
<item name="Inventario" type="462c0819:PsiDirectoryNode" />
<item name="sitio" type="462c0819:PsiDirectoryNode" />
<item name="js" 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>
</expand>
<select />
@@ -173,12 +173,12 @@
<workItem from="1547170217131" duration="2586000" />
<workItem from="1547236861734" duration="11265000" />
<workItem from="1547503840895" duration="2199000" />
<workItem from="1547508488120" duration="1489000" />
<workItem from="1547508488120" duration="2591000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="41735000" />
<option name="totallyTimeSpent" value="42837000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -258,20 +258,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="2" lean-forward="true" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/login.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1804">
@@ -288,8 +274,22 @@
</entry>
<entry file="file://$PROJECT_DIR$/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="24" column="66" selection-start-line="24" selection-start-column="66" selection-end-line="24" selection-end-column="66" />
<state relative-caret-position="484">
<caret line="22" column="48" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/login.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="2" lean-forward="true" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="2" />
</state>
</provider>
</entry>
js/main.js
+2 -2
View File
@@ -16,11 +16,11 @@ jQuery(document).on('submit','#formlg',function(event){
console.log(respuesta);
if (!respuesta.error){
if (respuesta.tipo == 'admin')
if (respuesta.tipo == 'Jefatura')
{
location.href = '132.248.80.188/Inventario/sitio/admin/admin.php';
}
else if (respuesta.tipo == 'usuario')
else if (respuesta.tipo == 'Area')
{
location.href = '132.248.80.188/Inventario/sitio/usuario/usuario.php';
}
login.php
+4 -4
View File
@@ -10,8 +10,8 @@
$usuario = $mysqli->real_escape_string($_POST['usuariolg']);
$pass = $mysqli->real_escape_string($_POST['passlg']);
if ($nueva_consulta = $mysqli->prepare("SELECT nombre, tipo
FROM usuarios
if ($nueva_consulta = $mysqli->prepare("SELECT nombre, perfil
FROM cat_usuario
WHERE user = ?
AND password = ?")){
@@ -21,8 +21,8 @@
if ($resultado->num_rows == 1){
$datos = $resultado->fetch_assoc();
$_SESSION['usuario'] = $datos;
echo json_encode(array('error' => false, 'tipo' => $datos['tipo']));
$_SESSION['cat_usuario'] = $datos;
echo json_encode(array('error' => false, 'perfil' => $datos['perfil']));
}
else{
echo json_encode(array('error' => true));