Merge branch 'master' into oc_error
Georg Ehrke
commit
4e53db3d9c
@ -0,0 +1,40 @@
|
||||
<?php
|
||||
/**
|
||||
* ownCloud - Addressbook
|
||||
*
|
||||
* @author Thomas Tanghus
|
||||
* @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
|
||||
*
|
||||
* 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/>.
|
||||
*
|
||||
*/
|
||||
|
||||
function bailOut($msg, $tracelevel=1, $debuglevel=OCP\Util::ERROR) {
|
||||
OCP\JSON::error(array('data' => array('message' => $msg)));
|
||||
debug($msg, $tracelevel, $debuglevel);
|
||||
exit();
|
||||
}
|
||||
|
||||
function debug($msg, $tracelevel=0, $debuglevel=OCP\Util::DEBUG) {
|
||||
if(PHP_VERSION >= "5.4") {
|
||||
$call = debug_backtrace(false, $tracelevel+1);
|
||||
} else {
|
||||
$call = debug_backtrace(false);
|
||||
}
|
||||
error_log('trace: '.print_r($call, true));
|
||||
$call = $call[$tracelevel];
|
||||
if($debuglevel !== false) {
|
||||
OCP\Util::writeLog('contacts', $call['file'].'. Line: '.$call['line'].': '.$msg, $debuglevel);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
<?php
|
||||
/**
|
||||
* @author Victor Dubiniuk
|
||||
* Copyright (c) 2012 Victor Dubiniuk <victor.dubiniuk@gmail.com>
|
||||
* Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later.
|
||||
* See the COPYING-README file.
|
||||
*/
|
||||
|
||||
OCP\JSON::checkLoggedIn();
|
||||
OCP\JSON::checkAppEnabled('contacts');
|
||||
OCP\JSON::callCheck();
|
||||
|
||||
$ids = $_POST['ids'];
|
||||
$aid = intval($_POST['aid']);
|
||||
OC_Contacts_App::getAddressbook($aid);
|
||||
|
||||
if(!is_array($ids)) {
|
||||
$ids = array($ids,);
|
||||
}
|
||||
$goodids = array();
|
||||
foreach ($ids as $id){
|
||||
try {
|
||||
$card = OC_Contacts_App::getContactObject( intval($id) );
|
||||
if($card) {
|
||||
$goodids[] = $id;
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
OCP\Util::writeLog('contacts', 'Error moving contact "'.$id.'" to addressbook "'.$aid.'"'.$e->getMessage(), OCP\Util::ERROR);
|
||||
}
|
||||
}
|
||||
try {
|
||||
OC_Contacts_VCard::moveToAddressBook($aid, $ids);
|
||||
} catch (Exception $e) {
|
||||
$msg = $e->getMessage();
|
||||
OCP\Util::writeLog('contacts', 'Error moving contacts "'.implode(',', $ids).'" to addressbook "'.$aid.'"'.$msg, OCP\Util::ERROR);
|
||||
OC_JSON::error(array('data' => array('message' => $msg,)));
|
||||
}
|
||||
|
||||
OC_JSON::success(array('data' => array('ids' => $goodids,)));
|
||||
Loading…
Reference in New Issue