diff --git a/apps/calendar/ajax/activation.php b/apps/calendar/ajax/activation.php old mode 100644 new mode 100755 index adf44468c28..51c5777f643 --- a/apps/calendar/ajax/activation.php +++ b/apps/calendar/ajax/activation.php @@ -2,7 +2,7 @@ /************************************************* * ownCloud - Calendar Plugin * * * - * (c) Copyright 2011 Bart Visscher * + * (c) Copyright 2011 Georg Ehrke * * author: Georg Ehrke * * email: ownclouddev at georgswebsite dot de * * homepage: ownclouddev.georgswebsite.de * @@ -24,4 +24,4 @@ if(!OC_USER::isLoggedIn()) { $calendarid = $_POST['calendarid']; OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']); $cal = OC_Calendar_Calendar::findCalendar($calendarid); -echo $cal['active']; \ No newline at end of file +echo $cal['active']; diff --git a/apps/calendar/ajax/editcalendar.php b/apps/calendar/ajax/editcalendar.php new file mode 100755 index 00000000000..e32bf458652 --- /dev/null +++ b/apps/calendar/ajax/editcalendar.php @@ -0,0 +1,29 @@ + * + * * + * please write to the Free Software Foundation. * + * Address: * + * 59 Temple Place, Suite 330, Boston, * + * MA 02111-1307 USA * + *************************************************/ +require_once('../../../lib/base.php'); +$l10n = new OC_L10N('calendar'); +if(!OC_USER::isLoggedIn()) { + die(""); +} +$calendar = OC_Calendar_Calendar::findCalendar($_GET['calendarid']); +$tmpl = new OC_Template("calendar", "part.editcalendar"); +$tmpl->assign('calendar',$calendar); +$tmpl->printPage(); +?> diff --git a/apps/calendar/ajax/getcal.php b/apps/calendar/ajax/getcal.php index 702c0e057ba..b20f22957c3 100755 --- a/apps/calendar/ajax/getcal.php +++ b/apps/calendar/ajax/getcal.php @@ -23,4 +23,4 @@ if(!OC_USER::isLoggedIn()) { } $output = new OC_TEMPLATE("calendar", "part.getcal"); $output -> printpage(); -?> \ No newline at end of file +?> diff --git a/apps/calendar/ajax/settimezone.php b/apps/calendar/ajax/settimezone.php new file mode 100755 index 00000000000..62e171c66b9 --- /dev/null +++ b/apps/calendar/ajax/settimezone.php @@ -0,0 +1,26 @@ + "error", "data" => array( "message" => $l->t("Authentication error") ))); + exit(); +} + +// Get data +if( isset( $_POST['timezone'] ) ){ + $timezone=$_POST['timezone']; + OC_Preferences::setValue( OC_User::getUser(), 'calendar', 'timezone', $timezone ); + echo json_encode( array( "status" => "success", "data" => array( "message" => $l->t("Timezone changed") ))); +}else{ + echo json_encode( array( "status" => "error", "data" => array( "message" => $l->t("Invalid request") ))); +} + +?> diff --git a/apps/calendar/ajax/updatecalendar.php b/apps/calendar/ajax/updatecalendar.php new file mode 100755 index 00000000000..2836dda218a --- /dev/null +++ b/apps/calendar/ajax/updatecalendar.php @@ -0,0 +1,39 @@ + * + * * + * please write to the Free Software Foundation. * + * Address: * + * 59 Temple Place, Suite 330, Boston, * + * MA 02111-1307 USA * + *************************************************/ +require_once('../../../lib/base.php'); + +$l10n = new OC_L10N('calendar'); + +// We send json data +header( "Content-Type: application/jsonrequest" ); + +// Check if we are a user +if( !OC_User::isLoggedIn()){ + echo json_encode( array( "status" => "error", "data" => array( "message" => $l->t("Authentication error") ))); + exit(); +} + +$calendarid = $_POST['id']; +OC_Calendar_Calendar::editCalendar($calendarid, $_POST['name'], $_POST['description'], null, null, null, $_POST['color']); +OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']); +$calendar = OC_Calendar_Calendar::findCalendar($calendarid); +$tmpl = new OC_Template('calendar', 'part.calendar.row'); +$tmpl->assign('calendar', $calendar); +echo json_encode( array( "status" => "success", "data" => $tmpl->fetchPage() )); diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php old mode 100644 new mode 100755 index 0e3d9c9379e..5ec2177e20c --- a/apps/calendar/appinfo/app.php +++ b/apps/calendar/appinfo/app.php @@ -16,3 +16,5 @@ OC_App::addNavigationEntry( array( 'href' => OC_Helper::linkTo( 'calendar', 'index.php' ), 'icon' => OC_Helper::imagePath( 'calendar', 'icon.png' ), 'name' => $l->t('Calendar'))); + +OC_App::registerPersonal('calendar', 'settings'); diff --git a/apps/calendar/appinfo/database.xml b/apps/calendar/appinfo/database.xml old mode 100644 new mode 100755 index 0d7ec188dfb..159ca0127e4 --- a/apps/calendar/appinfo/database.xml +++ b/apps/calendar/appinfo/database.xml @@ -135,7 +135,7 @@ false 100 - + active integer @@ -143,7 +143,7 @@ true 4 - + ctag integer diff --git a/apps/calendar/appinfo/info.xml b/apps/calendar/appinfo/info.xml old mode 100644 new mode 100755 diff --git a/apps/calendar/caldav.php b/apps/calendar/caldav.php old mode 100644 new mode 100755 diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index eb64418bd03..d9bad110a6b 100755 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -1,7 +1,7 @@ /************************************************* * ownCloud - Calendar Plugin * * * - * (c) Copyright 2011 Georg Ehrke, Bart Visscher * + * (c) Copyright 2011 Georg Ehrke * * author: Georg Ehrke * * email: ownclouddev at georgswebsite dot de * * homepage: ownclouddev.georgswebsite.de * @@ -462,17 +462,17 @@ function oc_cal_switch2today() { function oc_cal_update_eventsvar(loadyear) { $.getJSON(oc_webroot + "/apps/calendar/ajax/getcal.php?year=" + loadyear, function(newevents, status) { - if(status == "nosession") { + if(status == "nosession") { alert("You are not logged in. That can happen if you don't use owncloud for a long time."); - document.location.href = oc_webroot; + document.location(oc_webroot); } if(status == "parsingfail" || typeof (newevents) == "undefined") { $(function() { $( "#parsingfail_dialog" ).dialog(); }); } else { - oc_cal_events[loadyear]= newevents[loadyear]; - oc_cal_update_view(''); + oc_cal_events[loadyear] = newevents[loadyear]; + oc_cal_update_view('', ''); } }); } @@ -678,8 +678,8 @@ function oc_cal_load_events(loadview) { var weekdays = new Array("monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"); var dates = oc_cal_generate_dates("oneweek"); for(var i = 0; i <= 6; i++) { - var loadevents_month = dates[i][0]; - var loadevents_days = dates[i][1]; + var loadevents_month = dates[i][1]; + var loadevents_days = dates[i][0]; if( typeof (oc_cal_events[oc_cal_year][loadevents_month]) != "undefined") { if( typeof (oc_cal_events[oc_cal_year][loadevents_month][loadevents_days]) != "undefined") { if( typeof (oc_cal_events[oc_cal_year][loadevents_month][loadevents_days]["allday"]) != "undefined") { @@ -718,8 +718,8 @@ function oc_cal_load_events(loadview) { var weekdaynum = 0; var weeknum = 1; for(var i = 0; i <= 27; i++) { - var loadevents_month = dates[i][0]; - var loadevents_days = dates[i][1]; + var loadevents_month = dates[i][1]; + var loadevents_days = dates[i][0]; if( typeof (oc_cal_events[oc_cal_year][loadevents_month]) != "undefined") { if( typeof (oc_cal_events[oc_cal_year][loadevents_month][loadevents_days]) != "undefined") { var pnum = 0; @@ -767,8 +767,8 @@ function oc_cal_load_events(loadview) { var weekdaynum = 0; var weeknum = 1; for(var i = 0; i <= 41; i++) { - var loadevents_month = dates[i][0]; - var loadevents_days = dates[i][1]; + var loadevents_month = dates[i][1]; + var loadevents_days = dates[i][0]; if( typeof (oc_cal_events[oc_cal_year][loadevents_month]) != "undefined") { if( typeof (oc_cal_events[oc_cal_year][loadevents_month][loadevents_days]) != "undefined") { var pnum = 0; @@ -896,10 +896,27 @@ function oc_cal_choosecalendar(){ alert(t("calendar", "You can't open more than one dialog per site!")); } } - -function oc_cal_calender_activation(checkbox, calendarid){ +function oc_cal_calender_activation(checkbox, calendarid) +{ $.post(oc_webroot + "/apps/calendar/ajax/activation.php", { calendarid: calendarid, active: checkbox.checked?1:0 }, - function(data) { - checkbox.checked = data == 1; - }); -} \ No newline at end of file + function(data) { + checkbox.checked = data == 1; + }); +} +function oc_cal_editcalendar(object, calendarid){ + $(object).closest('tr').load(oc_webroot + "/apps/calendar/ajax/editcalendar.php?calendarid="+calendarid); +} +function oc_cal_editcalendar_submit(button, calendarid){ + var displayname = $("#displayname_"+calendarid).val(); + var active = $("#active_"+calendarid+":checked").length; + var description = $("#description_"+calendarid).val(); + var calendarcolor = $("#calendarcolor_"+calendarid).val(); + + $.post("ajax/updatecalendar.php", { id: calendarid, name: displayname, active: active, description: description, color: calendarcolor }, + function(data){ + if(data.error == "true"){ + }else{ + $(button).closest('tr').html(data.data) + } + }, 'json'); +} diff --git a/apps/calendar/js/calendar_init.js b/apps/calendar/js/calendar_init.js index 4e71daabf3b..3140284094b 100755 --- a/apps/calendar/js/calendar_init.js +++ b/apps/calendar/js/calendar_init.js @@ -54,4 +54,4 @@ var oc_cal_datemonthyear = String(oc_cal_dayofmonth) + String(oc_cal_month) + S var oc_cal_calendars = new Array(); //event vars var oc_cal_events = new Array(); -oc_cal_events[oc_cal_year] = new Array(0,1,2,3,4,5,6,7,8,9,10,11); +oc_cal_events[oc_cal_year] = new Array(); diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js new file mode 100755 index 00000000000..b2da81b0d0f --- /dev/null +++ b/apps/calendar/js/settings.js @@ -0,0 +1,15 @@ +$(document).ready(function(){ + $("#timezone").change( function(){ + // Serialize the data + var post = $( "#timezone" ).serialize(); + // Ajax foo + $.post( oc_webroot + '/apps/calendar/ajax/settimezone.php', post, function(data){ + if( data.status == "success" ){ + } + else{ + $('#timezoneerror').html( data.data.message ); + } + }); + return false; + }); +}); diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php old mode 100644 new mode 100755 diff --git a/apps/calendar/l10n/es.php b/apps/calendar/l10n/es.php old mode 100644 new mode 100755 diff --git a/apps/calendar/l10n/xgettextfiles b/apps/calendar/l10n/xgettextfiles old mode 100644 new mode 100755 diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php old mode 100644 new mode 100755 index e28e384ba88..c1223b5b3ab --- a/apps/calendar/lib/calendar.php +++ b/apps/calendar/lib/calendar.php @@ -56,15 +56,15 @@ * This class manages our calendars */ class OC_Calendar_Calendar{ - public static function allCalendars($uid){ + public static function allCalendars($uid, $active=null){ $values = array($uid); - $active_where = ''; - if (!is_null($active)){ - $active_where = ' AND active = ?'; - $values[] = $active; - } - $stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*calendar_calendars WHERE userid = ?' . $active_where ); - $result = $stmt->execute($values); + $active_where = ''; + if (!is_null($active)){ + $active_where = ' AND active = ?'; + $values[] = $active; + } + $stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*calendar_calendars WHERE userid = ?' . $active_where ); + $result = $stmt->execute($values); $calendars = array(); while( $row = $result->fetchRow()){ @@ -112,14 +112,14 @@ class OC_Calendar_Calendar{ public static function editCalendar($id,$name=null,$description=null,$components=null,$timezone=null,$order=null,$color=null){ // Need these ones for checking uri - $calendar = self::find($id); + $calendar = self::findCalendar($id); // Keep old stuff if(is_null($name)) $name = $calendar['name']; if(is_null($description)) $description = $calendar['description']; if(is_null($components)) $components = $calendar['components']; if(is_null($timezone)) $timezone = $calendar['timezone']; - if(is_null($order)) $order = $calendar['order']; + if(is_null($order)) $order = $calendar['calendarorder']; if(is_null($color)) $color = $calendar['color']; $stmt = OC_DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET displayname=?,description=?,calendarorder=?,calendarcolor=?,timezone=?,components=?,ctag=ctag+1 WHERE id=?' ); @@ -131,6 +131,7 @@ class OC_Calendar_Calendar{ public static function setCalendarActive($id,$active){ $stmt = OC_DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET active = ? WHERE id = ?' ); $stmt->execute(array($active, $id)); + return true; } diff --git a/apps/calendar/lib/connector_sabre.php b/apps/calendar/lib/connector_sabre.php old mode 100644 new mode 100755 diff --git a/apps/calendar/lib/hooks.php b/apps/calendar/lib/hooks.php old mode 100644 new mode 100755 diff --git a/apps/calendar/settings.php b/apps/calendar/settings.php new file mode 100755 index 00000000000..bdf997eef70 --- /dev/null +++ b/apps/calendar/settings.php @@ -0,0 +1,10 @@ +assign('timezone',$timezone); +$tmpl->assign('timezones',DateTimeZone::listIdentifiers()); + +OC_Util::addScript('calendar','settings'); + +return $tmpl->fetchPage(); diff --git a/apps/calendar/templates/part.choosecalendar.php b/apps/calendar/templates/part.choosecalendar.php old mode 100644 new mode 100755 index 3bd7e5ef591..30866270ac5 --- a/apps/calendar/templates/part.choosecalendar.php +++ b/apps/calendar/templates/part.choosecalendar.php @@ -4,16 +4,13 @@ $option_calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser()); for($i = 0; $i < count($option_calendars); $i++){ echo ""; - echo ""; - echo ""; - echo "t("Download") . "\" class=\"action\">t("Rename") . "\" class=\"action\">"; + $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields'); + $tmpl->assign('calendar', $option_calendars[$i]); + $tmpl->printpage(); echo ""; } ?> -


-"> -