From 1fae9d39286430696cab46da8af6f88b2a214e97 Mon Sep 17 00:00:00 2001
From: Gabriel Fuentes <blender.1379@gmail.com>
Date: Wed, 30 Jan 2019 13:28:51 -0600
Subject: [PATCH] proceso de actualizacion1

---
 .idea/workspace.xml | 31 ++++++++++++++-----------------
 conexion.php        |  8 ++++----
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9f9c195..b3bea14 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,10 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <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$/sitio/usuario/busqueda_t.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/busqueda_t.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -32,11 +29,11 @@
   </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="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 relative-caret-position="66">
+              <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
             </state>
           </provider>
         </entry>
@@ -62,7 +59,7 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_t.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="396">
@@ -139,9 +136,9 @@
         <option value="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion_p.php" />
         <option value="$PROJECT_DIR$/sitio/admin/busqueda_t.php" />
         <option value="$PROJECT_DIR$/sitio/admin/solicitud/stoner.php" />
-        <option value="$PROJECT_DIR$/conexion.php" />
         <option value="$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php" />
         <option value="$PROJECT_DIR$/sitio/usuario/busqueda_t.php" />
+        <option value="$PROJECT_DIR$/conexion.php" />
       </list>
     </option>
   </component>
@@ -270,12 +267,12 @@
       <workItem from="1548442486112" duration="10568000" />
       <workItem from="1548805530548" duration="295000" />
       <workItem from="1548805926584" duration="9007000" />
-      <workItem from="1548871474944" duration="2969000" />
+      <workItem from="1548871474944" duration="3034000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="174888000" />
+    <option name="totallyTimeSpent" value="174953000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -493,13 +490,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/conexion.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <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/solicitud/stoner.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
@@ -524,5 +514,12 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/conexion.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/conexion.php b/conexion.php
index 7916679..c8ba8d1 100644
--- a/conexion.php
+++ b/conexion.php
@@ -3,22 +3,22 @@
  * 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;