rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-30 19:52:17 +01:00
Code Issues Releases Activity

ported oc_json

Browse Source
This commit is contained in:
Frank Karlitschek 2012-05-03 12:23:29 +02:00
parent 37df9e3dc0
commit 0343af38fd
34 changed files with 131 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ajax/activation.php
View File

@ -8,19 +8,19 @@
*/ */
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$bookid = $_POST['bookid']; $bookid = $_POST['bookid'];
$book = OC_Contacts_App::getAddressbook($bookid);// is owner access check $book = OC_Contacts_App::getAddressbook($bookid);// is owner access check
if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) { if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
OCP\Util::writeLog('contacts','ajax/activation.php: Error activating addressbook: '.$bookid, OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/activation.php: Error activating addressbook: '.$bookid, OCP\Util::ERROR);
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error (de)activating addressbook.')))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error (de)activating addressbook.'))));
exit(); exit();
} }
OC_JSON::success(array( OCP\JSON::success(array(
'active' => OC_Contacts_Addressbook::isActive($bookid), 'active' => OC_Contacts_Addressbook::isActive($bookid),
'bookid' => $bookid, 'bookid' => $bookid,
'book' => $book, 'book' => $book,

4
ajax/addbook.php Normal file → Executable file
View File

@ -7,8 +7,8 @@
*/ */
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$book = array( $book = array(
'id' => 'new', 'id' => 'new',
'displayname' => '', 'displayname' => '',

10
ajax/addcontact.php
View File

@ -23,7 +23,7 @@
// Init owncloud // Init owncloud
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/addcontact.php: '.$msg, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/addcontact.php: '.$msg, OCP\Util::DEBUG);
exit(); exit();
} }
@ -32,8 +32,8 @@ function debug($msg) {
} }
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
foreach ($_POST as $key=>$element) { foreach ($_POST as $key=>$element) {
debug('_POST: '.$key.'=>'.$element); debug('_POST: '.$key.'=>'.$element);
@ -55,9 +55,9 @@ $vcard->setString('N',$n);
$id = OC_Contacts_VCard::add($aid,$vcard); $id = OC_Contacts_VCard::add($aid,$vcard);
if(!$id) { if(!$id) {
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('There was an error adding the contact.')))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('There was an error adding the contact.'))));
OCP\Util::writeLog('contacts','ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OCP\Util::ERROR);
exit(); exit();
} }
OC_JSON::success(array('data' => array( 'id' => $id ))); OCP\JSON::success(array('data' => array( 'id' => $id )));

14
ajax/addproperty.php
View File

@ -24,8 +24,8 @@
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$id = isset($_POST['id'])?$_POST['id']:null; $id = isset($_POST['id'])?$_POST['id']:null;
$name = isset($_POST['name'])?$_POST['name']:null; $name = isset($_POST['name'])?$_POST['name']:null;
@ -37,7 +37,7 @@ $vcard = OC_Contacts_App::getContactVCard($id);
if(!is_array($value)){ if(!is_array($value)){
$value = trim($value); $value = trim($value);
if(!$value && in_array($name, array('TEL', 'EMAIL', 'ORG', 'BDAY', 'NICKNAME', 'NOTE'))) { if(!$value && in_array($name, array('TEL', 'EMAIL', 'ORG', 'BDAY', 'NICKNAME', 'NOTE'))) {
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot add empty property.')))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot add empty property.'))));
exit(); exit();
} }
} elseif($name === 'ADR') { // only add if non-empty elements. } elseif($name === 'ADR') { // only add if non-empty elements.
@ -49,7 +49,7 @@ if(!is_array($value)){
} }
} }
if($empty) { if($empty) {
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('At least one of the address fields has to be filled out.')))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('At least one of the address fields has to be filled out.'))));
exit(); exit();
} }
} }
@ -59,7 +59,7 @@ $current = $vcard->select($name);
foreach($current as $item) { foreach($current as $item) {
$tmpvalue = (is_array($value)?implode(';', $value):$value); $tmpvalue = (is_array($value)?implode(';', $value):$value);
if($tmpvalue == $item->value) { if($tmpvalue == $item->value) {
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Trying to add duplicate property: ').$name.': '.$tmpvalue))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Trying to add duplicate property: ').$name.': '.$tmpvalue)));
OCP\Util::writeLog('contacts','ajax/addproperty.php: Trying to add duplicate property: '.$name.': '.$tmpvalue, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/addproperty.php: Trying to add duplicate property: '.$name.': '.$tmpvalue, OCP\Util::DEBUG);
exit(); exit();
} }
@ -117,9 +117,9 @@ foreach ($parameters as $key=>$element) {
$checksum = md5($vcard->children[$line]->serialize()); $checksum = md5($vcard->children[$line]->serialize());
if(!OC_Contacts_VCard::edit($id,$vcard)) { if(!OC_Contacts_VCard::edit($id,$vcard)) {
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error adding contact property.')))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error adding contact property.'))));
OCP\Util::writeLog('contacts','ajax/addproperty.php: Error updating contact property: '.$name, OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/addproperty.php: Error updating contact property: '.$name, OCP\Util::ERROR);
exit(); exit();
} }
OC_JSON::success(array('data' => array( 'checksum' => $checksum ))); OCP\JSON::success(array('data' => array( 'checksum' => $checksum )));

