phpdoc cleanup:

 * add @category (Piwik => 'core', Piwik_Plugins => 'plugins')
 * in core, use @package and @subpackage more consistently to group files/classes; exception is DataFiles/*, PluginsFunctions/*, and SmartyPlugins/*
 * in plugins, @package is the plugin name
 * removed '@param none' -- not a phpdoc convention
 * '@throws' and '@return void' are also not phpdoc conventions, but are widely used elsewhere, e.g., Smarty & Zend

6 files changed, 12 insertions, 23 deletions

diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php
index 8ff75ec5f3..9bc4902831 100644
--- a/plugins/Login/Auth.php
+++ b/plugins/Login/Auth.php
@@ -6,9 +6,14 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
  * @version $Id$
  *
+ * @category Piwik_Plugins
  * @package Piwik_Login
  */
 
+/**
+ *
+ * @package Piwik_Login
+ */
 class Piwik_Login_Auth implements Piwik_Auth
 {
 	protected $login = null;
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 1ae2c3f2a5..14e099c77e 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -6,19 +6,18 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
  * @version $Id$
  *
+ * @category Piwik_Plugins
  * @package Piwik_Login
  */
 
 /**
+ *
  * @package Piwik_Login
  */
 class Piwik_Login_Controller extends Piwik_Controller
 {
 	/**
 	 * Default action
-	 *
-	 * @param none
-	 * @return void
 	 */
 	function index()
 	{
@@ -27,9 +26,6 @@ class Piwik_Login_Controller extends Piwik_Controller
 
 	/**
 	 * Login form
-	 *
-	 * @param none
-	 * @return void
 	 */
 	function login()
 	{
@@ -66,9 +62,6 @@ class Piwik_Login_Controller extends Piwik_Controller
 
 	/**
 	 * Form-less login
-	 *
-	 * @param none
-	 * @return void
 	 */
 	function logme()
 	{
@@ -127,9 +120,6 @@ class Piwik_Login_Controller extends Piwik_Controller
 
 	/**
 	 * Lost password form.  Email password reset information.
-	 *
-	 * @param none
-	 * @return void
 	 */
 	function lostPassword()
 	{
@@ -221,9 +211,6 @@ class Piwik_Login_Controller extends Piwik_Controller
 
 	/**
 	 * Reset password form.  Enter new password here.
-	 *
-	 * @param none
-	 * @return void
 	 */
 	function resetPassword()
 	{
@@ -381,9 +368,6 @@ class Piwik_Login_Controller extends Piwik_Controller
 
 	/**
 	 * Clear session information
-	 *
-	 * @param none
-	 * @return void
 	 */
 	static public function clearSession()
 	{
@@ -394,9 +378,6 @@ class Piwik_Login_Controller extends Piwik_Controller
 
 	/**
 	 * Logout current user
-	 *
-	 * @param none
-	 * @return void
 	 */
 	public function logout()
 	{
diff --git a/plugins/Login/Form.php b/plugins/Login/Form.php
index 2e8f9a58ad..04176cd52d 100644
--- a/plugins/Login/Form.php
+++ b/plugins/Login/Form.php
@@ -6,6 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
  * @version $Id$
  *
+ * @category Piwik_Plugins
  * @package Piwik_Login
  */
 
diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php
index 78e41d1c23..3866cd7ba7 100644
--- a/plugins/Login/Login.php
+++ b/plugins/Login/Login.php
@@ -6,6 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
  * @version $Id$
  *
+ * @category Piwik_Plugins
  * @package Piwik_Login
  */
 
diff --git a/plugins/Login/PasswordForm.php b/plugins/Login/PasswordForm.php
index 0b328ead6f..7bb39d454c 100644
--- a/plugins/Login/PasswordForm.php
+++ b/plugins/Login/PasswordForm.php
@@ -6,6 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
  * @version $Id$
  *
+ * @category Piwik_Plugins
  * @package Piwik_Login
  */
 
@@ -35,7 +36,6 @@ class Piwik_Login_PasswordForm extends Piwik_Form
 
 		$formRules = array(
 			array('form_login', sprintf(Piwik_Translate('General_Required'), Piwik_Translate('Login_LoginOrEmail')), 'required'),
-			array('hidden', 'form_url', $urlToGoAfter),
 		);
 		$this->addRules( $formRules );
 
diff --git a/plugins/Login/ResetPasswordForm.php b/plugins/Login/ResetPasswordForm.php
index d80421240e..a62cf775d1 100644
--- a/plugins/Login/ResetPasswordForm.php
+++ b/plugins/Login/ResetPasswordForm.php
@@ -4,8 +4,9 @@
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id: Form.php 1296 2009-07-08 04:19:14Z vipsoft $
+ * @version $Id$
  *
+ * @category Piwik_Plugins
  * @package Piwik_Login
  */