Merge branch 'php8'

[scuttle] / ajaxDelete.php

diff --git a/ajaxDelete.php b/ajaxDelete.php
index ad3efc86ccf0c99f7f2d973df19c8d2a54848fb3..0760a8eb91fb9eb9caaf60e8611e7566f7cfa9e6 100644 (file)
--- a/ajaxDelete.php
+++ b/ajaxDelete.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (C) 2005 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2005 - 2010 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,22 +18,18 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
-header('Content-Type: text/xml; charset=UTF-8');
+header('Content-Type: text/plain; charset=UTF-8');
 header('Last-Modified: '. gmdate("D, d M Y H:i:s") .' GMT');
 header('Cache-Control: no-cache, must-revalidate');
-require_once('header.inc.php');
+require_once 'header.inc.php';
 
-$bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService');
+$sf = new ServiceFactory();
+$bookmarkservice =& $sf->getServiceInstance('BookmarkService');
 $bookmark = intval($_GET['id']);
 if (!$bookmarkservice->editAllowed($bookmark)) {
-    $result = T_('You are not allowed to delete this bookmark');
+  echo T_('You are not allowed to delete this bookmark');
 } elseif ($bookmarkservice->deleteBookmark($bookmark)) {
-    $result = 'true';
+  echo true;
 } else {
-    $result = T_('Failed to delete bookmark');
+  echo T_('Failed to delete bookmark');
 }
-?>
-<response>
-  <method>deleteConfirmed</method>
-  <result><?php echo $result; ?></result>
-</response>
\ No newline at end of file