wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ported oc_json

Browse source
This commit is contained in:
Frank Karlitschek 2012-05-03 12:23:29 +02:00
parent 375ba98645
commit 43caa3b3b9
107 changed files with 457 additions and 363 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/bookmarks/ajax/addBookmark.php Normal file → Executable file
View file

@ -27,9 +27,9 @@ $RUNTIME_NOSETUPFS=true;
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('bookmarks');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('bookmarks');
require_once(OC::$APPSROOT . '/apps/bookmarks/bookmarksHelper.php');
$id = addBookmark($_GET['url'], $_GET['title'], $_GET['tags']);
OC_JSON::success(array('data' => $id));
OCP\JSON::success(array('data' => $id));

6
apps/bookmarks/ajax/delBookmark.php
View file

@ -27,8 +27,8 @@ $RUNTIME_NOSETUPFS=true;
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('bookmarks');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('bookmarks');
$params=array(
htmlspecialchars_decode($_GET["url"]),
@ -59,4 +59,4 @@ $query = OC_DB::prepare("
$result = $query->execute();
// var_dump($params);
OC_JSON::success(array('data' => array()));
OCP\JSON::success(array('data' => array()));

4
apps/bookmarks/ajax/editBookmark.php
View file

@ -27,8 +27,8 @@ $RUNTIME_NOSETUPFS=true;
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('bookmarks');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('bookmarks');
$CONFIG_DBTYPE = OCP\Config::getSystemValue( "dbtype", "sqlite" );
if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){

4
apps/bookmarks/ajax/recordClick.php
View file

@ -27,8 +27,8 @@ $RUNTIME_NOSETUPFS=true;
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('bookmarks');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('bookmarks');
$query = OC_DB::prepare("
UPDATE *PREFIX*bookmarks

6
apps/bookmarks/ajax/updateList.php Normal file → Executable file
View file

@ -28,8 +28,8 @@ $RUNTIME_NOSETUPFS=true;
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('bookmarks');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('bookmarks');
//Filter for tag?
@ -47,4 +47,4 @@ if($sort == 'bookmarks_sorting_clicks') {
$bookmarks = OC_Bookmarks_Bookmarks::findBookmarks($offset, $sqlSortColumn, $filterTag, true);
OC_JSON::success(array('data' => $bookmarks));
OCP\JSON::success(array('data' => $bookmarks));

6
apps/calendar/ajax/calendar/activation.php Normal file → Executable file
View file

@ -7,13 +7,13 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
$calendarid = $_POST['calendarid'];
$calendar = OC_Calendar_App::getCalendar($calendarid);//access check
OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
$calendar = OC_Calendar_App::getCalendar($calendarid);
OC_JSON::success(array(
OCP\JSON::success(array(
'active' => $calendar['active'],
'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
));

8
apps/calendar/ajax/calendar/delete.php Normal file → Executable file
View file

@ -7,15 +7,15 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
$cal = $_POST["calendarid"];
$calendar = OC_Calendar_App::getCalendar($cal);
$del = OC_Calendar_Calendar::deleteCalendar($cal);
if($del == true){
OC_JSON::success();
OCP\JSON::success();
}else{
OC_JSON::error(array('error'=>'dberror'));
OCP\JSON::error(array('error'=>'dberror'));
}
?>

4
apps/calendar/ajax/calendar/edit.form.php Normal file → Executable file
View file

@ -7,8 +7,8 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
$calendar = OC_Calendar_App::getCalendar($_GET['calendarid']);

4
apps/calendar/ajax/calendar/edit.php Normal file → Executable file
View file

@ -7,8 +7,8 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
$calendar = OC_Calendar_App::getCalendar($_GET['calendarid']);

4
apps/calendar/ajax/calendar/new.form.php Normal file → Executable file
View file

@ -7,8 +7,8 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
$calendar = array(
'id' => 'new',

10
apps/calendar/ajax/calendar/new.php
View file

@ -9,17 +9,17 @@
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
if(trim($_POST['name']) == ''){
OC_JSON::error(array('message'=>'empty'));
OCP\JSON::error(array('message'=>'empty'));
exit;
}
$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
foreach($calendars as $cal){
if($cal['displayname'] == $_POST['name']){
OC_JSON::error(array('message'=>'namenotavailable'));
OCP\JSON::error(array('message'=>'namenotavailable'));
exit;
}
}
@ -31,7 +31,7 @@ OC_Calendar_Calendar::setCalendarActive($calendarid, 1);
$calendar = OC_Calendar_Calendar::find($calendarid);
$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
$tmpl->assign('calendar', $calendar);
OC_JSON::success(array(
OCP\JSON::success(array(
'page' => $tmpl->fetchPage(),
'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
));

4
apps/calendar/ajax/calendar/overview.php Normal file → Executable file
View file

@ -8,8 +8,8 @@
$l10n = OC_L10N::get('calendar');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
$output = new OC_TEMPLATE("calendar", "part.choosecalendar");
$output -> printpage();
?>

10
apps/calendar/ajax/calendar/update.php
View file

@ -9,17 +9,17 @@
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
if(trim($_POST['name']) == ''){
OC_JSON::error(array('message'=>'empty'));
OCP\JSON::error(array('message'=>'empty'));
exit;
}
$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
foreach($calendars as $cal){
if($cal['displayname'] == $_POST['name'] && $cal['id'] != $_POST['id']){
OC_JSON::error(array('message'=>'namenotavailable'));
OCP\JSON::error(array('message'=>'namenotavailable'));
exit;
}
}
@ -32,7 +32,7 @@ OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
$calendar = OC_Calendar_App::getCalendar($calendarid);
$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields');
$tmpl->assign('calendar', $calendar);
OC_JSON::success(array(
OCP\JSON::success(array(
'page' => $tmpl->fetchPage(),
'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
));

8
apps/calendar/ajax/categories/rescan.php
View file

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

8
apps/calendar/ajax/changeview.php
View file

@ -5,8 +5,8 @@
* later.
* See the COPYING-README file.
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
$view = $_GET['v'];
switch($view){
case 'agendaWeek':
@ -14,9 +14,9 @@ switch($view){
case 'list':
break;
default:
OC_JSON::error(array('message'=>'unexspected parameter: ' . $view));
OCP\JSON::error(array('message'=>'unexspected parameter: ' . $view));
exit;
}
OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'currentview', $view);
OC_JSON::success();
OCP\JSON::success();
?>

8
apps/calendar/ajax/event/delete.php Normal file → Executable file
View file

@ -7,14 +7,14 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
$id = $_POST['id'];
$access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
if($access != 'owner' && $access != 'rw'){
OC_JSON::error(array('message'=>'permission denied'));
OCP\JSON::error(array('message'=>'permission denied'));
exit;
}
$result = OC_Calendar_Object::delete($id);
OC_JSON::success();
OCP\JSON::success();

4
apps/calendar/ajax/event/edit.form.php
View file

@ -11,13 +11,13 @@
if(!OCP\User::isLoggedIn()) {
die('<script type="text/javascript">document.location = oc_webroot;</script>');
}
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkAppEnabled('calendar');
$id = $_GET['id'];
$data = OC_Calendar_App::getEventObject($id, true, true);
if(!$data){
OC_JSON::error(array('data' => array('message' => self::$l10n->t('Wrong calendar'))));
OCP\JSON::error(array('data' => array('message' => self::$l10n->t('Wrong calendar'))));
exit;
}
$access = OC_Calendar_App::getaccess($id, OC_Calendar_Share::EVENT);

10
apps/calendar/ajax/event/edit.php Normal file → Executable file
View file

@ -7,8 +7,8 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
$id = $_POST['id'];
@ -21,14 +21,14 @@ if(!array_key_exists('calendar', $_POST)){
$access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
if($access != 'owner' && $access != 'rw'){
OC_JSON::error(array('message'=>'permission denied'));
OCP\JSON::error(array('message'=>'permission denied'));
exit;
}
$errarr = OC_Calendar_Object::validateRequest($_POST);
if($errarr){
//show validate errors
OC_JSON::error($errarr);
OCP\JSON::error($errarr);
exit;
}else{
$data = OC_Calendar_App::getEventObject($id, false, false);
@ -41,6 +41,6 @@ if($errarr){
if ($data['calendarid'] != $cal) {
OC_Calendar_Object::moveToCalendar($id, $cal);
}
OC_JSON::success();
OCP\JSON::success();
}
?>

6
apps/calendar/ajax/event/move.php Normal file → Executable file
View file

@ -6,12 +6,12 @@
* See the COPYING-README file.
*/
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
$id = $_POST['id'];
$access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
if($access != 'owner' && $access != 'rw'){
OC_JSON::error(array('message'=>'permission denied'));
OCP\JSON::error(array('message'=>'permission denied'));
exit;
}
$vcalendar = OC_Calendar_App::getVCalendar($id, false, false);
@ -43,4 +43,4 @@ $vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
$result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
OC_JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));

4
apps/calendar/ajax/event/new.form.php
View file

@ -11,10 +11,10 @@
if(!OCP\User::isLoggedIn()) {
die('<script type="text/javascript">document.location = oc_webroot;</script>');
}
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkAppEnabled('calendar');
if (!isset($_POST['start'])){
OC_JSON::error();
OCP\JSON::error();
die;
}
$start = $_POST['start'];

8
apps/calendar/ajax/event/new.php Normal file → Executable file
View file

@ -8,18 +8,18 @@
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
$errarr = OC_Calendar_Object::validateRequest($_POST);
if($errarr){
//show validate errors
OC_JSON::error($errarr);
OCP\JSON::error($errarr);
exit;
}else{
$cal = $_POST['calendar'];
$vcalendar = OC_Calendar_Object::createVCalendarFromRequest($_POST);
$result = OC_Calendar_Object::add($cal, $vcalendar->serialize());
OC_JSON::success();
OCP\JSON::success();
}
?>

6
apps/calendar/ajax/event/resize.php Normal file → Executable file
View file

@ -6,13 +6,13 @@
* See the COPYING-README file.
*/
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
$id = $_POST['id'];
$access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
if($access != 'owner' && $access != 'rw'){
OC_JSON::error(array('message'=>'permission denied'));
OCP\JSON::error(array('message'=>'permission denied'));
exit;
}
@ -35,4 +35,4 @@ $vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
OC_Calendar_Object::edit($id, $vcalendar->serialize());
$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
OC_JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));

6
apps/calendar/ajax/events.php Normal file → Executable file
View file

@ -9,8 +9,8 @@
require_once('when/When.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
$start = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['start']):new DateTime('@' . $_GET['start']);
$end = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['end']):new DateTime('@' . $_GET['end']);
@ -21,5 +21,5 @@ $output = array();
foreach($events as $event){
$output[] = OC_Calendar_App::generateEventOutput($event, $start, $end);
}
OC_JSON::encodedPrint($output);
OCP\JSON::encodedPrint($output);
?>

2
apps/calendar/ajax/import/dialog.php
View file

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

6
apps/calendar/ajax/import/import.php
View file

@ -7,7 +7,7 @@
*/
//check for calendar rights or create new one
ob_start();
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
OCP\App::checkAppEnabled('calendar');
$nl="\r\n";
$comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
@ -24,7 +24,7 @@ if($_POST['method'] == 'new'){
}else{
$calendar = OC_Calendar_App::getCalendar($_POST['id']);
if($calendar['userid'] != OCP\USER::getUser()){
OC_JSON::error();
OCP\JSON::error();
exit();
}
$id = $_POST['id'];
@ -126,4 +126,4 @@ sleep(3);
if(is_writable('import_tmp/')){
unlink($progressfile);
}
OC_JSON::success();
OCP\JSON::success();

4
apps/calendar/ajax/settings/getfirstday.php
View file

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
$firstday = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'firstday', 'mo');
OC_JSON::encodedPrint(array('firstday' => $firstday));
OCP\JSON::encodedPrint(array('firstday' => $firstday));
?>

6
apps/calendar/ajax/settings/gettimezonedetection.php
View file

@ -6,6 +6,6 @@
* See the COPYING-README file.
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OC_JSON::success(array('detection' => OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection')));
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
OCP\JSON::success(array('detection' => OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection')));

8
apps/calendar/ajax/settings/guesstimezone.php
View file

@ -7,8 +7,8 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
$l = OC_L10N::get('calendar');
@ -18,10 +18,10 @@ $lng = $_GET['long'];
$timezone = OC_Geo::timezone($lat, $lng);
if($timezone == OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezone')){
OC_JSON::success();
OCP\JSON::success();
exit;
}
OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezone', $timezone);
$message = array('message'=> $l->t('New Timezone:') . $timezone);
OC_JSON::success($message);
OCP\JSON::success($message);
?>

6
apps/calendar/ajax/settings/setfirstday.php
View file

@ -6,12 +6,12 @@
* See the COPYING-README file.
*/
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
if(isset($_POST["firstday"])){
OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'firstday', $_POST["firstday"]);
OC_JSON::success();
OCP\JSON::success();
}else{
OC_JSON::error();
OCP\JSON::error();
}
?>

6
apps/calendar/ajax/settings/settimeformat.php
View file

@ -6,12 +6,12 @@
* See the COPYING-README file.
*/
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
if(isset($_POST["timeformat"])){
OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timeformat', $_POST["timeformat"]);
OC_JSON::success();
OCP\JSON::success();
}else{
OC_JSON::error();
OCP\JSON::error();
}
?>

8
apps/calendar/ajax/settings/settimezone.php
View file

@ -12,16 +12,16 @@
$l=OC_L10N::get('calendar');
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
// Get data
if( isset( $_POST['timezone'] ) ){
$timezone=$_POST['timezone'];
OCP\Config::setUserValue( OCP\USER::getUser(), 'calendar', 'timezone', $timezone );
OC_JSON::success(array('data' => array( 'message' => $l->t('Timezone changed') )));
OCP\JSON::success(array('data' => array( 'message' => $l->t('Timezone changed') )));
}else{
OC_JSON::error(array('data' => array( 'message' => $l->t('Invalid request') )));
OCP\JSON::error(array('data' => array( 'message' => $l->t('Invalid request') )));
}
?>

4
apps/calendar/ajax/settings/timeformat.php
View file

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
$timeformat = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'timeformat', "24");
OC_JSON::encodedPrint(array("timeformat" => $timeformat));
OCP\JSON::encodedPrint(array("timeformat" => $timeformat));
?>

8
apps/calendar/ajax/settings/timezonedetection.php
View file

@ -6,15 +6,15 @@
* See the COPYING-README file.
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar');
if(array_key_exists('timezonedetection', $_POST)){
if($_POST['timezonedetection'] == 'on'){
OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection', 'true');
}else{
OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection', 'false');
}
OC_JSON::success();
OCP\JSON::success();
}else{
OC_JSON::error();
OCP\JSON::error();
}

2
apps/calendar/ajax/share/activation.php
View file

@ -9,4 +9,4 @@ require_once('../../../../lib/base.php');
$id = strip_tags($_GET['id']);
$activation = strip_tags($_GET['activation']);
OC_Calendar_Share::set_active(OCP\USER::getUser(), $id, $activation);
OC_JSON::success();
OCP\JSON::success();

10
apps/calendar/ajax/share/changepermission.php
View file

@ -14,7 +14,7 @@ switch($idtype){
case 'event':
break;
default:
OC_JSON::error(array('message'=>'unexspected parameter'));
OCP\JSON::error(array('message'=>'unexspected parameter'));
exit;
}
$sharewith = $_GET['sharewith'];
@ -25,16 +25,16 @@ switch($sharetype){
case 'public':
break;
default:
OC_JSON::error(array('message'=>'unexspected parameter'));
OCP\JSON::error(array('message'=>'unexspected parameter'));
exit;
}
if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
OC_JSON::error(array('message'=>'user not found'));
OCP\JSON::error(array('message'=>'user not found'));
exit;
}
if($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
OC_JSON::error(array('message'=>'group not found'));
OCP\JSON::error(array('message'=>'group not found'));
exit;
}
$success = OC_Calendar_Share::changepermission($sharewith, $sharetype, $id, $permission, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::EVENT));
OC_JSON::success();
OCP\JSON::success();

2
apps/calendar/ajax/share/dropdown.php
View file

@ -10,7 +10,7 @@ $user = OCP\USER::getUser();
$calid = $_GET['calid'];
$calendar = OC_Calendar_Calendar::find($calid);
if($calendar['userid'] != $user){
OC_JSON::error();
OCP\JSON::error();
exit;
}
$tmpl = new OC_Template('calendar', 'share.dropdown');

20
apps/calendar/ajax/share/share.php
View file

@ -13,15 +13,15 @@ switch($idtype){
case 'event':
break;
default:
OC_JSON::error(array('message'=>'unexspected parameter'));
OCP\JSON::error(array('message'=>'unexspected parameter'));
exit;
}
if($idtype == 'calendar' && !OC_Calendar_App::getCalendar($id)){
OC_JSON::error(array('message'=>'permission denied'));
OCP\JSON::error(array('message'=>'permission denied'));
exit;
}
if($idtype == 'event' && !OC_Calendar_App::getEventObject($id)){
OC_JSON::error(array('message'=>'permission denied'));
OCP\JSON::error(array('message'=>'permission denied'));
exit;
}
$sharewith = $_GET['sharewith'];
@ -32,28 +32,28 @@ switch($sharetype){
case 'public':
break;
default:
OC_JSON::error(array('message'=>'unexspected parameter'));
OCP\JSON::error(array('message'=>'unexspected parameter'));
exit;
}
if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
OC_JSON::error(array('message'=>'user not found'));
OCP\JSON::error(array('message'=>'user not found'));
exit;
}
if($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
OC_JSON::error(array('message'=>'group not found'));
OCP\JSON::error(array('message'=>'group not found'));
exit;
}
if($sharetype == 'user' && OCP\USER::getUser() == $sharewith){
OC_JSON::error(array('meesage'=>'you can not share with yourself'));
OCP\JSON::error(array('meesage'=>'you can not share with yourself'));
}
$success = OC_Calendar_Share::share(OCP\USER::getUser(), $sharewith, $sharetype, $id, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::EVENT));
if($success){
if($sharetype == 'public'){
OC_JSON::success(array('message'=>$success));
OCP\JSON::success(array('message'=>$success));
}else{
OC_JSON::success(array('message'=>'shared'));
OCP\JSON::success(array('message'=>'shared'));
}
}else{
OC_JSON::error(array('message'=>'can not share'));
OCP\JSON::error(array('message'=>'can not share'));
exit;
}

12
apps/calendar/ajax/share/unshare.php
View file

@ -13,7 +13,7 @@ switch($idtype){
case 'event':
break;
default:
OC_JSON::error(array('message'=>'unexspected parameter'));
OCP\JSON::error(array('message'=>'unexspected parameter'));
exit;
}
$sharewith = $_GET['sharewith'];
@ -24,20 +24,20 @@ switch($sharetype){
case 'public':
break;
default:
OC_JSON::error(array('message'=>'unexspected parameter'));
OCP\JSON::error(array('message'=>'unexspected parameter'));
exit;
}
if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
OC_JSON::error(array('message'=>'user not found'));
OCP\JSON::error(array('message'=>'user not found'));
exit;
}elseif($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
OC_JSON::error(array('message'=>'group not found'));
OCP\JSON::error(array('message'=>'group not found'));
exit;
}
$success = OC_Calendar_Share::unshare(OCP\USER::getUser(), $sharewith, $sharetype, $id, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::EVENT));
if($success){
OC_JSON::success();
OCP\JSON::success();
}else{
OC_JSON::error(array('message'=>'can not unshare'));
OCP\JSON::error(array('message'=>'can not unshare'));
exit;
}

2
apps/calendar/lib/app.php
View file

@ -106,7 +106,7 @@ class OC_Calendar_App{
public static function isNotModified($vevent, $lastmodified){
$last_modified = $vevent->__get('LAST-MODIFIED');
if($last_modified && $lastmodified != $last_modified->getDateTime()->format('U')){
OC_JSON::error(array('modified'=>true));
OCP\JSON::error(array('modified'=>true));
exit;
}
return true;

8
apps/contacts/ajax/activation.php
View file

@ -8,19 +8,19 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
$bookid = $_POST['bookid'];
$book = OC_Contacts_App::getAddressbook($bookid);// is owner access check
if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
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();
}
OC_JSON::success(array(
OCP\JSON::success(array(
'active' => OC_Contacts_Addressbook::isActive($bookid),
'bookid' => $bookid,
'book' => $book,

4
apps/contacts/ajax/addbook.php Normal file → Executable file
View file

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

10
apps/contacts/ajax/addcontact.php
View file

@ -23,7 +23,7 @@
// Init owncloud
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);
exit();
}
@ -32,8 +32,8 @@ function debug($msg) {
}
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
foreach ($_POST as $key=>$element) {
debug('_POST: '.$key.'=>'.$element);
@ -55,9 +55,9 @@ $vcard->setString('N',$n);
$id = OC_Contacts_VCard::add($aid,$vcard);
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);
exit();
}
OC_JSON::success(array('data' => array( 'id' => $id )));
OCP\JSON::success(array('data' => array( 'id' => $id )));

14
apps/contacts/ajax/addproperty.php
View file

@ -24,8 +24,8 @@
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
$id = isset($_POST['id'])?$_POST['id']:null;
$name = isset($_POST['name'])?$_POST['name']:null;
@ -37,7 +37,7 @@ $vcard = OC_Contacts_App::getContactVCard($id);
if(!is_array($value)){
$value = trim($value);
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();
}
} elseif($name === 'ADR') { // only add if non-empty elements.
@ -49,7 +49,7 @@ if(!is_array($value)){
}
}
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();
}
}
@ -59,7 +59,7 @@ $current = $vcard->select($name);
foreach($current as $item) {
$tmpvalue = (is_array($value)?implode(';', $value):$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);
exit();
}
@ -117,9 +117,9 @@ foreach ($parameters as $key=>$element) {
$checksum = md5($vcard->children[$line]->serialize());
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);
exit();
}
OC_JSON::success(array('data' => array( 'checksum' => $checksum )));
OCP\JSON::success(array('data' => array( 'checksum' => $checksum )));

10
apps/contacts/ajax/categories/categoriesfor.php
View file

@ -7,12 +7,12 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
$id = isset($_GET['id'])?$_GET['id']:null;
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();
}
$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);
if($property->name == 'CATEGORIES') {
$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();
}
}
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
apps/contacts/ajax/categories/delete.php
View file

