Update

Author: videowhisper

README.md

@@ -1,7 +1,7 @@
 ## VideoCall-HTML5-Videochat-PHP / 2 Way Video Calls - Standalone PHP
 
-- [Video Call PHP / HTML5 Videochat on VideoWhisper WebRTC](https://demo.videowhisper.com/p2p-html5-videocall/)
-- [Video Call PHP / HTML5 Videochat on Wowza SE](https://demo.videowhisper.com/videocall-html5-videochat-php/)
+- [Video Call PHP / HTML5 Videochat on P2P WebRTC](https://demo.videowhisper.com/p2p-html5-videocall/)
+- [Video Call PHP / HTML5 Videochat on Wowza SE relay](https://demo.videowhisper.com/videocall-html5-videochat-php/)
 
 ![PHP HTML5 Videochat / Video Call](/snapshots/h5a-2way-call.jpg)
 
@@ -81,4 +81,4 @@ For a quick setup, see [VideoWhisper Turnkey Stream Hosting Plans](https://webrt
 - [Video Calls & Random Chat Turnkey Site - WordPress](https://wordpress.org/plugins/webcam-2way-videochat/)
 - [WebRTC Signaling Server](https://github.com/videowhisper/videowhisper-webrtc/)
 
-For a free consultation [Consult VideoWhisper](https://consult.videowhisper.com) related to commercial services like turnkey site platforms, compatible hosting, custom development services.
+[Consult VideoWhisper](https://consult.videowhisper.com) for commercial services like turnkey site platforms, compatible hosting, custom development services.

app-call.php

@@ -16,8 +16,8 @@
 	$roomID = intval($VideoWhisper['roomID']);
 	$sessionKey = intval($VideoWhisper['sessionKey']);
 
-	$privateUID = intval($VideoWhisper['privateUID']);
-	$roomActionID = intval($VideoWhisper['roomActionID']);
+	$privateUID = intval($VideoWhisper['privateUID'] ?? 0);
+	$roomActionID = intval($VideoWhisper['roomActionID'] ?? 0);
 }
 
 $response['VideoWhisper'] = 'https://videowhisper.com';
@@ -60,9 +60,9 @@
 
 	//config params, const
 	$response['config'] = [
-	'serverType' => $options['serverType'],
-	'vwsSocket' => $options['vwsSocket'],
-	'vwsToken' => $options['vwsToken'],
+	'serverType' => $options['serverType'] ?? '',
+	'vwsSocket' => $options['vwsSocket'] ?? '',
+	'vwsToken' => $options['vwsToken'] ?? '',
 
 	'wss' => $options['wsURLWebRTC'],
 	'application' => $options['applicationWebRTC'],
@@ -377,8 +377,8 @@
 
 
 //update time
-$lastMessage = intval($_POST['lastMessage']);
-$lastMessageID = intval($_POST['lastMessageID']);
+$lastMessage = intval($_POST['lastMessage'] ?? 0);
+$lastMessageID = intval($_POST['lastMessageID'] ?? 0);
 
 //retrieve only messages since user came online / updated
 $sdate = 0;
@@ -468,7 +468,7 @@
 $response['timestamp'] = $ztime; //update time
 ///update message
 
-$response['lastMessageID'] = $idMax;
+$response['lastMessageID'] = $idMax ?? 0;
 
 $response['roomUpdate']['users'] = appRoomUsers($roomID, $options);
 

app-functions.php

@@ -3,7 +3,7 @@
 
 //For more advanced implementations see WordPress plugin and its php source code:
 //https://wordpress.org/plugins/ppv-live-webcams/
-//https://plugins.svn.wordpress.org/ppv-live-webcams/trunk/inc/h5videochat.php 
+//https://plugins.svn.wordpress.org/ppv-live-webcams/trunk/inc/h5videochat.php
 
 
 //demo setup saves variables in plain files in uploads folder: integration should use framework database
@@ -20,15 +20,15 @@ function varLoad($path)
 
 			return unserialize(file_get_contents('uploads/' . $path));
 		}
-		
+
 		function arrayLoad($path)
 		{
 			$res = varLoad($path);
-			
+
 			if (is_array($res)) return $res;
 			else return array();
 		}
-		
+
 // app parameter functions
 
 	function __(  $text,  $domain = 'default' )
@@ -41,11 +41,11 @@ function path2url($file)
 			$url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
 			return dirname($url) . '/' . str_replace( dirname(__FILE__) , '', $file);
 		}
-		
+
 	 function appFail($message = 'Request Failed', $response = null)
 	{
 		//bad request: fail
-		
+
 		if (!$response) $response = array();
 
 		$response['error'] = $message;
@@ -56,26 +56,26 @@ function appFail($message = 'Request Failed', $response = null)
 
 		die();
 	}
-	
-	
+
+
 	 function appSfx()
 	{
 		//sound effects sources
-		
+
 		$base = VW_H5V_URL. 'sounds/';
-		
-		
+
+
 		return array(
 		'message' => $base . 'message.mp3',
 		'hello' => $base . 'hello.mp3',
-		'leave' => $base . 'leave.mp3',	
+		'leave' => $base . 'leave.mp3',
 		'call' => $base . 'call.mp3',
 		'warning' => $base . 'warning.mp3',
 		'error' => $base . 'error.mp3',
 		'buzz' => $base . 'buzz.mp3',
 		);
 	}
-		
+
 	function appText()
 	{
 		//implement translations
@@ -148,18 +148,18 @@ function appText()
 
 function appRoomUsers($roomID, $options)
 	{
-		
+
 		$sessions = arrayLoad($roomID . '_sessions');
-		
+
 		foreach ($sessions as $key => $session)
 			{
-				if (!is_array($userMeta = unserialize($session['meta']))) $userMeta = array();
+				if (!is_array($userMeta = unserialize($session['meta'] ?? ''))) $userMeta = array();
 
 				$item = [];
 				$item['userID'] = intval($session['uid']);
-				$item['userName'] = $session['username'];
+				$item['userName'] = $session['username'] ?? '';
 				if (!$item['userName']) $item['userName'] = '#' . $session['uid'];
-				
+
 				$item['sdate'] = intval($session['sdate']);
 				$item['meta'] = $userMeta;
 				$item['updated'] = intval($session['edate']);
@@ -168,11 +168,11 @@ function appRoomUsers($roomID, $options)
 
 				$items[intval($session['uid'])] = $item;
 			}
-			
+
 			return $items;
 	}
 
-	
+
  function appTipOptions($options)
 	{
 
@@ -224,17 +224,17 @@ function appPublicRoom($roomID, $userID, $options, $welcome ='')
 	$isPerformer = ($userID == (10000+$roomID));
 
 	$clientID = $roomID;
-	
+
 	// $privateUID = the other user ID
-	
+
 	if ($isPerformer) $privateUID = $clientID;
 	else $privateUID = $room['performerID'];
 	$room['privateUID'] = $privateUID;
 
-	
+
 	//screen
 	$room['screen'] = 'Way2Screen';
-	
+
 
 	$room['streamBroadcast'] = appStream($userID, $roomID, $options);
 	$room['streamBroadcastName'] = appStreamName($userID, $roomID, $options);
@@ -264,15 +264,15 @@ function appPublicRoom($roomID, $userID, $options, $welcome ='')
 		$room['welcome'] .= "\n".'You are invited participant (client).';
 		}
 
-	
+
 	//if ($options['videochatNext']) if (!$isPerformer) $room['next'] = true;
 
 			if ($welcome) $room['welcome'] .= "\n" . $welcome;
 
 			//configure tipping options for clients
 			$room['tips'] = false;
 		if ($options['tips'])
-			if (!$session->broadcaster)
+			if (!isset($session) || !$session->broadcaster)
 			{
 				$tipOptions = appTipOptions($options);
 				if (count($tipOptions))
@@ -283,16 +283,16 @@ function appPublicRoom($roomID, $userID, $options, $welcome ='')
 				}
 			}
 
-			//demo goal	
+			//demo goal
 			$room['welcome'] .= "\n 🎁 " . 'Current gifts goal' .': '. 'Demo Goal';
 			$room['welcome'] .= "\n " . 'Chat can display goals that can be achieved with gifts/donations.';
 			$room['welcomeProgressValue'] = 8;
 			$room['welcomeProgressTotal'] = 10;
-			$room['welcomeProgressDetails'] =  'Demo Goal';	
-			
-		//offline snapshot (poster) and video 
+			$room['welcomeProgressDetails'] =  'Demo Goal';
+
+		//offline snapshot (poster) and video
 		$room['snapshot'] = VW_H5V_URL . 'images/no-picture.png';
-		$room['videoOffline'] = VW_H5V_URL . 'videos/hamsterad.mp4';;		
+		$room['videoOffline'] = VW_H5V_URL . 'videos/hamsterad.mp4';;
 
 		return $room;
 }

index.php

@@ -6,7 +6,7 @@
 //access existing room or create a new one as performer
 //all IDs generated randomly for demonstrative purposes; on integrations should be from database
 
-$roomID = intval($_GET['r']);
+$roomID = intval($_GET['r'] ?? 0);
 
 if (!$roomID)
 {
@@ -27,17 +27,17 @@
 
 
 //embed the app: all integrations should contain this part
-$dataCode .= "window.VideoWhisper = {userID: $userID, sessionID: $sessionID, sessionKey: '$sessionKey', roomID: $roomID, performer: $isPerformer, serverURL: '" . VW_H5V_CALL . "', modeVersion: ''}";
+$dataCode = "window.VideoWhisper = {userID: $userID, sessionID: $sessionID, sessionKey: '$sessionKey', roomID: $roomID, performer: $isPerformer, serverURL: '" . VW_H5V_CALL . "', modeVersion: ''}";
 
-$bodyCode .= <<<HTMLCODE
+$bodyCode = <<<HTMLCODE
 <!--VideoWhisper.com - HTML5 Videochat web app - uid:$userID p:$isPerformer s:$sessionID-->
 <noscript>You need to enable JavaScript to run this app.</noscript>
 <div style="display:block;min-height:600px;background-color:#eee;position:relative;z-index:102!important;"><div style="display:block;width:100%; height:100%; position:absolute;z-index:102!important;" id="videowhisperVideochat"></div></div>
 <script>$dataCode;</script>
 HTMLCODE;
 
 //app requires semantic ui
-$headCode .= '<link href="//cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.css" rel="stylesheet" type="text/css">';
+$headCode = '<link href="//cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.css" rel="stylesheet" type="text/css">';
 
 //app css & js
 $CSSfiles = scandir(dirname(  __FILE__ ) . '/static/css/');
@@ -53,7 +53,7 @@
 
 //room link
 $roomURL = $_SERVER['REQUEST_SCHEME'] .'://'. $_SERVER['HTTP_HOST'] . explode('?', $_SERVER['REQUEST_URI'], 2)[0] . '?r=' . $roomID;
-if (!$_GET['r'])
+if (!isset($_GET['r']))
 {
 $bodyCode .= '<div class="ui segment"><h4 class="ui header">Invite URL</h4>Invite the other person (client) with this call room URL:<br>' . $roomURL ;
 $bodyCode .= '<br><a class="ui button" href="' . $roomURL . '" target="_answer"><i class="phone icon"></i> Answer </a> - Use a different device or browser to answer! Camera works only from 1 tab in same browser.';