X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fevent.php;h=3a41dad4e70dd5b66b3f51cc964f62b8271b3e5e;hb=cc16369b6f45eff2c0faa91bda96ae619f9f80e4;hp=98307e23e1537dc0440f628b6420284125719e34;hpb=dc6cce408041d017a81241b315864098abaea475;p=friendica.git

diff --git a/include/event.php b/include/event.php
index 98307e23e1..3a41dad4e7 100644
--- a/include/event.php
+++ b/include/event.php
@@ -271,7 +271,7 @@ function event_store($arr) {
 			intval($arr['id']),
 			intval($arr['uid'])
 		);
-		if((! count($r)) || ($r[0]['edited'] === $arr['edited'])) {
+		if((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) {
 
 			// Nothing has changed. Grab the item id to return.
 
@@ -279,7 +279,7 @@ function event_store($arr) {
 				intval($arr['id']),
 				intval($arr['uid'])
 			);
-			return((count($r)) ? $r[0]['id'] : 0);
+			return((dbm::is_result($r)) ? $r[0]['id'] : 0);
 		}
 
 		// The event changed. Update it.
@@ -293,7 +293,7 @@ function event_store($arr) {
 			`location` = '%s',
 			`type` = '%s',
 			`adjust` = %d,
-			`nofinish` = %d,
+			`nofinish` = %d
 			WHERE `id` = %d AND `uid` = %d",
 
 			dbesc($arr['edited']),
@@ -312,7 +312,7 @@ function event_store($arr) {
 			intval($arr['id']),
 			intval($arr['uid'])
 		);
-		if(count($r)) {
+		if (dbm::is_result($r)) {
 			$object = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
 			$object .= '<content>' . xmlify(format_event_bbcode($arr)) . '</content>';
 			$object .= '</object>' . "\n";
@@ -365,7 +365,7 @@ function event_store($arr) {
 			dbesc($arr['uri']),
 			intval($arr['uid'])
 		);
-		if(count($r))
+		if (dbm::is_result($r))
 			$event = $r[0];
 
 		$item_arr = array();
@@ -407,7 +407,7 @@ function event_store($arr) {
 		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($arr['uid'])
 		);
-		//if(count($r))
+		//if (dbm::is_result($r))
 		//	$plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
 
 
@@ -480,6 +480,13 @@ function get_event_strings() {
 			"month" => t("month"),
 			"week" => t("week"),
 			"day" => t("day"),
+			"allday" => t("all-day"),
+
+			"noevent" => t("No events to display"),
+
+			"dtstart_label" => t("Starts:"),
+			"dtend_label" => t("Finishes:"),
+			"location_label" => t("Location:")
 		);
 
 	return $i18n;
@@ -502,13 +509,13 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
 	// query for the event by event id
 	$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
 			`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
-		LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
+		STRAIGHT_JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
 		WHERE `event`.`uid` = %d AND `event`.`id` = %d $sql_extra",
 		intval($owner_uid),
 		intval($event_params["event_id"])
 	);
 
-	if(count($r))
+	if (dbm::is_result($r))
 		return $r;
 
 }
@@ -535,7 +542,7 @@ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
 	// query for the event by date
 	$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
 				`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
-			LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
+			STRAIGHT_JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
 			WHERE `event`.`uid` = %d AND event.ignore = %d
 			AND ((`adjust` = 0 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s')
 			OR  (`adjust` = 1 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s'))
@@ -550,7 +557,7 @@ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
 			dbesc($event_params["adjust_finish"])
 	);
 
-	if(count($r))
+	if (dbm::is_result($r))
 		return $r;
 }
 
@@ -743,7 +750,7 @@ function events_by_uid($uid = 0, $sql_extra = '') {
 		);
 	}
 
-	if(count($r))
+	if (dbm::is_result($r))
 		return $r;
 }
 
@@ -766,7 +773,7 @@ function event_export($uid, $format = 'ical') {
 	// we are allowed to show events
 	// get the timezone the user is in
 	$r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
-	if (count($r))
+	if (dbm::is_result($r))
 		$timezone = $r[0]['timezone'];
 
 	// get all events which are owned by a uid (respects permissions);