#17946293 : rss_reader 위젯의 rss_request() 함수의 잘못된 반환값을 수정하고, proc() 함수에서 연결에 실패하였을 때 적절한 오류 메시지를 반환하도록 수정. 그리고, 이에 맞게 각 lang 파일에 메시지 코드 추가.

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6142 201d5d3c-b55e-5fd7-737f-ddc643e51545

common/lang/en.lang.php

@@ -221,6 +221,8 @@
     $lang->msg_error_occured = 'An error has occured';
     $lang->msg_not_founded = 'Target could not be found';
     $lang->msg_no_result = 'Nothing found';
+    $lang->msg_fail_to_request_open = 'Fail to open your request';
+    $lang->msg_invalid_format = 'Invalid Format';
 
     $lang->msg_not_permitted_act = 'You do not have permission to execute requested action';
     $lang->msg_module_is_not_exists = 'Requested module could not be found';

common/lang/es.lang.php

@@ -227,6 +227,8 @@
     $lang->msg_error_occured = 'Error';
     $lang->msg_not_founded = 'No se ha encontrado';
     $lang->msg_no_result = 'Sin resultado';
+    $lang->msg_fail_to_request_open = 'Fail to open your request';
+    $lang->msg_invalid_format = 'Invalid Format';
 
     $lang->msg_not_permitted_act = 'No está permitodo para ejecutar esta acción';
     $lang->msg_module_is_not_exists = 'No existe el Módulo requerido';

common/lang/fr.lang.php

@@ -221,6 +221,8 @@
     $lang->msg_error_occured = 'Une erreur a lieu';
     $lang->msg_not_founded = 'L\'objet n\'est pas trouvé.';
     $lang->msg_no_result = 'Nul Résultat';
+    $lang->msg_fail_to_request_open = 'Fail to open your request';
+    $lang->msg_invalid_format = 'Invalid Format';
 
     $lang->msg_not_permitted_act = 'Vous n\'êtes pas autorisés à exécuter l\'action que vous avez demandé.';
     $lang->msg_module_is_not_exists = 'Le module demandé n\'a pas été trouvé.';

common/lang/ge.lang.php

@@ -221,6 +221,8 @@
     $lang->msg_error_occured = 'Ein Fehler ist aufgetreten ';
     $lang->msg_not_founded = 'Target konnte nicht gefunden werden';
     $lang->msg_no_result = 'Nichts gefunden';
+    $lang->msg_fail_to_request_open = 'Fail to open your request';
+    $lang->msg_invalid_format = 'Invalid Format';
 
     $lang->msg_not_permitted_act = 'Sie haben keine Berechtigung zur Ausführung angeforderte Aktion';
     $lang->msg_module_is_not_exists = 'Gewünschte Modul konnte nicht gefunden werden';

common/lang/jp.lang.php

@@ -221,6 +221,8 @@
     $lang->msg_error_occured = 'エラーが発生しました。';
     $lang->msg_not_founded = '見つかりません。';
     $lang->msg_no_result = '検索結果がありません。';
+    $lang->msg_fail_to_request_open = 'Fail to open your request';
+    $lang->msg_invalid_format = 'Invalid Format';
 
     $lang->msg_not_permitted_act = '現在の操作は実行する権限がありません。';
     $lang->msg_module_is_not_exists = 'モジュールが見つかりません。';

common/lang/ko.lang.php

@@ -221,6 +221,8 @@
     $lang->msg_error_occured = '오류가 발생하였습니다';
     $lang->msg_not_founded = '대상을 찾을 수 없습니다';
     $lang->msg_no_result = '검색 결과가 없습니다';
+    $lang->msg_fail_to_request_open = '요청하신 연결에 실패하였습니다';
+    $lang->msg_invalid_format = '잘못된 형식입니다';
 
     $lang->msg_not_permitted_act = '요청하신 기능을 실행할 수 있는 권한이 없습니다';
     $lang->msg_module_is_not_exists = '요청하신 모듈을 찾을 수 없습니다';

common/lang/ru.lang.php

@@ -219,6 +219,8 @@
     $lang->msg_error_occured = 'Произошла ошибка';
     $lang->msg_not_founded = 'Сообщение не найдено';
     $lang->msg_no_result = 'Ничего не найдено';
+    $lang->msg_fail_to_request_open = 'Fail to open your request';
+    $lang->msg_invalid_format = 'Invalid Format';
 
     $lang->msg_not_permitted_act = 'У Вас нет прав для исполнения запрошенного действия';
     $lang->msg_module_is_not_exists = 'Запрошенный модуль не найден';

common/lang/zh-CN.lang.php

@@ -221,6 +221,8 @@
     $lang->msg_error_occured = '发生错误';
     $lang->msg_not_founded = '没有找到相关内容';
     $lang->msg_no_result = '找不到和您查询的相符结果';
+    $lang->msg_fail_to_request_open = 'Fail to open your request';
+    $lang->msg_invalid_format = 'Invalid Format';
 
     $lang->msg_not_permitted_act = '没有权限执行 action命令';
     $lang->msg_module_is_not_exists = '找不到您查询的模块';

common/lang/zh-TW.lang.php

@@ -221,6 +221,8 @@
     $lang->msg_error_occured = '發生錯誤';
     $lang->msg_not_founded = '找不到相關內容';
     $lang->msg_no_result = '找不到與您查詢的相符結果';
+    $lang->msg_fail_to_request_open = 'Fail to open your request';
+    $lang->msg_invalid_format = 'Invalid Format';
 
     $lang->msg_not_permitted_act = '沒有權限執行';
     $lang->msg_module_is_not_exists = '找不到您查詢的模組';

widgets/rss_reader/rss_reader.class.php

@@ -45,7 +45,7 @@
 
             $oResponse = $oReqeust->sendRequest();
             if (PEAR::isError($oResponse)) {
-                return new Object(-1, 'msg_fail_to_request_open');
+                return;
             }
             $header = $oReqeust->getResponseHeader();
             if($header['location']) {
@@ -73,7 +73,7 @@
 
             $buff = $this->rss_request($args->rss_url);
 
-            if(!$buff) return new Object(-1, 'msg_fail_to_request_open');
+            if(!is_string($buff) or !$buff) return Context::getLang('msg_fail_to_request_open');
 
             $encoding = preg_match("/<\?xml.*encoding=\"(.+)\".*\?>/i", $buff, $matches);
             if($encoding && !preg_match("/UTF-8/i", $matches[1])) $buff = trim(iconv($matches[1]=="ks_c_5601-1987"?"EUC-KR":$matches[1], "UTF-8", $buff));
@@ -87,7 +87,7 @@
 
             $items = $xml_doc->rss->channel->item;
 
-            if(!$items) return; 
+            if(!$items) return Context::getLang('msg_invalid_format');
             if($items && !is_array($items)) $items = array($items);
 
             $rss_list = array();