diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2012-04-29 20:40:21 +0200 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2012-04-29 22:12:27 +0200 |
commit | 023479b1e2a8f33e7d540bd77dc7d1070f9554f8 (patch) | |
tree | edd9b4ad02ae4115a675629443c23f39a6c6537d | |
parent | 163344243b0e00a2ffccddd171e8d0a4163943a8 (diff) | |
download | nextcloud-server-023479b1e2a8f33e7d540bd77dc7d1070f9554f8.tar.gz nextcloud-server-023479b1e2a8f33e7d540bd77dc7d1070f9554f8.zip |
Contacts: removed unused method and ajax file.
-rw-r--r-- | apps/contacts/ajax/getdetails.php | 34 | ||||
-rw-r--r-- | apps/contacts/l10n/xgettextfiles | 2 | ||||
-rw-r--r-- | apps/contacts/lib/app.php | 33 |
3 files changed, 1 insertions, 68 deletions
diff --git a/apps/contacts/ajax/getdetails.php b/apps/contacts/ajax/getdetails.php deleted file mode 100644 index aac69f4c52e..00000000000 --- a/apps/contacts/ajax/getdetails.php +++ /dev/null @@ -1,34 +0,0 @@ -<?php -/** - * ownCloud - Addressbook - * - * @author Jakob Sack - * @copyright 2011 Jakob Sack mail@jakobsack.de - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see <http://www.gnu.org/licenses/>. - * - */ - -// Init owncloud - - -// Check if we are a user -OC_JSON::checkLoggedIn(); -OC_JSON::checkAppEnabled('contacts'); - -$id = $_GET['id']; -$new = isset($_GET['new']) ? true : false; -$vcard = OC_Contacts_App::getContactVCard( $id ); - -OC_Contacts_App::renderDetails($id, $vcard, $new); diff --git a/apps/contacts/l10n/xgettextfiles b/apps/contacts/l10n/xgettextfiles index e2492431ff8..e291074fba9 100644 --- a/apps/contacts/l10n/xgettextfiles +++ b/apps/contacts/l10n/xgettextfiles @@ -5,7 +5,7 @@ ../ajax/createaddressbook.php ../ajax/deletebook.php ../ajax/deleteproperty.php -../ajax/getdetails.php +../ajax/contactdetails.php ../ajax/saveproperty.php ../ajax/updateaddressbook.php ../lib/app.php diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php index 2c2cc331ed7..ee8b0c550b3 100644 --- a/apps/contacts/lib/app.php +++ b/apps/contacts/lib/app.php @@ -15,39 +15,6 @@ class OC_Contacts_App { public static $l10n; public static $categories; - /** - * Render templates/part.details to json output - * @param int $id of contact - * @param Sabre_VObject_Component $vcard to render - */ - public static function renderDetails($id, $vcard, $new=false) { - $property_types = self::getAddPropertyOptions(); - $adr_types = self::getTypesOfProperty('ADR'); - $phone_types = self::getTypesOfProperty('TEL'); - $upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize')); - $post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size')); - $maxUploadFilesize = min($upload_max_filesize, $post_max_size); - - $freeSpace=OC_Filesystem::free_space('/'); - $freeSpace=max($freeSpace,0); - $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace); - - $details = OC_Contacts_VCard::structureContact($vcard); - $name = $details['FN'][0]['value']; - $t = $new ? 'part.contact' : 'part.details'; - $tmpl = new OC_Template('contacts',$t); - $tmpl->assign('details',$details); - $tmpl->assign('id',$id); - $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize); - $tmpl->assign( 'uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize)); - $tmpl->assign('property_types',$property_types); - $tmpl->assign('adr_types',$adr_types); - $tmpl->assign('phone_types',$phone_types); - $page = $tmpl->fetchPage(); - - OC_JSON::success(array('data' => array( 'id' => $id, 'name' => $name, 'page' => $page ))); - } - public static function getAddressbook($id) { $addressbook = OC_Contacts_Addressbook::find( $id ); if( $addressbook === false || $addressbook['userid'] != OC_User::getUser()) { |