show shared calendars

2 files changed, 20 insertions, 5 deletions

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 6e92cf67c5c..27129e77e35 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -114,4 +114,19 @@ class OC_Calendar_App{
 	public static function getWeekofMonth(){
 		return OC_Calendar_Object::getWeekofMonth(self::$l10n);
 	}
+	
+	public static function prepareForOutput($event, $vevent, $return_event){
+		$return_event['id'] = (int)$event['id'];
+		$return_event['title'] = htmlspecialchars($event['summary']);
+		$return_event['description'] = isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'';
+		$last_modified = $vevent->__get('LAST-MODIFIED');
+		if ($last_modified){
+			$lastmodified = $last_modified->getDateTime()->format('U');
+		}else{
+			$lastmodified = 0;
+		}
+		$return_event['lastmodified'] = (int)$lastmodified;
+		return $return_event;
+		
+	}
 }
diff --git a/apps/calendar/lib/share.php b/apps/calendar/lib/share.php
index bbc8770f65a..33bf50f68ad 100644
--- a/apps/calendar/lib/share.php
+++ b/apps/calendar/lib/share.php
@@ -17,21 +17,21 @@ class OC_Calendar_Share{
 	 * @param: (string) $type - use const self::CALENDAR or self::EVENT
 	 * @return: (array) $return - information about calendars
 	 */
-	public static function allSharedwithuser($userid, $type){
-		$group_where = 'false';
+	public static function allSharedwithuser($userid, $type, $active=null){
+		$group_where = '';
 		$groups = OC_Group::getUserGroups($userid);
 		$i = 0;
 		foreach($groups as $group){
 			if($i == 0){
-				$group_where = '';
+				$group_where = 'OR (';
 			}else{
 				$group_where .= ' OR ';
 			}
 			$group_where .= ' (share = "' . $group . '" and sharetype = "group") ';
 			$i++;
 		}
-		$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . $type . ' WHERE (share = ? AND sharetype = "user") OR (' . $group_where . ')');
-		$result = $stmt->execute(array($userid));
+		$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . $type . ' WHERE ((share = ? AND sharetype = "user") ' . $group_where . ') AND owner <> ?' . ((!is_null($active) && $active)?' AND active = 1':''));
+		$result = $stmt->execute(array($userid, $userid));
 		$return = array();
 		while( $row = $result->fetchRow()){
 			$return[] = $row;