10
ajax/categories/categoriesfor.php
View File

@ -7,12 +7,12 @@
*/ */
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$id = isset($_GET['id'])?$_GET['id']:null; $id = isset($_GET['id'])?$_GET['id']:null;
if(is_null($id)) { if(is_null($id)) {
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('No ID provided')))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('No ID provided'))));
exit(); exit();
} }
$vcard = OC_Contacts_App::getContactVCard( $id ); $vcard = OC_Contacts_App::getContactVCard( $id );
@ -20,9 +20,9 @@ foreach($vcard->children as $property){
//OCP\Util::writeLog('contacts','ajax/categories/checksumfor.php: '.$property->name, OCP\Util::DEBUG); //OCP\Util::writeLog('contacts','ajax/categories/checksumfor.php: '.$property->name, OCP\Util::DEBUG);
if($property->name == 'CATEGORIES') { if($property->name == 'CATEGORIES') {
$checksum = md5($property->serialize()); $checksum = md5($property->serialize());
OC_JSON::success(array('data' => array('value'=>$property->value, 'checksum'=>$checksum))); OCP\JSON::success(array('data' => array('value'=>$property->value, 'checksum'=>$checksum)));
exit(); exit();
} }
} }
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error setting checksum.')))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error setting checksum.'))));
?> ?>

8
ajax/categories/delete.php
View File

@ -7,15 +7,15 @@
*/ */
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
foreach ($_POST as $key=>$element) { foreach ($_POST as $key=>$element) {
debug('_POST: '.$key.'=>'.print_r($element, true)); debug('_POST: '.$key.'=>'.print_r($element, true));
} }
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/categories/delete.php: '.$msg, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/categories/delete.php: '.$msg, OCP\Util::DEBUG);
exit(); exit();
} }
@ -55,6 +55,6 @@ $catman = new OC_VCategories('contacts');
$catman->delete($categories, $cards); $catman->delete($categories, $cards);
debug('After delete: '.print_r($catman->categories(), true)); debug('After delete: '.print_r($catman->categories(), true));
OC_Contacts_VCard::updateDataByID($cards); OC_Contacts_VCard::updateDataByID($cards);
OC_JSON::success(array('data' => array('categories'=>$catman->categories()))); OCP\JSON::success(array('data' => array('categories'=>$catman->categories())));
?> ?>

6
ajax/categories/list.php Normal file → Executable file
View File

@ -7,11 +7,11 @@
*/ */
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$categories = OC_Contacts_App::getCategories(); $categories = OC_Contacts_App::getCategories();
OC_JSON::success(array('data' => array('categories'=>$categories))); OCP\JSON::success(array('data' => array('categories'=>$categories)));
?> ?>

8
ajax/categories/rescan.php
View File

