Merge branch 'extended-cookie'

[scuttle] / import.php

diff --git a/import.php b/import.php
index 2af25d0e2a764e886e5bf7eb3a9b72838919ec0c..5f0c5eeadbb8104a9818a7890db12b18b43f6eec 100644 (file)
--- a/import.php
+++ b/import.php
@@ -19,17 +19,20 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
 require_once 'header.inc.php';
-$userservice =& ServiceFactory::getServiceInstance('UserService');
+
+$userservice     =& ServiceFactory::getServiceInstance('UserService');
 $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
+
 $tplVars = array();
 
 if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['size'] > 0) {
     $userinfo = $userservice->getCurrentUser();
 
     if (isset($_POST['status']) && is_numeric($_POST['status'])) {
-        $status = intval($_POST['status']);
-    } else {
-        $status = 2;
+      $status = intval($_POST['status']);
+    }
+    else {
+      $status = 2;
     }
 
     $depth = array();
@@ -48,11 +51,12 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
     }
     xml_parser_free($xml_parser);
     header('Location: '. createURL('bookmarks', $userinfo[$userservice->getFieldName('username')]));
-} else {
-    $templatename = 'importDelicious.tpl';
-    $tplVars['subtitle'] = T_('Import Bookmarks from del.icio.us');
-    $tplVars['formaction']  = createURL('import');
-    $templateservice->loadTemplate($templatename, $tplVars);
+}
+else {
+  $templatename = 'importDelicious.tpl';
+  $tplVars['subtitle'] = T_('Import Bookmarks from del.icio.us');
+  $tplVars['formaction']  = createURL('import');
+  $templateservice->loadTemplate($templatename, $tplVars);
 }
 
 function startElement($parser, $name, $attrs) {
@@ -76,6 +80,9 @@ function startElement($parser, $name, $attrs) {
                 case 'TIME':
                     $bDatetime = $attrVal;
                     break;
+                case 'PRIVATE':
+                    $bStatus = (strcasecmp('yes', $attrVal) == 0) ? 2 : $status ;
+                    break;
                 case 'TAG':
                     $tags = strtolower($attrVal);
                     break;
@@ -92,7 +99,7 @@ function startElement($parser, $name, $attrs) {
                 $bDatetime = gmdate('Y-m-d H:i:s');
             }
 
-            if ($bookmarkservice->addBookmark($bAddress, $bTitle, $bDescription, $status, $tags, $bDatetime, true, true))
+            if ($bookmarkservice->addBookmark($bAddress, $bTitle, $bDescription, $bStatus, $tags, $bDatetime, true, true))
                 $tplVars['msg'] = T_('Bookmark imported.');
             else
                 $tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.');