IX-9.0.0-SUP-523

VERSION.txt

@@ -1 +1 @@
-Hercules 8.0.0
+IX 9.0.0

admin_console/configs/lang/en.php

@@ -1094,6 +1094,65 @@
 	'Kaltura_Client_EventNotification_Enum_EventNotificationTemplateType::EMAIL' => 'Email',
 	'Kaltura_Client_EventNotification_Enum_EventNotificationTemplateType::HTTP' => 'HTTP',
 
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventType::BATCH_JOB_STATUS' => 'Batch job status (Very dangerous)',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventType::OBJECT_ADDED' => 'Object added',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventType::OBJECT_CHANGED' => 'Object changed',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventType::OBJECT_COPIED' => 'Object copied',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventType::OBJECT_CREATED' => 'Object created',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventType::OBJECT_DATA_CHANGED' => 'Object data changed',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventType::OBJECT_DELETED' => 'Object deleted',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventType::OBJECT_ERASED' => 'Object erased',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventType::OBJECT_READY_FOR_REPLACMENT' => 'Object ready for replacment',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventType::OBJECT_SAVED' => 'Object saved',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventType::OBJECT_UPDATED' => 'Object updated',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventType::OBJECT_REPLACED' => 'Object replaced',
+
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::AD_CUE_POINT' => 'Ad cue-point',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::ANNOTATION' => 'Annotation',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::CODE_CUE_POINT' => 'Code cue-point',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::CUE_POINT' => 'Cue-point',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::METADATA' => 'Metadata',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::ENTRY' => 'Entry',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::CATEGORY' => 'Category',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::ASSET' => 'Asset',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::FLAVORASSET' => 'Flavor asset',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::THUMBASSET' => 'Thumbnail asset',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::KUSER' => 'User',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::ACCESSCONTROL' => 'Access control',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::BATCHJOB' => 'Batch job',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::BULKUPLOADRESULT' => 'Bulk upload result',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::CATEGORYKUSER' => 'Category - User',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::CONVERSIONPROFILE2' => 'Conversion profile',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::FLAVORPARAMS' => 'Flavor params',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::FLAVORPARAMSCONVERSIONPROFILE' => 'Flavor params - Conversion profile',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::FLAVORPARAMSOUTPUT' => 'Flavor params output',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::GENERICSYNDICATIONFEED' => 'Generic syndication feed',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::KUSERTOUSERROLE' => 'User - User role',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::PARTNER' => 'Partner',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::PERMISSION' => 'Permission',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::PERMISSIONITEM' => 'Permission item',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::PERMISSIONTOPERMISSIONITEM' => 'Permission - Permission item',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::SCHEDULER' => 'Scheduler',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::SCHEDULERCONFIG' => 'Scheduler config',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::SCHEDULERSTATUS' => 'Scheduler status',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::SCHEDULERWORKER' => 'Scheduler worker',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::STORAGEPROFILE' => 'Storage profile',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::SYNDICATIONFEED' => 'Syndication feed',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::THUMBPARAMS' => 'Thumbnail params',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::THUMBPARAMSOUTPUT' => 'Thumbnail params output',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::UPLOADTOKEN' => 'Upload token',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::USERLOGINDATA' => 'User login data',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::USERROLE' => 'User role',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::WIDGET' => 'Widget',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::CATEGORYENTRY' => 'Category - Entry',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::DISTRIBUTION_PROFILE' => 'Distribution profile',
+	'Kaltura_Client_EventNotification_Enum_EventNotificationEventObjectType::ENTRY_DISTRIBUTION' => 'Entry distribution',
+
+
+	'Kaltura_Client_EmailNotification_Enum_EmailNotificationFormat::HTML' => 'HTML',
+	'Kaltura_Client_EmailNotification_Enum_EmailNotificationFormat::TEXT' => 'Text',
+
+
 	// user role
 	'user role intro text' => '',
 );

admin_console/views/scripts/partner/external-storages.phtml

@@ -50,6 +50,7 @@
 				<th><?php echo $this->translate('Trigger'); ?></th>
 				<th><?php echo $this->translate('Ready Behavior'); ?></th>
 				<th><?php echo $this->translate('Creation Date'); ?></th>
