Changeset 7016

Timestamp:

11/18/08 18:04:00 (7 weeks ago)

Author:

inureyes

Message:

refs #777

• 경로 판단 루틴을 정상적으로 동작하도록 수정
  
• 아직 정상적은 아닌듯?
  

Location:

trunk/library

Files:

• context.php (modified) (4 diffs)
• loader.php (modified) (1 diff)
• suri.php (modified) (1 diff)

trunk/library/context.php

@@ -31 +31 @@
             $_SERVER['REQUEST_URI'] = urldecode($_SERVER['HTTP_X_REWRITE_URL']);
         }
+        /* Retrieve Access Parameter Information. */
         $accessInfo = array(
             'host'      => $_SERVER['HTTP_HOST'],
             'fullpath' => str_replace('index.php', '', $_SERVER["REQUEST_URI"]), // SUGGEST: change the name 'fullpath' to 'fullQuery'
             'position'  => $_SERVER["SCRIPT_NAME"],
-            'root'      => rtrim(str_replace('rewrite.php', '', $_SERVER["SCRIPT_NAME"]), 'index.php')
+            'root'      => rtrim(str_replace('dispatcher.php', '', $_SERVER["SCRIPT_NAME"]), 'index.php')
             );
+        if (strpos($accessInfo['fullpath'],$accessInfo['root']) !== 0)
+            $accessInfo['fullpath'] = $accessInfo['root'].substr($accessInfo['fullpath'], strlen($accessInfo['root']) - 1);
         // Workaround for compartibility with fastCGI / Other environment
         $accessInfo['input'] = ltrim(substr($accessInfo['fullpath'],
             strlen($accessInfo['root']) + (defined('__TEXTCUBE_NO_FANCY_URL__') ? 1 : 0)),'/');
         // DEPRECATE?: Support for Tattertools 0.9x legacy address
-        
-        $accessInfo['URLfragment'] = explode('/',strtok($accessInfo['input'],'?'));
-        if (defined('__TEXTCUBE_NO_FANCY_URL__'))
+    $part = strtok($accessInfo['input'], '/');
+    if (in_array($part, array('resources','plugins','cache','skin','attach','thumbnail'))) {
+        $part = ltrim(rtrim($part == 'thumbnail' ?
+              preg_replace('/thumbnail/', 'cache/thumbnail', $accessInfo['input'], 1) :
+              $accessInfo['input']), '/');
+        $part = (($qpos = strpos($part, '?')) !== false) ? substr($part, 0, $qpos) : $part;
+        if(file_exists($part)) {
+            require_once ROOT.'/library/function/file.php';
+            dumpWithEtag($part);
+            exit;
+        } else {
+            header("HTTP/1.0 404 Not Found");exit;
+        }
+    }
+    if (strtok($part, '?') == 'setup.php') {require 'setup.php'; exit;}
+    $accessInfo['URLfragment'] = explode('/',strtok($accessInfo['input'],'?'));
+    unset($part);
+
+        /* Determine that which interface should be loaded. */
+        if (defined('__TEXTCUBE_NO_FANCY_URL__')) 
             $config->service['type'] = 'single';
         switch ($config->service['type']) {
@@ -62 +82 @@
         }
         $pathPart = strtok($pathPart,'&');
+        /* Load interface. */
         $interfacePath = null;
         if (in_array($pathPart, array('favicon.ico','index.gif'))) {
@@ -88 +109 @@
             $accessInfo['interfacePath'] = $interfacePath;
         }
-
         // TODO: Add these to debug-mode output
         //echo "<b>\$accessInfo : </b>";
@@ -97 +117 @@
 
         // TODO: Parse $_GET, $_POST, and etc./
-        if(isset($accessInfo['URLfragment'][0]) && $accessInfo['URLfragment'][0] == 'owner') $this->mode = 'owner';
-        else $this->mode = 'blog';
         $this->accessInfo = $accessInfo;
     }

trunk/library/loader.php

@@ -61 +61 @@
         if (in_array($name,array('DBQuery'))) {
             require_once(ROOT . "/library/data/".$config->backend_name."/Adapter.php");
+            require_once(ROOT . "/library/data/Database.php");
         } else if(self::$relation[$name] == 'session' && isset($service['memcached']) && $service['memcached'] == true) {
             require_once(ROOT . "/library/session/Session_Memcached.php");

trunk/library/suri.php

@@ -3 +3 @@
 /// All rights reserved. Licensed under the GPL.
 /// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
-
 if(isset($context)) {$url = $context->accessInfo['fullpath'];} 
 else { $url = isset($_SERVER['REDIRECT_URL']) ? $_SERVER['REDIRECT_URL'] : $_SERVER['SCRIPT_NAME'];}