CIVIZOOM-65 Fix generation of join_url token, add null guards.

agileware · Mar 21, 2024 · 4f2c235 · 4f2c235
1 parent 7639f1a
commit 4f2c235
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/CRM/Zoomzoom/Tokens.php b/CRM/Zoomzoom/Tokens.php
@@ -59,22 +59,22 @@ protected static function evaluateRow(TokenRow $row) {
 				              ->addSelect('zoom.zoom_id', 'zoom.join_url', 'zoom.global_dial_in_numbers')
 				              ->execute()
 				              ->first();
-				$row->tokens(self::TOKEN, 'zoom_id', $event['zoom.zoom_id']);
-				$row->tokens(self::TOKEN, 'join_url', $event['zoom.zoom_url']);
-				$row->tokens(self::TOKEN, 'global_dial_in_numbers', $event['zoom.global_dial_in_numbers']);
+				$row->tokens(self::TOKEN, 'zoom_id', $event['zoom.zoom_id'] ?? '');
+				$row->tokens(self::TOKEN, 'join_url', $event['zoom.join_url'] ?? '' );
+				$row->tokens(self::TOKEN, 'global_dial_in_numbers', $event['zoom.global_dial_in_numbers'] ?? '');
 			}
 			if (!empty($row->context['participantId'])) {
 				$participant = Participant::get(FALSE)
 					->addWhere('id', '=', $row->context['participantId'])
 					->addSelect('zoom_registrant.registrant_id', 'zoom_registrant.join_url')
 					->execute()
 					->first();
-				$row->tokens(self::TOKEN, 'registrant_id', $participant['zoom_registrant.registrant_id']);
-				$row->tokens(self::TOKEN, 'join_url', $participant['zoom_registrant.join_url']);
+				$row->tokens(self::TOKEN, 'registrant_id', $participant['zoom_registrant.registrant_id'] ?? '');
+				$row->tokens(self::TOKEN, 'join_url', $participant['zoom_registrant.join_url'] ?? '');
 			}
 		}
 		catch(CRM_Core_Exception $e) {
 			// ...
 		}
 	}
-}
+}
diff --git a/info.xml b/info.xml
@@ -14,8 +14,8 @@
     <url desc="Support">https://github.com/agileware/au.com.agileware.zoomzoom/issues</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2023-11-06</releaseDate>
-  <version>1.10.0</version>
+  <releaseDate>2024-03-21</releaseDate>
+  <version>1.10.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.19</ver>