@ -7,15 +7,15 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
foreach ($_POST as $key=>$element) {
debug('_POST: '.$key.'=>'.print_r($element, true));
}
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);
exit();
}
@ -55,6 +55,6 @@ $catman = new OC_VCategories('contacts');
$catman->delete($categories, $cards);
debug('After delete: '.print_r($catman->categories(), true));
OC_Contacts_VCard::updateDataByID($cards);
OC_JSON::success(array('data' => array('categories'=>$catman->categories())));
OCP\JSON::success(array('data' => array('categories'=>$catman->categories())));
?>

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

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

8
apps/contacts/ajax/categories/rescan.php
View file

@ -7,15 +7,15 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
foreach ($_POST as $key=>$element) {
debug('_POST: '.$key.'=>'.print_r($element, true));
}
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);
exit();
}
@ -39,6 +39,6 @@ if(count($contacts) == 0) {
OC_Contacts_App::scanCategories($contacts);
$categories = OC_Contacts_App::getCategories();
OC_JSON::success(array('data' => array('categories'=>$categories)));
OCP\JSON::success(array('data' => array('categories'=>$categories)));
?>

4
apps/contacts/ajax/chooseaddressbook.php Normal file → Executable file
View file

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

8
apps/contacts/ajax/contactdetails.php
View file

@ -23,14 +23,14 @@
// Init owncloud
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);
exit();
}
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
$id = isset($_GET['id'])?$_GET['id']:null;
if(is_null($id)) {
@ -69,4 +69,4 @@ if(isset($details['PHOTO'])) {
}
$details['id'] = $id;
OC_Contacts_App::setLastModifiedHeader($vcard);
OC_JSON::success(array('data' => $details));
OCP\JSON::success(array('data' => $details));

6
apps/contacts/ajax/contacts.php
View file

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

12
apps/contacts/ajax/createaddressbook.php
View file

@ -9,32 +9,32 @@
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
$userid = OCP\USER::getUser();
$name = trim(strip_tags($_POST['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);
exit();
}
$bookid = OC_Contacts_Addressbook::add($userid, $name, null);
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);
exit();
}
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);
//exit();
}
$addressbook = OC_Contacts_App::getAddressbook($bookid);
$tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
$tmpl->assign('addressbook', $addressbook);
OC_JSON::success(array(
OCP\JSON::success(array(
'page' => $tmpl->fetchPage(),
'addressbook' => $addressbook,
));

6
apps/contacts/ajax/cropphoto.php
View file

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

10
apps/contacts/ajax/currentphoto.php
View file

@ -24,11 +24,11 @@
// Check if we are a user
// Firefox and Konqueror tries to download application/json for me. --Arthur
OC_JSON::setContentTypeHeader('text/plain');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::setContentTypeHeader('text/plain');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
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);
exit();
}
@ -55,7 +55,7 @@ if( is_null($contact)) {
}
if($image->valid()) {
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();
} else {
bailOut(OC_Contacts_App::$l10n->t('Error saving temporary file.'));

6
apps/contacts/ajax/deletebook.php Normal file → Executable file
View file

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

8
apps/contacts/ajax/deletecard.php
View file

@ -20,7 +20,7 @@
*
*/
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);
exit();
}
@ -29,8 +29,8 @@ function bailOut($msg) {
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
$id = isset($_GET['id'])?$_GET['id']:null;
if(!$id) {
@ -39,4 +39,4 @@ if(!$id) {
$card = OC_Contacts_App::getContactObject( $id );
OC_Contacts_VCard::delete($id);
OC_JSON::success(array('data' => array( 'id' => $id )));
OCP\JSON::success(array('data' => array( 'id' => $id )));

10
apps/contacts/ajax/deleteproperty.php
View file

@ -24,8 +24,8 @@
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
$id = $_GET['id'];
$checksum = $_GET['checksum'];
@ -33,16 +33,16 @@ $checksum = $_GET['checksum'];
$vcard = OC_Contacts_App::getContactVCard( $id );
$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
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();
}
unset($vcard->children[$line]);
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);
exit();
}
OC_JSON::success(array('data' => array( 'id' => $id )));
OCP\JSON::success(array('data' => array( 'id' => $id )));

