refs #514

* 1.8 트리와 동기화
Needlworks · Jan 15, 2010 · 68b146d · 68b146d
1 parent 7ddda5e
commit 68b146d
Show file tree

Hide file tree

Showing 9 changed files with 6,179 additions and 15 deletions.
diff --git a/framework/Dispatcher.php b/framework/Dispatcher.php
@@ -156,7 +156,7 @@ private function URIinterpreter() {
 							$interfacePath = 'interface/blog/'.$pathPart.'/index.php';
 							break;
 						case 'i': case 'm':
-							if(isset($uri['fragment'][1]) && in_array($uri['fragment'][1],array('entry','comment','guestbook','trackback'))) {
+							if(isset($uri['fragment'][1]) && in_array($uri['fragment'][1],array('archive','category','comment','entry','guestbook','imageResizer','link','login','logout','pannels','protected','search','tag','trackback'))) {
 								$pathPart = $uri['fragment'][0].'/'.$uri['fragment'][1]; 
 							} else {
 								$pathPart = $uri['fragment'][0];

diff --git a/framework/legacy/Needlworks.Cache.PageCache.php b/framework/legacy/Needlworks.Cache.PageCache.php
@@ -578,16 +578,20 @@ function flushItemsByPlugin($pluginName) {
 		}
 	}
 	function flushDBCache($prefix = null) {
+		$pool = queryCache::getInstance();
+		$pool->reset('PageCacheLog',$prefix);
+		return $pool->flush();
+/*		
 		global $database;
 		$context = Model_Context::getInstance();
-		if($context->getProperty('service.memcached') == true) {
+		if($context->getProperty('service.memcached') !== null) {
 			$memcache = Cache_Memcache::getInstance();
 			$memcache->reset('PageCacheLog',$prefix);
 			return $memcache->flush();
 		}
 		return POD::query("DELETE FROM {$database['prefix']}PageCacheLog
 			WHERE blogid = ".getBlogId()."
-			AND name like '%".(!empty($prefix) ? $prefix.'-' : '')."queryCache%'");
+			AND name like '%".(!empty($prefix) ? $prefix.'-' : '')."queryCache%'");*/
 	}
 	function purgeItems($items) {
 		if(!empty($items)) {

diff --git a/framework/legacy/Textcube.Control.Session.php b/framework/legacy/Textcube.Control.Session.php
@@ -230,14 +230,15 @@ private static function query($mode='query',$sql) {
 
 		$result = self::DBQuery($mode,$sql);
 		if($result === false) {
-			if (self::$sessionDBRepair === false) {		
+			if (self::$sessionDBRepair === false) {	
 				@POD::query("REPAIR TABLE ".self::$context->getProperty('database.prefix')."Sessions, ".self::$context->getProperty('database.prefix')."SessionVisits");
 				$result = self::DBQuery($mode,$sql);
 				self::$sessionDBRepair = true;
 			}
 		}
 		return $result;
 	}
+
 	private static function DBQuery($mode='query',$sql) {
 		switch($mode) {
 			case 'cell':	return POD::queryCell($sql);

diff --git a/interface/owner/plugin/adminMenu/index.php b/interface/owner/plugin/adminMenu/index.php
@@ -6,13 +6,6 @@
 require ROOT . '/library/preprocessor.php';
 require ROOT . '/interface/common/owner/header.php';
 
-
-if (false) {
-	fetchConfigVal();
-	getBlogSetting();
-	setBlogSetting();
-}
-
 if ((isset($_REQUEST['name'])) && (isset($adminMenuMappings[$_REQUEST['name']]))) 
 {
 
@@ -46,6 +39,18 @@
 		$pluginURL = "{$service['path']}/plugins/{$plugin}";
 		$pluginPath = ROOT . "/plugins/{$plugin}";
 		$pluginName = $plugin;
+
+		// Loading locale resource
+		$languageDomain = null;
+		if(is_dir($pluginPath . '/locale/')) {
+			$locale = Locale::getInstance();
+			$languageDomain = $locale->domain;
+			if(file_exists($pluginPath.'/locale/'.$locale->defaultLanguage.'.php')) {
+				$locale->setDirectory($pluginPath.'/locale');
+				$locale->set($locale->defaultLanguage, $pluginName);
+				$locale->domain = $pluginName;
+			}
+		}		
 		include_once (ROOT . "/plugins/{$plugin}/index.php");
 		if (function_exists($handler)) {
 			if( !empty( $configMappings[$plugin]['config'] ) ) 				
@@ -54,6 +59,8 @@
 				$configVal ='';
 			call_user_func($handler);
 		}
+		/// unload.
+		if(!is_null($languageDomain)) $locale->domain = $languageDomain;		
 	}
 }
 require ROOT . '/interface/common/owner/footer.php';

diff --git a/library/config.default.php b/library/config.default.php
@@ -8,11 +8,11 @@
 define('TEXTCUBE_VERSION', '1.9 : Alpha 1');
 define('TEXTCUBE_COPYRIGHT', 'Copyright &copy; 2004-2010. Needlworks / Tatter Network Foundation. All rights reserved. Licensed under the GPL.');
 define('TEXTCUBE_HOMEPAGE', 'http://www.textcube.org/');
-define('TEXTCUBE_RESOURCE_URL', 'http://resources.textcube.org/1.8.1');
+define('TEXTCUBE_RESOURCE_URL', 'http://resources.textcube.org/1.8.2');
 define('CRLF', "\r\n");
 define('TAB', "	");
 define('INT_MAX',2147483647);
-define('JQUERY_VERSION','1.3.2');
+define('JQUERY_VERSION','1.4');
 if( strstr( PHP_OS, "WIN") !== false ) {
 	define('DS', "\\");
 } else {

diff --git a/library/view/iphoneView.php b/library/view/iphoneView.php
@@ -427,7 +427,9 @@ function printIphoneTrackbackView($entryId, $page, $mode = null) {
 				<span class="left">
 					<?php echo htmlspecialchars($trackback['subject']);?>
 				</span>
-				<span class="right">&nbsp;</span>
+				<span class="right">
+					<a href="<?php echo $blogURL;?>/i/entry/<?php echo $trackback['entry'];?>"><?php echo  _text('글보기');?></a>
+				</span>
 			</li>
 			<li class="body">
 				<span class="date">DATE : <?php echo Timestamp::format5($trackback['written']);?></span>

diff --git a/library/view/view.php b/library/view/view.php
@@ -1189,7 +1189,7 @@ function getRandomTagsView($tags, $template) {
 	return $view;
 }
 
-function getEntryContentView($blogid, $id, $content, $formatter, $keywords = array(), $type = 'Post', $useAbsolutePath = false, $bRssMode = false) {
+function getEntryContentView($blogid, $id, $content, $formatter, $keywords = array(), $type = 'Post', $useAbsolutePath = true, $bRssMode = false) {
 	global $hostURL, $service;
 	requireModel('blog.attachment');
 	requireModel('blog.keyword');