From 1c0cde231721c7d4bfd8fcd061a7988d6628c2be Mon Sep 17 00:00:00 2001 From: inureyes Date: Thu, 11 Feb 2010 14:56:05 +0000 Subject: [PATCH] =?UTF-8?q?=20refs=20#1431=20=20=20*=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20=EB=AC=B8=EC=84=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/model/Line.php | 3 +- interface/owner/entry/line/index.php | 4 +- library/model/blog.cron.php | 1 + library/model/common.plugin.php | 1 - plugins/JP_TC_PluginForTwitter/index.php | 95 ++++++++++++++++++------ plugins/JP_TC_PluginForTwitter/index.xml | 12 ++- 6 files changed, 89 insertions(+), 27 deletions(-) diff --git a/framework/model/Line.php b/framework/model/Line.php index c8cd220c7..92c8c0948 100644 --- a/framework/model/Line.php +++ b/framework/model/Line.php @@ -17,6 +17,7 @@ public static function getInstance() { } public function reset($param = null) { + parent::reset('Lines'); $this->id = null; $this->blogid = getBlogId(); $this->category = 'public'; @@ -39,7 +40,7 @@ public function add() { $this->setAttribute('root',$this->root,true); $this->setAttribute('author',$this->author,true); $this->setAttribute('content',$this->content,true); - $this->setAttribute('permalink',$this->content,true); + $this->setAttribute('permalink',$this->permalink,true); $this->setAttribute('created',$this->created); return $this->insert(); } diff --git a/interface/owner/entry/line/index.php b/interface/owner/entry/line/index.php index c102960c5..7de3b440c 100644 --- a/interface/owner/entry/line/index.php +++ b/interface/owner/entry/line/index.php @@ -45,14 +45,16 @@ $conditions['linesforpage'] = 15; $d = _t('삭제'); + $conditions['template'] = <<
[##_date_##]
[##_content_##]
+
{$d}
EOS; -$conditions['dress'] = array('id'=>'id','date'=>'created','content'=>'content'); +$conditions['dress'] = array('id'=>'id','date'=>'created','content'=>'content','permalink'=>'permalink','root'=>'root'); $line = Model_Line::getInstance(); $view = $line->getFormattedList($conditions); $m = _t('더 보기'); diff --git a/library/model/blog.cron.php b/library/model/blog.cron.php index 508c6d7c5..4082e3065 100644 --- a/library/model/blog.cron.php +++ b/library/model/blog.cron.php @@ -18,6 +18,7 @@ function dumbCronScheduler($checkOnly=true) $schedules = array( '1m' => 60, '5m' => 60*5, + '10m' => 60*10, '30m' => 60*30, '1h' => 60*60, '2h' => 60*60*2, diff --git a/library/model/common.plugin.php b/library/model/common.plugin.php index 873a79708..23c1d73e9 100644 --- a/library/model/common.plugin.php +++ b/library/model/common.plugin.php @@ -26,7 +26,6 @@ function activatePlugin($name) { return false; if (!file_exists(ROOT . "/plugins/$name/index.xml") || !file_exists(ROOT . "/plugins/$name/index.php")) return false; - $xmls = new XMLStruct(); $manifest = @file_get_contents(ROOT . "/plugins/$name/index.xml"); if ($xmls->open($manifest)) { diff --git a/plugins/JP_TC_PluginForTwitter/index.php b/plugins/JP_TC_PluginForTwitter/index.php index 24ff112ed..b92c839ae 100644 --- a/plugins/JP_TC_PluginForTwitter/index.php +++ b/plugins/JP_TC_PluginForTwitter/index.php @@ -101,7 +101,7 @@ function getCovertDate($reqTime, $published) { // Twitter Recipients List function getTwitterRecipientsList($target) { global $service, $pluginURL, $blogURL, $configVal; - $data = Misc::fetchConfigVal($configVal); + $data = Setting::fetchConfigVal($configVal); getTwitterInitConfigVal($data); $tw = new Twitter($data['username'], $data['password']); $recipientsList = $tw->getRecipientsList(array('twttr'=>'true')); @@ -114,7 +114,7 @@ function getTwitterRecipientsList($target) { // Twitter Create Favorites function getCreateFavorites($target) { global $service, $pluginURL, $blogURL, $configVal; - $data = Misc::fetchConfigVal($configVal); + $data = Setting::fetchConfigVal($configVal); getTwitterInitConfigVal($data); $id = (isset($_POST['id']) && !empty($_POST['id'])) ? $_POST['id'] : ''; $tw = new Twitter($data['username'], $data['password']); @@ -129,7 +129,7 @@ function getCreateFavorites($target) { // Twitter Destroy Favorites function getDestroyFavorites($target) { global $service, $pluginURL, $blogURL, $configVal; - $data = Misc::fetchConfigVal($configVal); + $data = Setting::fetchConfigVal($configVal); getTwitterInitConfigVal($data); $id = (isset($_POST['id']) && !empty($_POST['id'])) ? $_POST['id'] : ''; $tw = new Twitter($data['username'], $data['password']); @@ -163,7 +163,7 @@ function getSavedSearchesOpenClose($target) { // Twitter Create Saved Searches function getCreateSavedSearches($target) { global $service, $pluginURL, $blogURL, $configVal; - $data = Misc::fetchConfigVal($configVal); + $data = Setting::fetchConfigVal($configVal); getTwitterInitConfigVal($data); $q = (isset($_POST['qdata']) && !empty($_POST['qdata'])) ? $_POST['qdata'] : ''; @@ -194,7 +194,7 @@ function getCreateSavedSearches($target) { // Twitter Destroy Saved Searches function getDestroySavedSearches($target) { global $service, $pluginURL, $blogURL, $configVal; - $data = Misc::fetchConfigVal($configVal); + $data = Setting::fetchConfigVal($configVal); getTwitterInitConfigVal($data); $id = (isset($_POST['qdata']) && !empty($_POST['qdata'])) ? $_POST['qdata'] : ''; @@ -225,7 +225,7 @@ function getDestroySavedSearches($target) { // Twitter management (Admin->center->Twitter management) function PN_Twitter_Management() { global $service, $pluginURL, $blogURL, $pluginMenuURL, $pluginName, $handler, $configVal; - $data = Misc::fetchConfigVal($configVal); + $data = Setting::fetchConfigVal($configVal); getTwitterInitConfigVal($data); $savedSearchesView = !is_null(Setting::getBlogSetting("saved_searches")) ? Setting::getBlogSetting("saved_searches") : "open"; @@ -445,7 +445,7 @@ function PN_Twitter_Management() { -