Version 4.5.0

system/Content/ShareServices/Email.php

@@ -11,7 +11,7 @@
 namespace IPS\Content\ShareServices;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -20,58 +20,15 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 /**
  * Email share link
  */
-class _Email
+class _Email extends \IPS\Content\ShareServices
 {
-	/**
-	 * @brief	URL to the content item
-	 */
-	protected $url		= NULL;
-	
-	/**
-	 * @brief	Title of the content item
-	 */
-	protected $title	= NULL;
-	
-	/**
-	 * Constructor
-	 *
-	 * @param	\IPS\Http\Url	$url	URL to the content [optional - if omitted, some services will figure out on their own]
-	 * @param	string			$title	Default text for the content, usually the title [optional - if omitted, some services will figure out on their own]
-	 * @return	void
-	 */
-	public function __construct( \IPS\Http\Url $url=NULL, $title=NULL )
-	{
-		$this->url		= $url;
-		$this->title	= $title;
-	}
-		
-	/**
-	 * Determine whether the logged in user has the ability to autoshare
-	 *
-	 * @return	boolean
-	 */
-	public static function canAutoshare()
-	{
-		return false;
-	}
-
-	/**
-	 * Add any additional form elements to the configuration form. These must be setting keys that the service configuration form can save as a setting.
-	 *
-	 * @param	\IPS\Helpers\Form	$form	Configuration form for this service
-	 * @return	void
-	 */
-	public static function modifyForm( \IPS\Helpers\Form &$form )
-	{
-	}
-
 	/**
 	 * Return the HTML code to show the share link
 	 *
 	 * @return	string
 	 */
 	public function __toString()
-	{		
-		return \IPS\Theme::i()->getTemplate( 'sharelinks', 'core' )->email( (string) $this->url->setQueryString( array( 'do' => 'email' ) ) );
+	{
+		return \IPS\Theme::i()->getTemplate( 'sharelinks', 'core' )->email( urlencode( $this->url ), $this->title );
 	}
 }