+				<th><?php echo $this->translate('Updated At'); ?></th>
 				<th><?php echo $this->translate('Action'); ?></th>
 			</tr>
 		</thead>
@@ -72,6 +73,7 @@
 				<td><?php echo $triggersNames[$storage->trigger]; ?></td>
 				<td><?php echo $this->enumTranslate('Kaltura_Client_Enum_StorageProfileReadyBehavior', $storage->readyBehavior); ?></td>
 				<td><?php echo $this->dateFormat($storage->createdAt, Zend_Date::DATE_LONG); ?></td>
+				<td><?php echo $this->dateFormat($storage->updatedAt, Zend_Date::DATE_LONG); ?></td>
 				<td>
 					<select class="options" onchange="doAction(this.value, <?php echo $storage->partnerId; ?>, <?php echo $storage->id; ?>)">
 						<option value=""><?php echo $this->translate('Select Action'); ?></option>

alpha/apps/kaltura/lib/access_control/model/conditions/kAssetPropertiesCompareCondition.php

@@ -20,16 +20,18 @@ public function __construct($not = false)
 	}
 
 	/**
-	 * @param accessControl $accessControl
+	 * @param kScope $scope
 	 * @return bool
 	 */
-	protected function internalFulfilled(accessControl $accessControl)
+	protected function internalFulfilled(kScope $scope)
 	{
 		// no properties defined, the condition is fulfilled
 		if (count($this->getProperties()) == 0)
 			return true;
 
-		$scope = $accessControl->getScope();
+		if(!($scope instanceof accessControlScope))
+			return false;
+
 		$entryId = $scope->getEntryId();
 		$entryAssets = assetPeer::retrieveReadyByEntryId($scope->getEntryId());
 		foreach($entryAssets as $asset)

alpha/apps/kaltura/lib/access_control/model/conditions/kAuthenticatedCondition.php

@@ -40,9 +40,11 @@ function getPrivileges()
 	/* (non-PHPdoc)
 	 * @see kCondition::internalFulfilled()
 	 */
-	protected function internalFulfilled(accessControl $accessControl)
+	protected function internalFulfilled(kScope $scope)
 	{
-		$scope = $accessControl->getScope();
+		if(!($scope instanceof accessControlScope))
+			return false;
+
 		if (!$scope->getKs() || (!$scope->getKs() instanceof ks))
 			return false;
 

alpha/apps/kaltura/lib/access_control/model/conditions/kCompareCondition.php

@@ -54,10 +54,10 @@ public function setComparison($comparison)
 
 	/**
 	 * Return single integer or array of integers
-	 * @param accessControl $accessControl
+	 * @param kScope $scope
 	 * @return int|array<int> the field content
 	 */
-	abstract public function getFieldValue(accessControl $accessControl);
+	abstract public function getFieldValue(kScope $scope);
 
 	/**
 	 * @return int
@@ -110,10 +110,10 @@ protected function fieldFulfilled($field, $value)
 	/* (non-PHPdoc)
 	 * @see kCondition::internalFulfilled()
 	 */
-	protected function internalFulfilled(accessControl $accessControl)
+	protected function internalFulfilled(kScope $scope)
 	{
-		$field = $this->getFieldValue($accessControl);
-		$value = $this->getIntegerValue($accessControl->getScope());
+		$field = $this->getFieldValue($scope);
+		$value = $this->getIntegerValue($scope);
 
 		KalturaLog::debug("Copares field [$field] to value [$value]");
 		if (is_null($value))

alpha/apps/kaltura/lib/access_control/model/conditions/kCondition.php

@@ -11,6 +11,11 @@ abstract class kCondition
 	 */
 	protected $type;
 
+	/**
+	 * @var string
+	 */
+	protected $description;
+
 	/**
 	 * @var bool
 	 */
@@ -22,18 +27,26 @@ public function __construct($not = false)
 	}
 
 	/**
-	 * @param accessControl $accessControl
+	 * Enable changing the condition attributes according to additional data in the scope
+	 */
+	protected function applyDynamicValues(kScope $scope)
+	{
+	}
+
+	/**
+	 * @param kScope $scope
 	 * @return bool
 	 */
-	abstract protected function internalFulfilled(accessControl $accessControl);
+	abstract protected function internalFulfilled(kScope $scope);
 
 	/**
-	 * @param accessControl $accessControl
+	 * @param kScope $scope
 	 * @return bool
 	 */
-	final public function fulfilled(accessControl $accessControl)
+	final public function fulfilled(kScope $scope)
 	{
-		return $this->calcNot($this->internalFulfilled($accessControl));
+		$this->applyDynamicValues($scope);
+		return $this->calcNot($this->internalFulfilled($scope));
 	}
 
 	/**
@@ -51,6 +64,22 @@ protected function setType($type)
 	{
 		$this->type = $type;
 	}
+
+	/**
+	 * @return string $description
+	 */
+	public function getDescription() 
+	{
+		return $this->description;
+	}
+
+	/**
+	 * @param string $description
+	 */
+	public function setDescription($description) 
+	{
+		$this->description = $description;
+	}
 
 	/**
 	 * @return bool

alpha/apps/kaltura/lib/access_control/model/conditions/kCountryCondition.php

@@ -41,9 +41,8 @@ function getGeoCoderType()
 	/* (non-PHPdoc)
 	 * @see kCondition::getFieldValue()
 	 */
-	public function getFieldValue(accessControl $accessControl)
+	public function getFieldValue(kScope $scope)
 	{
-		$scope = $accessControl->getScope();
 		kApiCache::addExtraField(kApiCache::ECF_COUNTRY, kApiCache::COND_MATCH, $this->getStringValues($scope));
 
 		$ip = $scope->getIp();

alpha/apps/kaltura/lib/access_control/model/conditions/kFieldCompareCondition.php

@@ -24,9 +24,9 @@ public function __construct($not = false)
 	/* (non-PHPdoc)
 	 * @see kMatchCondition::getFieldValue()
 	 */
-	public function getFieldValue(accessControl $accessControl)
+	public function getFieldValue(kScope $scope)
 	{
-		$this->field->setScope($accessControl->getScope());
+		$this->field->setScope($scope);
 		return $this->field->getValue();
 	}
 

alpha/apps/kaltura/lib/access_control/model/conditions/kFieldMatchCondition.php

@@ -23,9 +23,9 @@ public function __construct($not = false)
 	/* (non-PHPdoc)
 	 * @see kMatchCondition::getFieldValue()
 	 */
-	public function getFieldValue(accessControl $accessControl)
+	public function getFieldValue(kScope $scope)
 	{
-		$this->field->setScope($accessControl->getScope());
+		$this->field->setScope($scope);
 		return $this->field->getValue();
 	}
 

alpha/apps/kaltura/lib/access_control/model/conditions/kIpAddressCondition.php

@@ -17,9 +17,8 @@ public function __construct($not = false)
 	/* (non-PHPdoc)
 	 * @see kCondition::getFieldValue()
 	 */
-	public function getFieldValue(accessControl $accessControl)
+	public function getFieldValue(kScope $scope)
 	{
-		$scope = $accessControl->getScope();
 		kApiCache::addExtraField(kApiCache::ECF_IP, kApiCache::COND_IP_RANGE, $this->getStringValues($scope));
 		return $scope->getIp();	
 	}

alpha/apps/kaltura/lib/access_control/model/conditions/kMatchCondition.php

@@ -10,7 +10,12 @@ abstract class kMatchCondition extends kCondition
 	 * @var array<kStringValue>
 	 */
 	protected $values;
-
+
+	/**
+	 * @var array
+	 */
+	protected $dynamicValues;
+
 	/**
 	 * @param array $values
 	 */
@@ -31,6 +36,15 @@ function getValues()
 	{
 		return $this->values;
 	}
+
+	/* (non-PHPdoc)
+	 * @see kCondition::applyDynamicValues()
+	 */
+	protected function applyDynamicValues(kScope $scope)
+	{
+		parent::applyDynamicValues($scope);
+		$this->dynamicValues = $scope->getDynamicValues('{', '}');
+	}
 
 	/**
 	 * @param kScope $scope
@@ -42,31 +56,40 @@ function getStringValues($scope = null)
 			return array();
 
 		$values = array();
+		$dynamicValuesKeys = null;
+		if(is_array($this->dynamicValues) && count($this->dynamicValues))
+			$dynamicValuesKeys = array_keys($this->dynamicValues);
 
 		foreach($this->values as $value)
 		{
 			/* @var $value kStringValue */
+			$calculatedValue = null;
 			if(is_object($value))
 			{
 				if($scope && $value instanceof kStringField)
 					$value->setScope($scope);
-					
-				$values[] = $value->getValue();
+
+				$calculatedValue = $value->getValue();
 			}
 			else
 			{
-				$values[] = strval($value);
+				$calculatedValue = strval($value);
 			}
+
+			if($dynamicValuesKeys)
+				$calculatedValue = str_replace($dynamicValuesKeys, $this->dynamicValues, $calculatedValue);
+
+			$values[] = $calculatedValue;
 		}
 
 		return $values;
 	}
 
 	/**
-	 * @param accessControl $accessControl
+	 * @param kScope $scope
 	 * @return string the field content
 	 */
-	abstract public function getFieldValue(accessControl $accessControl);
+	abstract public function getFieldValue(kScope $scope);
 
 	/**
 	 * @param string $field
@@ -106,10 +129,10 @@ public function fieldFulfilled($field, $values)
 	/* (non-PHPdoc)
 	 * @see kCondition::internalFulfilled()
 	 */
-	protected function internalFulfilled(accessControl $accessControl)
+	protected function internalFulfilled(kScope $scope)
 	{
-		$field = $this->getFieldValue($accessControl);
-		$values = $this->getStringValues($accessControl->getScope());
+		$field = $this->getFieldValue($scope);
+		$values = $this->getStringValues($scope);
 
 		KalturaLog::debug("Matches field [$field] to values [" . print_r($values, true) . "]");
 		if (!count($values))

alpha/apps/kaltura/lib/access_control/model/conditions/kSiteCondition.php

@@ -23,19 +23,17 @@ public function __construct($not = false)
 	/* (non-PHPdoc)
 	 * @see kCondition::getFieldValue()
 	 */
-	public function getFieldValue(accessControl $accessControl)
+	public function getFieldValue(kScope $scope)
 	{
-		$scope = $accessControl->getScope();
 		$referrer = $scope->getReferrer();
 		return requestUtils::parseUrlHost($referrer);
 	}
 
 	/* (non-PHPdoc)
 	 * @see kCondition::internalFulfilled()
 	 */
-	protected function internalFulfilled(accessControl $accessControl)
+	protected function internalFulfilled(kScope $scope)
 	{
-		$scope = $accessControl->getScope();
 		$referrer = $scope->getReferrer();
 
 		if ($this->getNot()===true && !$this->globalWhitelistDomainsAppended && strpos($referrer, "kwidget") === false && kConf::hasParam("global_whitelisted_domains"))
@@ -56,7 +54,7 @@ protected function internalFulfilled(accessControl $accessControl)
 
 		kApiCache::addExtraField(kApiCache::ECF_REFERRER, kApiCache::COND_SITE_MATCH, $this->getStringValues($scope));
 
-		return parent::internalFulfilled($accessControl);
+		return parent::internalFulfilled($scope);
 	}
 
 	/* (non-PHPdoc)

alpha/apps/kaltura/lib/access_control/model/conditions/kUserAgentCondition.php

@@ -17,9 +17,8 @@ public function __construct($not = false)
 	/* (non-PHPdoc)
 	 * @see kCondition::getFieldValue()
 	 */
-	public function getFieldValue(accessControl $accessControl)
+	public function getFieldValue(kScope $scope)
 	{
-		$scope = $accessControl->getScope();
 		kApiCache::addExtraField(kApiCache::ECF_USER_AGENT, kApiCache::COND_REGEX, $this->getStringValues($scope));
 		return $scope->getUserAgent();
 	}