4
apps/contacts/ajax/editaddress.php Normal file → Executable file
View file

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

4
apps/contacts/ajax/editaddressbook.php Normal file → Executable file
View file

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

6
apps/contacts/ajax/editname.php
View file

@ -7,10 +7,10 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
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);
exit();
}

2
apps/contacts/ajax/importaddressbook.php
View file

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

2
apps/contacts/ajax/importdialog.php
View file

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

8
apps/contacts/ajax/loadcard.php
View file

@ -23,7 +23,7 @@
// Init owncloud
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);
exit();
}
@ -35,8 +35,8 @@ function debug($msg) {
// }
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
@ -58,4 +58,4 @@ $tmpl->assign('email_types',$email_types);
$tmpl->assign('id','');
$page = $tmpl->fetchPage();
OC_JSON::success(array('data' => array( 'page' => $page )));
OCP\JSON::success(array('data' => array( 'page' => $page )));

6
apps/contacts/ajax/loadintro.php Normal file → Executable file
View file

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

8
apps/contacts/ajax/loadphoto.php
View file

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

10
apps/contacts/ajax/oc_photo.php
View file

@ -24,11 +24,11 @@ require_once('lib/base.php');
// Check if we are a user
// Firefox and Konqueror tries to download application/json for me. --Arthur
OC_JSON::setContentTypeHeader('text/plain');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::setContentTypeHeader('text/plain');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
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);
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);
}
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();
} else {
bailOut('Couldn\'t save temporary image: '.$tmpfname);

10
apps/contacts/ajax/savecrop.php
View file

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

8
apps/contacts/ajax/saveproperty.php
View file

@ -24,11 +24,11 @@
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
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);
exit();
}
@ -154,4 +154,4 @@ if(!OC_Contacts_VCard::edit($id,$vcard)) {
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
apps/contacts/ajax/updateaddressbook.php
View file

@ -9,27 +9,27 @@
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
$bookid = $_POST['id'];
OC_Contacts_App::getAddressbook($bookid); // is owner access check
$name = trim(strip_tags($_POST['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);
exit();
}
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);
//exit();
}
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);
//exit();
}
@ -37,7 +37,7 @@ if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
$addressbook = OC_Contacts_App::getAddressbook($bookid);
$tmpl = new OC_Template('contacts', 'part.chooseaddressbook.rowfields');
$tmpl->assign('addressbook', $addressbook);
OC_JSON::success(array(
OCP\JSON::success(array(
'page' => $tmpl->fetchPage(),
'addressbook' => $addressbook,
));

12
apps/contacts/ajax/uploadimport.php
View file

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

18
apps/contacts/ajax/uploadphoto.php
View file

@ -24,11 +24,11 @@
// Check if we are a user
// Firefox and Konqueror tries to download application/json for me. --Arthur
OC_JSON::setContentTypeHeader('text/plain');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
OCP\JSON::setContentTypeHeader('text/plain');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('contacts');
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);
exit();
}
@ -42,7 +42,7 @@ if ($fn) {
// AJAX call
if (!isset($_GET['id'])) {
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();
}
$id = $_GET['id'];
@ -58,7 +58,7 @@ if ($fn) {
debug('Couldn\'t save correct image orientation: '.$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();
} else {
bailOut('Couldn\'t save temporary image: '.$tmpfname);
@ -71,12 +71,12 @@ if ($fn) {
if (!isset($_POST['id'])) {
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();
}
if (!isset($_FILES['imagefile'])) {
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();
}
$error = $_FILES['imagefile']['error'];
@ -104,7 +104,7 @@ if(file_exists($file['tmp_name'])) {
debug('Couldn\'t save correct image orientation: '.$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();
} else {
bailOut('Couldn\'t save temporary image: '.$tmpfname);

6
apps/contacts/import.php
View file

@ -8,7 +8,7 @@
//check for addressbooks rights or create new one
ob_start();
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
OCP\App::checkAppEnabled('contacts');
$nl = "\n";
$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']);
}
if(!$file) {
OC_JSON::error(array('message' => 'Import file was empty.'));
OCP\JSON::error(array('message' => 'Import file was empty.'));
exit();
}
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);
}
}
OC_JSON::success(array('data' => array('imported'=>$imported, 'failed'=>$failed)));
OCP\JSON::success(array('data' => array('imported'=>$imported, 'failed'=>$failed)));

6
apps/contacts/lib/app.php
View file

@ -20,11 +20,11 @@ class OC_Contacts_App {
if( $addressbook === false || $addressbook['userid'] != OCP\USER::getUser()) {
if ($addressbook === false) {
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 {
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();
}
@ -35,7 +35,7 @@ class OC_Contacts_App {
$card = OC_Contacts_VCard::find( $id );
if( $card === false ) {
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();
}

2
apps/contacts/thumbnail.php
View file

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

4
apps/files/ajax/autocomplete.php Normal file → Executable file
View file

@ -5,7 +5,7 @@
// Init owncloud
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
// Get data
$query = $_GET['term'];
@ -51,6 +51,6 @@ if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)){
}
}
}
OC_JSON::encodedPrint($files);
OCP\JSON::encodedPrint($files);
?>

6
apps/files/ajax/delete.php Normal file → Executable file
View file

@ -3,7 +3,7 @@
// Init owncloud
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
// Get data
$dir = stripslashes($_GET["dir"]);
@ -21,9 +21,9 @@ foreach($files as $file) {
}
if($success) {
OC_JSON::success(array("data" => array( "dir" => $dir, "files" => $files )));
OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $files )));
} else {
OC_JSON::error(array("data" => array( "message" => "Could not delete:\n" . $filesWithError )));
OCP\JSON::error(array("data" => array( "message" => "Could not delete:\n" . $filesWithError )));
}
?>