@ -7,15 +7,15 @@
*/ */
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
foreach ($_POST as $key=>$element) { foreach ($_POST as $key=>$element) {
debug('_POST: '.$key.'=>'.print_r($element, true)); debug('_POST: '.$key.'=>'.print_r($element, true));
} }
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG);
exit(); exit();
} }
@ -39,6 +39,6 @@ if(count($contacts) == 0) {
OC_Contacts_App::scanCategories($contacts); OC_Contacts_App::scanCategories($contacts);
$categories = OC_Contacts_App::getCategories(); $categories = OC_Contacts_App::getCategories();
OC_JSON::success(array('data' => array('categories'=>$categories))); OCP\JSON::success(array('data' => array('categories'=>$categories)));
?> ?>

4
ajax/chooseaddressbook.php Normal file → Executable file
View File

@ -7,8 +7,8 @@
*/ */
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$output = new OC_TEMPLATE("contacts", "part.chooseaddressbook"); $output = new OC_TEMPLATE("contacts", "part.chooseaddressbook");
$output -> printpage(); $output -> printpage();

8
ajax/contactdetails.php
View File

@ -23,14 +23,14 @@
// Init owncloud // Init owncloud
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/contactdetails.php: '.$msg, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/contactdetails.php: '.$msg, OCP\Util::DEBUG);
exit(); exit();
} }
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$id = isset($_GET['id'])?$_GET['id']:null; $id = isset($_GET['id'])?$_GET['id']:null;
if(is_null($id)) { if(is_null($id)) {
@ -69,4 +69,4 @@ if(isset($details['PHOTO'])) {
} }
$details['id'] = $id; $details['id'] = $id;
OC_Contacts_App::setLastModifiedHeader($vcard); OC_Contacts_App::setLastModifiedHeader($vcard);
OC_JSON::success(array('data' => $details)); OCP\JSON::success(array('data' => $details));

6
ajax/contacts.php
View File

@ -7,8 +7,8 @@
*/ */
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser()); $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
$contacts = OC_Contacts_VCard::all($ids); $contacts = OC_Contacts_VCard::all($ids);
@ -16,5 +16,5 @@ $tmpl = new OC_TEMPLATE("contacts", "part.contacts");
$tmpl->assign('contacts', $contacts); $tmpl->assign('contacts', $contacts);
$page = $tmpl->fetchPage(); $page = $tmpl->fetchPage();
OC_JSON::success(array('data' => array( 'page' => $page ))); OCP\JSON::success(array('data' => array( 'page' => $page )));
?> ?>

12
ajax/createaddressbook.php
View File

@ -9,32 +9,32 @@
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$userid = OCP\USER::getUser(); $userid = OCP\USER::getUser();
$name = trim(strip_tags($_POST['name'])); $name = trim(strip_tags($_POST['name']));
if(!$name) { if(!$name) {
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot add addressbook with an empty name.')))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot add addressbook with an empty name.'))));
OCP\Util::writeLog('contacts','ajax/createaddressbook.php: Cannot add addressbook with an empty name: '.strip_tags($_POST['name']), OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/createaddressbook.php: Cannot add addressbook with an empty name: '.strip_tags($_POST['name']), OCP\Util::ERROR);
exit(); exit();
} }
$bookid = OC_Contacts_Addressbook::add($userid, $name, null); $bookid = OC_Contacts_Addressbook::add($userid, $name, null);
if(!$bookid) { if(!$bookid) {
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error adding addressbook.')))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error adding addressbook.'))));
OCP\Util::writeLog('contacts','ajax/createaddressbook.php: Error adding addressbook: '.$_POST['name'], OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/createaddressbook.php: Error adding addressbook: '.$_POST['name'], OCP\Util::ERROR);
exit(); exit();
} }
if(!OC_Contacts_Addressbook::setActive($bookid, 1)) { if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error activating addressbook.')))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error activating addressbook.'))));
OCP\Util::writeLog('contacts','ajax/createaddressbook.php: Error activating addressbook: '.$bookid, OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/createaddressbook.php: Error activating addressbook: '.$bookid, OCP\Util::ERROR);
//exit(); //exit();
} }
$addressbook = OC_Contacts_App::getAddressbook($bookid); $addressbook = OC_Contacts_App::getAddressbook($bookid);
$tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields'); $tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
$tmpl->assign('addressbook', $addressbook); $tmpl->assign('addressbook', $addressbook);
OC_JSON::success(array( OCP\JSON::success(array(
'page' => $tmpl->fetchPage(), 'page' => $tmpl->fetchPage(),
'addressbook' => $addressbook, 'addressbook' => $addressbook,
)); ));

6
ajax/cropphoto.php
View File

@ -24,8 +24,8 @@
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$tmp_path = $_GET['tmp_path']; $tmp_path = $_GET['tmp_path'];
$id = $_GET['id']; $id = $_GET['id'];
@ -35,4 +35,4 @@ $tmpl->assign('tmp_path', $tmp_path);
$tmpl->assign('id', $id); $tmpl->assign('id', $id);
$page = $tmpl->fetchPage(); $page = $tmpl->fetchPage();
OC_JSON::success(array('data' => array( 'page' => $page ))); OCP\JSON::success(array('data' => array( 'page' => $page )));

