Version 4.7.0

applications/core/widgets/relatedContent.php

@@ -21,7 +21,7 @@ if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 /**
  * Related Content Widget
  */
-class _relatedContent extends \IPS\Widget
+class _relatedContent extends \IPS\Widget\PermissionCache
 {
 	/**
 	 * @brief	Widget Key
@@ -38,6 +38,60 @@ class _relatedContent extends \IPS\Widget
 	 */
 	public $plugin = '';
 
+	/**
+	 * Constructor
+	 *
+	 * @param	String				$uniqueKey				Unique key for this specific instance
+	 * @param	array				$configuration			Widget custom configuration
+	 * @param	null|string|array	$access					Array/JSON string of executable apps (core=sidebar only, content=IP.Content only, etc)
+	 * @param	null|string			$orientation			Orientation (top, bottom, right, left)
+	 * @return	void
+	 */
+	public function __construct( $uniqueKey, array $configuration, $access=null, $orientation=null )
+	{
+		parent::__construct( $uniqueKey, $configuration, $access, $orientation );
+		
+		/* We can't run the URL related logic if we have no dispatcher because this class could also be initialized by the CLI cron job */
+		if( \IPS\Dispatcher::hasInstance() )
+		{
+			/* Cache per item, not per block */
+			$parts = parse_url( (string) \IPS\Request::i()->url()->setPage() );
+
+			if ( \IPS\Settings::i()->htaccess_mod_rewrite )
+			{
+				$url = $parts['scheme'] . "://" . $parts['host'] . ( isset( $parts['port'] ) ? ':' . $parts['port'] : '' ) . $parts['path'];
+			}
+			else
+			{
+				$url = $parts['scheme'] . "://" . $parts['host'] . ( isset( $parts['port'] ) ? ':' . $parts['port'] : '' ) . $parts['path'] . ( isset( $parts['query'] ) ? '?' . $parts['query'] : '' );
+			}
+
+			$member = \IPS\Member::loggedIn() ?: new \IPS\Member;
+			$theme = $member->skin ?: \IPS\Theme::defaultTheme();
+			$this->cacheKey = "widget_{$this->key}_" . $this->uniqueKey . '_' . md5( $url . '_' . json_encode( $configuration ) . "_" . $member->language()->id . "_" . $theme . "_" . $orientation );
+		}
+	}
+
+	/**
+	 * Ran before saving widget configuration
+	 *
+	 * @param	array	$values	Values from form
+	 * @return	array
+	 */
+	public function preConfig( $values )
+	{
+		if ( !isset( $this->configuration['language_key'] ) )
+		{
+			$this->configuration['language_key'] = 'widget_title_' . md5( mt_rand() );
+		}
+		$values['language_key'] = $this->configuration['language_key'];
+
+		\IPS\Lang::saveCustom( 'core', $this->configuration['language_key'], $values['widget_feed_title'] );
+		unset( $values['widget_feed_title'] );
+
+		return $values;
+	}
+
 	/**
 	 * Specify widget configuration
 	 *
@@ -47,7 +101,9 @@ class _relatedContent extends \IPS\Widget
 	public function configuration( &$form=null )
  	{
 		$form = parent::configuration( $form );
- 		
+
+		/* Block title */
+		$form->add( new \IPS\Helpers\Form\Translatable( 'widget_feed_title', isset( $this->configuration['language_key'] ) ? NULL : \IPS\Member::loggedIn()->language()->addToStack( 'block_relatedContent' ), FALSE, array( 'app' => 'core', 'key' => ( isset( $this->configuration['language_key'] ) ? $this->configuration['language_key'] : NULL ) ) ) );
 		$form->add( new \IPS\Helpers\Form\Number( 'toshow', isset( $this->configuration['toshow'] ) ? $this->configuration['toshow'] : 5, TRUE ) );
 		
 		return $form;
@@ -74,6 +130,15 @@ class _relatedContent extends \IPS\Widget
 			return '';
 		}
 
-		return $this->output( $related );
+		if ( isset( $this->configuration['language_key'] ) )
+		{
+			$title = \IPS\Member::loggedIn()->language()->addToStack( $this->configuration['language_key'], FALSE, array( 'escape' => TRUE ) );
+		}
+		else
+		{
+			$title = \IPS\Member::loggedIn()->language()->addToStack( 'block_relatedContent' );
+		}
+
+		return $this->output( $related, $title );
 	}
 }