From f6dc158d51217be414f89d0c15526c3903e452ef Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 13 May 2012 12:02:36 +0200
Subject: [PATCH 1/4] fix php notice and displaying of events

---
 apps/calendar/ajax/events.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index f149e0d400e..56fa51aaff2 100755
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -15,7 +15,7 @@ OCP\JSON::checkAppEnabled('calendar');
 // Look for the calendar id
 $calendar_id = OC_Calendar_App::getCalendar($_GET['calendar_id'], false, false);
 if($calendar_id !== false){
-	if(! is_numeric($calendar['userid']) && $calendar['userid'] != OCP\User::getUser()){
+	if(! is_numeric($calendar_id['userid']) && $calendar_id['userid'] != OCP\User::getUser()){
 		OCP\JSON::error();
 		exit;
 	}

From 85cc34fd05ec73714b73cc3553f04e4960ccb42b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 13 May 2012 12:14:08 +0200
Subject: [PATCH 2/4] fix another php notice

---
 apps/calendar/templates/share.dropdown.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/calendar/templates/share.dropdown.php b/apps/calendar/templates/share.dropdown.php
index 356a8d4fab1..20d4c19bc19 100755
--- a/apps/calendar/templates/share.dropdown.php
+++ b/apps/calendar/templates/share.dropdown.php
@@ -72,6 +72,6 @@ echo OCP\html_select_options($allgroups, array());
 <?php endforeach; ?>
 </ul>
 <div id="public">
-	<input type="checkbox" id="publish" <?php echo ($public['share'])?'checked="checked"':'' ?>><label for="publish"><?php echo $l->t('make public'); ?></label><br>
-	<input type="text" id="public_token" value="<?php echo OCP\Util::linkToAbsolute('', 'public.php').'?service=calendar&t=' . $public['share'] ?>" onmouseover="$('#public_token').select();" style="<?php echo (!$public['share'])?'display:none':'' ?>">
-</div>
+	<input type="checkbox" id="publish" <?php echo (array_key_exists('share', $public))?'checked="checked"':'' ?>><label for="publish"><?php echo $l->t('make public'); ?></label><br>
+	<input type="text" id="public_token" value="<?php if(array_key_exists('share', $public)){echo OCP\Util::linkToAbsolute('', 'public.php').'?service=calendar&t=' . $public['share']; } ?>" onmouseover="$('#public_token').select();" style="<?php echo (!array_key_exists('share', $public))?'display:none':'' ?>">
+</div>
\ No newline at end of file

From f45411f79d5795d833653554330d3eb38634c8a0 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 13 May 2012 12:25:26 +0200
Subject: [PATCH 3/4] fix another php notice

---
 apps/calendar/ajax/event/new.form.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php
index f47cb6c3e2a..91b85fff07f 100755
--- a/apps/calendar/ajax/event/new.form.php
+++ b/apps/calendar/ajax/event/new.form.php
@@ -57,6 +57,7 @@ $tmpl->assign('repeat_byweekno_options', $repeat_byweekno_options);
 $tmpl->assign('repeat_bymonthday_options', $repeat_bymonthday_options);
 $tmpl->assign('repeat_weekofmonth_options', $repeat_weekofmonth_options);
 
+$tmpl->assign('eventid', 'new');
 $tmpl->assign('startdate', $start->format('d-m-Y'));
 $tmpl->assign('starttime', $start->format('H:i'));
 $tmpl->assign('enddate', $end->format('d-m-Y'));

From 5ac10a9c0eecfa6fe49c314954c506972f275e24 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 13 May 2012 12:28:28 +0200
Subject: [PATCH 4/4] hide share tab for new events, because you can't share an
 event that haven't got an id yet

---
 apps/calendar/templates/part.eventform.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php
index b3bbf7a375b..2d86ce4d318 100755
--- a/apps/calendar/templates/part.eventform.php
+++ b/apps/calendar/templates/part.eventform.php
@@ -9,7 +9,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
 	<li><a href="#tabs-2"><?php echo $l->t('Repeating'); ?></a></li>
 	<!--<li><a href="#tabs-3"><?php echo $l->t('Alarm'); ?></a></li>
 	<li><a href="#tabs-4"><?php echo $l->t('Attendees'); ?></a></li>-->
-	<?php if($_['access'] == 'owner') { ?>
+	<?php if($_['access'] == 'owner' && $_['eventid'] != 'new') { ?>
 	<li><a href="#tabs-5"><?php echo $l->t('Share'); ?></a></li>
 	<?php } ?>
 </ul>
@@ -246,6 +246,6 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
 <div id="tabs-4">//Attendees</div>-->
 <?php if($_['access'] == 'owner') { ?>
 <div id="tabs-5">
-	<?php echo $this->inc('share.dropdown'); ?>
+	<?php if($_['eventid'] != 'new'){ echo $this->inc('share.dropdown'); } ?>
 </div>
 <?php } ?>