4
apps/files/ajax/list.php
View file

@ -6,7 +6,7 @@ $RUNTIME_APPTYPES=array('filesystem');
// Init owncloud
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
@ -41,6 +41,6 @@ $list = new OC_Template( "files", "part.list", "" );
$list->assign( "files", $files );
$data = array('files' => $list->fetchPage());
OC_JSON::success(array('data' => $data));
OCP\JSON::success(array('data' => $data));
?>

6
apps/files/ajax/move.php Normal file → Executable file
View file

@ -3,7 +3,7 @@
// Init owncloud
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
// Get data
$dir = stripslashes($_GET["dir"]);
@ -12,9 +12,9 @@ $target = stripslashes($_GET["target"]);
if(OC_Files::move($dir,$file,$target,$file)){
OC_JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
}else{
OC_JSON::error(array("data" => array( "message" => "Could not move $file" )));
OCP\JSON::error(array("data" => array( "message" => "Could not move $file" )));
}
?>

14
apps/files/ajax/newfile.php Normal file → Executable file
View file

@ -3,7 +3,7 @@
// Init owncloud
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
// Get the params
$dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
@ -12,13 +12,13 @@ $content = isset( $_POST['content'] ) ? $_POST['content'] : '';
$source = isset( $_POST['source'] ) ? stripslashes($_POST['source']) : '';
if($filename == '') {
OC_JSON::error(array("data" => array( "message" => "Empty Filename" )));
OCP\JSON::error(array("data" => array( "message" => "Empty Filename" )));
exit();
}
if($source){
if(substr($source,0,8)!='https://' and substr($source,0,7)!='http://'){
OC_JSON::error(array("data" => array( "message" => "Not a valid source" )));
OCP\JSON::error(array("data" => array( "message" => "Not a valid source" )));
exit();
}
$sourceStream=fopen($source,'rb');
@ -26,10 +26,10 @@ if($source){
$result=OC_Filesystem::file_put_contents($target,$sourceStream);
if($result){
$mime=OC_Filesystem::getMimetype($target);
OC_JSON::success(array("data" => array('mime'=>$mime)));
OCP\JSON::success(array("data" => array('mime'=>$mime)));
exit();
}else{
OC_JSON::error(array("data" => array( "message" => "Error while downloading ".$source. ' to '.$target )));
OCP\JSON::error(array("data" => array( "message" => "Error while downloading ".$source. ' to '.$target )));
exit();
}
}
@ -39,9 +39,9 @@ if(OC_Files::newFile($dir, $filename, 'file')) {
if($content){
OC_Filesystem::file_put_contents($dir.'/'.$filename,$content);
}
OC_JSON::success(array("data" => array('content'=>$content)));
OCP\JSON::success(array("data" => array('content'=>$content)));
exit();
}
OC_JSON::error(array("data" => array( "message" => "Error when creating the file" )));
OCP\JSON::error(array("data" => array( "message" => "Error when creating the file" )));

8
apps/files/ajax/newfolder.php Normal file → Executable file
View file

@ -3,20 +3,20 @@
// Init owncloud
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
// Get the params
$dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
$foldername = isset( $_POST['foldername'] ) ? stripslashes($_POST['foldername']) : '';
if(trim($foldername) == '') {
OC_JSON::error(array("data" => array( "message" => "Empty Foldername" )));
OCP\JSON::error(array("data" => array( "message" => "Empty Foldername" )));
exit();
}
if(OC_Files::newFile($dir, stripslashes($foldername), 'dir')) {
OC_JSON::success(array("data" => array()));
OCP\JSON::success(array("data" => array()));
exit();
}
OC_JSON::error(array("data" => array( "message" => "Error when creating the folder" )));
OCP\JSON::error(array("data" => array( "message" => "Error when creating the folder" )));

4
apps/files/ajax/rawlist.php
View file

@ -7,7 +7,7 @@ $RUNTIME_APPTYPES=array('filesystem');
require_once('lib/template.php');
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
@ -21,6 +21,6 @@ foreach( OC_Files::getdirectorycontent( $dir, $mimetype ) as $i ){
$files[] = $i;
}
OC_JSON::success(array('data' => $files));
OCP\JSON::success(array('data' => $files));
?>

6
apps/files/ajax/rename.php Normal file → Executable file
View file

@ -3,7 +3,7 @@
// Init owncloud
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
// Get data
$dir = stripslashes($_GET["dir"]);
@ -12,10 +12,10 @@ $newname = stripslashes($_GET["newname"]);
// Delete
if( OC_Files::move( $dir, $file, $dir, $newname )) {
OC_JSON::success(array("data" => array( "dir" => $dir, "file" => $file, "newname" => $newname )));
OCP\JSON::success(array("data" => array( "dir" => $dir, "file" => $file, "newname" => $newname )));
}
else{
OC_JSON::error(array("data" => array( "message" => "Unable to rename file" )));
OCP\JSON::error(array("data" => array( "message" => "Unable to rename file" )));
}
?>

4
apps/files/ajax/scan.php Normal file → Executable file
View file

@ -20,12 +20,12 @@ if($force or !OC_FileCache::inCache('')){
OC_DB::commit();
$eventSource->send('success',true);
}else{
OC_JSON::success(array('data'=>array('done'=>true)));
OCP\JSON::success(array('data'=>array('done'=>true)));
exit;
}
}else{
if($checkOnly){
OC_JSON::success(array('data'=>array('done'=>false)));
OCP\JSON::success(array('data'=>array('done'=>false)));
exit;
}
if(isset($eventSource)){

14
apps/files/ajax/upload.php
View file

@ -4,12 +4,12 @@
// 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();
if (!isset($_FILES['files'])) {
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();
}
foreach ($_FILES['files']['error'] as $error) {
@ -24,7 +24,7 @@ foreach ($_FILES['files']['error'] as $error) {
UPLOAD_ERR_NO_TMP_DIR=>$l->t("Missing a temporary folder"),
UPLOAD_ERR_CANT_WRITE=>$l->t('Failed to write to disk'),
);
OC_JSON::error(array("data" => array( "message" => $errors[$error] )));
OCP\JSON::error(array("data" => array( "message" => $errors[$error] )));
exit();
}
}
@ -38,7 +38,7 @@ foreach($files['size'] as $size){
$totalSize+=$size;
}
if($totalSize>OC_Filesystem::free_space('/')){
OC_JSON::error(array("data" => array( "message" => "Not enough space available" )));
OCP\JSON::error(array("data" => array( "message" => "Not enough space available" )));
exit();
}
@ -52,12 +52,12 @@ if(strpos($dir,'..') === false){
$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'],'name'=>basename($target));
}
}
OC_JSON::encodedPrint($result);
OCP\JSON::encodedPrint($result);
exit();
}else{
$error='invalid dir';
}
OC_JSON::error(array('data' => array('error' => $error, "file" => $fileName)));
OCP\JSON::error(array('data' => array('error' => $error, "file" => $fileName)));
?>

