Changeset 7017

Show
Ignore:
Timestamp:
11/18/08 18:46:39 (7 weeks ago)
Author:
inureyes
Message:

refs #777

  • suri 동작 관련 일단 돌아가게 조정
  • 관련 부분을 모듈화해야 한다. (일단 돌아가게 해 놓음)
Location:
trunk/library
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • trunk/library/context.php

    r7016 r7017  
    2828            $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL']; 
    2929        } // IIS 5.x/6.0/7.0 and Ionics ISAPI Rewrite Filter 
    30         else if (isset($_SERVER['HTTP_X_REWRITE_URL']) && strpos($_SERVER['REQUEST_URI'], 'rewrite.php') !== FALSE) { 
     30        else if (isset($_SERVER['HTTP_X_REWRITE_URL']) && strpos($_SERVER['REQUEST_URI'], 'dispatcher.php') !== FALSE) { 
    3131            $_SERVER['REQUEST_URI'] = urldecode($_SERVER['HTTP_X_REWRITE_URL']); 
    3232        } 
  • trunk/library/debug/MySQL.php

    r6994 r7017  
    394394        print '<h4>Path parse result</h4>'.CRLF; 
    395395        print '<pre> path parser result : '."\r\n"; 
    396         print_r( $accessInfo ); 
     396        $context = Context::getInstance(); 
     397        print_r( $context->accessInfo ); 
    397398        print_r( $suri ); 
    398399        print '</pre>'; 
  • trunk/library/suri.php

    r7016 r7017  
    1010$blogid          = null; 
    1111$isStrictBlogURL = true; 
    12 $depth           = substr_count($service['path'], '/'); 
    13  
     12$depth           = substr_count($config->service['path'], '/'); 
    1413if ($depth > 0) { 
    1514    if (preg_match('@^((/+[^/]+){' . $depth . '})(.*)$@', $url, $matches)) 
     
    5150        Respond::NotFoundPage(); 
    5251} 
    53 $owner = $blogid; // For legacy.(<1.5) 
    5452 
    5553$gCacheStorage = new globalCacheStorage; // Initialize global cache 
     
    5755$blog = getBlogSettings($blogid); 
    5856$skinSetting = getSkinSetting($blogid); 
    59 if(isset($interfacePath)) { 
    60     $depth = substr_count($interfacePath, '/') - 1; 
     57if(isset($context->accessInfo['interfacePath'])) { 
     58    $depth = substr_count($context->accessInfo['interfacePath'], '/') - 1; 
    6159} else { 
    6260    $depth = substr_count(ROOT, '/');