Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70e6ab9c authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

calendar_props removed and used calendar object

parent e1682ce6
Loading
Loading
Loading
Loading
Loading
+14 −45
Original line number Diff line number Diff line
@@ -84,13 +84,7 @@ class InvitationMiddleware extends Middleware

			$query2 = $this->db->getQueryBuilder();
			$query2
				->select(
					"co.id",
					"co.calendardata",
					"cp.parameter",
					"cp.name",
					"cp.value"
				)
				->select("co.id", "co.calendardata")
				->from("calendarobjects", "co")
				->innerJoin(
					"co",
@@ -98,12 +92,6 @@ class InvitationMiddleware extends Middleware
					"c",
					$query2->expr()->eq("co.calendarid", "c.id")
				)
				->innerJoin(
					"co",
					"calendarobjects_props",
					"cp",
					$query2->expr()->eq("co.id", "cp.objectid")
				)
				->where(
					$query
						->expr()
@@ -116,48 +104,29 @@ class InvitationMiddleware extends Middleware
					$query
						->expr()
						->eq("co.uid", $query2->createNamedParameter($uid))
				)
				->andWhere(
					$query
						->expr()
						->eq(
							"cp.parameter",
							$query2->createNamedParameter("CN")
						)
				);
			$stmt2 = $query2->execute();
			$row2 = $stmt2->fetchAll(\PDO::FETCH_ASSOC);

			foreach ($row2 as $calendarobj1) {
				if ($calendarobj1["name"] == "ATTENDEE") {
					$attendeename = $calendarobj1["value"];
				}
				if ($calendarobj1["name"] == "ORGANIZER") {
					$organizername = $calendarobj1["value"];
			$row2 = $stmt2->fetch(\PDO::FETCH_ASSOC);
			$vObject = Reader::read($row2["calendardata"]);
			$SUMMARY = $vObject->VEVENT->SUMMARY;
			$datestart = (string) $vObject->VEVENT->DTSTART;
			$attendeename = $sender;
			$organizername = $recipient;
			$ATTENDEE = $vObject->VEVENT->ATTENDEE["CN"];
			$ORGANIZER = $vObject->VEVENT->ORGANIZER["CN"];
			if ($ATTENDEE != "") {
				$attendeename = $ATTENDEE;
			}
			if ($ORGANIZER != "") {
				$organizername = $ORGANIZER;
			}

			$vObject = Reader::read($row2[0]["calendardata"]);
			$SUMMARY = $vObject->VEVENT->SUMMARY;
			$datestart = (string) $vObject->VEVENT->DTSTART;
			if (str_contains($datestart, "T")) {
				$eventdate = date("F d, Y h:i", strtotime($datestart));
			} else {
				$eventdate = date("F d, Y", strtotime($datestart));
			}

			if ($attendeename == "") {
				$attendeename = $sender;
			}

			if ($organizername == "") {
				$organizername = $recipient;
			}

			$userdata = $this->iusermanager->getByEmail($recipient);
			$username = $userdata[0]->getUID();
			$userlang = $this->languageFactory->getUserLanguage($userdata[0]);

			if ($methodName === "tentative") {
				$meetingTitle = $this->l10n->t(
					"Invitation Tentatively Accepted: %s",