10
ajax/currentphoto.php
View File

@ -24,11 +24,11 @@
// Check if we are a user // Check if we are a user
// Firefox and Konqueror tries to download application/json for me. --Arthur // Firefox and Konqueror tries to download application/json for me. --Arthur
OC_JSON::setContentTypeHeader('text/plain'); OCP\JSON::setContentTypeHeader('text/plain');
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/currentphoto.php: '.$msg, OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/currentphoto.php: '.$msg, OCP\Util::ERROR);
exit(); exit();
} }
@ -55,7 +55,7 @@ if( is_null($contact)) {
} }
if($image->valid()) { if($image->valid()) {
if($image->save($tmpfname)) { if($image->save($tmpfname)) {
OC_JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpfname))); OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpfname)));
exit(); exit();
} else { } else {
bailOut(OC_Contacts_App::$l10n->t('Error saving temporary file.')); bailOut(OC_Contacts_App::$l10n->t('Error saving temporary file.'));

6
ajax/deletebook.php Normal file → Executable file
View File

@ -24,12 +24,12 @@
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
//$id = $_GET['id']; //$id = $_GET['id'];
$id = $_POST['id']; $id = $_POST['id'];
OC_Contacts_App::getAddressbook( $id ); // is owner access check OC_Contacts_App::getAddressbook( $id ); // is owner access check
OC_Contacts_Addressbook::delete($id); OC_Contacts_Addressbook::delete($id);
OC_JSON::success(array('data' => array( 'id' => $id ))); OCP\JSON::success(array('data' => array( 'id' => $id )));

8
ajax/deletecard.php
View File

@ -20,7 +20,7 @@
* *
*/ */
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG);
exit(); exit();
} }
@ -29,8 +29,8 @@ function bailOut($msg) {
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$id = isset($_GET['id'])?$_GET['id']:null; $id = isset($_GET['id'])?$_GET['id']:null;
if(!$id) { if(!$id) {
@ -39,4 +39,4 @@ if(!$id) {
$card = OC_Contacts_App::getContactObject( $id ); $card = OC_Contacts_App::getContactObject( $id );
OC_Contacts_VCard::delete($id); OC_Contacts_VCard::delete($id);
OC_JSON::success(array('data' => array( 'id' => $id ))); OCP\JSON::success(array('data' => array( 'id' => $id )));

10
ajax/deleteproperty.php
View File

@ -24,8 +24,8 @@
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$id = $_GET['id']; $id = $_GET['id'];
$checksum = $_GET['checksum']; $checksum = $_GET['checksum'];
@ -33,16 +33,16 @@ $checksum = $_GET['checksum'];
$vcard = OC_Contacts_App::getContactVCard( $id ); $vcard = OC_Contacts_App::getContactVCard( $id );
$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum); $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
if(is_null($line)){ if(is_null($line)){
OC_JSON::error(array('data' => array( 'message' => OC_Contacts_App::$l10n->t('Information about vCard is incorrect. Please reload the page.')))); OCP\JSON::error(array('data' => array( 'message' => OC_Contacts_App::$l10n->t('Information about vCard is incorrect. Please reload the page.'))));
exit(); exit();
} }
unset($vcard->children[$line]); unset($vcard->children[$line]);
if(!OC_Contacts_VCard::edit($id,$vcard)) { if(!OC_Contacts_VCard::edit($id,$vcard)) {
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error deleting contact property.')))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error deleting contact property.'))));
OCP\Util::writeLog('contacts','ajax/deleteproperty.php: Error deleting contact property', OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/deleteproperty.php: Error deleting contact property', OCP\Util::ERROR);
exit(); exit();
} }
OC_JSON::success(array('data' => array( 'id' => $id ))); OCP\JSON::success(array('data' => array( 'id' => $id )));

4
ajax/editaddress.php Normal file → Executable file
View File

@ -7,8 +7,8 @@
*/ */
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$id = $_GET['id']; $id = $_GET['id'];
$checksum = isset($_GET['checksum'])?$_GET['checksum']:''; $checksum = isset($_GET['checksum'])?$_GET['checksum']:'';

4
ajax/editaddressbook.php Normal file → Executable file
View File

