Contacts: Fixed paths in import.

diff --git a/apps/contacts/ajax/importaddressbook.php b/apps/contacts/ajax/importaddressbook.php
index bc02e814f5b776c519e99b316f62ec7282211d60..66cfa4f8af4362b7a1acc794999024da3a43143c 100755 (executable)
--- a/apps/contacts/ajax/importaddressbook.php
+++ b/apps/contacts/ajax/importaddressbook.php
@@ -6,7 +6,6 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../lib/base.php');
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
 $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));

diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
index 947d4670a29d233d1cbab2b31f872557b97bb15d..99386516f5083c56281de69a99ea4685962c0ae6 100755 (executable)
--- a/apps/contacts/ajax/uploadimport.php
+++ b/apps/contacts/ajax/uploadimport.php
@@ -19,8 +19,6 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// Init owncloud
-require_once('../../../lib/base.php');
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 346db5924c693ed09ad2b4bb93a1a6081a473a08..2386a1cff980d6f7bf579dfe7c5a15cce1a19dd5 100755 (executable)
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -28,7 +28,7 @@ if(!$file) {
        OCP\JSON::error(array('message' => 'Import file was empty.'));
        exit();
 }
-error_log('File: '.$file);
+
 if(isset($_POST['method']) && $_POST['method'] == 'new'){
        $id = OC_Contacts_Addressbook::add(OCP\USER::getUser(), $_POST['addressbookname']);
        OC_Contacts_Addressbook::setActive($id, 1);