Fixes #3194. Support for contibutors in manifest.

documentation/info/manifest.xml

@@ -29,6 +29,19 @@
 		<path>graphics/plugin_ss2.png</path>
 	</screenshot>
 
+	<contributor>
+		<name>Evan Winslow</name>
+		<email>evan@elgg.org</email>
+		<website>http://evanwinslow.com/</website>
+		<username>ewinslow</username> <!-- Elgg community username -->
+		<description>Description of Evan's role in the project</description>
+	</contributor>
+
+	<contributor>
+		<name>Cash Costello</name>
+		<email>cash@elgg.org</email>
+		<description>Description of Cash's role in the project</description>
+	</contributor>
 	<category>admin</category>
 	<category>api</category>
 

engine/classes/ElggPluginManifest.php

@@ -113,6 +113,17 @@ class ElggPluginManifest {
 		'description' => '',
 		'path' => ''
 	);
+
+	/**
+	 * The expected structure of a contributor element
+	 */
+	private $contributorStruct = array(
+		'name' => '',
+		'email' => '',
+		'website' => '',
+		'username' => '',
+		'description' => '',
+	);
 
 	/**
 	 * The API version of the manifest.
@@ -386,6 +397,26 @@ public function getScreenshots() {
 
 		return $normalized;
 	}
+
+	/**
+	 * Return the contributors listed.
+	 *
+	 * @return array
+	 */
+	public function getContributors() {
+		$ss = $this->parser->getAttribute('contributor');
+
+		if (!$ss) {
+			$ss = array();
+		}
+
+		$normalized = array();
+		foreach ($ss as $s) {
+			$normalized[] = $this->buildStruct($this->contributorStruct, $s);
+		}
+
+		return $normalized;
+	}
 
 	/**
 	 * Return the list of provides by this plugin.

engine/classes/ElggPluginManifestParser18.php

@@ -15,7 +15,7 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser {
 	protected $validAttributes = array(
 		'name', 'author', 'version', 'blurb', 'description', 'id',
 		'website', 'copyright', 'license', 'requires', 'suggests',
-		'screenshot', 'category', 'conflicts', 'provides',
+		'screenshot', 'contributor', 'category', 'conflicts', 'provides',
 		'activate_on_install'
 	);
 
@@ -60,6 +60,7 @@ public function parse() {
 
 				// 3d arrays
 				case 'screenshot':
+				case 'contributor':
 				case 'provides':
 				case 'conflicts':
 				case 'requires':

engine/tests/ElggCorePluginsAPITest.php

@@ -88,6 +88,11 @@ public function testElggPluginManifest18() {
 				array('description' => 'Fun things to do 1', 'path' => 'graphics/plugin_ss1.png'),
 				array('description' => 'Fun things to do 2', 'path' => 'graphics/plugin_ss2.png'),
 			),
+
+			'contributor' => array(
+				array('name' => 'Evan Winslow', 'email' => 'evan@elgg.org', 'website' => 'http://evanwinslow.com/', 'username' => 'ewinslow', 'description' => "Description of Evan's role in the project"),
+				array('name' => 'Cash Costello', 'email' => 'cash@elgg.org', 'description' => "Description of Cash's role in the project"),
+			),
 
 			'category' => array(
 				'Admin', 'ServiceAPI'
@@ -235,6 +240,16 @@ public function testElggPluginManifestGetScreenshots() {
 		$this->assertIdentical($this->package18->getManifest()->getScreenshots(), $screenshots);
 		$this->assertIdentical($this->package17->getManifest()->getScreenshots(), array());
 	}
+
+	public function testElggPluginManifestGetContributors() {
+		$contributors = array(
+			array('name' => 'Evan Winslow', 'email' => 'evan@elgg.org', 'website' => 'http://evanwinslow.com/', 'username' => 'ewinslow', 'description' => "Description of Evan's role in the project"),
+			array('name' => 'Cash Costello', 'email' => 'cash@elgg.org', 'website' => '', 'username' => '', 'description' => "Description of Cash's role in the project"),
+		);
+
+		$this->assertIdentical($this->package18->getManifest()->getContributors(), $contributors);
+		$this->assertIdentical($this->package17->getManifest()->getContributors(), array());
+	}
 
 	public function testElggPluginManifestGetProvides() {
 		$provides = array(

engine/tests/test_files/plugin_18/manifest.xml

@@ -30,6 +30,20 @@
 		<path>graphics/plugin_ss2.png</path>
 	</screenshot>
 
+	<contributor>
+		<name>Evan Winslow</name>
+		<email>evan@elgg.org</email>
+		<website>http://evanwinslow.com/</website>
+		<username>ewinslow</username> <!-- Elgg community username -->
+		<description>Description of Evan's role in the project</description>
+	</contributor>
+
+	<contributor>
+		<name>Cash Costello</name>
+		<email>cash@elgg.org</email>
+		<description>Description of Cash's role in the project</description>
+	</contributor>
+
 	<category>Admin</category>
 
 	<category>ServiceAPI</category>

languages/en.php

@@ -693,6 +693,7 @@
 	'admin:plugins:label:moreinfo' => 'more info',
 	'admin:plugins:label:version' => 'Version',
 	'admin:plugins:label:location' => 'Location',
+	'admin:plugins:label:contributors' => 'Contributors',
 	'admin:plugins:label:dependencies' => 'Dependencies',
 
 	'admin:plugins:warning:elgg_version_unknown' => 'This plugin uses a legacy manifest file and does not specify a compatible Elgg version. It probably will not work!',

views/default/css/admin.php

@@ -1417,6 +1417,14 @@
 .elgg-plugin-screenshot-lightbox h2 {
 	color: black;
 }
+.elgg-plugin-contributors {
+	list-style-position: inside;
+	list-style-type: circle;
+}
+.elgg-plugin-contributors li {
+	font-style: italic;
+	padding-left: 10px;
+}
 .elgg-plugin.elgg-state-active {
 	background: white;
 }

views/default/object/plugin/elements/contributors.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Shows a list of contributors for ElggPlugin in $vars['plugin'].
+ *
+ * @package Elgg.Core
+ * @subpackage Admin.Plugins
+ */
+
+$plugin = elgg_extract('plugin', $vars, false);
+$contributors = $plugin->getManifest()->getContributors();
+
+echo '<ul class="elgg-plugin-contributors">';
+
+foreach ($contributors as $contributor) {
+	echo "<li title=\"{$contributor['description']}\">";
+	echo $contributor['name'];
+
+	if ($contributor['email'] || $contributor['username'] || $contributor['website']) {
+		echo " - ";
+	}
+
+	if ($contributor['email']) {
+		echo "<a href=\"mailto:{$contributor['email']}\">&lt;{$contributor['email']}&gt;</a>";
+	}
+
+	if ($contributor['email'] && ($contributor['website'])) {
+		echo ",  ";
+	}
+
+	if ($contributor['website']) {
+		echo "<a href=\"{$contributor['website']}\">{$contributor['website']}</a>";
+	}
+
+	if (($contributor['email'] || $contributor['website']) && $contributor['username']) {
+		echo ",  ";
+	}
+
+	if ($contributor['username']) {
+		echo "<a href=\"http://community.elgg.org/profile/{$contributor['username']}\">@{$contributor['username']}</a>";
+	}
+}
+
+echo '</dl>';

views/default/object/plugin/full.php

@@ -276,6 +276,11 @@
 		<div><?php echo elgg_echo('admin:plugins:label:copyright') . ": " . $copyright; ?></div>
 		<div><?php echo elgg_echo('admin:plugins:label:licence') . ": " . $license; ?></div>
 		<div><?php echo elgg_echo('admin:plugins:label:location') . ": " . htmlspecialchars($plugin->getPath()) ?></div>
+		<div><?php echo elgg_echo('admin:plugins:label:contributors') ?>:
+		<?php
+			echo elgg_view('object/plugin/elements/contributors', array('plugin' => $plugin));
+		?>
+		</div>
 
 		<div><?php echo elgg_echo('admin:plugins:label:dependencies'); ?>:
 		<?php