@ -7,8 +7,8 @@
*/ */
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$addressbook = OC_Contacts_App::getAddressbook($_GET['bookid']); $addressbook = OC_Contacts_App::getAddressbook($_GET['bookid']);
$tmpl = new OC_Template("contacts", "part.editaddressbook"); $tmpl = new OC_Template("contacts", "part.editaddressbook");
$tmpl->assign('new', false); $tmpl->assign('new', false);

6
ajax/editname.php
View File

@ -7,10 +7,10 @@
*/ */
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/editname.php: '.$msg, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/editname.php: '.$msg, OCP\Util::DEBUG);
exit(); exit();
} }

2
ajax/importaddressbook.php
View File

@ -7,7 +7,7 @@
*/ */
require_once('../../../lib/base.php'); require_once('../../../lib/base.php');
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OCP\App::checkAppEnabled('contacts'); OCP\App::checkAppEnabled('contacts');
$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));

2
ajax/importdialog.php
View File

@ -7,7 +7,7 @@
*/ */
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OCP\App::checkAppEnabled('contacts'); OCP\App::checkAppEnabled('contacts');
$tmpl = new OC_Template('contacts', 'part.import'); $tmpl = new OC_Template('contacts', 'part.import');
$tmpl->assign('path', $_POST['path']); $tmpl->assign('path', $_POST['path']);

8
ajax/loadcard.php
View File

@ -23,7 +23,7 @@
// Init owncloud // Init owncloud
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/loadcard.php: '.$msg, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/loadcard.php: '.$msg, OCP\Util::DEBUG);
exit(); exit();
} }
@ -35,8 +35,8 @@ function debug($msg) {
// } // }
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
@ -58,4 +58,4 @@ $tmpl->assign('email_types',$email_types);
$tmpl->assign('id',''); $tmpl->assign('id','');
$page = $tmpl->fetchPage(); $page = $tmpl->fetchPage();
OC_JSON::success(array('data' => array( 'page' => $page ))); OCP\JSON::success(array('data' => array( 'page' => $page )));

6
ajax/loadintro.php Normal file → Executable file
View File

@ -21,11 +21,11 @@
*/ */
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$tmpl = new OC_Template('contacts','part.no_contacts'); $tmpl = new OC_Template('contacts','part.no_contacts');
$page = $tmpl->fetchPage(); $page = $tmpl->fetchPage();
OC_JSON::success(array('data' => array( 'page' => $page ))); OCP\JSON::success(array('data' => array( 'page' => $page )));

8
ajax/loadphoto.php
View File

@ -22,15 +22,15 @@
// Init owncloud // Init owncloud
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
// foreach ($_POST as $key=>$element) { // foreach ($_POST as $key=>$element) {
// OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OCP\Util::DEBUG); // OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OCP\Util::DEBUG);
// } // }
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/loadphoto.php: '.$msg, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/loadphoto.php: '.$msg, OCP\Util::DEBUG);
exit(); exit();
} }
@ -59,5 +59,5 @@ if($refresh) {
$tmpl->assign('refresh', 1); $tmpl->assign('refresh', 1);
} }
$page = $tmpl->fetchPage(); $page = $tmpl->fetchPage();
OC_JSON::success(array('data' => array('page'=>$page, 'checksum'=>$checksum))); OCP\JSON::success(array('data' => array('page'=>$page, 'checksum'=>$checksum)));
?> ?>

10
ajax/oc_photo.php
View File