4
apps/files_sharing/ajax/email.php
View file

@ -1,6 +1,6 @@
<?php
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('files_sharing');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('files_sharing');
$user = OCP\USER::getUser();
// TODO translations
$subject = $user + ' ' + 'shared a file with you';

4
apps/files_sharing/ajax/getitem.php
View file

@ -2,7 +2,7 @@
//$RUNTIME_NOAPPS = true;
OC_JSON::checkAppEnabled('files_sharing');
OCP\JSON::checkAppEnabled('files_sharing');
require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
$userDirectory = "/".OCP\USER::getUser()."/files";
@ -32,5 +32,5 @@ while ($source != "" && $source != "/" && $source != "." && $source != $userDire
$source = dirname($source);
}
if (!empty($users)) {
OC_JSON::encodedPrint($users);
OCP\JSON::encodedPrint($users);
}

2
apps/files_sharing/ajax/setpermissions.php
View file

@ -2,7 +2,7 @@
//$RUNTIME_NOAPPS = true;
OC_JSON::checkAppEnabled('files_sharing');
OCP\JSON::checkAppEnabled('files_sharing');
require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
$source = "/".OCP\USER::getUser()."/files".$_GET['source'];

2
apps/files_sharing/ajax/share.php
View file

@ -2,7 +2,7 @@
//$RUNTIME_NOAPPS = true;
OC_JSON::checkAppEnabled('files_sharing');
OCP\JSON::checkAppEnabled('files_sharing');
require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
$userDirectory = "/".OCP\USER::getUser()."/files";

