diff --git a/addons/planet_bookmark/planet_bookmark.addon.php b/addons/planet_bookmark/planet_bookmark.addon.php index ee6237afc..b1bfbd7cf 100644 --- a/addons/planet_bookmark/planet_bookmark.addon.php +++ b/addons/planet_bookmark/planet_bookmark.addon.php @@ -2,23 +2,16 @@ if(!defined("__ZBXE__")) exit(); /** - * @file planet_bookmark.addon.php - * @author zero (zero@zeroboard.com) + * @file planet_todo.addon.php + * @author SOL군 (sol@ngleader.com) * @brief **/ - if($called_position == 'after_module_proc' && Context::getResponseMethod()!="XMLRPC" && Context::getResponseMethod()!="JSON") { - $config = Context::get('config'); - if($config && $config->mid == 'planet'){ - $oPlanet = Context::get('planet'); - if(!is_object($oPlanet)) return; - if($oPlanet->isMyPlanet()){ - $oPlanetModel = &getModel('planet'); - $countBookmark = $oPlanetModel->getTagSearchResultCount($oPlanet->getModuleSrl(),'bookmark'); - - Context::addHtmlHeader(""); - Context::addJsFile('./addons/planet_bookmark/planet_bookmark.js'); - } - } + $planet = Context::get('planet'); + if(!$planet || !$planet->isMyPlanet()) return; + $oPlanetModel = &getModel('planet'); + $countBookmark = $oPlanetModel->getTagSearchResultCount($planet->getModuleSrl(),'bookmark'); + Context::addHtmlHeader(""); + Context::addJsFile('./addons/planet_bookmark/planet_bookmark.js'); } ?> diff --git a/addons/planet_bookmark/planet_todo.addon.php b/addons/planet_bookmark/planet_todo.addon.php deleted file mode 100644 index 07e4ae6a9..000000000 --- a/addons/planet_bookmark/planet_todo.addon.php +++ /dev/null @@ -1,28 +0,0 @@ -mid == 'planet'){ - $oPlanet = Context::get('planet'); - if($oPlanet->isMyPlanet()){ - $oPlanetModel = &getModel('planet'); - $countTodo = $oPlanetModel->getTagSearchResultCount($oPlanet->getModuleSrl(),'todo'); - $countDone = $oPlanetModel->getTagSearchResultCount($oPlanet->getModuleSrl(),'done'); - - Context::addHtmlHeader(""); - Context::addJsFile('./addons/planet_todo/planet_todo.js'); - } - } - } -?> diff --git a/addons/planet_todo/planet_todo.addon.php b/addons/planet_todo/planet_todo.addon.php index 247dafe37..5fa102f6a 100644 --- a/addons/planet_todo/planet_todo.addon.php +++ b/addons/planet_todo/planet_todo.addon.php @@ -7,19 +7,14 @@ * @brief **/ if($called_position == 'after_module_proc' && Context::getResponseMethod()!="XMLRPC" && Context::getResponseMethod()!="JSON") { - $config = Context::get('config'); + $planet = Context::get('planet'); + if(!$planet || !$planet->isMyPlanet()) return; - if($config && $config->mid == 'planet'){ - $oPlanet = Context::get('planet'); - if(!is_object($oPlanet)) return; - if($oPlanet->isMyPlanet()){ - $oPlanetModel = &getModel('planet'); - $countTodo = $oPlanetModel->getTagSearchResultCount($oPlanet->getModuleSrl(),'todo'); - $countDone = $oPlanetModel->getTagSearchResultCount($oPlanet->getModuleSrl(),'done'); + $oPlanetModel = &getModel('planet'); + $countTodo = $oPlanetModel->getTagSearchResultCount($planet->getModuleSrl(),'todo'); + $countDone = $oPlanetModel->getTagSearchResultCount($planet->getModuleSrl(),'done'); - Context::addHtmlHeader(""); - Context::addJsFile('./addons/planet_todo/planet_todo.js'); - } - } + Context::addHtmlHeader(""); + Context::addJsFile('./addons/planet_todo/planet_todo.js'); } ?> diff --git a/addons/planet_todo/planet_todo.js b/addons/planet_todo/planet_todo.js index e1cc37216..ac5b7ba67 100644 --- a/addons/planet_todo/planet_todo.js +++ b/addons/planet_todo/planet_todo.js @@ -5,9 +5,6 @@ function planetTab(){ } xAddEventListener(window,'load',planetTab); - - - function planetTabOff(){ $Element('planetex_Tab').leave(); } @@ -22,8 +19,8 @@ function planet_showTodoList(o){ function planet_reload_todo(){ $('commentList').innerHTML = '
TODO