@ -24,11 +24,11 @@ require_once('lib/base.php');
// Check if we are a user // Check if we are a user
// Firefox and Konqueror tries to download application/json for me. --Arthur // Firefox and Konqueror tries to download application/json for me. --Arthur
OC_JSON::setContentTypeHeader('text/plain'); OCP\JSON::setContentTypeHeader('text/plain');
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/oc_photo.php: '.$msg, OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/oc_photo.php: '.$msg, OCP\Util::ERROR);
exit(); exit();
} }
@ -66,7 +66,7 @@ if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
debug('Couldn\'t save correct image orientation: '.$tmpfname); debug('Couldn\'t save correct image orientation: '.$tmpfname);
} }
if($image->save($tmpfname)) { if($image->save($tmpfname)) {
OC_JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpfname))); OCP\JSON::success(array('data' => array('id'=>$_GET['id'], 'tmp'=>$tmpfname)));
exit(); exit();
} else { } else {
bailOut('Couldn\'t save temporary image: '.$tmpfname); bailOut('Couldn\'t save temporary image: '.$tmpfname);

10
ajax/savecrop.php
View File

@ -26,18 +26,18 @@
OCP\Util::writeLog('contacts','ajax/savecrop.php: Huzzah!!!', OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/savecrop.php: Huzzah!!!', OCP\Util::DEBUG);
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
// foreach ($_POST as $key=>$element) { // foreach ($_POST as $key=>$element) {
// OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OCP\Util::DEBUG); // OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OCP\Util::DEBUG);
// } // }
// Firefox and Konqueror tries to download application/json for me. --Arthur // Firefox and Konqueror tries to download application/json for me. --Arthur
OC_JSON::setContentTypeHeader('text/plain'); OCP\JSON::setContentTypeHeader('text/plain');
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$msg, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$msg, OCP\Util::DEBUG);
exit(); exit();
} }
@ -109,7 +109,7 @@ if(file_exists($tmp_path)) {
$tmpl->assign('width', $image->width()); $tmpl->assign('width', $image->width());
$tmpl->assign('height', $image->height()); $tmpl->assign('height', $image->height());
$page = $tmpl->fetchPage(); $page = $tmpl->fetchPage();
OC_JSON::success(array('data' => array('page'=>$page, 'tmp'=>$tmpfname))); OCP\JSON::success(array('data' => array('page'=>$page, 'tmp'=>$tmpfname)));
exit(); exit();
} else { } else {
if(file_exists($tmpfname)) { if(file_exists($tmpfname)) {

8
ajax/saveproperty.php
View File

@ -24,11 +24,11 @@
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG);
exit(); exit();
} }
@ -154,4 +154,4 @@ if(!OC_Contacts_VCard::edit($id,$vcard)) {
exit(); exit();
} }
OC_JSON::success(array('data' => array( 'line' => $line, 'checksum' => $checksum, 'oldchecksum' => $_POST['checksum'] ))); OCP\JSON::success(array('data' => array( 'line' => $line, 'checksum' => $checksum, 'oldchecksum' => $_POST['checksum'] )));

12
ajax/updateaddressbook.php
View File

@ -9,27 +9,27 @@
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
$bookid = $_POST['id']; $bookid = $_POST['id'];
OC_Contacts_App::getAddressbook($bookid); // is owner access check OC_Contacts_App::getAddressbook($bookid); // is owner access check
$name = trim(strip_tags($_POST['name'])); $name = trim(strip_tags($_POST['name']));
if(!$name) { if(!$name) {
OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot update addressbook with an empty name.')))); OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot update addressbook with an empty name.'))));
OCP\Util::writeLog('contacts','ajax/updateaddressbook.php: Cannot update addressbook with an empty name: '.strip_tags($_POST['name']), OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/updateaddressbook.php: Cannot update addressbook with an empty name: '.strip_tags($_POST['name']), OCP\Util::ERROR);
exit(); exit();
} }
if(!OC_Contacts_Addressbook::edit($bookid, $name, null)) { if(!OC_Contacts_Addressbook::edit($bookid, $name, null)) {
OC_JSON::error(array('data' => array('message' => $l->t('Error updating addressbook.')))); OCP\JSON::error(array('data' => array('message' => $l->t('Error updating addressbook.'))));
OCP\Util::writeLog('contacts','ajax/updateaddressbook.php: Error adding addressbook: ', OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/updateaddressbook.php: Error adding addressbook: ', OCP\Util::ERROR);
//exit(); //exit();
} }
if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) { if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
OC_JSON::error(array('data' => array('message' => $l->t('Error (de)activating addressbook.')))); OCP\JSON::error(array('data' => array('message' => $l->t('Error (de)activating addressbook.'))));
OCP\Util::writeLog('contacts','ajax/updateaddressbook.php: Error (de)activating addressbook: '.$bookid, OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/updateaddressbook.php: Error (de)activating addressbook: '.$bookid, OCP\Util::ERROR);
//exit(); //exit();
} }
@ -37,7 +37,7 @@ if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
$addressbook = OC_Contacts_App::getAddressbook($bookid); $addressbook = OC_Contacts_App::getAddressbook($bookid);
$tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields'); $tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
$tmpl->assign('addressbook', $addressbook); $tmpl->assign('addressbook', $addressbook);
OC_JSON::success(array( OCP\JSON::success(array(
'page' => $tmpl->fetchPage(), 'page' => $tmpl->fetchPage(),
'addressbook' => $addressbook, 'addressbook' => $addressbook,
)); ));

12
ajax/uploadimport.php
View File

