Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 12 Dec 2014 09:24:50 +0000 (10:24 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 12 Dec 2014 09:24:50 +0000 (10:24 +0100)
1  2 
tine20/Admin/Frontend/Cli.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php

Simple merge
@@@ -979,13 -979,14 +979,13 @@@ class Calendar_Convert_Event_VCalendar_
                                  Tinebase_Core::getLogger()->warn(__METHOD__ . '::' . __LINE__ . ' attachment found that could not be imported due to missing managed id');
                      }
                      
-                     if($readFromURL) {
+                     if ($readFromURL) {
                          if (preg_match('#^(https?://)(.*)$#', str_replace(array("\n","\r"), '', $url), $matches)) {
                              // we are client and found an external hosted attachment that we need to import
 -                            $user = Tinebase_Core::getUser();
 -                            $userCredentialCache = Tinebase_Core::get(Tinebase_Core::USERCREDENTIALCACHE);
 +                            $userCredentialCache = Tinebase_Core::getUserCredentialCache();
                              $url = $matches[1] . $userCredentialCache->username . ':' . $userCredentialCache->password . '@' . $matches[2];
                              $attachmentInfo = $matches[1] . $matches[2]. ' ' . $name . ' ' . $managedId;
 -                            if (urlExists($url)) {
 +                            if (Tinebase_Helper::urlExists($url)) {
                                  if (Tinebase_Core::isLogLevel(Zend_Log::INFO))
                                      Tinebase_Core::getLogger()->info(__METHOD__ . '::' . __LINE__
                                              . ' Downloading attachment: ' . $attachmentInfo);