diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php index 29b0271cc..263302aff 100644 --- a/modules/spamfilter/spamfilter.model.php +++ b/modules/spamfilter/spamfilter.model.php @@ -125,10 +125,6 @@ * @brief 특정 글에 이미 엮인글이 등록되어 있는지 확인 **/ function isInsertedTrackback($document_srl) { - $config = $this->getConfig(); - $check_trackback = $config->check_trackback=='Y'?true:false; - if(!$check_trackback) return new Object(); - $oTrackbackModel = &getModel('trackback'); $count = $oTrackbackModel->getTrackbackCountByIPAddress($document_srl, $_SERVER['REMOTE_ADDR']); if($count>0) return new Object(-1, 'msg_alert_trackback_denied'); diff --git a/modules/trackback/lang/en.lang.php b/modules/trackback/lang/en.lang.php index ae8f78376..d6d6df131 100644 --- a/modules/trackback/lang/en.lang.php +++ b/modules/trackback/lang/en.lang.php @@ -13,6 +13,7 @@ $lang->send_trackback_url = 'Destination URL'; $lang->msg_trackback_url_is_invalid = 'Destination URL is invalid'; $lang->msg_trackback_send_success = 'Sent successfully'; + $lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.'; $lang->search_target_list = array( 'url' => 'Target URL', diff --git a/modules/trackback/lang/es.lang.php b/modules/trackback/lang/es.lang.php index 348cfc47c..f4718305d 100644 --- a/modules/trackback/lang/es.lang.php +++ b/modules/trackback/lang/es.lang.php @@ -5,11 +5,17 @@ * @sumario Paquete del idioma español para el módulo de trackback (básico) **/ + $lang->cmd_toggle_checked_trackback = 'Reverse selected trackback(s)'; $lang->cmd_delete_checked_trackback = 'Trackback(s) es eliminado'; $lang->msg_cart_is_null = 'Seleccione un trackback para ser eliminado.'; $lang->msg_checked_trackback_is_deleted = '%d trackback(s) eliminado.'; + $lang->send_trackback_url = 'Destination URL'; + $lang->msg_trackback_url_is_invalid = 'Destination URL is invalid'; + $lang->msg_trackback_send_success = 'Sent successfully'; + $lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.'; + $lang->search_target_list = array( 'url' => 'URL objetivo', 'blog_name' => 'Ojetivo del nombre de sitio', diff --git a/modules/trackback/lang/fr.lang.php b/modules/trackback/lang/fr.lang.php index 4c7e6b5d5..eff2e0417 100644 --- a/modules/trackback/lang/fr.lang.php +++ b/modules/trackback/lang/fr.lang.php @@ -13,6 +13,7 @@ $lang->send_trackback_url = 'URL de Destination'; $lang->msg_trackback_url_is_invalid = 'URL de Destination est invalide'; $lang->msg_trackback_send_success = 'Envoyé avec succès'; + $lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.'; $lang->search_target_list = array( 'url' => 'URL objectif', diff --git a/modules/trackback/lang/jp.lang.php b/modules/trackback/lang/jp.lang.php index add45944f..df98d91fd 100644 --- a/modules/trackback/lang/jp.lang.php +++ b/modules/trackback/lang/jp.lang.php @@ -13,6 +13,7 @@ $lang->send_trackback_url = '送信するURL'; $lang->msg_trackback_url_is_invalid = 'トラックバックのurlが正しくありません。'; $lang->msg_trackback_send_success = 'トラックバックの送信が成功しました。'; + $lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.'; $lang->search_target_list = array( 'url' => 'URL', diff --git a/modules/trackback/lang/ko.lang.php b/modules/trackback/lang/ko.lang.php index cb62d1ec6..933426840 100644 --- a/modules/trackback/lang/ko.lang.php +++ b/modules/trackback/lang/ko.lang.php @@ -12,7 +12,8 @@ $lang->send_trackback_url = '발송할 주소'; $lang->msg_trackback_url_is_invalid = '발송할 대상 url이 올바르지 않습니다.'; - $lang->msg_trackback_send_success = '엮인글 발송에 성공하였습니다.'; + $lang->msg_trackback_send_success = '엮인글 발송을 성공하였습니다.'; + $lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.'; $lang->search_target_list = array( 'url' => '대상 URL', diff --git a/modules/trackback/lang/ru.lang.php b/modules/trackback/lang/ru.lang.php index abcfee5da..6f6270563 100644 --- a/modules/trackback/lang/ru.lang.php +++ b/modules/trackback/lang/ru.lang.php @@ -5,11 +5,17 @@ * @brief Russian basic language pack **/ + $lang->cmd_toggle_checked_trackback = 'Reverse selected trackback(s)'; $lang->cmd_delete_checked_trackback = 'Удалить выбранные трекбеки'; $lang->msg_cart_is_null = 'Пожалуйста, выберите трекбек для удаления.'; $lang->msg_checked_trackback_is_deleted = '%d трекбеков удалено.'; + $lang->send_trackback_url = 'Destination URL'; + $lang->msg_trackback_url_is_invalid = 'Destination URL is invalid'; + $lang->msg_trackback_send_success = 'Sent successfully'; + $lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.'; + $lang->search_target_list = array( 'url' => 'URL назначения', 'blog_name' => 'Имя сайта', diff --git a/modules/trackback/lang/tr.lang.php b/modules/trackback/lang/tr.lang.php index 1bd9700a8..4b0432ffa 100644 --- a/modules/trackback/lang/tr.lang.php +++ b/modules/trackback/lang/tr.lang.php @@ -13,6 +13,7 @@ $lang->send_trackback_url = 'Hedef URL'; $lang->msg_trackback_url_is_invalid = 'Hedef URL geçersiz.'; $lang->msg_trackback_send_success = 'Başarıyla gönderildi'; + $lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.'; $lang->search_target_list = array( 'url' => 'Hedef URL', diff --git a/modules/trackback/lang/vi.lang.php b/modules/trackback/lang/vi.lang.php index 221e0ded6..ce02ac7f6 100644 --- a/modules/trackback/lang/vi.lang.php +++ b/modules/trackback/lang/vi.lang.php @@ -16,6 +16,7 @@ $lang->send_trackback_url = 'Địa chỉ muốn gửi'; $lang->msg_trackback_url_is_invalid = 'Địa chỉ muốn gửi không hợp lệ'; $lang->msg_trackback_send_success = 'Đã gửi thành công.'; + $lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.'; $lang->search_target_list = array( 'url' => 'URL muốn gửi', diff --git a/modules/trackback/lang/zh-CN.lang.php b/modules/trackback/lang/zh-CN.lang.php index ae84eab93..302d89a82 100644 --- a/modules/trackback/lang/zh-CN.lang.php +++ b/modules/trackback/lang/zh-CN.lang.php @@ -13,6 +13,7 @@ $lang->send_trackback_url = '发送地址'; $lang->msg_trackback_url_is_invalid = '错误的发送地址!'; $lang->msg_trackback_send_success = '成功发送引用。'; + $lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.'; $lang->search_target_list = array( 'url' => '对象URL', diff --git a/modules/trackback/lang/zh-TW.lang.php b/modules/trackback/lang/zh-TW.lang.php index fb1cf1ebd..017466bba 100644 --- a/modules/trackback/lang/zh-TW.lang.php +++ b/modules/trackback/lang/zh-TW.lang.php @@ -13,6 +13,7 @@ $lang->send_trackback_url = '發送網址'; $lang->msg_trackback_url_is_invalid = '發送錯誤!'; $lang->msg_trackback_send_success = '成功發送。'; + $lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.'; $lang->search_target_list = array( 'url' => '目標網址', diff --git a/modules/trackback/trackback.controller.php b/modules/trackback/trackback.controller.php index 23e2f3307..814dbd24a 100644 --- a/modules/trackback/trackback.controller.php +++ b/modules/trackback/trackback.controller.php @@ -298,13 +298,18 @@ // 결과를 기다림 (특정 서버의 경우 EOF가 떨어지지 않을 수가 있음 while(!feof($fp)) { $line = trim(fgets($fp, 4096)); - if(preg_match("/^/i",$line)) break; + if(preg_match("/^/i",$line)){ + $error = preg_replace('/[^0-9]/','',$line); + break; + } } // socket 닫음 fclose($fp); - return new Object(0, 'msg_trackback_send_success'); + if($error == "0") return new Object(0, 'msg_trackback_send_success'); + + return new Object(-1, 'msg_trackback_send_failed'); } /**