4
apps/files_sharing/ajax/toggleresharing.php
View file

@ -1,7 +1,7 @@
<?php
OC_JSON::checkAppEnabled('files_sharing');
OC_JSON::checkAdminUser();
OCP\JSON::checkAppEnabled('files_sharing');
OCP\JSON::checkAdminUser();
if ($_POST['resharing'] == true) {
OCP\Config::setAppValue('files_sharing', 'resharing', 'yes');
} else {

2
apps/files_sharing/ajax/unshare.php
View file

@ -2,7 +2,7 @@
//$RUNTIME_NOAPPS = true;
OC_JSON::checkAppEnabled('files_sharing');
OCP\JSON::checkAppEnabled('files_sharing');
require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
$source = "/".OCP\USER::getUser()."/files".$_GET['source'];

6
apps/files_sharing/ajax/userautocomplete.php
View file

@ -3,8 +3,8 @@
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('files_sharing');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('files_sharing');
$users = array();
$groups = array();
@ -24,6 +24,6 @@ foreach ($userGroups as $group) {
$users[] = "</optgroup>";
$groups[] = "</optgroup>";
$users = array_merge($users, $groups);
OC_JSON::encodedPrint($users);
OCP\JSON::encodedPrint($users);
?>

2
apps/files_sharing/get.php
View file

@ -1,7 +1,7 @@
<?php
$RUNTIME_NOSETUPFS=true; //don't setup the fs yet
OC_JSON::checkAppEnabled('files_sharing');
OCP\JSON::checkAppEnabled('files_sharing');
require_once 'lib_share.php';
//get the path of the shared file

8
apps/files_texteditor/ajax/loadfile.php Normal file → Executable file
View file

@ -25,7 +25,7 @@
// Check if we are a user
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
// Set the session key for the file we are about to edit.
$dir = isset($_GET['dir']) ? $_GET['dir'] : '';
@ -37,14 +37,14 @@ if(!empty($filename))
{
$mtime = OC_Filesystem::filemtime($path);
$filecontents = OC_Filesystem::file_get_contents($path);
OC_JSON::success(array('data' => array('filecontents' => $filecontents, 'write' => 'true', 'mtime' => $mtime)));
OCP\JSON::success(array('data' => array('filecontents' => $filecontents, 'write' => 'true', 'mtime' => $mtime)));
}
else
{
$mtime = OC_Filesystem::filemtime($path);
$filecontents = OC_Filesystem::file_get_contents($path);
OC_JSON::success(array('data' => array('filecontents' => $filecontents, 'write' => 'false', 'mtime' => $mtime)));
OCP\JSON::success(array('data' => array('filecontents' => $filecontents, 'write' => 'false', 'mtime' => $mtime)));
}
} else {
OC_JSON::error(array('data' => array( 'message' => 'Invalid file path supplied.')));
OCP\JSON::error(array('data' => array( 'message' => 'Invalid file path supplied.')));
}

8
apps/files_texteditor/ajax/mtime.php Normal file → Executable file
View file

@ -25,7 +25,7 @@
// Check if we are a user
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
// Get the path from GET
$path = isset($_GEt['path']) ? $_GET['path'] : '';
@ -36,14 +36,14 @@ if($path != '')
$mtime = OC_Filesystem::filemtime($path);
if($mtime)
{
OC_JSON::success(array('data' => array('path' => $path, 'mtime' => $mtime)));
OCP\JSON::success(array('data' => array('path' => $path, 'mtime' => $mtime)));
}
else
{
OC_JSON::error();
OCP\JSON::error();
}
}
else
{
OC_JSON::error();
OCP\JSON::error();
}

