From 21d613cbc651d537c6fe145a8ddbec99a56035d1 Mon Sep 17 00:00:00 2001 From: Thomas Olsen Date: Thu, 1 Dec 2011 02:02:45 +0100 Subject: [PATCH] Added export.php for contacts app. Works the same way as the one in the calendar app, except there is no UI for it. Fixed indentation in /index.php --- apps/contacts/export.php | 44 ++++++++++++++++++++++++++++++++++++++++ index.php | 17 ++++++++-------- 2 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 apps/contacts/export.php diff --git a/apps/contacts/export.php b/apps/contacts/export.php new file mode 100644 index 0000000000..3c74d7f553 --- /dev/null +++ b/apps/contacts/export.php @@ -0,0 +1,44 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +require_once ("../../lib/base.php"); +OC_Util::checkLoggedIn(); +OC_Util::checkAppEnabled('contacts'); +$book = isset($_GET["bookid"]) ? $_GET["bookid"] : NULL; +$contact = isset($_GET["contactid"]) ? $_GET["contactid"] : NULL; +if(isset($book)){ + OC_Log::write('contacts',"book isset($book)",OC_Log::DEBUG); + $addressbook = OC_Contacts_Addressbook::find($book); + OC_Log::write('contacts',"Got addressbook",OC_Log::DEBUG); + OC_Log::write('contacts',"userid: {$addressbook["userid"]}",OC_Log::DEBUG); + if($addressbook["userid"] != OC_User::getUser()){ + OC_JSON::error(); + exit; + } + OC_Log::write('contacts',"User match",OC_Log::DEBUG); + $cardobjects = OC_Contacts_VCard::all($book); + header("Content-Type: text/directory"); + header("Content-Disposition: inline; filename=addressbook.vcf"); + for($i = 0;$i <= count($cardobjects); $i++){ + echo $cardobjects[$i]["carddata"] . "\n"; + } +}elseif(isset($contact)){ + OC_Log::write('contacts',"contact isset($contact)",OC_Log::DEBUG); + $data = OC_Contacts_VCard::find($contact); + $addressbookid = $data["addressbookid"]; + OC_Log::write('contacts',"addressbookid: $addressbookid",OC_Log::DEBUG); + $addressbook = OC_Contacts_Addressbook::find($addressbookid); + if($addressbook["userid"] != OC_User::getUser()){ + OC_JSON::error(); + exit; + } + header("Content-Type: text/directory"); + header("Content-Disposition: inline; filename=" . $data["fullname"] . ".vcf"); + echo $data["carddata"]; +} +?> diff --git a/index.php b/index.php index 558733e1cd..7ead0fb48a 100644 --- a/index.php +++ b/index.php @@ -100,14 +100,15 @@ else { $error = true; } } - // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP - elseif(isset($_SERVER["PHP_AUTH_USER"]) && isset($_SERVER["PHP_AUTH_PW"])){ - if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"])) { - OC_User::unsetMagicInCookie(); - OC_Util::redirectToDefaultPage(); - }else{ - $error = true; - } + // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP + elseif(isset($_SERVER["PHP_AUTH_USER"]) && isset($_SERVER["PHP_AUTH_PW"])){ + if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"])) { + //OC_Log::write('core',"Logged in with HTTP Authentication",OC_Log::DEBUG); + OC_User::unsetMagicInCookie(); + OC_Util::redirectToDefaultPage(); + }else{ + $error = true; } + } OC_Template::printGuestPage('', 'login', array('error' => $error, 'redirect' => isset($_REQUEST['redirect_url'])?$_REQUEST['redirect_url']:'' )); }