Merge pull request #26 from VSEphpbb/fixes

Additional fixes and updates

Author: michaelcullum

controller/main.php

@@ -15,6 +15,7 @@
 
 use phpbb\config\config;
 use phpbb\controller\helper;
+use phpbb\exception\http_exception;
 use phpbb\request\request;
 use phpbb\skeleton\helper\packager;
 use phpbb\skeleton\helper\validator;
@@ -76,9 +77,15 @@ public function __construct(config $config, helper $helper, request $request, pa
 	* Demo controller for route /skeleton
 	*
 	* @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	* @throws http_exception
 	*/
 	public function handle()
 	{
+		if ($this->user->data['is_bot'])
+		{
+			throw new http_exception(403, 'NOT_AUTHORISED');
+		}
+
 		if ($this->request->is_set_post('submit'))
 		{
 			try

helper/validator.php

@@ -25,6 +25,16 @@ public function __construct(user $user)
 		$this->user = $user;
 	}
 
+	public function validate_author_name($value)
+	{
+		if (strlen($value))
+		{
+			return $value;
+		}
+
+		throw new \RuntimeException($this->user->lang('SKELETON_INVALID_AUTHOR_NAME'));
+	}
+
 	public function validate_num_authors($value)
 	{
 		if (preg_match('#^\d+$#', $value) && $value > 0 && $value <= 20)
@@ -45,6 +55,16 @@ public function validate_extension_name($value)
 		throw new \RuntimeException($this->user->lang('SKELETON_INVALID_EXTENSION_NAME'));
 	}
 
+	public function validate_extension_display_name($value)
+	{
+		if (strlen($value))
+		{
+			return $value;
+		}
+
+		throw new \RuntimeException($this->user->lang('SKELETON_INVALID_EXTENSION_NAME'));
+	}
+
 	public function validate_extension_time($value)
 	{
 		if (preg_match('#^\d{4}\-\d{2}\-\d{2}$#', $value))

language/en/common.php

@@ -98,9 +98,10 @@
 	'SKELETON_TITLE_REQUIREMENT_INFO'	=> 'Requirements',
 	'SKELETON_TITLE_COMPONENT_INFO'		=> 'Components',
 
+	'SKELETON_INVALID_AUTHOR_NAME'		=> 'The author name is required',
 	'SKELETON_INVALID_EXTENSION_NAME'	=> 'The extension name you provided is invalid',
 	'SKELETON_INVALID_EXTENSION_TIME'	=> 'The extension date you provided is invalid',
-	'SKELETON_INVALID_EXTENSION_VERSION'	=> 'The extension version you provided is invalid',
-	'SKELETON_INVALID_NUM_AUTHORS'	=> 'The number of authors you provided is invalid',
-	'SKELETON_INVALID_VENDOR_NAME'	=> 'The vendor name you provided is invalid',
+	'SKELETON_INVALID_EXTENSION_VERSION'=> 'The extension version you provided is invalid',
+	'SKELETON_INVALID_NUM_AUTHORS'		=> 'The number of authors you provided is invalid',
+	'SKELETON_INVALID_VENDOR_NAME'		=> 'The vendor name you provided is invalid',
 ));