10
apps/files_texteditor/ajax/savefile.php
View file

@ -25,7 +25,7 @@
// Check if we are a user
OC_JSON::checkLoggedIn();
OCP\JSON::checkLoggedIn();
// Get paramteres
$filecontents = $_POST['filecontents'];
@ -39,7 +39,7 @@ if($path != '' && $mtime != '')
if($mtime != $filemtime)
{
// Then the file has changed since opening
OC_JSON::error();
OCP\JSON::error();
OCP\Util::writeLog('files_texteditor',"File: ".$path." modified since opening.",OCP\Util::ERROR);
}
else
@ -53,16 +53,16 @@ if($path != '' && $mtime != '')
clearstatcache();
// Get new mtime
$newmtime = OC_Filesystem::filemtime($path);
OC_JSON::success(array('data' => array('mtime' => $newmtime)));
OCP\JSON::success(array('data' => array('mtime' => $newmtime)));
}
else
{
// Not writeable!
OC_JSON::error(array('data' => array( 'message' => 'Insufficient permissions')));
OCP\JSON::error(array('data' => array( 'message' => 'Insufficient permissions')));
OCP\Util::writeLog('files_texteditor',"User does not have permission to write to file: ".$path,OCP\Util::ERROR);
}
}
} else {
OC_JSON::error(array('data' => array( 'message' => 'File path or mtime not supplied')));
OCP\JSON::error(array('data' => array( 'message' => 'File path or mtime not supplied')));
OCP\Util::writeLog('files_texteditor',"Invalid path supplied:".$path,OCP\Util::ERROR);
}

6
apps/files_versions/ajax/getVersions.php
View file

