X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FBookmark%2Fdeliciousbackupimporter.php;h=0ceba61d89a1619b009cf771bf4e20b82b335a1a;hb=59043dca7fb6f974b11797c4d0f20e5b78b0611d;hp=a8d2819fe7c0f04bff88c0b93d242f7cf93b6ee0;hpb=14456cbbb2b8f9266eb5ca13acff77e6b6699ac2;p=quix0rs-gnu-social.git diff --git a/plugins/Bookmark/deliciousbackupimporter.php b/plugins/Bookmark/deliciousbackupimporter.php index a8d2819fe7..0ceba61d89 100644 --- a/plugins/Bookmark/deliciousbackupimporter.php +++ b/plugins/Bookmark/deliciousbackupimporter.php @@ -4,7 +4,7 @@ * Copyright (C) 2010, StatusNet, Inc. * * Importer class for Delicious.com backups - * + * * PHP version 5 * * This program is free software: you can redistribute it and/or modify @@ -44,7 +44,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class DeliciousBackupImporter extends QueueHandler { /** @@ -52,7 +51,6 @@ class DeliciousBackupImporter extends QueueHandler * * @return string transport string */ - function transport() { return 'dlcsback'; @@ -72,17 +70,30 @@ class DeliciousBackupImporter extends QueueHandler * * @return boolean success value */ - function handle($data) { list($user, $body) = $data; - $doc = $this->importHTML($body); + try { + $doc = $this->importHTML($body); + } catch (ClientException $cex) { + // XXX: message to the user + common_log(LOG_WARNING, $cex->getMessage()); + return true; + } + + // If we can't parse it, it's no good + + if (empty($doc)) { + return true; + } $dls = $doc->getElementsByTagName('dl'); if ($dls->length != 1) { - throw new ClientException(_m("Bad import file.")); + // XXX: message to the user + common_log(LOG_WARNING, 'Bad input file'); + return true; } $dl = $dls->item(0); @@ -112,9 +123,11 @@ class DeliciousBackupImporter extends QueueHandler case 'dd': $dd = $child; - // This
in the