From 0b822a26cd95fd0b81b039dd393c6d750881a2f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20=27rysiek=27=20Wo=C5=BAniak?=
 <rysiek@fwioo.pl>
Date: Tue, 4 Feb 2014 02:55:34 +0100
Subject: [PATCH] testing event double-display bugfix; minor code cleanups in
 calendar.js

---
 js/calendar.js | 11 -----------
 js/l10n.php    | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/js/calendar.js b/js/calendar.js
index 12f1c73d..074fdc32 100644
--- a/js/calendar.js
+++ b/js/calendar.js
@@ -1100,14 +1100,6 @@ $(document).ready(function(){
 		OC.appSettings({appid:'calendar', loadJS:true, cache:false, scriptName:'settingswrapper.php'});
 	});
 	$('#fullcalendar').fullCalendar('option', 'height', $(window).height() - $('#controls').height() - $('#header').height() - 15);
-  // fixing the calendar share link
-  // https://github.com/owncloud/apps/issues/411#issuecomment-32303184
-  var oldOCShareShowLink = OC.Share.showLink;
-  OC.Share.showLink = function () {
-      var r = oldOCShareShowLink.apply(this, arguments);
-      $('#linkText').val($('#linkText').val().replace('service=files', 'service=calendar'));
-      return r;
-  };
 
   /* link-sharing/unsharing of single events and calendars done right */
   $('.share-interface-container.link-share input[type="checkbox"].share-link').live('change', function(e){
@@ -1239,7 +1231,4 @@ $(document).ready(function(){
       });
     }
   })
-  /*
-  $('a.action').each(function(){$(this).tipsy('disable')})
-  */
 });
diff --git a/js/l10n.php b/js/l10n.php
index 08bcaef4..b270b04a 100644
--- a/js/l10n.php
+++ b/js/l10n.php
@@ -19,14 +19,17 @@ $l = OCP\Util::getL10N('calendar');
 
 // Get the event sources
 $eventSources = array();
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser());
-foreach($calendars as $calendar) {
-	if(!array_key_exists('active', $calendar)){
-		$calendar['active'] = 1;
-	}
-	if($calendar['active'] == 1) {
-		$eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
-	}
+
+if (OCP\User::isLoggedIn()) {
+  $calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser());
+  foreach($calendars as $calendar) {
+    if(!array_key_exists('active', $calendar)){
+      $calendar['active'] = 1;
+    }
+    if($calendar['active'] == 1) {
+      $eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
+    }
+  }
 }
 
 $events_baseURL = OCP\Util::linkTo('calendar', 'ajax/events.php');