@ -1,7 +1,7 @@
<?php
require_once('../../../lib/base.php');
OC_JSON::checkAppEnabled('files_versions');
OCP\JSON::checkAppEnabled('files_versions');
require_once('../versions.php');
$userDirectory = "/".OCP\USER::getUser()."/files";
@ -23,7 +23,7 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
$versionsSorted = array_reverse( $versionsFormatted );
if ( !empty( $versionsSorted ) ) {
OC_JSON::encodedPrint($versionsSorted);
OCP\JSON::encodedPrint($versionsSorted);
}
}else{
@ -57,5 +57,5 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
// $source = dirname($source);
// }
// if (!empty($users)) {
// OC_JSON::encodedPrint($users);
// OCP\JSON::encodedPrint($users);
// }

2
apps/files_versions/ajax/rollbackVersion.php
View file

@ -1,7 +1,7 @@
<?php
require_once('../../../lib/base.php');
OC_JSON::checkAppEnabled('files_versions');
OCP\JSON::checkAppEnabled('files_versions');
require_once('../versions.php');
$userDirectory = "/".OCP\USER::getUser()."/files";

4
apps/files_versions/ajax/togglesettings.php
View file

@ -1,7 +1,7 @@
<?php
OC_JSON::checkAppEnabled('files_versions');
OC_JSON::checkAdminUser();
OCP\JSON::checkAppEnabled('files_versions');
OCP\JSON::checkAdminUser();
if (OCP\Config::getSystemValue('versions', 'true')=='true') {
OCP\Config::setSystemValue('versions', 'false');
} else {

6
apps/gallery/ajax/createAlbum.php
View file

@ -22,11 +22,11 @@
*/
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('gallery');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('gallery');
OC_Gallery_Album::create(OCP\USER::getUser(), $_GET['album_name']);
OC_JSON::success(array('name' => $_GET['album_name']));
OCP\JSON::success(array('name' => $_GET['album_name']));
?>

28
apps/gallery/ajax/galleryOp.php
View file

@ -24,8 +24,8 @@
header('Content-type: text/html; charset=UTF-8') ;
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('gallery');
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('gallery');
function handleRename($oldname, $newname) {
OC_Gallery_Album::rename($oldname, $newname, OCP\USER::getUser());
@ -61,16 +61,16 @@ function handleFilescan($cleanup) {
if ($cleanup) OC_Gallery_Album::cleanup();
$pathlist = OC_Gallery_Scanner::find_paths();
sort($pathlist);
OC_JSON::success(array('paths' => $pathlist));
OCP\JSON::success(array('paths' => $pathlist));
}
function handleStoreSettings($root, $order) {
if (!OC_Filesystem::file_exists($root)) {
OC_JSON::error(array('cause' => 'No such file or directory'));
OCP\JSON::error(array('cause' => 'No such file or directory'));
return;
}
if (!OC_Filesystem::is_dir($root)) {
OC_JSON::error(array('cause' => $root . ' is not a directory'));
OCP\JSON::error(array('cause' => $root . ' is not a directory'));
return;
}
@ -80,7 +80,7 @@ function handleStoreSettings($root, $order) {
$rescan = $current_root==$root?'no':'yes';
OCP\Config::setUserValue(OCP\USER::getUser(), 'gallery', 'root', $root);
OCP\Config::setUserValue(OCP\USER::getUser(), 'gallery', 'order', $order);
OC_JSON::success(array('rescan' => $rescan));
OCP\JSON::success(array('rescan' => $rescan));
}
function handleGetGallery($path) {
@ -121,7 +121,7 @@ function handleGetGallery($path) {
$token = $row['token'];
}
OC_JSON::success(array('albums'=>$a, 'photos'=>$p, 'shared' => $shared, 'recursive' => $recursive, 'token' => $token));
OCP\JSON::success(array('albums'=>$a, 'photos'=>$p, 'shared' => $shared, 'recursive' => $recursive, 'token' => $token));
}
function handleShare($path, $share, $recursive) {
@ -134,23 +134,23 @@ function handleShare($path, $share, $recursive) {
if ($row = $r->fetchRow()) {
$albumId = $row['album_id'];
} else {
OC_JSON::error(array('cause' => 'Couldn\'t find requested gallery'));
OCP\JSON::error(array('cause' => 'Couldn\'t find requested gallery'));
exit;
}
if ($share == false) {
OC_Gallery_Sharing::remove($albumId);
OC_JSON::success(array('sharing' => false));
OCP\JSON::success(array('sharing' => false));
} else { // share, yeah \o/
$r = OC_Gallery_Sharing::getEntryByAlbumId($albumId);
if (($row = $r->fetchRow())) { // update entry
OC_Gallery_Sharing::updateSharingByToken($row['token'], $recursive);
OC_JSON::success(array('sharing' => true, 'token' => $row['token'], 'recursive' => $recursive == 1 ? true : false ));
OCP\JSON::success(array('sharing' => true, 'token' => $row['token'], 'recursive' => $recursive == 1 ? true : false ));
} else { // and new sharing entry
$date = new DateTime();
$token = md5($owner . $date->getTimestamp());
OC_Gallery_Sharing::addShared($token, intval($albumId), $recursive);
OC_JSON::success(array('sharing' => true, 'token' => $token, 'recursive' => $recursive == 1 ? true : false ));
OCP\JSON::success(array('sharing' => true, 'token' => $token, 'recursive' => $recursive == 1 ? true : false ));
}
}
}
@ -160,11 +160,11 @@ if ($_GET['operation']) {
switch($_GET['operation']) {
case 'rename':
handleRename($_GET['oldname'], $_GET['newname']);
OC_JSON::success(array('newname' => $_GET['newname']));
OCP\JSON::success(array('newname' => $_GET['newname']));
break;
case 'remove':
handleRemove($_GET['name']);
OC_JSON::success();
OCP\JSON::success();
break;
case 'get_covers':
handleGetThumbnails(urldecode($_GET['albumname']));
@ -182,7 +182,7 @@ if ($_GET['operation']) {
handleShare($_GET['path'], $_GET['share'] == 'true' ? true : false, $_GET['recursive']);
break;
default:
OC_JSON::error(array('cause' => 'Unknown operation'));
OCP\JSON::error(array('cause' => 'Unknown operation'));
}
}
?>

6
apps/gallery/ajax/sharing.php
View file

@ -24,7 +24,7 @@
if (!isset($_GET['token']) || !isset($_GET['operation'])) {
OC_JSON::error(array('cause' => 'Not enought arguments'));
OCP\JSON::error(array('cause' => 'Not enought arguments'));
exit;
}
@ -32,7 +32,7 @@ $operation = $_GET['operation'];
$token = $_GET['token'];
if (!OC_Gallery_Sharing::isTokenValid($token)) {
OC_JSON::error(array('cause' => 'Given token is not valid'));
OCP\JSON::error(array('cause' => 'Given token is not valid'));
exit;
}
@ -65,7 +65,7 @@ function handleGetGallery($token, $path) {
$photos[] = $row['file_path'];
}
OC_JSON::success(array('albums' => $albums, 'photos' => $photos));
OCP\JSON::success(array('albums' => $albums, 'photos' => $photos));
}
function handleGetThumbnail($token, $imgpath) {

Some files were not shown because too many files have changed in this diff Show more