@ -23,10 +23,10 @@
require_once('../../../lib/base.php'); require_once('../../../lib/base.php');
// Check if we are a user // Check if we are a user
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/uploadimport.php: '.$msg, OCP\Util::ERROR); OCP\Util::writeLog('contacts','ajax/uploadimport.php: '.$msg, OCP\Util::ERROR);
exit(); exit();
} }
@ -42,7 +42,7 @@ $fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : fals
if($fn) { if($fn) {
if($view->file_put_contents('/'.$tmpfile, file_get_contents('php://input'))) { if($view->file_put_contents('/'.$tmpfile, file_get_contents('php://input'))) {
debug($fn.' uploaded'); debug($fn.' uploaded');
OC_JSON::success(array('data' => array('path'=>'', 'file'=>$tmpfile))); OCP\JSON::success(array('data' => array('path'=>'', 'file'=>$tmpfile)));
exit(); exit();
} else { } else {
bailOut(OC_Contacts_App::$l10n->t('Error uploading contacts to storage.')); bailOut(OC_Contacts_App::$l10n->t('Error uploading contacts to storage.'));
@ -52,7 +52,7 @@ if($fn) {
// File input transfers are handled here // File input transfers are handled here
if (!isset($_FILES['importfile'])) { if (!isset($_FILES['importfile'])) {
OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OCP\Util::DEBUG);
OC_JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' ))); OCP\JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' )));
exit(); exit();
} }
$error = $_FILES['importfile']['error']; $error = $_FILES['importfile']['error'];
@ -73,7 +73,7 @@ $tmpfname = tempnam("/tmp", "occOrig");
if(file_exists($file['tmp_name'])) { if(file_exists($file['tmp_name'])) {
if($view->file_put_contents('/'.$tmpfile, file_get_contents($file['tmp_name']))) { if($view->file_put_contents('/'.$tmpfile, file_get_contents($file['tmp_name']))) {
debug($fn.' uploaded'); debug($fn.' uploaded');
OC_JSON::success(array('data' => array('path'=>'', 'file'=>$tmpfile))); OCP\JSON::success(array('data' => array('path'=>'', 'file'=>$tmpfile)));
} else { } else {
bailOut(OC_Contacts_App::$l10n->t('Error uploading contacts to storage.')); bailOut(OC_Contacts_App::$l10n->t('Error uploading contacts to storage.'));
} }

18
ajax/uploadphoto.php
View File

@ -24,11 +24,11 @@
// Check if we are a user // Check if we are a user
// Firefox and Konqueror tries to download application/json for me. --Arthur // Firefox and Konqueror tries to download application/json for me. --Arthur
OC_JSON::setContentTypeHeader('text/plain'); OCP\JSON::setContentTypeHeader('text/plain');
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts'); OCP\JSON::checkAppEnabled('contacts');
function bailOut($msg) { function bailOut($msg) {
OC_JSON::error(array('data' => array('message' => $msg))); OCP\JSON::error(array('data' => array('message' => $msg)));
OCP\Util::writeLog('contacts','ajax/uploadphoto.php: '.$msg, OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/uploadphoto.php: '.$msg, OCP\Util::DEBUG);
exit(); exit();
} }
@ -42,7 +42,7 @@ if ($fn) {
// AJAX call // AJAX call
if (!isset($_GET['id'])) { if (!isset($_GET['id'])) {
OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OCP\Util::DEBUG);
OC_JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' ))); OCP\JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
exit(); exit();
} }
$id = $_GET['id']; $id = $_GET['id'];
@ -58,7 +58,7 @@ if ($fn) {
debug('Couldn\'t save correct image orientation: '.$tmpfname); debug('Couldn\'t save correct image orientation: '.$tmpfname);
} }
if($image->save($tmpfname)) { if($image->save($tmpfname)) {
OC_JSON::success(array('data' => array('mime'=>$_SERVER['CONTENT_TYPE'], 'name'=>$fn, 'id'=>$id, 'tmp'=>$tmpfname))); OCP\JSON::success(array('data' => array('mime'=>$_SERVER['CONTENT_TYPE'], 'name'=>$fn, 'id'=>$id, 'tmp'=>$tmpfname)));
exit(); exit();
} else { } else {
bailOut('Couldn\'t save temporary image: '.$tmpfname); bailOut('Couldn\'t save temporary image: '.$tmpfname);
@ -71,12 +71,12 @@ if ($fn) {
if (!isset($_POST['id'])) { if (!isset($_POST['id'])) {
OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OCP\Util::DEBUG);
OC_JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' ))); OCP\JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' )));
exit(); exit();
} }
if (!isset($_FILES['imagefile'])) { if (!isset($_FILES['imagefile'])) {
OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OCP\Util::DEBUG); OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OCP\Util::DEBUG);
OC_JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' ))); OCP\JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' )));
exit(); exit();
} }
$error = $_FILES['imagefile']['error']; $error = $_FILES['imagefile']['error'];
@ -104,7 +104,7 @@ if(file_exists($file['tmp_name'])) {
debug('Couldn\'t save correct image orientation: '.$tmpfname); debug('Couldn\'t save correct image orientation: '.$tmpfname);
} }
if($image->save($tmpfname)) { if($image->save($tmpfname)) {
OC_JSON::success(array('data' => array('mime'=>$file['type'],'size'=>$file['size'],'name'=>$file['name'], 'id'=>$_POST['id'], 'tmp'=>$tmpfname))); OCP\JSON::success(array('data' => array('mime'=>$file['type'],'size'=>$file['size'],'name'=>$file['name'], 'id'=>$_POST['id'], 'tmp'=>$tmpfname)));
exit(); exit();
} else { } else {
bailOut('Couldn\'t save temporary image: '.$tmpfname); bailOut('Couldn\'t save temporary image: '.$tmpfname);

6
import.php
View File

@ -8,7 +8,7 @@
//check for addressbooks rights or create new one //check for addressbooks rights or create new one
ob_start(); ob_start();
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OCP\App::checkAppEnabled('contacts'); OCP\App::checkAppEnabled('contacts');
$nl = "\n"; $nl = "\n";
$progressfile = 'import_tmp/' . md5(session_id()) . '.txt'; $progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
@ -25,7 +25,7 @@ if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
$file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']); $file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
} }
if(!$file) { if(!$file) {
OC_JSON::error(array('message' => 'Import file was empty.')); OCP\JSON::error(array('message' => 'Import file was empty.'));
exit(); exit();
} }
error_log('File: '.$file); error_log('File: '.$file);
@ -137,4 +137,4 @@ if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
OCP\Util::writeLog('contacts','Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], OCP\Util::ERROR); OCP\Util::writeLog('contacts','Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], OCP\Util::ERROR);
} }
} }
OC_JSON::success(array('data' => array('imported'=>$imported, 'failed'=>$failed))); OCP\JSON::success(array('data' => array('imported'=>$imported, 'failed'=>$failed)));

