plat 24912:Add support in V2 to V7 redirect

VERSION.txt

@@ -1 +1 @@
-Tucana-20.18.0
+Tucana-20.20.0

admin_console/configs/lang/en.php

@@ -393,6 +393,7 @@
 	'Kaltura_Client_Enum_UiConfObjType::WEBCASTING' => 'Kaltura Webcasting Studio',
 	'Kaltura_Client_Enum_UiConfObjType::CLIPPER' => 'KMC Clipper',
 	'Kaltura_Client_Enum_UiConfObjType::SAP' => 'Slim Audio Player',
+	'Kaltura_Client_Enum_UiConfObjType::REELS' => 'Reels Player',
 
 	//audit trail
 	'Kaltura_Client_Enum_AuditTrailObjectType::ACCESS_CONTROL' => 'ACCESS_CONTROL',

alpha/apps/kaltura/lib/KSecureEntryHelper.class.php

@@ -159,7 +159,7 @@ public function validateApiAccessControl()
 	public function validateForPlay($performApiAccessCheck = true)
 	{
 		if ($this->entry->getDisplayInSearch() === EntryDisplayInSearchType::RECYCLED &&
-			!($this->entry->isOwnerActionsAllowed(kCurrentContext::getCurrentKsKuserId()) || $this->isKsAdmin()))
+			!($this->entry->isOwnerActionsAllowed($this->ks->getKuserId()) || $this->isKsAdmin()))
 		{
 			KExternalErrors::dieError(KExternalErrors::RECYCLED_ENTRY_UNAVAILABLE);
 		}

alpha/apps/kaltura/lib/clipconcat/kClipManager.php

@@ -898,7 +898,14 @@ protected function setConversionParamsOnResourcesData(&$resourcesData, $conversi
 		{
 			$imageToVideo = $resourceData[self::IMAGE_TO_VIDEO];
 			$mediaInfoObj = $resourceData[self::MEDIA_INFO_OBJECT];
-			$subtitles = isset($resourceData[self::SUBTITLES_DATA_ARRAY]) && count($resourceData[self::SUBTITLES_DATA_ARRAY]) > 0;
+			$subtitles = false;
+			if(isset($resourceData[self::SUBTITLES_DATA_ARRAY]))
+			{
+				foreach ($resourceData[self::SUBTITLES_DATA_ARRAY] as $subtitlesArray)
+				{
+					$subtitles = $subtitles || count($subtitlesArray) > 0;
+				}
+			}
 
 			$currentConversionParams = array();
 			$currentConversionParams[self::TARGET_HEIGHT] = $targetHeight;
@@ -968,7 +975,7 @@ protected function setConversionParamsOnResourcesData(&$resourcesData, $conversi
 			if($subtitles)
 			{
 				$prevParams = isset($currentConversionParams[self::EXTRA_CONVERSION_PARAMS]) ? $currentConversionParams[self::EXTRA_CONVERSION_PARAMS] : "";
-				$currentConversionParams[self::EXTRA_CONVERSION_PARAMS] = $prevParams . " -copyts";
+				$currentConversionParams[self::EXTRA_CONVERSION_PARAMS] = "$prevParams -copyts ";
 			}
 
 			$resourcesData[$key][self::CONVERSION_PARAMS] = json_encode($currentConversionParams, true);

alpha/apps/kaltura/lib/db/DbManager.php

@@ -233,6 +233,12 @@ protected static function getSphinxConnIndexByLastUpdatedAt($dataSources)
 		}
 
 		list($hostToLag, $hostToIndex) = self::filterLagsAndHosts($dataSources, $lastUpdatedAtPerSphinx);
+		if(!count($hostToLag))
+		{
+			KalturaLog::debug("failed to map sphinx host to sphinx lag data, no sphinx index will be chosen by updatedAt");
+			return false;
+		}
+
 		return self::getPreferredSphinxIndexByWeight($hostToLag, $hostToIndex);
 	}
 

alpha/apps/kaltura/lib/kPermissionManager.php

@@ -1093,20 +1093,32 @@ public function objectCreated(BaseObject $object)
 		return true;
 	}
 
