Diffs

Keires_Feed/trunk/src/Keires/Feed.php

@@ -22,10 +22,13 @@
* @since      File available since Release 0.1
*/
-require_once 'Keires/FeedParser.php';
-require_once 'Keires/ExceptionWrapper.php';
require_once 'HTTP/Request.php';  // PEAR::HTTP_Request
+require_once 'Keires/FeedParser.php';
+require_once 'Openpear/Util.php';
+Openpear_Util::import('array_val');
+Openpear_Util::import('ExceptionWrapper');
+
/*
* Error codes
*/
@@ -37,18 +40,6 @@
define('KEIRES_ERROR_DOM_LOADING',     6);
/*
- * Utility function
- */
-if (!function_exists('array_val')) {
-    function array_val(&$data, $key, $default = null) {
-        if (!is_array($data)) {
-            return $default;
-        }
-        return isset($data[$key])? $data[$key]: $default;
-    }
-}
-
-/*
* Excepiton
*/
class Keires_Exception extends Exception {
@@ -81,7 +72,7 @@
}
$result = $req->sendRequest();
if (PEAR::isError($result)) {
-            Keires_ExceptionWrapper::handleError($result);
+            ExceptionWrapper::handleError($result);
}
$code = $req->getResponseCode();