Merge pull request kaltura#8028 from kaltura/master-merge-Naos-14.12.0

Master merge naos 14.12.0
amiras89 · Jan 21, 2019 · ef16cc5 · ef16cc5
2 parents 12d29f9 + 164149e
commit ef16cc5
Show file tree

Hide file tree

Showing 95 changed files with 5,340 additions and 140 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-Naos-14.11.0
+Naos-14.12.0
diff --git a/admin_console/configs/lang/en.php b/admin_console/configs/lang/en.php
@@ -1244,6 +1244,8 @@
 	'Kaltura_Client_EmailNotification_Enum_EmailNotificationFormat::HTML' => 'HTML',
 	'Kaltura_Client_EmailNotification_Enum_EmailNotificationFormat::TEXT' => 'Text',
 
+	'Kaltura_Client_Enum_ConfMapSourceLocation::FS' => 'File System',
+	'Kaltura_Client_Enum_ConfMapSourceLocation::DB' => 'Database',
 
 	// user role
 	'user role intro text' => '',

diff --git a/admin_console/web/css/global.css b/admin_console/web/css/global.css
@@ -1957,6 +1957,55 @@ form#frmClonePartnerCatalogItems dd,form#frmClonePartnerCatalogItems dt {
 	padding: 1px;
 }
 
+#configuration-map-configure-dialog {
+	padding-top: 10px;
+}
+
+#configuration-map-configure-dialog label {
+	padding: 0;
+	width: 400px;
+}
+
+#configuration-map-configure-dialog dl {
+	margin-top: 15px;
+}
+
+#configuration-map-configure-dialog b {
+	display: block;
+}
+
+#configuration-map-configure-dialog dl p {
+	width: 400px;
+	padding: 3px;
+	margin-top: 5px;
+	border: solid 1px #ccc;
+	background: #f0f0f0;
+}
+
+#configuration-map-configure-dialog dt {
+	margin: 10px 0 5px;
+}
+
+#configuration-map-configure-dialog dd input {
+	width: 333px;
+	height: 22px;
+}
+
+#configuration-map-configure-dialog dd textarea {
+	width: 550px;
+}
+
+
+#configuration-map-configure-dialog dd input#max_bulk_size {
+	width: 150px;
+}
+
+#configuration-map-configure-dialog select {
+	min-width: 338px;
+	height: 24px;
+	padding: 1px;
+}
+
 #catalog-item-configure-dialog {
 	padding-top: 10px;
 }

diff --git a/alpha/apps/kaltura/lib/kMrssManager.php b/alpha/apps/kaltura/lib/kMrssManager.php
@@ -458,7 +458,7 @@ public static function getEntryMrssXml(entry $entry, SimpleXMLElement $mrss = nu
 		$mrss->addChild('status', self::stringToSafeXml($entry->getStatus()));
 		$mrss->addChild('description', self::stringToSafeXml($entry->getDescription()));
 		$thumbnailUrl = $mrss->addChild('thumbnailUrl');
-		$thumbnailUrl->addAttribute('url', $entry->getThumbnailUrl());
+		$thumbnailUrl->addAttribute('url', $entry->getThumbnailUrl($entry->getThumbnailVersion()));
 		if(trim($entry->getTags(), " \r\n\t"))
 		{
 			$tags = $mrss->addChild('tags');

diff --git a/alpha/apps/kaltura/lib/myEntryUtils.class.php b/alpha/apps/kaltura/lib/myEntryUtils.class.php
@@ -949,7 +949,8 @@ public static function resizeEntryImage( entry $entry, $version , $width , $heig
 
 			if ($multi)
 			{
-				list($w, $h, $type, $attr, $srcIm) = myFileConverter::createImageByFile($processingThumbPath);
+				//please notice the 3rd parameter - image type, is ignored. 
+				list($w, $h, , $attr, $srcIm) = myFileConverter::createImageByFile($processingThumbPath);
 				if (!$im)
 					$im = imagecreatetruecolor($w * $vid_slices, $h);
 

diff --git a/alpha/apps/kaltura/lib/myNotificationMgr.class.php b/alpha/apps/kaltura/lib/myNotificationMgr.class.php
@@ -208,7 +208,7 @@ public static function createNotification ( $notification_type , $object_data ,
 		if ( $object_data instanceof BaseObject )
 		{
 			$objectId = $object_data->getId();
-			$notificationData = self::createNotificationData ( $notification_type , $object_data, $extra_notification_data  );
+			$notificationData = self::createNotificationData ( $notification_type , $object_data, $extra_notification_data, $partner_id  );
 
 			if ( $object_data instanceof entry )
 			{
@@ -273,8 +273,17 @@ public static function createNotification ( $notification_type , $object_data ,
 		}
 	}
 
+	protected static function createNotificationData ($notification_type, $obj, $extra_notification_data = null, $partner_id = null)
+	{
+		$httpsServerVal = $_SERVER['HTTPS'];
+		self::setServerHttps('on', $partner_id);
+		$notificationData = self::fillNotificationData($notification_type , $obj, $extra_notification_data);
+		self::setServerHttps($httpsServerVal, $partner_id);
+		return $notificationData;
+	}
+
 
-	private static function createNotificationData ( $notification_type , $obj , $extra_notification_data = null )
+	protected static function fillNotificationData ( $notification_type , $obj , $extra_notification_data = null)
 	{
 		$params = array();
 		$param_names = null;
@@ -341,7 +350,7 @@ private static function createNotificationData ( $notification_type , $obj , $ex
 
 		if ( $param_names == null )
 		return "";
-			
+
 		foreach ( $param_names as $name )
 		{
 			$method_name = "get" . $name;
@@ -372,10 +381,18 @@ private static function createNotificationData ( $notification_type , $obj , $ex
 		{
 			KalturaLog::log('could not crack KS ['.kCurrentContext::$ks.'] for adding to notification param');
 		}
-		
+
 		return serialize( $params );
 	}
 
+	protected static function setServerHttps($val, $partner_id)
+	{
+		if($partner_id && PermissionPeer::isValidForPartner(PermissionName::FEATURE_HTTP_NOTIFICATIONS_DEFAULT_PROTOCOL_HTTPS, $partner_id))
+		{
+			$_SERVER['HTTPS'] = $val;
+		}
+	}
+
 	public static function getDataAsArray ( $serialized_data )
 	{
 		if ( empty ( $serialized_data ))	return null;

diff --git a/alpha/apps/kaltura/lib/reports/kKavaBase.php b/alpha/apps/kaltura/lib/reports/kKavaBase.php
@@ -50,6 +50,7 @@ class kKavaBase extends kDruidBase
 	const DIMENSION_CUSTOM_VAR2 = 'customVar2';
 	const DIMENSION_CUSTOM_VAR3 = 'customVar3';
 	const DIMENSION_TYPE = 'type';
+	const DIMENSION_ENTRY_OWNER_ID = 'entryKuserId';
 
 	// metrics
 	const METRIC_COUNT = 'count';