-	protected static function handlePermissions($object)
+	protected static function handlePermissions($permission)
 	{
-		switch ($object->getName())
+		switch ($permission->getName())
 		{
 			case PermissionName::FEATURE_RECYCLE_BIN:
-				self::handleRecycleBinPermission($object);
+				self::handleRecycleBinPermission($permission);
 				return;
 
 			case PermissionName::GAME_PLUGIN_PERMISSION:
-				self::handleGamePluginPermission($object);
+				self::handleGamePluginPermission($permission);
+				return;
+
+			case PermissionName::FEATURE_MEDIA_REPURPOSING_NG_PERMISSION:
+				self::handleMediaRepurposingNGPermission($permission);
 				return;
 		}
 	}
 
+	protected static function handleMediaRepurposingNGPermission($permission)
+	{
+		if ($permission->getStatus() == PermissionStatus::ACTIVE)
+		{
+			MediaRepurposingHandler::enableMrPermission($permission->getPartnerId());
+		}
+	}
+
 	protected static function handleGamePluginPermission($permission)
 	{
 		$partner = PartnerPeer::retrieveByPK($permission->getPartnerId());
@@ -1120,12 +1132,23 @@ protected static function handleRecycleBinPermission($permission)
 		if ($permission->getStatus() == PermissionStatus::ACTIVE)
 		{
 			self::enableRecycleBinScheduledTaskProfile($permission->getPartnerId());
+			self::enableRequiredPluginsPermissions($permission->getPartnerId(), PermissionName::SCHEDULEDTASK_PLUGIN_PERMISSION);
 		}
 		elseif ($permission->getStatus() == PermissionStatus::BLOCKED)
 		{
 			self::disableRecycleBinScheduledTaskProfile($permission->getPartnerId());
 		}
 	}
+
+	protected static function enableRequiredPluginsPermissions($partnerId, $permissionName)
+	{
+		$requiredPluginPermission = PermissionPeer::getByNameAndPartner($permissionName, array($partnerId));
+		if ($requiredPluginPermission->getStatus() != PermissionStatus::ACTIVE)
+		{
+			$requiredPluginPermission->setStatus(PermissionStatus::ACTIVE);
+			$requiredPluginPermission->save();
+		}
+	}
 
 	protected static function enableRecycleBinScheduledTaskProfile($partnerId)
 	{

alpha/apps/kaltura/lib/microservice/MicroServiceBaseService.php

@@ -47,7 +47,7 @@ private function generateSession($partnerId)
 	 * @return string
 	 * @throws Exception
 	 */
-	public static function buildServiceUrl($hostName, $serviceName)
+	public static function buildServiceUrl($hostName, $serviceName, $isApi = true)
 	{
 		$serviceUrl = kConf::get("microservice_url", 'local', null);
 		if(!$serviceUrl)
@@ -61,6 +61,10 @@ public static function buildServiceUrl($hostName, $serviceName)
 		{
 			$serviceUrl = $serviceUrl . '/' . trim($serviceName, "\/");
 		}
+		if(!$isApi)
+		{
+			return str_replace('/api', '', $serviceUrl);
+		}
 		return $serviceUrl;
 	}
 

alpha/apps/kaltura/lib/microservice/MicroServiceUnisphereLoader.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Unisphere Micro Service
+ */
+class MicroServiceUnisphereLoader extends MicroServiceBaseService
+{
+	public static $host = 'unisphere';
+	public static $service = '';
+
+	public function __construct()
+	{
+		$this->hostName = self::$host;
+		parent::__construct();
+	}
+}

alpha/apps/kaltura/lib/myEntryUtils.class.php

@@ -1015,7 +1015,7 @@ public static function resizeEntryImage( entry $entry, $version, $width, $height
 
 						if (!$success)
 						{
-							$success = self::captureLocalThumb($entry, $capturedThumbPath, $calc_vid_sec, $cache, $cacheLockKey, $cacheLockKeyProcessing, $flavorAssetId, $fileToDelete);
+							$success = self::captureLocalThumb($entry, $capturedThumbPath, $calc_vid_sec, $cache, $cacheLockKey, $cacheLockKeyProcessing, $flavorAssetId, -1, -1, $fileToDelete);
 						}
 					}
 

alpha/apps/kaltura/lib/reports/kKavaEventPlatformReports.php

@@ -319,6 +319,29 @@ class kKavaEventPlatformReports extends kKavaReportsMgr
 				self::METRIC_UNIQUE_VOD_VIEW_PERIOD_USERS,
 				self::METRIC_VOD_UNIQUE_PERCENTILES_RATIO
 			)