6
lib/app.php
View File

@ -20,11 +20,11 @@ class OC_Contacts_App {
if( $addressbook === false || $addressbook['userid'] != OCP\USER::getUser()) { if( $addressbook === false || $addressbook['userid'] != OCP\USER::getUser()) {
if ($addressbook === false) { if ($addressbook === false) {
OCP\Util::writeLog('contacts', 'Addressbook not found: '. $id, OCP\Util::ERROR); OCP\Util::writeLog('contacts', 'Addressbook not found: '. $id, OCP\Util::ERROR);
OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Addressbook not found.')))); OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('Addressbook not found.'))));
} }
else { else {
OCP\Util::writeLog('contacts', 'Addressbook('.$id.') is not from '.OCP\USER::getUser(), OCP\Util::ERROR); OCP\Util::writeLog('contacts', 'Addressbook('.$id.') is not from '.OCP\USER::getUser(), OCP\Util::ERROR);
OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('This is not your addressbook.')))); OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('This is not your addressbook.'))));
} }
exit(); exit();
} }
@ -35,7 +35,7 @@ class OC_Contacts_App {
$card = OC_Contacts_VCard::find( $id ); $card = OC_Contacts_VCard::find( $id );
if( $card === false ) { if( $card === false ) {
OCP\Util::writeLog('contacts', 'Contact could not be found: '.$id, OCP\Util::ERROR); OCP\Util::writeLog('contacts', 'Contact could not be found: '.$id, OCP\Util::ERROR);
OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.').' '.$id))); OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.').' '.$id)));
exit(); exit();
} }

2
thumbnail.php
View File

@ -22,7 +22,7 @@
// Init owncloud // Init owncloud
OC_JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
//OCP\User::checkLoggedIn(); //OCP\User::checkLoggedIn();
OCP\App::checkAppEnabled('contacts'); OCP\App::checkAppEnabled('contacts');