refs #514

* trunk 를 branches/1.8 과 동기화
Needlworks · Oct 9, 2009 · b60479c · b60479c
1 parent 6880f94
commit b60479c
Show file tree

Hide file tree

Showing 61 changed files with 353 additions and 222 deletions.
diff --git a/library/auth.php b/library/auth.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function login($loginid, $password, $preKnownPassword = null) {
 	global $service;
@@ -161,15 +161,15 @@ function generatePassword() {
 }
 
 function resetPassword($blogid, $loginid) {
-	global $database;
 	global $service, $blog, $hostURL, $blogURL, $serviceURL;
 	if (!isLoginId($blogid, $loginid))
 		return false;
 	$userid = User::getUserIdByEmail($loginid);
 	$password = POD::queryCell("SELECT password FROM {$database['prefix']}Users WHERE userid = $userid");
 	$authtoken = md5(generatePassword());
 
-	$query = new DBModel($database['prefix'].'UserSettings');
+	$query = DBModel::getInstance();
+	$query->reset('UserSettings');
 	$query->setAttribute('userid',$userid);
 	$query->setAttribute('name','Authtoken',true);
 	$query->setAttribute('value',$authtoken,true);

diff --git a/library/blog.skin.php b/library/blog.skin.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 global $__gDressTags;
 
@@ -366,14 +366,16 @@ function getDressTags($contents) {
 
 	function saveCache() {
 		$skinCache = get_object_vars($this);
-		$cache = new pageCache('skinCache');
+		$cache = pageCache::getInstance();
+		$cache->reset('skinCache');
 		$cache->contents = serialize($skinCache);
 		return $cache->update();
 	}
 
 	function loadCache() {
 		global $__gDressTags;
-		$cache = new pageCache('skinCache');
+		$cache = pageCache::getInstance();
+		$cache->reset('skinCache');
 		if(!$cache->load()) return false;
 		$skinCache = unserialize($cache->contents);
 		foreach($skinCache as $key=>$value) {
@@ -385,7 +387,8 @@ function loadCache() {
 
 	function purgeCache() {
 		global $gCacheStorage;
-		$cache = new pageCache('skinCache');
+		$cache = pageCache::getInstance();
+		$cache->reset('skinCache');
 		$cache->purge();
 		$gCacheStorage->purge();
 	}

diff --git a/library/config.default.php b/library/config.default.php
@@ -1,15 +1,14 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 // Define basic signatures.
 define('TEXTCUBE_NAME', 'Textcube');
 define('TEXTCUBE_VERSION', '1.9 : alpha 1');
 define('TEXTCUBE_COPYRIGHT', 'Copyright &copy; 2004-2009. 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');
-define('TEXTCUBE_SYNC_URL', 'http://ping.eolin.com/');
+define('TEXTCUBE_RESOURCE_URL', 'http://resources.textcube.org/1.9');
 define('CRLF', "\r\n");
 define('TAB', "	");
 define('INT_MAX',2147483647);

diff --git a/library/debug.php b/library/debug.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 class DebuggerError extends Exception {};
 

diff --git a/library/function/file.php b/library/function/file.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function getFileExtension($path) {
 	for ($i = strlen($path) - 1; $i >= 0; $i--) {

diff --git a/library/function/html.php b/library/function/html.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function stripHTML($text, $allowTags = array()) {
 	$text = preg_replace('/<(script|style)[^>]*>.*?<\/\1>/si', '', $text);

diff --git a/library/function/image.php b/library/function/image.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 // img의 width/height에 맞춰 이미지를 리샘플링하는 함수. 썸네일 함수가 아님! 주의.
 function resampleImage($imgString, $originSrc, $useAbsolutePath) {

diff --git a/library/function/javascript.php b/library/function/javascript.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function escapeJSInAttribute($str) {
 	return htmlspecialchars(str_replace(array('\\', '\r', '\n', '\''), array('\\\\', '\\r', '\\n', '\\\''), $str));

diff --git a/library/function/logrotate.php b/library/function/logrotate.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function cutlog( $file, $size )
 {

diff --git a/library/function/mail.php b/library/function/mail.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function encodeMail($str) {
 	return '=?utf-8?b?' . base64_encode($str) . '?=';

diff --git a/library/function/misc.php b/library/function/misc.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function getArrayValue($array, $key) {
 	return $array[$key];

diff --git a/library/function/nsupdate.php b/library/function/nsupdate.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function setDomainAddress($domain, $address, $server, $ttl = 86400) {
 	$process = proc_open('/usr/bin/nsupdate', array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w')), $pipes);

diff --git a/library/function/string.php b/library/function/string.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function str_trans($str) {
 	return str_replace("'", "&#39;", str_replace("\"", "&quot;", $str));

diff --git a/library/function/time.php b/library/function/time.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function checkPeriod($period) {
 	if (is_numeric($period)) {

diff --git a/library/function/watermark.php b/library/function/watermark.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 // 사용되지 않는 함수이나 만약을 위해 남겨둠.
 function isLarge($target, $maxX, $maxY) {

diff --git a/library/function/xml.php b/library/function/xml.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function xml_parser($url, $mdate) {
 	if ($mdate == "0")

diff --git a/library/include.blog.php b/library/include.blog.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 define('__NO_ADMINPANEL__',true);
 $__requireComponent = array();
 $__requireBasics = array(

diff --git a/library/include.checkup.php b/library/include.checkup.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 require_once(ROOT.'/library/include.blog.php');
 ?>
diff --git a/library/include.feeder.php b/library/include.feeder.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 if(isset($config->service['reader']) && $config->service['reader'] === false) exit;
 

diff --git a/library/include.icon.php b/library/include.icon.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 define('NO_SESSION',true);
 define('NO_INITIALIZATION',true);
 

diff --git a/library/include.mobile.php b/library/include.mobile.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 require_once(ROOT.'/library/include.blog.php');
 ?>
diff --git a/library/include.owner.php b/library/include.owner.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 $__requireComponent = array();
 $__requireBasics = array(

diff --git a/library/include.php b/library/include.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 /** Pre-define basic components */
 global $__requireBasics, $__requireComponent, $__requireLibrary, $__requireModel, $__requireView;

diff --git a/library/include.reader.php b/library/include.reader.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 if(isset($config->service['reader']) && $config->service['reader'] === false) exit;
 

diff --git a/library/model/blog.api.php b/library/model/blog.api.php
@@ -1,7 +1,7 @@
 <?php
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 /*--------- Basic functions -----------*/
 

diff --git a/library/model/blog.archive.php b/library/model/blog.archive.php
@@ -1,13 +1,13 @@
 <?php 
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function getArchives($blogid, $option = 'yearmonth') {
 	global $database;
 	$archives = array();
 	$visibility = doesHaveOwnership() ? '' : 'AND e.visibility > 0'.getPrivateCategoryExclusionQuery($blogid);
-	$skinSetting = getSkinSetting($blogid);
+	$skinSetting = getSkinSettings($blogid);
 	$archivesOnPage = $skinSetting['archivesOnPage'];
 
 	switch (POD::dbms()) {

diff --git a/library/model/blog.attachment.php b/library/model/blog.attachment.php
@@ -1,7 +1,7 @@
 <?php 
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 global $__gCacheAttachment;
 $__gCacheAttachment = array();

diff --git a/library/model/blog.blogSetting.php b/library/model/blog.blogSetting.php
@@ -1,7 +1,7 @@
 <?php 
 /// Copyright (c) 2004-2009, Needlworks / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
-/// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+/// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
 
 function setBlogTitle($blogid, $title) {
 	global $blog;
@@ -187,7 +187,7 @@ function setCommentsOnRSS($blogid, $commentsOnRSS) {
 		return true;
 	if(setBlogSetting('commentsOnRSS',$commentsOnRSS) === false) return false;
 	$blog['commentsOnRSS'] = $commentsOnRSS;
-	$cache = new pageCache;
+	$cache = pageCache::getInstance();
 	$cache->name = 'commentRSS';
 	$cache->purge();
 	return true;
@@ -368,8 +368,8 @@ function getBlogName($blogid) {
 		WHERE blogid = $blogid AND name = 'name'");
 }
 function getAuthToken($userid){
-	global $database;
-	$query = new DBModel($database['prefix'].'UserSettings');
+	$query = DBModel::getInstance();
+	$query->reset('UserSettings');
 	$query->setQualifier('userid', 'equals', $userid);
 	$query->setQualifier('name', 'equals', 'AuthToken', true);
 	return $query->getCell('value');