+		),
+
+		ReportType::EP_WEBCAST_ENGAGEMENT_OVER_TIME => array(
+			self::REPORT_DIMENSION_MAP => array(
+				'position' => self::DIMENSION_POSITION
+			),
+			self::REPORT_FILTER => array(
+				self::DRUID_TYPE => self::DRUID_NOT,
+				self::DRUID_FILTER => array(
+					self::DRUID_DIMENSION => self::DIMENSION_POSITION,
+					self::DRUID_VALUES => array(self::VALUE_UNKNOWN, "0", "")
+				)
+			),
+			self::REPORT_JOIN_REPORTS => array(
+				array(
+					self::REPORT_UNION_DATA_SOURCES =>  array(self::DATASOURCE_HISTORICAL, self::DATASOURCE_MEETING_HISTORICAL),
+					self::REPORT_METRICS => array(self::METRIC_UNIQUE_COMBINED_LIVE_VIEW_PERIOD_USERS, self::METRIC_COMBINED_LIVE_ENGAGED_USERS_RATIO)
+				),
+				array(
+					self::REPORT_DATA_SOURCE => self::DATASOURCE_CNC_EVENTS,
+					self::REPORT_METRICS => array(self::EVENT_TYPE_MESSAGE_LIKED, self::EVENT_TYPE_REACTION_CLICKED, self::EVENT_TYPE_GROUP_MESSAGE_SENT)
+				)
+			)
 		)
 
 	);

alpha/apps/kaltura/lib/reports/kKavaReportsMgr.class.php

@@ -2833,6 +2833,12 @@ protected static function getEntryKuserDimension($data_source)
 		return in_array($data_source, array(self::DATASOURCE_ENTRY_LIFECYCLE, self::DATASOURCE_STORAGE_USAGE)) ? self::DIMENSION_KUSER_ID : self::DIMENSION_ENTRY_OWNER_ID;
 	}
 
+	protected static function getEntryIdDimension($data_source)
+	{
+		return $data_source === self::DATASOURCE_CNC_EVENTS ? self::DIMENSION_CONTEXT_ID : self::DIMENSION_ENTRY_ID;
+	}
+
+
 	protected static function getDruidFilter($partner_id, $report_def, $input_filter, $object_ids, $response_options)
 	{
 		$druid_filter = array();
@@ -2888,6 +2894,7 @@ protected static function getDruidFilter($partner_id, $report_def, $input_filter
 			);
 		}
 
