diff -urN 1.8.1/documents/changelog_ko.txt 1.8.2/documents/changelog_ko.txt --- 1.8.1/documents/changelog_ko.txt 2010-01-04 22:34:27.000000000 +0900 +++ 1.8.2/documents/changelog_ko.txt 2010-01-31 18:09:51.000000000 +0900 @@ -1,6 +1,39 @@ * 이 문서는 변경사항을 모두 포함하고 있지 않을 수 있습니다. 자세한 변경사항 열람을 위해서는 텍스트큐브 개발 사이트 (http://dev.textcube.org) 의 해당 버전의 로드맵과 티켓들을 확인해 주시기 바랍니다. * 버그 로그는 일반적으로 이전 버전에서 발생했으나 해결된 부분을 포함하며, 이번 버전을 만드는 과정에서 발생하는 버그는 기록하지 않습니다. - +== v1.8.2 개발 관련 노트 == +=== 추가된 점 === + * 설치 : 설치시 PHP 버전을 확인하여 동작 가능 여부를 알려줌 (#1406) + * 설치 : 1.7에서 1.8로 트리 변경 체크업시, 변경된 스킨 디렉토리 구조를 안내해 줌 (#1426) + * 일반 : 유니코드 제어 루틴 변경 (#1416) + * 플러그인 : 플러그인 언어 리소스가 플러그인이 생성하는 관리 패널 영역까지 적용됨 (#1412) + +=== 변경된 점 === + * 일반 : 컨텐츠 포매팅 시 이미지 및 첨부파일을 절대 경로를 참조하도록 기본 값을 수정 (#1407) + * 일반 : 유니코드 처리 루틴의 성능 개선 (#1416) + * TTXML : 티스토리 데이터를 복원할 경우 첨부파일의 파일명이 너무 길어 사라질 수 있는 부분 변경 (#1365) + +=== 버그 수정 === + * 블로그 : 일반 핸드폰용 모바일 블로그 주소 (/m) 접근이 제대로 되지 않는 문제 수정 (#1402) + * 블로그 : 모바일 블로깅 시 댓글 작성에 문제가 생기는 경우 수정 (#1402) + * 블로그 : 댓글을 작성하거나 수정할 경우 최근 댓글 목록 갱신이 1.8 호환 스킨에서 이상하게 출력되는 문제 수정 (#1409) + * 블로그 : 카테고리가 없는 경우 네비게이션 표시가 이상하게 되는 문제 수정 (#1372) + * 블로그 : 로그인하면 비공개 공지사항이 안 보이고 로그아웃하면 보이는 문제 수정 (#1428) + * 관리패널 : 서비스 - 언어 설정에서 셀렉트박스에 언어 목록이 이상하게 출력되는 문제 수정 (#1403) + * 관리패널 : line 기능을 주소 검색줄에 추가하는 버튼이 오동작하는 문제 수정 (#1148) + * 일반 : 세션 관련 Config 객체 (1.8 베타때 사용되었음) 사용하는 부분을 모두 다시 구현 (#1322) + * 일반 : 체크업으로 데이터베이스 업데이트 시 오타 난 부분 수정 (#1410) + * 일반 : memcached 기반의 캐시 운영시 플러싱 오류 수정 (#1362) + * 일반 : 쿼리 캐시 사용시 DB 기반의 캐시 동작 모드에서 지원되지 않는 메소드 참조 오류 수정 (#1362) + * 일반 : 세션이 닫힐 때 가비지 컬렉션 루틴이 정상동작하지 않는 오류 수정 (#1419) + * 일반 : 데이터베이스 접근시 autocommit 이 동작하지 않는 문제 수정 (#1277) + * 일반 : 백업시 텍스트큐브가 멈추는 문제 수정 (#1298) + * 일반 : PostgreSQL 설정이 autocommit이 아닌 경우 로그인이 안되는 문제 수정 (#1396) + * 에디터 : 볼드 버튼 동작시 HTML이 이상하게 생성되는 문제 수정 (#1422) + * 에디터 : 공지 작성시 미리보기가 동작하지 않는 오류 수정 (#1427) + * 모바일 : 아이폰 모드에서 그림 출력 및 페이지 출력이 이상하게 되는 문제 수정 (#1408, #1415) + * 설치 : MySQLi 모드 설치시 캐릭터셋 설정이 빠지는 문제 수정 (#1066) + + == v1.8.1 개발 관련 노트 == === 추가된 점 === * 일반 : memcached 서버를 다중 서버 기반에서 사용할 때 도메인 키를 통하여 데이터 혼선이 생기지 않도록 함 (#1375) diff -urN 1.8.1/framework/Dispatcher.php 1.8.2/framework/Dispatcher.php --- 1.8.1/framework/Dispatcher.php 2009-12-24 02:56:04.000000000 +0900 +++ 1.8.2/framework/Dispatcher.php 2010-01-15 13:56:52.000000000 +0900 @@ -128,7 +128,6 @@ $interfacePath = null; if ($uri['interfaceType'] == 'icon') { $uri['interfacePath'] = $this->interfacePath = 'interface/'.$pathPart.'.php'; - $this->uri = $uri; } else { if (!empty($uri['fragment'])) { if (is_numeric(strtok(end($uri['fragment']), '&'))) { @@ -147,7 +146,7 @@ $interfacePath = 'interface/blog/'.$pathPart.'.php'; break; case 'rss': case 'atom': - if(in_array($uri['fragment'][1],array('category','tag','search'))) { + if(isset($uri['fragment'][1]) && in_array($uri['fragment'][1],array('category','tag','search'))) { $pathPart = $uri['fragment'][0].'/'.$uri['fragment'][1]; $interfacePath = 'interface/'.$pathPart.'/index.php'; } @@ -156,11 +155,11 @@ $pathPart = implode("/",$uri['fragment']); $interfacePath = 'interface/blog/'.$pathPart.'/index.php'; break; - case 'i':case 'm': - if(in_array($uri['fragment'][1],array('entry','comment'))) { + case 'i': case 'm': + 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 { - $pathPath = $uri['fragment'][0].'/'; + $pathPart = $uri['fragment'][0]; } $interfacePath = 'interface/'.$pathPart.'/index.php'; break; @@ -176,8 +175,8 @@ header("HTTP/1.0 404 Not Found");exit; } $uri['interfacePath'] = $this->interfacePath = $interfacePath; - $this->uri = $uri; } + $this->uri = $uri; } } ?> diff -urN 1.8.1/framework/alias/DBAdapter.php 1.8.2/framework/alias/DBAdapter.php --- 1.8.1/framework/alias/DBAdapter.php 2009-12-24 02:56:04.000000000 +0900 +++ 1.8.2/framework/alias/DBAdapter.php 2010-01-31 15:21:09.000000000 +0900 @@ -12,6 +12,4 @@ } require_once(ROOT."/framework/data/IAdapter.php"); require_once(ROOT."/framework/data/".$dbms."/Adapter.php"); - DBAdapter::cacheLoad(); - register_shutdown_function( array('DBAdapter','cacheSave') ); -?> +?> \ No newline at end of file diff -urN 1.8.1/framework/alias/POD.php 1.8.2/framework/alias/POD.php --- 1.8.1/framework/alias/POD.php 2009-12-05 14:22:05.000000000 +0900 +++ 1.8.2/framework/alias/POD.php 2010-01-31 15:21:09.000000000 +0900 @@ -58,4 +58,7 @@ return $cache->contents; } } -?> + +POD::cacheLoad(); +register_shutdown_function( array('POD','cacheSave') ); +?> \ No newline at end of file diff -urN 1.8.1/framework/alias/UTF8.php 1.8.2/framework/alias/UTF8.php --- 1.8.1/framework/alias/UTF8.php 1970-01-01 09:00:00.000000000 +0900 +++ 1.8.2/framework/alias/UTF8.php 2010-01-21 16:04:18.000000000 +0900 @@ -0,0 +1,10 @@ + diff -urN 1.8.1/framework/boot/10-CoreClasses.php 1.8.2/framework/boot/10-CoreClasses.php --- 1.8.1/framework/boot/10-CoreClasses.php 2009-12-24 02:56:04.000000000 +0900 +++ 1.8.2/framework/boot/10-CoreClasses.php 2010-01-21 16:03:12.000000000 +0900 @@ -42,228 +42,6 @@ } } -/// Unicode string manipulation class. -/// (PHP built-in functions work incorrectly.) -final class UTF8 { - static function validate($str, $truncated = false) { - $length = strlen($str); - if ($length == 0) - return true; - for ($i = 0; $i < $length; $i++) { - $high = ord($str{$i}); - if ($high < 0x80) { - continue; - } else if ($high <= 0xC1) { - return false; - } else if ($high < 0xE0) { - if (++$i >= $length) - return $truncated; - else if (($str{$i} & "\xC0") == "\x80") - continue; - } else if ($high < 0xF0) { - if (++$i >= $length) { - return $truncated; - } else if (($str{$i} & "\xC0") == "\x80") { - if (++$i >= $length) - return $truncated; - else if (($str{$i} & "\xC0") == "\x80") - continue; - } - } else if ($high < 0xF5) { - if (++$i >= $length) { - return $truncated; - } else if (($str{$i} & "\xC0") == "\x80") { - if (++$i >= $length) { - return $truncated; - } else if (($str{$i} & "\xC0") == "\x80") { - if (++$i >= $length) - return $truncated; - else if (($str{$i} & "\xC0") == "\x80") - continue; - } - } - } // F5~FF is invalid by RFC 3629 - return false; - } - return true; - } - - static function correct($str, $broken = '') { - $corrected = ''; - $strlen = strlen($str); - for ($i = 0; $i < $strlen; $i++) { - switch ($str{$i}) { - case "\x09": - case "\x0A": - case "\x0D": - $corrected .= $str{$i}; - break; - case "\x7F": - $corrected .= $broken; - break; - default: - $high = ord($str{$i}); - if ($high < 0x20) { // Special Characters. - $corrected .= $broken; - } else if ($high < 0x80) { // 1byte. - $corrected .= $str{$i}; - } else if ($high <= 0xC1) { - $corrected .= $broken; - } else if ($high < 0xE0) { // 2byte. - if (($i + 1 >= $strlen) || (($str{$i + 1} & "\xC0") != "\x80")) - $corrected .= $broken; - else - $corrected .= $str{$i} . $str{$i + 1}; - $i += 1; - } else if ($high < 0xF0) { // 3byte. - if (($i + 2 >= $strlen) || (($str{$i + 1} & "\xC0") != "\x80") || (($str{$i + 2} & "\xC0") != "\x80")) - $corrected .= $broken; - else - $corrected .= $str{$i} . $str{$i + 1} . $str{$i + 2}; - $i += 2; - } else if ($high < 0xF5) { // 4byte. - if (($i + 3 >= $strlen) || (($str{$i + 1} & "\xC0") != "\x80") || (($str{$i + 2} & "\xC0") != "\x80") || (($str{$i + 3} & "\xC0") != "\x80")) - $corrected .= $broken; - else - $corrected .= $str{$i} . $str{$i + 1} . $str{$i + 2} . $str{$i + 3}; - $i += 3; - } else { // F5~FF is invalid by RFC3629. - $corrected .= $broken; - } - break; - } - } - if (preg_match('/&#([0-9]{1,});/', $corrected)) - $corrected = mb_decode_numericentity($corrected, array(0x0, 0x10000, 0, 0xfffff), 'UTF-8'); - return $corrected; - } - - static function bring($str, $encoding = null) { - global $service; - return @iconv((isset($encoding) ? $encoding : $service['encoding']), 'UTF-8', $str); - } - - static function convert($str, $encoding = null) { - global $service; - return @iconv('UTF-8', (isset($encoding) ? $encoding : $service['encoding']), $str); - } - - static function length($str) { - $len = strlen($str); - for ($i = $length = 0; $i < $len; $length++) { - $high = ord($str{$i}); - if ($high < 0x80) - $i += 1; - else if ($high < 0xE0) - $i += 2; - else if ($high < 0xF0) - $i += 3; - else - $i += 4; - } - return $length; - } - - static function lengthAsEm($str) { - $len = strlen($str); - for ($i = $length = 0; $i < $len; ) { - $high = ord($str{$i}); - if ($high < 0x80) { - $i += 1; - $length += 1; - } else { - if ($high < 0xE0) - $i += 2; - else if ($high < 0xF0) - $i += 3; - else - $i += 4; - $length += 2; - } - } - return $length; - } - - static function lessenAsEncoding($str, $length = 255, $tail = '...') { - $context = Model_Context::getInstance(); - if($context->getProperty('database.utf8') != true) - return UTF8::lessen($str, $length, $tail); - else - return UTF8::lessenAsByte($str, $length, $tail); - } - - static function lessen($str, $chars, $tail = '...') { - if (UTF8::length($str) <= $chars) - $tail = ''; - else - $chars -= UTF8::length($tail); - $len = strlen($str); - for ($i = $adapted = 0; $i < $len; $adapted = $i) { - $high = ord($str{$i}); - if ($high < 0x80) - $i += 1; - else if ($high < 0xE0) - $i += 2; - else if ($high < 0xF0) - $i += 3; - else - $i += 4; - if (--$chars < 0) - break; - } - return trim(substr($str, 0, $adapted)) . $tail; - } - - static function lessenAsByte($str, $bytes, $tail = '...') { - if (strlen($str) <= $bytes) - $tail = ''; - else - $bytes -= strlen($tail); - $len = strlen($str); - for ($i = $adapted = 0; $i < $len; $adapted = $i) { - $high = ord($str{$i}); - if ($high < 0x80) - $i += 1; - else if ($high < 0xE0) - $i += 2; - else if ($high < 0xF0) - $i += 3; - else - $i += 4; - if ($i > $bytes) - break; - } - return substr($str, 0, $adapted) . $tail; - } - - static function lessenAsEm($str, $ems, $tail = '...') { - if (UTF8::lengthAsEm($str) <= $ems) - $tail = ''; - else - $ems -= strlen($tail); - $len = strlen($str); - for ($i = $adapted = 0; $i < $len; $adapted = $i) { - $high = ord($str{$i}); - if ($high < 0x80) { - $i += 1; - $ems -= 1; - } else { - if ($high < 0xE0) - $i += 2; - else if ($high < 0xF0) - $i += 3; - else - $i += 4; - $ems -= 2; - } - if ($ems < 0) - break; - } - return trim(substr($str, 0, $adapted)) . $tail; - } -} - - final class Validator { /** Date-Time ::= RFC-1123 (the modification of RFC-822) diff -urN 1.8.1/framework/data/DBModel.php 1.8.2/framework/data/DBModel.php --- 1.8.1/framework/data/DBModel.php 2010-01-04 22:04:18.000000000 +0900 +++ 1.8.2/framework/data/DBModel.php 2010-01-20 23:11:40.000000000 +0900 @@ -34,7 +34,7 @@ class DBModel extends Singleton implements IModel { protected $_attributes, $_qualifiers, $_query; - protected $_relations, $_filters, $_order, $_limitation, $table, $id, $_reservedFields, $_isReserved; + protected $_relations, $_filters, $_order, $_limitation, $table, $id, $_reservedFields, $_isReserved, $param; function __construct($table = null) { $this->context = Model_Context::getInstance(); @@ -56,7 +56,7 @@ $this->_order = array(); $this->_limit = array(); $this->_isReserved = array(); - + $this->param = array(); $this->_reservedFields = POD::reservedFieldNames(); $this->_reservedFunctions = POD::reservedFunctionNames(); if(!empty($this->_reservedFields)) { @@ -64,6 +64,7 @@ $this->_isReserved[$reserved] = true; } } + if(!empty($param)) $this->param = $param; } public function resetAttributes() { @@ -277,7 +278,7 @@ return true; return false; } - + /// To use create() method, $this->structure variable must be defined. public function create() { if(!isset($this->structure) || empty($this->structure) || !is_array($this->structure)) return false; diff -urN 1.8.1/framework/data/PostgreSQL/Adapter.php 1.8.2/framework/data/PostgreSQL/Adapter.php --- 1.8.1/framework/data/PostgreSQL/Adapter.php 2010-01-04 17:12:24.000000000 +0900 +++ 1.8.2/framework/data/PostgreSQL/Adapter.php 2010-01-31 15:14:44.000000000 +0900 @@ -317,11 +317,12 @@ } public static function cacheSave() { - global $fileCachedResult; + @self::commit(); } public static function commit() { - return true; // Auto commit. + return pg_query("commit"); +// return true; // Auto commit. } /* Raw public static functions (to easier adoptation) */ @@ -358,8 +359,8 @@ /*@static@*/ public static function stat($stat = null) { - if($stat === null) return mysql_stat(); - else return mysql_stat($stat); + if($stat === null) return pg_connection_status(); + else return pg_connection_status($stat); } /*@static@*/ diff -urN 1.8.1/framework/legacy/Needlworks.Cache.PageCache.php 1.8.2/framework/legacy/Needlworks.Cache.PageCache.php --- 1.8.1/framework/legacy/Needlworks.Cache.PageCache.php 2009-12-29 00:37:26.000000000 +0900 +++ 1.8.2/framework/legacy/Needlworks.Cache.PageCache.php 2010-01-20 23:11:40.000000000 +0900 @@ -169,6 +169,7 @@ } class queryCache extends Singleton { + private $pooltype = null; function __construct($query = null, $prefix = null){ $this->reset(); @@ -177,8 +178,10 @@ if($this->context->getProperty('service.memcached') == true) { $this->pool = Cache_Memcache::getInstance(); + $this->pooltype = 'memcache'; } else { $this->pool = DBModel::getInstance(); + $this->pooltype = 'db'; } } @@ -219,8 +222,15 @@ else return false; } public function flush() { + if(empty($this->__usePageCache)) return false; $this->pool->reset('PageCacheLog',$this->prefix); - $this->pool->flush(); + if($this->pooltype == 'memcache') { + $this->pool->flush(); + } else { + $this->pool->setQualifier('blogid','equals',getBlogId()); + $this->pool->setQualifier('name','like',$this->prefix,true); + $this->pool->delete(); + } } private function getQueryHash(){ @@ -454,7 +464,7 @@ $Entries = POD::queryColumn("SELECT name FROM {$database['prefix']}PageCacheLog WHERE blogid = ".getBlogId()." - AND (name like 'entry-".$entryId."%' OR name = 'commentRSS-".$entryId."')"); + AND (name like 'entry-".$entryId."%' OR name = 'commentRSS-".$entryId."' OR name = 'commentATOM-".$entryId."')"); CacheControl::purgeItems($Entries); if(!empty($entryId)) { $entry = POD::queryCell("SELECT userid, category FROM {$database['prefix']}Entries @@ -578,16 +588,20 @@ } } 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 -urN 1.8.1/framework/legacy/Textcube.Control.Session.Memcached.php 1.8.2/framework/legacy/Textcube.Control.Session.Memcached.php --- 1.8.1/framework/legacy/Textcube.Control.Session.Memcached.php 2009-12-24 02:56:04.000000000 +0900 +++ 1.8.2/framework/legacy/Textcube.Control.Session.Memcached.php 2010-01-06 01:37:09.000000000 +0900 @@ -42,6 +42,7 @@ } public static function write($id, $data) { + if(is_null(self::$mc)) self::initialize(); return self::$mc->set(self::$context->getProperty('service.domain')."/sessions/{$id}/{$_SERVER['REMOTE_ADDR']}",$data,self::$context->getProperty('service.timeout')); } diff -urN 1.8.1/framework/legacy/Textcube.Control.Session.php 1.8.2/framework/legacy/Textcube.Control.Session.php --- 1.8.1/framework/legacy/Textcube.Control.Session.php 2009-12-24 02:56:04.000000000 +0900 +++ 1.8.2/framework/legacy/Textcube.Control.Session.php 2010-01-21 14:12:08.000000000 +0900 @@ -10,10 +10,18 @@ private static $sessionName = null; private static $sessionDBRepair = false; private static $sConfig = null; + private static $context = null; + private static $pool = null; + function __construct() { $sessionMicrotime = Timer::getMicroTime(); } + private static function initialize() { + self::$context = Model_Context::getInstance(); + self::$pool = DBModel::getInstance(); + } + public static function open($savePath, $sessionName) { return true; } @@ -23,12 +31,12 @@ } public static function getName() { - $config = Model_Config::getInstance(); - if( self::$sessionName == null ) { - if( !empty($service['session_cookie']) ) { - self::$sessionName = $config->service['session_cookie']; + if(is_null(self::$context)) self::initialize(); + if( self::$sessionName == null ) { + if( self::$context->getProperty('service.session_cookie') !== null) { + self::$sessionName = self::$context->getProperty('service.session_cookie'); } else { - self::$sessionName = 'TSSESSION'.$config->service['domain'].$config->service['path']; + self::$sessionName = 'TSSESSION'.self::$context->getProperty('service.domain').self::$context->getProperty('service.path'); self::$sessionName = preg_replace( '/[^a-zA-Z0-9]/', '', self::$sessionName ); } } @@ -36,16 +44,18 @@ } public static function read($id) { - $config = Model_Config::getInstance(); - if ($result = self::query('cell',"SELECT privilege FROM {$config->database['prefix']}Sessions - WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}' AND updated >= (UNIX_TIMESTAMP() - {$config->service['timeout']})")) { + if(is_null(self::$context)) self::initialize(); + + if ($result = self::query('cell',"SELECT privilege FROM ".self::$context->getProperty('database.prefix')."Sessions + WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}' AND updated >= (UNIX_TIMESTAMP() - ".self::$context->getProperty('service.timeout').")")) { return $result; } return ''; } public static function write($id, $data) { - $config = Model_Config::getInstance(); + if(is_null(self::$context)) self::initialize(); + if (strlen($id) < 32) return false; $userid = Acl::getIdentity('textcube'); @@ -58,7 +68,7 @@ $request = POD::escapeString(substr($_SERVER['REQUEST_URI'], 0, 255)); $referer = isset($_SERVER['HTTP_REFERER']) ? POD::escapeString(substr($_SERVER['HTTP_REFERER'],0,255)) : ''; $timer = Timer::getMicroTime() - self::$sessionMicrotime; - $result = self::query('count',"UPDATE {$config->database['prefix']}Sessions + $result = self::query('count',"UPDATE ".self::$context->getProperty('database.prefix')."Sessions SET userid = $userid, privilege = '$data', server = '$server', request = '$request', referer = '$referer', timer = $timer, updated = UNIX_TIMESTAMP() WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}'"); if ($result && $result == 1) { @@ -69,43 +79,43 @@ } public static function destroy($id, $setCookie = false) { - $config = Model_Config::getInstance(); - @self::query('cell',"DELETE FROM {$config->database['prefix']}Sessions + if(is_null(self::$context)) self::initialize(); + self::query('query',"DELETE FROM ".self::$context->getProperty('database.prefix')."Sessions WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}'"); self::gc(); } public static function gc($maxLifeTime = false) { - $config = Model_Config::getInstance(); - @self::query('query',"DELETE FROM {$config->database['prefix']}Sessions - WHERE updated < (UNIX_TIMESTAMP() - {$config->service['timeout']})"); - $result = @self::query('all',"SELECT DISTINCT v.id, v.address - FROM {$config->database['prefix']}SessionVisits v - LEFT JOIN {$config->database['prefix']}Sessions s ON v.id = s.id AND v.address = s.address + if(is_null(self::$context)) self::initialize(); + self::query('query',"DELETE FROM ".self::$context->getProperty('database.prefix')."Sessions + WHERE updated < ".(Timestamp::getUNIXtime() - self::$context->getProperty('service.timeout'))); + $result = self::query('all',"SELECT DISTINCT v.id, v.address + FROM ".self::$context->getProperty('database.prefix')."SessionVisits v + LEFT JOIN ".self::$context->getProperty('database.prefix')."Sessions s ON v.id = s.id AND v.address = s.address WHERE s.id IS NULL AND s.address IS NULL"); if ($result) { $gc = array(); - foreach ($result as $g) - array_push($gc, $g); - foreach ($gc as $g) - @self::query('query',"DELETE FROM {$config->database['prefix']}SessionVisits WHERE id = '{$g[0]}' AND address = '{$g[1]}'"); + foreach ($result as $g) { + self::query('query',"DELETE FROM ".self::$context->getProperty('database.prefix')."SessionVisits WHERE id = '{$g['id']}' AND address = '{$g['address']}'"); + } } return true; } private static function getAnonymousSession() { - $config = Model_Config::getInstance(); - $result = self::query('cell',"SELECT id FROM {$config->database['prefix']}Sessions WHERE address = '{$_SERVER['REMOTE_ADDR']}' AND userid IS NULL AND preexistence IS NULL"); + if(is_null(self::$context)) self::initialize(); + $result = self::query('cell',"SELECT id FROM ".self::$context->getProperty('database.prefix')."Sessions WHERE address = '{$_SERVER['REMOTE_ADDR']}' AND userid IS NULL AND preexistence IS NULL"); if ($result) return $result; return false; } private static function newAnonymousSession() { - $config = Model_Config::getInstance(); + if(is_null(self::$context)) self::initialize(); $meet_again_baby = 3600; - if( isset($config->service['timeout']) ) { - $meet_again_baby = $config->service['timeout']; + $t = self::$context->getProperty('service.timeout'); + if( !empty($t)) { + $meet_again_baby = self::$context->getProperty('service.timeout'); } //If you are not a robot, subsequent UPDATE query will override to proper timestamp. @@ -115,7 +125,7 @@ if (($id = self::getAnonymousSession()) !== false) return $id; $id = dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)); - $result = self::query('count',"INSERT INTO {$config->database['prefix']}Sessions (id, address, created, updated) VALUES('$id', '{$_SERVER['REMOTE_ADDR']}', UNIX_TIMESTAMP(), UNIX_TIMESTAMP() - $meet_again_baby)"); + $result = self::query('count',"INSERT INTO ".self::$context->getProperty('database.prefix')."Sessions (id, address, created, updated) VALUES('$id', '{$_SERVER['REMOTE_ADDR']}', UNIX_TIMESTAMP(), UNIX_TIMESTAMP() - $meet_again_baby)"); if ($result > 0) return $id; } @@ -139,9 +149,10 @@ public static function isAuthorized($id) { /* OpenID and Admin sessions are treated as authorized ones*/ - $config = Model_Config::getInstance(); + if(is_null(self::$context)) self::initialize(); + $result = self::query('cell',"SELECT id - FROM {$config->database['prefix']}Sessions + FROM ".self::$context->getProperty('database.prefix')."Sessions WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}' AND (userid IS NOT NULL OR preexistence IS NOT NULL)"); @@ -151,9 +162,9 @@ } public static function isGuestOpenIDSession($id) { - $config = Model_Config::getInstance(); + if(is_null(self::$context)) self::initialize(); $result = self::query('cell',"SELECT id - FROM {$config->database['prefix']}Sessions + FROM ".self::$context->getProperty('database.prefix')."Sessions WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}' AND userid < 0"); if ($result) @@ -177,10 +188,12 @@ } public static function authorize($blogid, $userid) { - $config = Model_Config::getInstance(); + if(is_null(self::$context)) self::initialize(); + $session_cookie_path = "/"; - if( !empty($config->service['session_cookie_path']) ) { - $session_cookie_path = $config->service['session_cookie_path']; + $t = self::$context->getProperty('service.session_cookie_path'); + if( !empty($t)) { + $session_cookie_path = self::$context->getProperty('service.session_cookie_path'); } if (!is_numeric($userid)) return false; @@ -188,8 +201,8 @@ $_SESSION['userid'] = $userid; $id = session_id(); if( self::isGuestOpenIDSession($id) ) { - $result = self::query('execute',"UPDATE {$config->database['prefix']}Sessions - set userid = $userid WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}'"); + $result = self::query('execute',"UPDATE ".self::$context->getProperty('database.prefix')."Sessions + SET userid = $userid WHERE id = '$id' AND address = '{$_SERVER['REMOTE_ADDR']}'"); if ($result) { return true; } @@ -199,13 +212,13 @@ return true; for ($i = 0; $i < 3; $i++) { $id = dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)); - $result = self::query('execute',"INSERT INTO {$config->database['prefix']}Sessions + $result = self::query('execute',"INSERT INTO ".self::$context->getProperty('database.prefix')."Sessions (id, address, userid, created, updated) VALUES('$id', '{$_SERVER['REMOTE_ADDR']}', $userid, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())"); if ($result) { @session_id($id); //$service['domain'] = $service['domain'].':8888'; - setcookie( self::getName(), $id, 0, $session_cookie_path, $config->service['session_cookie_domain']); + setcookie( self::getName(), $id, 0, $session_cookie_path, self::$context->getProperty('service.session_cookie_domain')); return true; } } @@ -214,17 +227,20 @@ /* Customized queryset (for recovering Session tables) */ private static function query($mode='query',$sql) { - $config = Model_Config::getInstance(); + if(is_null(self::$context)) self::initialize(); + $result = self::DBQuery($mode,$sql); if($result === false) { - if (self::$sessionDBRepair === false) { - @POD::query("REPAIR TABLE {$config->database['prefix']}Sessions, {$config->database['prefix']}SessionVisits"); + if (self::$sessionDBRepair === false) { + @POD::query("REPAIR TABLE ".self::$context->getProperty('database.prefix')."Sessions"); + @POD::query("REPAIR TABLE ".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 -urN 1.8.1/framework/legacy/Textcube.Data.Link.php 1.8.2/framework/legacy/Textcube.Data.Link.php --- 1.8.1/framework/legacy/Textcube.Data.Link.php 2009-12-30 13:46:30.000000000 +0900 +++ 1.8.2/framework/legacy/Textcube.Data.Link.php 2010-01-21 14:12:08.000000000 +0900 @@ -7,7 +7,7 @@ // due to compartibility issues with other software under 'Project Tattertools.' class Link { - function Link() { + function __construct() { $this->reset(); } @@ -82,7 +82,7 @@ if (!$query = $this->_buildQuery()) return false; if (!isset($this->registered)) - $query->setAttribute('written', 'UNIX_TIMESTAMP()'); + $query->setAttribute('written', Timestamp::getUNIXtime()); if (!$query->insert()) return $this->_error('insert'); diff -urN 1.8.1/framework/legacy/Textcube.Data.SkinSetting.php 1.8.2/framework/legacy/Textcube.Data.SkinSetting.php --- 1.8.1/framework/legacy/Textcube.Data.SkinSetting.php 2009-12-24 02:56:04.000000000 +0900 +++ 1.8.2/framework/legacy/Textcube.Data.SkinSetting.php 2010-01-28 15:27:08.000000000 +0900 @@ -43,9 +43,10 @@ $result = $pool->getAll('name, value'); if (!empty($result)) { foreach ($result as $data) { - if ($data['name'] == 'tagboxAlign') $data['name'] = 'alignOnTagbox'; -// dumpAsFile($data); - $this->$data['name'] = $data['value']; + if (!empty($date['name'])) { + if ($data['name'] == 'tagboxAlign') $data['name'] = 'alignOnTagbox'; + $this->$data['name'] = $data['value']; + } } return true; } diff -urN 1.8.1/framework/locale/Locale.php 1.8.2/framework/locale/Locale.php --- 1.8.1/framework/locale/Locale.php 2009-12-25 11:32:28.000000000 +0900 +++ 1.8.2/framework/locale/Locale.php 2010-01-12 00:28:15.000000000 +0900 @@ -25,12 +25,16 @@ if(!isset($this->locale)) $this->locale = array(); if(!isset($this->directory)) $this->directory = null; if (file_exists($this->directory . '/' . $locale .'.php')) { // If locale file exists - $this->resource[$domain] = $this->includeLocaleFile($this->directory . '/' . $locale . '.php'); - $this->locale[$domain] = $locale; + if(!isset($this->resource[$domain])) { + $this->resource[$domain] = $this->includeLocaleFile($this->directory . '/' . $locale . '.php'); + $this->locale[$domain] = $locale; + } return true; } else if (($common != $locale) && file_exists($this->directory . '/' . $common . '.php')) { - $this->resource[$domain] = $this->includeLocaleFile($this->directory . '/' . $common . '.php'); - $this->locale[$domain] = $common; + if(!isset($this->resource[$domain])) { + $this->resource[$domain] = $this->includeLocaleFile($this->directory . '/' . $common . '.php'); + $this->locale[$domain] = $common; + } return true; } return false; diff -urN 1.8.1/framework/utils/Browser.php 1.8.2/framework/utils/Browser.php --- 1.8.1/framework/utils/Browser.php 1970-01-01 09:00:00.000000000 +0900 +++ 1.8.2/framework/utils/Browser.php 2010-01-22 17:47:07.000000000 +0900 @@ -0,0 +1,64 @@ +browserName = null; + } + + public function getBrowserName() { + /// Blocking (is in development) + $ctx = Model_Context::getInstance(); + if($ctx->getProperty('service.useMobileAdmin') != true) { + return 'unknown'; + } + if(!is_null($this->browserName)) return $this->browserName; + if(isset($_SERVER['HTTP_USER_AGENT'])) { + if(strpos($_SERVER['HTTP_USER_AGENT'],'iPhone') || + strpos($_SERVER['HTTP_USER_AGENT'],'iPod')) { + $this->browserName = 'mSafari'; + } else if(strpos($_SERVER['HTTP_USER_AGENT'],'Firefox') || + strpos($_SERVER['HTTP_USER_AGENT'],'iceweasel') || + strpos($_SERVER['HTTP_USER_AGENT'],'Minefield')) { + $this->browserName = 'firefox'; + } else if(strpos($_SERVER['HTTP_USER_AGENT'],'Safari')) { + $this->browserName = 'Safari'; + } else if(strpos($_SERVER['HTTP_USER_AGENT'],'Chrome')) { + $this->browserName = 'Chrome'; + } else if (strpos($_SERVER['HTTP_USER_AGENT'],'Webkit')) { + $this->browserName = 'Webkit'; + } else if (strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')) { + $this->browserName = 'IE'; + } else if (strpos($_SERVER['HTTP_USER_AGENT'],'Opera')) { + $this->browserName = 'Opera'; + } else { + $this->browserName = 'unknown'; + } + } + return $this->browserName; + } + public function getVersion() { + } + + public function isMobile() { + } + public function isSafari() { + } + public function isIE() { + } + public function isOpera() { + } + + function __destruct() { + // Nothing to do: destruction of this class means the end of execution + } +} +?> diff -urN 1.8.1/framework/utils/Unicode.php 1.8.2/framework/utils/Unicode.php --- 1.8.1/framework/utils/Unicode.php 1970-01-01 09:00:00.000000000 +0900 +++ 1.8.2/framework/utils/Unicode.php 2010-01-21 16:04:18.000000000 +0900 @@ -0,0 +1,257 @@ += $length) + return $truncated; + else if (($str{$i} & "\xC0") == "\x80") + continue; + } else if ($high < 0xF0) { + if (++$i >= $length) { + return $truncated; + } else if (($str{$i} & "\xC0") == "\x80") { + if (++$i >= $length) + return $truncated; + else if (($str{$i} & "\xC0") == "\x80") + continue; + } + } else if ($high < 0xF5) { + if (++$i >= $length) { + return $truncated; + } else if (($str{$i} & "\xC0") == "\x80") { + if (++$i >= $length) { + return $truncated; + } else if (($str{$i} & "\xC0") == "\x80") { + if (++$i >= $length) + return $truncated; + else if (($str{$i} & "\xC0") == "\x80") + continue; + } + } + } // F5~FF is invalid by RFC 3629 + return false; + } + return true; + } + + static function correct($str, $broken = '') { + $corrected = ''; + $strlen = strlen($str); + for ($i = 0; $i < $strlen; $i++) { + switch ($str{$i}) { + case "\x09": + case "\x0A": + case "\x0D": + $corrected .= $str{$i}; + break; + case "\x7F": + $corrected .= $broken; + break; + default: + $high = ord($str{$i}); + if ($high < 0x20) { // Special Characters. + $corrected .= $broken; + } else if ($high < 0x80) { // 1byte. + $corrected .= $str{$i}; + } else if ($high <= 0xC1) { + $corrected .= $broken; + } else if ($high < 0xE0) { // 2byte. + if (($i + 1 >= $strlen) || (($str{$i + 1} & "\xC0") != "\x80")) + $corrected .= $broken; + else + $corrected .= $str{$i} . $str{$i + 1}; + $i += 1; + } else if ($high < 0xF0) { // 3byte. + if (($i + 2 >= $strlen) || (($str{$i + 1} & "\xC0") != "\x80") || (($str{$i + 2} & "\xC0") != "\x80")) + $corrected .= $broken; + else + $corrected .= $str{$i} . $str{$i + 1} . $str{$i + 2}; + $i += 2; + } else if ($high < 0xF5) { // 4byte. + if (($i + 3 >= $strlen) || (($str{$i + 1} & "\xC0") != "\x80") || (($str{$i + 2} & "\xC0") != "\x80") || (($str{$i + 3} & "\xC0") != "\x80")) + $corrected .= $broken; + else + $corrected .= $str{$i} . $str{$i + 1} . $str{$i + 2} . $str{$i + 3}; + $i += 3; + } else { // F5~FF is invalid by RFC3629. + $corrected .= $broken; + } + break; + } + } + if (preg_match('/&#([0-9]{1,});/', $corrected)) + $corrected = mb_decode_numericentity($corrected, array(0x0, 0x10000, 0, 0xfffff), 'UTF-8'); + return $corrected; + } + + static function bring($str, $encoding = null) { + $context = Model_Context::getInstance(); + return @iconv((isset($encoding) ? $encoding : $context->getProperty('service.encoding')), 'UTF-8', $str); + } + + static function convert($str, $encoding = null) { + $context = Model_Context::getInstance(); + return @iconv('UTF-8', (isset($encoding) ? $encoding : $context->getProperty('service.encoding')), $str); + } + + static function length($str) { + if(function_exists('mb_strlen')) { + return mb_strlen($str,'utf-8'); + } + $len = strlen($str); + for ($i = $length = 0; $i < $len; $length++) { + $high = ord($str{$i}); + if ($high < 0x80) + $i += 1; + else if ($high < 0xE0) + $i += 2; + else if ($high < 0xF0) + $i += 3; + else + $i += 4; + } + return $length; + } + + static function lengthAsEm($str) { + if(function_exists('mb_strwidth')) { + return mb_strwidth($str,'utf-8'); + } + $len = strlen($str); + for ($i = $length = 0; $i < $len; ) { + $high = ord($str{$i}); + if ($high < 0x80) { + $i += 1; + $length += 1; + } else { + if ($high < 0xE0) + $i += 2; + else if ($high < 0xF0) + $i += 3; + else + $i += 4; + $length += 2; + } + } + return $length; + } + + static function lessenAsEncoding($str, $length = 255, $tail = '...') { + $context = Model_Context::getInstance(); + if($context->getProperty('database.utf8') != true) + return UTF8::lessen($str, $length, $tail); + else + return UTF8::lessenAsByte($str, $length, $tail); + } + + static function lessen($str, $chars, $tail = '...') { + if (UTF8::length($str) <= $chars) + $tail = ''; + else + $chars -= UTF8::length($tail); + if(function_exists('mb_substr')) { + return mb_substr($str,0,$chars,'utf-8').$tail; + } + + $len = strlen($str); + for ($i = $adapted = 0; $i < $len; $adapted = $i) { + $high = ord($str{$i}); + if ($high < 0x80) + $i += 1; + else if ($high < 0xE0) + $i += 2; + else if ($high < 0xF0) + $i += 3; + else + $i += 4; + if (--$chars < 0) + break; + } + return trim(substr($str, 0, $adapted)) . $tail; + } + + static function lessenAsByte($str, $bytes, $tail = '...') { + if (strlen($str) <= $bytes) + return $str; + else + $bytes -= strlen($tail); + + $siclVerifyInt=ord($str[$bytes-1])>>6; + if(($siclVerifyInt>>1)===0) // 1byte + $siclLocationSubtInt=0; + elseif($siclVerifyInt===3) // Head byte of multi-bytes characters. + $siclLocationSubtInt=1; + elseif($siclVerifyInt===2) { // Middle of multi-bytes character. + for($siclLoopInt=2;$siclLengthInt>=$siclLoopInt;$siclLoopInt++) { // Seeking for head byte. + if((ord($str[$bytes-$siclLoopInt])>>6)!==2) + break; + } + switch(ord($str[$bytes-$siclLoopInt])>>4) { // Identify the length of current character. + case 12: + case 13: + $siclVerifiedLengthInt=2; + break; + case 14: + $siclVerifiedLengthInt=3; + break; + case 15: + $siclVerifiedLengthInt=4; + break; + } + if($siclLoopInt===$siclVerifiedLengthInt) // The byte we're verifying is the last byte of the character. + $siclLocationSubtInt=0; + else + $siclLocationSubtInt=$siclLoopInt; + unset($siclLoopInt,$siclVerifiedLengthInt); + } + $siclSlicedStr=substr($str,0,$bytes-$siclLocationSubtInt); + unset($str,$bytes,$siclLocationSubtInt); + + return $siclSlicedStr.$tail; + } + + static function lessenAsEm($str, $ems, $tail = '...') { + if(function_exists('mb_strimwidth')) { + return mb_strimwidth($str,0,$ems-1,$tail,'utf-8'); + } + if (UTF8::lengthAsEm($str) <= $ems) + $tail = ''; + else + $ems -= strlen($tail); + $len = strlen($str); + for ($i = $adapted = 0; $i < $len; $adapted = $i) { + $high = ord($str{$i}); + if ($high < 0x80) { + $i += 1; + $ems -= 1; + } else { + if ($high < 0xE0) + $i += 2; + else if ($high < 0xF0) + $i += 3; + else + $i += 4; + $ems -= 2; + } + if ($ems < 0) + break; + } + return trim(substr($str, 0, $adapted)) . $tail; + } +} +?> diff -urN 1.8.1/interface/blog/checkup.php 1.8.2/interface/blog/checkup.php --- 1.8.1/interface/blog/checkup.php 2010-01-04 23:24:18.000000000 +0900 +++ 1.8.2/interface/blog/checkup.php 2010-01-28 15:48:06.000000000 +0900 @@ -94,7 +94,19 @@
    • - + +

    + + +