From 0020ba4873c9cea0472bdbd760f05c24dc2f7fa9 Mon Sep 17 00:00:00 2001
From: "Albert E. Hidalgo Taveras" <itsalb3rt@gmail.com>
Date: Wed, 20 Feb 2019 15:38:35 -0400
Subject: [PATCH] Mejoras

- Se mejoro el router para que el projecto funcione en subdirectorios de la raiz del servidor donde se encuentre alojado
  *La principal ventaja de esto es que es posible crear api rest versionadas con el directorio 'v1' tal y como lo establecen los estandares
---
 .idea/workspace.xml               | 88 +++++++++++++++++++------------
 Controllers/DefaultController.php |  4 +-
 router.php                        | 17 +++++-
 3 files changed, 70 insertions(+), 39 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 10c59a1..17efa97 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="c5c30ad5-e240-41b9-86e1-5ed7797d0a0d" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dispatcher.php" beforeDir="false" afterPath="$PROJECT_DIR$/dispatcher.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Controllers/DefaultController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Controllers/DefaultController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/router.php" beforeDir="false" afterPath="$PROJECT_DIR$/router.php" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.idea/httpRequests/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -28,12 +29,21 @@
     <select />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="dispatcher.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/dispatcher.php">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="router.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/router.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="345">
+              <caret line="35" column="58" lean-forward="true" selection-start-line="35" selection-start-column="58" selection-end-line="35" selection-end-column="58" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="DefaultController.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/Controllers/DefaultController.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="414">
-              <caret line="36" column="54" selection-start-line="36" selection-start-column="54" selection-end-line="36" selection-end-column="54" />
+              <caret line="23" column="35" lean-forward="true" selection-start-line="23" selection-start-column="35" selection-end-line="23" selection-end-column="35" />
             </state>
           </provider>
         </entry>
@@ -134,8 +144,6 @@
         <option value="$PROJECT_DIR$/Core/Util/HttpFoundation/Tests/tests.php" />
         <option value="$PROJECT_DIR$/request.php" />
         <option value="$PROJECT_DIR$/Core/Util/HttpFoundation/Request.php" />
-        <option value="$PROJECT_DIR$/Controllers/DefaultController.php" />
-        <option value="$PROJECT_DIR$/router.php" />
         <option value="$PROJECT_DIR$/.htaccess" />
         <option value="$PROJECT_DIR$/Webroot/.htaccess" />
         <option value="$PROJECT_DIR$/Config/config.php.ini" />
@@ -148,6 +156,8 @@
         <option value="$PROJECT_DIR$/../ligne_php_util/pdox/src/Pdox.php" />
         <option value="$PROJECT_DIR$/Core/System/Core/pages_messages/Views/code_messages/messages.php" />
         <option value="$PROJECT_DIR$/dispatcher.php" />
+        <option value="$PROJECT_DIR$/router.php" />
+        <option value="$PROJECT_DIR$/Controllers/DefaultController.php" />
       </list>
     </option>
   </component>
@@ -169,7 +179,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -177,16 +186,22 @@
               <item name="ligne_php_pro" type="b2602c69:ProjectViewProjectNode" />
               <item name="ligne_php_pro" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="ligne_php_pro" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ligne_php_pro" type="462c0819:PsiDirectoryNode" />
+              <item name="Controllers" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$USER_HOME$/Desktop/Documentos/01 - Desarrollo/Tools/diccionario espanol phpstrorm/src/dict/spanish.dic" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../ligne_php_main_dir_test" />
     <property name="list.type.of.created.stylesheet" value="CSS" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -370,11 +385,13 @@
       <workItem from="1545596831884" duration="148000" />
       <workItem from="1545613390861" duration="568000" />
       <workItem from="1547311740506" duration="22000" />
+      <workItem from="1548459690720" duration="354000" />
+      <workItem from="1550690823794" duration="584000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="254395000" />
+    <option name="totallyTimeSpent" value="255333000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -387,19 +404,20 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24550128" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25192803" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3292683" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
       <window_info anchor="right" id="Database" order="3" weight="0.32969153" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.3292683" />
+      <window_info anchor="bottom" id="Run" order="2" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.3292683" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -634,13 +652,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Controllers/DefaultController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.htaccess">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="23">
@@ -655,13 +666,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/router.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1127">
-          <caret line="49" column="39" lean-forward="true" selection-start-line="49" selection-start-column="39" selection-end-line="49" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Config/config.php.ini">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="230">
@@ -690,13 +694,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Core/Controller.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="690">
-          <caret line="88" column="5" selection-start-line="88" selection-start-column="5" selection-end-line="88" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../ligne_php_util/pdox/src/Pdox.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="202">
@@ -725,12 +722,33 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Core/Controller.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="644">
+          <caret line="88" column="5" selection-start-line="88" selection-start-column="5" selection-end-line="88" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/dispatcher.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
+        <state relative-caret-position="644">
           <caret line="36" column="54" selection-start-line="36" selection-start-column="54" selection-end-line="36" selection-end-column="54" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/router.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="35" column="58" lean-forward="true" selection-start-line="35" selection-start-column="58" selection-end-line="35" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Controllers/DefaultController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="414">
+          <caret line="23" column="35" lean-forward="true" selection-start-line="23" selection-start-column="35" selection-end-line="23" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/Controllers/DefaultController.php b/Controllers/DefaultController.php
index 41dc5b2..e0d4cd8 100644
--- a/Controllers/DefaultController.php
+++ b/Controllers/DefaultController.php
@@ -19,9 +19,9 @@ class DefaultController extends Controller
     public function index()
     {
         $data['framework_name'] = "Ligne Framework";
-        $data['version'] = "v1.3";
+        $data['version'] = "v1.4";
         $data['environment'] = "Dev";
-        $data['date'] = "Oct 2018";
+        $data['date'] = "Feb 2019";
         $data['external_components_included'] = "HttpFoundation";
         $data['autor'] = "Albert Eduardo Hidalgo Taveras";
         $this->setData($data); //envia datos a la vista
diff --git a/router.php b/router.php
index 2d8c6bb..2b5c1f2 100644
--- a/router.php
+++ b/router.php
@@ -17,11 +17,24 @@
  **/
 class Router
 {
+    /**
+     * Las variables @projectDir y @offSet se incluyeron en la actualizacion del 20/02/2019 para
+     * que el framework pueda estar en cualquier directorio o subdirectorio del servidor
+     *
+     * Esto analiza en que nivel de la URLI estan el contorlador, la accion y los parametros
+     *
+     * @param $url
+     * @param $request
+     */
     static public function parse($url, $request){
         $url = strtok(trim($url),'?');
         $explode_url = explode('/', $url);
-        $explode_url = array_slice($explode_url, 2);
-        if ($url == '/' . self::root_dir() . '/' )
+
+        $projectDir = explode('/',ROOT);
+        $offSet = count($projectDir)-3;
+
+        $explode_url = array_slice($explode_url, $offSet);
+        if ($url == '/' . self::root_dir() . '/' || strlen($explode_url[0]) == 0 )
             self::load_index($request);
         elseif(self::is_array_url_valid($explode_url))
             self::route_construct($request,$explode_url);