diff options
107 files changed, 457 insertions, 363 deletions
diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php index ceeb034ec9d..9241dc8ddf6 100644..100755 --- a/apps/bookmarks/ajax/addBookmark.php +++ b/apps/bookmarks/ajax/addBookmark.php @@ -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));
\ No newline at end of file +OCP\JSON::success(array('data' => $id));
\ No newline at end of file diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php index 984a8593169..f40192943e4 100755 --- a/apps/bookmarks/ajax/delBookmark.php +++ b/apps/bookmarks/ajax/delBookmark.php @@ -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())); diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php index 5bed9d08448..1b6d6d6ce44 100755 --- a/apps/bookmarks/ajax/editBookmark.php +++ b/apps/bookmarks/ajax/editBookmark.php @@ -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' ){ diff --git a/apps/bookmarks/ajax/recordClick.php b/apps/bookmarks/ajax/recordClick.php index 6519de241b6..03d010637fc 100755 --- a/apps/bookmarks/ajax/recordClick.php +++ b/apps/bookmarks/ajax/recordClick.php @@ -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 diff --git a/apps/bookmarks/ajax/updateList.php b/apps/bookmarks/ajax/updateList.php index 6aa951bbb65..c919a5fc439 100644..100755 --- a/apps/bookmarks/ajax/updateList.php +++ b/apps/bookmarks/ajax/updateList.php @@ -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)); diff --git a/apps/calendar/ajax/calendar/activation.php b/apps/calendar/ajax/calendar/activation.php index c93a0495717..3523590aa27 100644..100755 --- a/apps/calendar/ajax/calendar/activation.php +++ b/apps/calendar/ajax/calendar/activation.php @@ -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), )); diff --git a/apps/calendar/ajax/calendar/delete.php b/apps/calendar/ajax/calendar/delete.php index 4bef912333c..a36a0534650 100644..100755 --- a/apps/calendar/ajax/calendar/delete.php +++ b/apps/calendar/ajax/calendar/delete.php @@ -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')); } ?> diff --git a/apps/calendar/ajax/calendar/edit.form.php b/apps/calendar/ajax/calendar/edit.form.php index d3f9629f1ae..17118c5165f 100644..100755 --- a/apps/calendar/ajax/calendar/edit.form.php +++ b/apps/calendar/ajax/calendar/edit.form.php @@ -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']); diff --git a/apps/calendar/ajax/calendar/edit.php b/apps/calendar/ajax/calendar/edit.php index d3f9629f1ae..17118c5165f 100644..100755 --- a/apps/calendar/ajax/calendar/edit.php +++ b/apps/calendar/ajax/calendar/edit.php @@ -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']); diff --git a/apps/calendar/ajax/calendar/new.form.php b/apps/calendar/ajax/calendar/new.form.php index 3de56460c2d..fa30b871e42 100644..100755 --- a/apps/calendar/ajax/calendar/new.form.php +++ b/apps/calendar/ajax/calendar/new.form.php @@ -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', diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php index b7136981633..4b8688e3d1d 100755 --- a/apps/calendar/ajax/calendar/new.php +++ b/apps/calendar/ajax/calendar/new.php @@ -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), )); diff --git a/apps/calendar/ajax/calendar/overview.php b/apps/calendar/ajax/calendar/overview.php index f66d1eae8f8..586bf3db814 100644..100755 --- a/apps/calendar/ajax/calendar/overview.php +++ b/apps/calendar/ajax/calendar/overview.php @@ -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(); ?> diff --git a/apps/calendar/ajax/calendar/update.php b/apps/calendar/ajax/calendar/update.php index 1e35035fa48..408ac900912 100755 --- a/apps/calendar/ajax/calendar/update.php +++ b/apps/calendar/ajax/calendar/update.php @@ -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), )); diff --git a/apps/calendar/ajax/categories/rescan.php b/apps/calendar/ajax/categories/rescan.php index a8e62f64a5b..93e8c50954a 100755 --- a/apps/calendar/ajax/categories/rescan.php +++ b/apps/calendar/ajax/categories/rescan.php @@ -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))); diff --git a/apps/calendar/ajax/changeview.php b/apps/calendar/ajax/changeview.php index a637e62aad1..2c2d09ccb12 100755 --- a/apps/calendar/ajax/changeview.php +++ b/apps/calendar/ajax/changeview.php @@ -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(); ?> diff --git a/apps/calendar/ajax/event/delete.php b/apps/calendar/ajax/event/delete.php index 3b726651641..cb30621af4d 100644..100755 --- a/apps/calendar/ajax/event/delete.php +++ b/apps/calendar/ajax/event/delete.php @@ -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(); diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php index 675a417eba8..91d07d3897a 100755 --- a/apps/calendar/ajax/event/edit.form.php +++ b/apps/calendar/ajax/event/edit.form.php @@ -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); diff --git a/apps/calendar/ajax/event/edit.php b/apps/calendar/ajax/event/edit.php index 172488f6241..e615fb093de 100644..100755 --- a/apps/calendar/ajax/event/edit.php +++ b/apps/calendar/ajax/event/edit.php @@ -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(); } ?> diff --git a/apps/calendar/ajax/event/move.php b/apps/calendar/ajax/event/move.php index 75d174c13e1..8added69143 100644..100755 --- a/apps/calendar/ajax/event/move.php +++ b/apps/calendar/ajax/event/move.php @@ -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'))); diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php index 376149b57c3..42cdb81642e 100755 --- a/apps/calendar/ajax/event/new.form.php +++ b/apps/calendar/ajax/event/new.form.php @@ -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']; diff --git a/apps/calendar/ajax/event/new.php b/apps/calendar/ajax/event/new.php index 5e8c305e97a..72d57be03bf 100644..100755 --- a/apps/calendar/ajax/event/new.php +++ b/apps/calendar/ajax/event/new.php @@ -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(); } ?> diff --git a/apps/calendar/ajax/event/resize.php b/apps/calendar/ajax/event/resize.php index 260b6914426..0dc0a5fca7f 100644..100755 --- a/apps/calendar/ajax/event/resize.php +++ b/apps/calendar/ajax/event/resize.php @@ -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'))); diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php index 8adaa4c98f3..2499c5163a2 100644..100755 --- a/apps/calendar/ajax/events.php +++ b/apps/calendar/ajax/events.php @@ -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); ?> diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php index 9ee989c0dee..e686066a993 100755 --- a/apps/calendar/ajax/import/dialog.php +++ b/apps/calendar/ajax/import/dialog.php @@ -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']); diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php index 43dfb5493fc..202af1eb46e 100755 --- a/apps/calendar/ajax/import/import.php +++ b/apps/calendar/ajax/import/import.php @@ -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(); diff --git a/apps/calendar/ajax/settings/getfirstday.php b/apps/calendar/ajax/settings/getfirstday.php index dfc8b304b69..23b71bba043 100755 --- a/apps/calendar/ajax/settings/getfirstday.php +++ b/apps/calendar/ajax/settings/getfirstday.php @@ -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)); ?> diff --git a/apps/calendar/ajax/settings/gettimezonedetection.php b/apps/calendar/ajax/settings/gettimezonedetection.php index be01807bbb4..6bc9a07a1e9 100755 --- a/apps/calendar/ajax/settings/gettimezonedetection.php +++ b/apps/calendar/ajax/settings/gettimezonedetection.php @@ -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')));
\ No newline at end of file +OCP\JSON::checkLoggedIn(); +OCP\JSON::checkAppEnabled('calendar'); +OCP\JSON::success(array('detection' => OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection')));
\ No newline at end of file diff --git a/apps/calendar/ajax/settings/guesstimezone.php b/apps/calendar/ajax/settings/guesstimezone.php index 19aa778472d..13092777b78 100755 --- a/apps/calendar/ajax/settings/guesstimezone.php +++ b/apps/calendar/ajax/settings/guesstimezone.php @@ -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); ?>
\ No newline at end of file diff --git a/apps/calendar/ajax/settings/setfirstday.php b/apps/calendar/ajax/settings/setfirstday.php index 0c6ab695365..373eeee7968 100755 --- a/apps/calendar/ajax/settings/setfirstday.php +++ b/apps/calendar/ajax/settings/setfirstday.php @@ -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(); } ?> diff --git a/apps/calendar/ajax/settings/settimeformat.php b/apps/calendar/ajax/settings/settimeformat.php index d648545d9ca..eae7be54e80 100755 --- a/apps/calendar/ajax/settings/settimeformat.php +++ b/apps/calendar/ajax/settings/settimeformat.php @@ -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(); } ?> diff --git a/apps/calendar/ajax/settings/settimezone.php b/apps/calendar/ajax/settings/settimezone.php index abe14bd0ec7..d2797a08aae 100755 --- a/apps/calendar/ajax/settings/settimezone.php +++ b/apps/calendar/ajax/settings/settimezone.php @@ -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') ))); } ?> diff --git a/apps/calendar/ajax/settings/timeformat.php b/apps/calendar/ajax/settings/timeformat.php index dbcfcb29b42..809164e870a 100755 --- a/apps/calendar/ajax/settings/timeformat.php +++ b/apps/calendar/ajax/settings/timeformat.php @@ -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)); ?> diff --git a/apps/calendar/ajax/settings/timezonedetection.php b/apps/calendar/ajax/settings/timezonedetection.php index 8cb375183bb..ba5f2af5fd9 100755 --- a/apps/calendar/ajax/settings/timezonedetection.php +++ b/apps/calendar/ajax/settings/timezonedetection.php @@ -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(); }
\ No newline at end of file diff --git a/apps/calendar/ajax/share/activation.php b/apps/calendar/ajax/share/activation.php index 5c2fe8efd13..5526e5230f4 100755 --- a/apps/calendar/ajax/share/activation.php +++ b/apps/calendar/ajax/share/activation.php @@ -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();
\ No newline at end of file +OCP\JSON::success();
\ No newline at end of file diff --git a/apps/calendar/ajax/share/changepermission.php b/apps/calendar/ajax/share/changepermission.php index 431ef7964b6..e4a4f186ab0 100755 --- a/apps/calendar/ajax/share/changepermission.php +++ b/apps/calendar/ajax/share/changepermission.php @@ -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();
\ No newline at end of file +OCP\JSON::success();
\ No newline at end of file diff --git a/apps/calendar/ajax/share/dropdown.php b/apps/calendar/ajax/share/dropdown.php index 988e18c0b03..bac487f0d0b 100755 --- a/apps/calendar/ajax/share/dropdown.php +++ b/apps/calendar/ajax/share/dropdown.php @@ -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'); diff --git a/apps/calendar/ajax/share/share.php b/apps/calendar/ajax/share/share.php index 39d97522338..3ce2bf1e217 100755 --- a/apps/calendar/ajax/share/share.php +++ b/apps/calendar/ajax/share/share.php @@ -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; }
\ No newline at end of file diff --git a/apps/calendar/ajax/share/unshare.php b/apps/calendar/ajax/share/unshare.php index e5676c72f31..cbd5ed8e505 100755 --- a/apps/calendar/ajax/share/unshare.php +++ b/apps/calendar/ajax/share/unshare.php @@ -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; }
\ No newline at end of file diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php index 8e2679a43f4..e8fdbe8c78a 100755 --- a/apps/calendar/lib/app.php +++ b/apps/calendar/lib/app.php @@ -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; diff --git a/apps/contacts/ajax/activation.php b/apps/contacts/ajax/activation.php index b45d1a6ccbe..388a3b5438c 100755 --- a/apps/contacts/ajax/activation.php +++ b/apps/contacts/ajax/activation.php @@ -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, diff --git a/apps/contacts/ajax/addbook.php b/apps/contacts/ajax/addbook.php index f466d57e12e..254af1c3f50 100644..100755 --- a/apps/contacts/ajax/addbook.php +++ b/apps/contacts/ajax/addbook.php @@ -7,8 +7,8 @@ */ -OC_JSON::checkLoggedIn(); -OC_JSON::checkAppEnabled('contacts'); +OCP\JSON::checkLoggedIn(); +OCP\JSON::checkAppEnabled('contacts'); $book = array( 'id' => 'new', 'displayname' => '', diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php index d87cbabe819..dc083df1fa5 100755 --- a/apps/contacts/ajax/addcontact.php +++ b/apps/contacts/ajax/addcontact.php @@ -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 ))); diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php index 8623c6fdca7..bf23df67585 100755 --- a/apps/contacts/ajax/addproperty.php +++ b/apps/contacts/ajax/addproperty.php @@ -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 ))); diff --git a/apps/contacts/ajax/categories/categoriesfor.php b/apps/contacts/ajax/categories/categoriesfor.php index c6b753a73b5..846af300de8 100755 --- a/apps/contacts/ajax/categories/categoriesfor.php +++ b/apps/contacts/ajax/categories/categoriesfor.php @@ -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.')))); ?> diff --git a/apps/contacts/ajax/categories/delete.php b/apps/contacts/ajax/categories/delete.php index d1099da044a..bee2dbe3f6b 100755 --- a/apps/contacts/ajax/categories/delete.php +++ b/apps/contacts/ajax/categories/delete.php @@ -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()))); ?> diff --git a/apps/contacts/ajax/categories/list.php b/apps/contacts/ajax/categories/list.php index 98c1c705180..3ae7635390c 100644..100755 --- a/apps/contacts/ajax/categories/list.php +++ b/apps/contacts/ajax/categories/list.php @@ -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))); ?> diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php index 37a19fbce4a..84a67dec0b1 100755 --- a/apps/contacts/ajax/categories/rescan.php +++ b/apps/contacts/ajax/categories/rescan.php @@ -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))); ?> diff --git a/apps/contacts/ajax/chooseaddressbook.php b/apps/contacts/ajax/chooseaddressbook.php index b47c872e9aa..2fe55606d1d 100644..100755 --- a/apps/contacts/ajax/chooseaddressbook.php +++ b/apps/contacts/ajax/chooseaddressbook.php @@ -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(); diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php index aa6aca4562a..0cbd55258de 100755 --- a/apps/contacts/ajax/contactdetails.php +++ b/apps/contacts/ajax/contactdetails.php @@ -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)); diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php index f0e7dde088c..93e618a0800 100755 --- a/apps/contacts/ajax/contacts.php +++ b/apps/contacts/ajax/contacts.php @@ -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 ))); ?> diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php index 3a331131a15..772232b67d7 100755 --- a/apps/contacts/ajax/createaddressbook.php +++ b/apps/contacts/ajax/createaddressbook.php @@ -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, )); diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php index 09bdbbc439a..125dd107602 100755 --- a/apps/contacts/ajax/cropphoto.php +++ b/apps/contacts/ajax/cropphoto.php @@ -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 ))); diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php index 488f064836b..d8afa060b1e 100755 --- a/apps/contacts/ajax/currentphoto.php +++ b/apps/contacts/ajax/currentphoto.php @@ -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.')); diff --git a/apps/contacts/ajax/deletebook.php b/apps/contacts/ajax/deletebook.php index b80df526f95..bcf6aa44329 100644..100755 --- a/apps/contacts/ajax/deletebook.php +++ b/apps/contacts/ajax/deletebook.php @@ -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 ))); diff --git a/apps/contacts/ajax/deletecard.php b/apps/contacts/ajax/deletecard.php index 84526e9b13b..46fd8252d47 100755 --- a/apps/contacts/ajax/deletecard.php +++ b/apps/contacts/ajax/deletecard.php @@ -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 ))); diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php index 4c753816218..9bb1208cdd1 100755 --- a/apps/contacts/ajax/deleteproperty.php +++ b/apps/contacts/ajax/deleteproperty.php @@ -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 ))); diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php index 73f34ef5c6c..4044eb5a359 100644..100755 --- a/apps/contacts/ajax/editaddress.php +++ b/apps/contacts/ajax/editaddress.php @@ -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']:''; diff --git a/apps/contacts/ajax/editaddressbook.php b/apps/contacts/ajax/editaddressbook.php index ef797778d95..fe1806a7b8a 100644..100755 --- a/apps/contacts/ajax/editaddressbook.php +++ b/apps/contacts/ajax/editaddressbook.php @@ -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); diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php index 331aa4c7742..155bee70a7f 100755 --- a/apps/contacts/ajax/editname.php +++ b/apps/contacts/ajax/editname.php @@ -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(); } diff --git a/apps/contacts/ajax/importaddressbook.php b/apps/contacts/ajax/importaddressbook.php index dc251de201a..bc02e814f5b 100755 --- a/apps/contacts/ajax/importaddressbook.php +++ b/apps/contacts/ajax/importaddressbook.php @@ -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')); diff --git a/apps/contacts/ajax/importdialog.php b/apps/contacts/ajax/importdialog.php index bd195023dd2..7a564ccec83 100755 --- a/apps/contacts/ajax/importdialog.php +++ b/apps/contacts/ajax/importdialog.php @@ -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']); diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php index 90ba3f66097..047db4d940c 100755 --- a/apps/contacts/ajax/loadcard.php +++ b/apps/contacts/ajax/loadcard.php @@ -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 ))); diff --git a/apps/contacts/ajax/loadintro.php b/apps/contacts/ajax/loadintro.php index 1aa03a62f38..8ad828ebba3 100644..100755 --- a/apps/contacts/ajax/loadintro.php +++ b/apps/contacts/ajax/loadintro.php @@ -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 ))); diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php index 8d40669a5b3..9913fe13e11 100755 --- a/apps/contacts/ajax/loadphoto.php +++ b/apps/contacts/ajax/loadphoto.php @@ -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))); ?> diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php index 8c6b95c5563..0fd978e325a 100755 --- a/apps/contacts/ajax/oc_photo.php +++ b/apps/contacts/ajax/oc_photo.php @@ -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); diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php index 958f9fd926c..5418e26cd10 100755 --- a/apps/contacts/ajax/savecrop.php +++ b/apps/contacts/ajax/savecrop.php @@ -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)) { diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php index b8b4a422cf2..0cd6d5b36fb 100755 --- a/apps/contacts/ajax/saveproperty.php +++ b/apps/contacts/ajax/saveproperty.php @@ -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'] ))); diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php index b016cf92939..13f1c15ac23 100755 --- a/apps/contacts/ajax/updateaddressbook.php +++ b/apps/contacts/ajax/updateaddressbook.php @@ -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, )); diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php index 51ae949b680..947d4670a29 100755 --- a/apps/contacts/ajax/uploadimport.php +++ b/apps/contacts/ajax/uploadimport.php @@ -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.')); } diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php index 1148c271dcd..99015e2d502 100755 --- a/apps/contacts/ajax/uploadphoto.php +++ b/apps/contacts/ajax/uploadphoto.php @@ -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); diff --git a/apps/contacts/import.php b/apps/contacts/import.php index 2bcb40f7d42..346db5924c6 100755 --- a/apps/contacts/import.php +++ b/apps/contacts/import.php @@ -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))); diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php index f4b9562605e..58cc7f03462 100755 --- a/apps/contacts/lib/app.php +++ b/apps/contacts/lib/app.php @@ -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(); } diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php index d7bf1fd8c3c..11d1db03108 100755 --- a/apps/contacts/thumbnail.php +++ b/apps/contacts/thumbnail.php @@ -22,7 +22,7 @@ // Init owncloud -OC_JSON::checkLoggedIn(); +OCP\JSON::checkLoggedIn(); //OCP\User::checkLoggedIn(); OCP\App::checkAppEnabled('contacts'); diff --git a/apps/files/ajax/autocomplete.php b/apps/files/ajax/autocomplete.php index 8cdb6188a02..7ff34da96b3 100644..100755 --- a/apps/files/ajax/autocomplete.php +++ b/apps/files/ajax/autocomplete.php @@ -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); ?> diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index d8a01d7acf1..ed155de0dc7 100644..100755 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -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 ))); } ?> diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index 0bff5742ef4..520e54e708d 100755 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -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)); ?> diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php index 0ad314f873c..945fe4e7b82 100644..100755 --- a/apps/files/ajax/move.php +++ b/apps/files/ajax/move.php @@ -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" ))); } ?> diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index 472b577a32a..2712b54f063 100644..100755 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -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" ))); diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php index 2aff95e5b35..512e0e1f6d9 100644..100755 --- a/apps/files/ajax/newfolder.php +++ b/apps/files/ajax/newfolder.php @@ -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" ))); diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php index 86119de2d1b..36dd35cc73e 100755 --- a/apps/files/ajax/rawlist.php +++ b/apps/files/ajax/rawlist.php @@ -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)); ?> diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php index dc5d3962abd..e2fa3d54a61 100644..100755 --- a/apps/files/ajax/rename.php +++ b/apps/files/ajax/rename.php @@ -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" ))); } ?> diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php index a227dcc3ffc..d36366caf49 100644..100755 --- a/apps/files/ajax/scan.php +++ b/apps/files/ajax/scan.php @@ -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)){ diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index ca64f58e14b..d6c799af32c 100755 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -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))); ?> diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php index 84202a23f5c..9eba203465e 100755 --- a/apps/files_sharing/ajax/email.php +++ b/apps/files_sharing/ajax/email.php @@ -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'; diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php index b15a81e6086..d9404f7e3b4 100755 --- a/apps/files_sharing/ajax/getitem.php +++ b/apps/files_sharing/ajax/getitem.php @@ -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); } diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php index fc907bd7517..73f59d73db2 100755 --- a/apps/files_sharing/ajax/setpermissions.php +++ b/apps/files_sharing/ajax/setpermissions.php @@ -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']; diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php index eaaf2a3d244..4863170f57c 100755 --- a/apps/files_sharing/ajax/share.php +++ b/apps/files_sharing/ajax/share.php @@ -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"; diff --git a/apps/files_sharing/ajax/toggleresharing.php b/apps/files_sharing/ajax/toggleresharing.php index 853b2bd5349..673f00c5d18 100755 --- a/apps/files_sharing/ajax/toggleresharing.php +++ b/apps/files_sharing/ajax/toggleresharing.php @@ -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 { diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php index 061d31e2a98..5056c59a3d4 100755 --- a/apps/files_sharing/ajax/unshare.php +++ b/apps/files_sharing/ajax/unshare.php @@ -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']; diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php index 83fdc3bdf4d..73b5f126984 100755 --- a/apps/files_sharing/ajax/userautocomplete.php +++ b/apps/files_sharing/ajax/userautocomplete.php @@ -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); ?> diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php index b17dc85c5ba..de3bc5f46dc 100755 --- a/apps/files_sharing/get.php +++ b/apps/files_sharing/get.php @@ -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 diff --git a/apps/files_texteditor/ajax/loadfile.php b/apps/files_texteditor/ajax/loadfile.php index a946e26f210..c263306e719 100644..100755 --- a/apps/files_texteditor/ajax/loadfile.php +++ b/apps/files_texteditor/ajax/loadfile.php @@ -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.'))); }
\ No newline at end of file diff --git a/apps/files_texteditor/ajax/mtime.php b/apps/files_texteditor/ajax/mtime.php index 436592c383f..ee683722add 100644..100755 --- a/apps/files_texteditor/ajax/mtime.php +++ b/apps/files_texteditor/ajax/mtime.php @@ -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(); }
\ No newline at end of file diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php index 7c7fb90e7c6..4c260e237c5 100755 --- a/apps/files_texteditor/ajax/savefile.php +++ b/apps/files_texteditor/ajax/savefile.php @@ -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); } diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php index d12cf368f18..5949c32ed16 100755 --- a/apps/files_versions/ajax/getVersions.php +++ b/apps/files_versions/ajax/getVersions.php @@ -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); // } diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php index a7b18c4e091..3faaafe935d 100755 --- a/apps/files_versions/ajax/rollbackVersion.php +++ b/apps/files_versions/ajax/rollbackVersion.php @@ -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"; diff --git a/apps/files_versions/ajax/togglesettings.php b/apps/files_versions/ajax/togglesettings.php index 49e314f86aa..d513d12dd6c 100755 --- a/apps/files_versions/ajax/togglesettings.php +++ b/apps/files_versions/ajax/togglesettings.php @@ -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 { diff --git a/apps/gallery/ajax/createAlbum.php b/apps/gallery/ajax/createAlbum.php index eaf5c296de9..61e2e9ae2e9 100755 --- a/apps/gallery/ajax/createAlbum.php +++ b/apps/gallery/ajax/createAlbum.php @@ -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'])); ?> diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php index c302a3a734c..b9ca31901c3 100755 --- a/apps/gallery/ajax/galleryOp.php +++ b/apps/gallery/ajax/galleryOp.php @@ -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')); } } ?> diff --git a/apps/gallery/ajax/sharing.php b/apps/gallery/ajax/sharing.php index a1af75ad461..1223320120b 100755 --- a/apps/gallery/ajax/sharing.php +++ b/apps/gallery/ajax/sharing.php @@ -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) { diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php index 92e9fd4269e..ff0cb44022c 100755 --- a/apps/gallery/ajax/thumbnail.php +++ b/apps/gallery/ajax/thumbnail.php @@ -22,8 +22,8 @@ */ -OC_JSON::checkLoggedIn(); -OC_JSON::checkAppEnabled('gallery'); +OCP\JSON::checkLoggedIn(); +OCP\JSON::checkAppEnabled('gallery'); $img = $_GET['img']; diff --git a/apps/gallery/lib/images_utils.php b/apps/gallery/lib/images_utils.php index eb50f5217ea..ac3a383c977 100644..100755 --- a/apps/gallery/lib/images_utils.php +++ b/apps/gallery/lib/images_utils.php @@ -21,8 +21,8 @@ * */ -OC_JSON::checkLoggedIn(); -OC_JSON::checkAppEnabled('gallery'); +OCP\JSON::checkLoggedIn(); +OCP\JSON::checkAppEnabled('gallery'); function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height, $tgtImg, $shift) { //getting the image dimensions diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php index 95259fdefa0..130344ac6dc 100755 --- a/apps/media/ajax/api.php +++ b/apps/media/ajax/api.php @@ -23,7 +23,7 @@ header('Content-type: text/html; charset=UTF-8') ; -OC_JSON::checkAppEnabled('media'); +OCP\JSON::checkAppEnabled('media'); require_once(OC::$APPSROOT . '/apps/media/lib_collection.php'); require_once(OC::$APPSROOT . '/apps/media/lib_scanner.php'); @@ -64,7 +64,7 @@ if($arguments['action']){ $data['artists']=OC_MEDIA_COLLECTION::getArtists(); $data['albums']=OC_MEDIA_COLLECTION::getAlbums(); $data['songs']=OC_MEDIA_COLLECTION::getSongs(); - OC_JSON::encodedPrint($data); + OCP\JSON::encodedPrint($data); break; case 'scan': OC_DB::beginTransaction(); @@ -78,13 +78,13 @@ if($arguments['action']){ echo (OC_MEDIA_SCANNER::scanFile($arguments['path']))?'true':'false'; break; case 'get_artists': - OC_JSON::encodedPrint(OC_MEDIA_COLLECTION::getArtists($arguments['search'])); + OCP\JSON::encodedPrint(OC_MEDIA_COLLECTION::getArtists($arguments['search'])); break; case 'get_albums': - OC_JSON::encodedPrint(OC_MEDIA_COLLECTION::getAlbums($arguments['artist'],$arguments['search'])); + OCP\JSON::encodedPrint(OC_MEDIA_COLLECTION::getAlbums($arguments['artist'],$arguments['search'])); break; case 'get_songs': - OC_JSON::encodedPrint(OC_MEDIA_COLLECTION::getSongs($arguments['artist'],$arguments['album'],$arguments['search'])); + OCP\JSON::encodedPrint(OC_MEDIA_COLLECTION::getSongs($arguments['artist'],$arguments['album'],$arguments['search'])); break; case 'get_path_info': if(OC_Filesystem::file_exists($arguments['path'])){ @@ -97,7 +97,7 @@ if($arguments['action']){ $song=OC_MEDIA_COLLECTION::getSong($songId); $song['artist']=OC_MEDIA_COLLECTION::getArtistName($song['song_artist']); $song['album']=OC_MEDIA_COLLECTION::getAlbumName($song['song_album']); - OC_JSON::encodedPrint($song); + OCP\JSON::encodedPrint($song); } } break; @@ -122,7 +122,7 @@ if($arguments['action']){ $music=OC_FileCache::searchByMime('audio'); $ogg=OC_FileCache::searchByMime('application','ogg'); $music=array_merge($music,$ogg); - OC_JSON::encodedPrint($music); + OCP\JSON::encodedPrint($music); exit; } } diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php index 1efbea3acef..3122c7e6754 100755 --- a/apps/media/ajax/autoupdate.php +++ b/apps/media/ajax/autoupdate.php @@ -28,11 +28,11 @@ $RUNTIME_NOAPPS=true; $RUNTIME_NOSETUPFS=true; -OC_JSON::checkAppEnabled('media'); +OCP\JSON::checkAppEnabled('media'); $autoUpdate=(isset($_GET['autoupdate']) and $_GET['autoupdate']=='true'); OCP\Config::setUserValue(OCP\USER::getUser(),'media','autoupdate',(integer)$autoUpdate); -OC_JSON::success(array('data' => $autoUpdate)); +OCP\JSON::success(array('data' => $autoUpdate)); ?> diff --git a/apps/media/tomahawk.php b/apps/media/tomahawk.php index d4f5ac6afad..700a75bf41e 100755 --- a/apps/media/tomahawk.php +++ b/apps/media/tomahawk.php @@ -24,7 +24,7 @@ $_POST=$_GET; //debug require_once('../inc.php'); -OC_JSON::checkAppEnabled('media'); +OCP\JSON::checkAppEnabled('media'); require_once(OC::$APPSROOT . '/apps/media/lib_collection.php'); $user=isset($_POST['user'])?$_POST['user']:''; @@ -76,5 +76,5 @@ foreach($songs as $song) { 'score' => (float)1.0 ); } -OC_JSON::encodedPrint($results); +OCP\JSON::encodedPrint($results); ?> diff --git a/apps/user_migrate/ajax/export.php b/apps/user_migrate/ajax/export.php index ef8e331c68c..07c35c73470 100755 --- a/apps/user_migrate/ajax/export.php +++ b/apps/user_migrate/ajax/export.php @@ -24,33 +24,33 @@ // Check if we are a user -OC_JSON::checkLoggedIn(); +OCP\JSON::checkLoggedIn(); OCP\App::checkAppEnabled('user_migrate'); // Which operation if( $_GET['operation']=='create' ){ $uid = !empty( $_POST['uid'] ) ? $_POST['uid'] : OCP\USER::getUser(); if( $uid != OCP\USER::getUser() ){ // Needs to be admin to export someone elses account - OC_JSON::error(); + OCP\JSON::error(); die(); } // Create the export zip $response = json_decode( OC_Migrate::export( $uid ) ); if( !$response->success ){ // Error - OC_JSON::error(); + OCP\JSON::error(); die(); } else { // Save path in session $_SESSION['ocuserexportpath'] = $response->data; } - OC_JSON::success(); + OCP\JSON::success(); die(); } else if( $_GET['operation']=='download' ){ // Download the export $path = isset( $_SESSION['ocuserexportpath'] ) ? $_SESSION['ocuserexportpath'] : false; if( !$path ){ - OC_JSON::error(); + OCP\JSON::error(); } header("Content-Type: application/zip"); header("Content-Disposition: attachment; filename=" . basename($path)); diff --git a/lib/public/json.php b/lib/public/json.php new file mode 100644 index 00000000000..36d3bed807f --- /dev/null +++ b/lib/public/json.php @@ -0,0 +1,94 @@ +<?php +/** +* ownCloud +* +* @author Frank Karlitschek +* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* +* 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/>. +* +*/ + +/** + * Public interface of ownCloud for apps to use. + * JSON Class + * + */ + +// use OCP namespace for all classes that are considered public. +// This means that they should be used by apps instead of the internal ownCloud classes +namespace OCP; + +class JSON { + + + + /** + * Encode and print $data in JSON format + */ + public static function encodedPrint($data,$setContentType=true){ + return(\OC_JSON::encodedPrint($data,$setContentType)); + } + + /** + * Check if the user is logged in, send json error msg if not + */ + public static function checkLoggedIn(){ + return(\OC_JSON::checkLoggedIn()); + } + + + + /** + * Send json success msg + */ + public static function success($data = array()){ + return(\OC_JSON::success($data)); + } + + + /** + * Send json error msg + */ + public static function error($data = array()){ + return(\OC_JSON::error($data)); + } + + + /** + * set Content-Type header to jsonrequest + */ + public static function setContentTypeHeader($type='application/json'){ + return(\OC_JSON::setContentTypeHeader($type)); + } + + + /** + * Check if the app is enabled, send json error msg if not + */ + public static function checkAppEnabled($app){ + return(\OC_JSON::checkAppEnabled($app)); + } + + + /** + * Check if the user is a admin, send json error msg if not + */ + public static function checkAdminUser(){ + return(\OC_JSON::checkAdminUser()); + } + +} + +?> |