+		$entry_id_dimension = self::getEntryIdDimension($data_source);
 		$field_dim_map = array(
 			'categoriesIds' => array(self::DRUID_DIMENSION => self::DIMENSION_CATEGORIES),
 			'countries' => array(self::DRUID_DIMENSION => self::DIMENSION_LOCATION_COUNTRY),
@@ -2906,8 +2913,8 @@ protected static function getDruidFilter($partner_id, $report_def, $input_filter
 			'cities' => array(self::DRUID_DIMENSION => self::DIMENSION_LOCATION_CITY),
 			'media_types' => array(self::DRUID_DIMENSION => self::DIMENSION_MEDIA_TYPE),
 			'source_types' => array(self::DRUID_DIMENSION => self::DIMENSION_SOURCE_TYPE),
-			'entries_ids' => array(self::DRUID_DIMENSION => self::DIMENSION_ENTRY_ID),
-			'entries_ids_not_in' => array(self::DRUID_DIMENSION => self::DIMENSION_ENTRY_ID, self::DRUID_TYPE => self::DRUID_NOT),
+			'entries_ids' => array(self::DRUID_DIMENSION => $entry_id_dimension),
+			'entries_ids_not_in' => array(self::DRUID_DIMENSION => $entry_id_dimension, self::DRUID_TYPE => self::DRUID_NOT),
 			'playback_context_ids' => array(self::DRUID_DIMENSION => self::DIMENSION_PLAYBACK_CONTEXT),
 			'root_entries_ids' => array(self::DRUID_DIMENSION => self::DIMENSION_ROOT_ENTRY_ID),
 			'event_var1' => array(self::DRUID_DIMENSION => self::DIMENSION_EVENT_VAR1),
@@ -3066,7 +3073,7 @@ protected static function getDruidFilter($partner_id, $report_def, $input_filter
 		if (count($entry_ids_from_db))
 		{
 			$druid_filter[] = array(
-				self::DRUID_DIMENSION => self::DIMENSION_ENTRY_ID,
+				self::DRUID_DIMENSION => $entry_id_dimension,
 				self::DRUID_VALUES => array_values(array_unique($entry_ids_from_db))
 			);
 		}

alpha/apps/kaltura/lib/v2RedirectUtils.class.php

@@ -0,0 +1,106 @@
+<?php
+
+class v2RedirectUtils
+{
+	const V2REDIRECT_PARAM_NAME = 'v2Redirect';
+	const FLASHVARS_PARAM_NAME = 'flashvars';
+	const SHOULD_TRANSLATE_PLUGINS = self::V2REDIRECT_PARAM_NAME .'translate';
+	const SCRIPT_PLUGIN_NAME = 'playkit-player-scripts';
+	const SCRIPT_PLUGIN_VERSION = '{latest}';
+
+	static private function getV7PluginInfo($v2PluginName): array
+	{
+		$translation = ["info" => ["playkitscreen", "playkit-js-info"],
+						"quiz"          => ["playkit-ivq", "ivq"],
+						"moderation"    => ["playkit-moderation", "playkit-js-moderation"],
+						"playlistAPI"   => ["playkit-playlist", "playlist"],
+						"liveStatus"    => ["playkit-kaltura-live","kaltura-live"],
+						"related"       => ["playkit-related", "related"],
+						"dualScreen"    => ["playkit-dual-screen", "dualscreen"],
+						"video360"      => ["playkit-vr" ,"vr"],
+						"raptMedia"     => ["rapt", "rapt"],
+						"transcript"    => ["playkit-transcript", "playkit-js-transcript"],
+						"qna"           => ["playkit-qna", "qna"],
+						"bumper"        => [ "playkit-bumper" , "bumper" ],
+						"infoScreen" => ["playkit-info", "playkit-js-info"]];
+
+		if(isset($translation[$v2PluginName]))
+		{
+			$v7PluginInfo = $translation[$v2PluginName];
+			KalturaLog::log("Found " . print_r($v7PluginInfo, true));
+			return $v7PluginInfo;
+		}
+		else
+		{
+			throw new Exception ($v2PluginName);
+		}
+	}
+
+	static function addV2toV7plugins($flashvars, &$bundleConfig, &$playerConfig)
+	{
+		if(!$flashvars)
+		{
+			return;
+		}
+		$unHandledPlugins = array();
+
+		//Merge v7 config
+		foreach ($flashvars as $key => $value)
+		{
+			if(self::isVarPlugin($key))
+			{
+				//get plugin name
+				KalturaLog::log("V2 to V7 adding plugin: " . $key. " value:" . $value);
+				if ($value) 
+				{
+					if (!$bundleConfig) 
+					{
+						$bundleConfig = [];
+					}
+					$key = trim(trim($key, '"'), "'");
+					$v2PluginName = explode(".", $key);
+					try
+					{
+						$v7PluginName = self::getV7PluginInfo($v2PluginName[0]);
+						$bundleConfig = array_merge($bundleConfig, [$v7PluginName[0] => "{latest}"]);
+						$v7PluginConfig = $v7PluginName[1];
+						if (!isset($playerConfig->plugins)) 
+						{
+							$playerConfig->plugins = new stdClass();
+						}
+						if (!isset($playerConfig->plugins->$v7PluginConfig)) 
+						{
+							$playerConfig->plugins->$v7PluginConfig = new stdClass();
+						}
+					}
+					catch (Exception $e){
+						$unHandledPlugins[] = $e->getMessage();
+					}
+				}
+			}
+		}
+		if(sizeof($unHandledPlugins))
+		{
+			throw new Exception ("Unhandled plugins: " . implode(", ", $unHandledPlugins));
+		}
+	}
+
+	static function addV2toV7config($flashvars, $uiconfId)
+	{
+		$config = [];
+		if($flashvars)
+		{   foreach ($flashvars as $key => $value) 
+			{
+				$key = trim(trim($key, '"'), "'");
+				$config[$key] = json_decode($value);
+			}
+		}
+		$config["uiconf_id"] = $uiconfId;
+		return $config;
+	}
+
+	private static function isVarPlugin($varKeyName)
+	{
+		return str_contains($varKeyName, ".plugin");
+	}
+}