mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into calendar_export

This commit is contained in:
Georg Ehrke 2012-06-16 09:48:32 +02:00
parent 4d392801cc 31ec93bd00
commit be4820bbca
25 changed files with 25 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/calendar/ajax/calendar/delete.php
View File

@ -22,4 +22,3 @@ if($del == true){
}else{ }else{
OCP\JSON::error(array('error'=>'dberror')); OCP\JSON::error(array('error'=>'dberror'));
} }
?>

1
apps/calendar/ajax/calendar/edit.form.php
View File

@ -17,4 +17,3 @@ $tmpl->assign('new', false);
$tmpl->assign('calendarcolor_options', $calendarcolor_options); $tmpl->assign('calendarcolor_options', $calendarcolor_options);
$tmpl->assign('calendar', $calendar); $tmpl->assign('calendar', $calendar);
$tmpl->printPage(); $tmpl->printPage();
?>

1
apps/calendar/ajax/calendar/edit.php
View File

@ -21,4 +21,3 @@ $tmpl->assign('new', false);
$tmpl->assign('calendarcolor_options', $calendarcolor_options); $tmpl->assign('calendarcolor_options', $calendarcolor_options);
$tmpl->assign('calendar', $calendar); $tmpl->assign('calendar', $calendar);
$tmpl->printPage(); $tmpl->printPage();
?>

1
apps/calendar/ajax/calendar/new.form.php
View File

@ -20,4 +20,3 @@ $tmpl->assign('new', true);
$tmpl->assign('calendarcolor_options', $calendarcolor_options); $tmpl->assign('calendarcolor_options', $calendarcolor_options);
$tmpl->assign('calendar', $calendar); $tmpl->assign('calendar', $calendar);
$tmpl->printPage(); $tmpl->printPage();
?>

1
apps/calendar/ajax/calendar/overview.php
View File

@ -12,4 +12,3 @@ OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar'); OCP\JSON::checkAppEnabled('calendar');
$output = new OCP\Template("calendar", "part.choosecalendar"); $output = new OCP\Template("calendar", "part.choosecalendar");
$output -> printpage(); $output -> printpage();
?>

1
apps/calendar/ajax/event/edit.php
View File

@ -43,4 +43,3 @@ if($errarr){
} }
OCP\JSON::success(); OCP\JSON::success();
} }
?>

1
apps/calendar/ajax/event/new.php
View File

@ -22,4 +22,3 @@ if($errarr){
$result = OC_Calendar_Object::add($cal, $vcalendar->serialize()); $result = OC_Calendar_Object::add($cal, $vcalendar->serialize());
OCP\JSON::success(); OCP\JSON::success();
} }
?>

1
apps/calendar/ajax/import/dialog.php
View File

@ -13,4 +13,3 @@ $tmpl = new OCP\Template('calendar', 'part.import');
$tmpl->assign('path', $_POST['path']); $tmpl->assign('path', $_POST['path']);
$tmpl->assign('filename', $_POST['filename']); $tmpl->assign('filename', $_POST['filename']);
$tmpl->printpage(); $tmpl->printpage();
?>

1
apps/calendar/ajax/import/dropimport.php
View File

@ -71,4 +71,3 @@ foreach($uids as $uid) {
} }
} }
OCP\JSON::success(); OCP\JSON::success();
?>

1
apps/calendar/ajax/settings/getfirstday.php
View File

@ -9,4 +9,3 @@
OCP\JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
$firstday = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'firstday', 'mo'); $firstday = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'firstday', 'mo');
OCP\JSON::encodedPrint(array('firstday' => $firstday)); OCP\JSON::encodedPrint(array('firstday' => $firstday));
?>

1
apps/calendar/ajax/settings/guesstimezone.php
View File

@ -24,4 +24,3 @@ if($timezone == OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timez
OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezone', $timezone); OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezone', $timezone);
$message = array('message'=> $l->t('New Timezone:') . $timezone); $message = array('message'=> $l->t('New Timezone:') . $timezone);
OCP\JSON::success($message); OCP\JSON::success($message);
?>

2
apps/calendar/ajax/settings/setfirstday.php
View File

@ -13,5 +13,3 @@ if(isset($_POST["firstday"])){
}else{ }else{
OCP\JSON::error(); OCP\JSON::error();
} }
?>

2
apps/calendar/ajax/settings/settimeformat.php
View File

@ -13,5 +13,3 @@ if(isset($_POST["timeformat"])){
}else{ }else{
OCP\JSON::error(); OCP\JSON::error();
} }
?>

2
apps/calendar/ajax/settings/settimezone.php
View File

@ -23,5 +23,3 @@ if( isset( $_POST['timezone'] ) ){
}else{ }else{
OCP\JSON::error(array('data' => array( 'message' => $l->t('Invalid request') ))); OCP\JSON::error(array('data' => array( 'message' => $l->t('Invalid request') )));
} }
?>

1
apps/calendar/ajax/settings/timeformat.php
View File

@ -9,4 +9,3 @@
OCP\JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
$timeformat = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'timeformat', "24"); $timeformat = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'timeformat', "24");
OCP\JSON::encodedPrint(array("timeformat" => $timeformat)); OCP\JSON::encodedPrint(array("timeformat" => $timeformat));
?>