Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsgiehl <stefangiehl@gmail.com>2012-05-03 02:08:23 +0400
committersgiehl <stefangiehl@gmail.com>2012-05-03 02:08:23 +0400
commit0e64dd6c7cdfa5c10a71e2c354cc545b2c592c81 (patch)
tree3c0d8708a7e5cb3287ab17394d107543eeb819d3 /plugins/Login
parent9f5147e17b2f728e1071b2e7f18dd386e92f70a5 (diff)
added/fixed several doc blocks; fixed some css
git-svn-id: http://dev.piwik.org/svn/trunk@6243 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/Login')
-rw-r--r--plugins/Login/Controller.php3
-rw-r--r--plugins/Login/Login.php11
2 files changed, 8 insertions, 6 deletions
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 8722704f58..6daf725bb6 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -106,7 +106,7 @@ class Piwik_Login_Controller extends Piwik_Controller
/**
* Form-less login
* @see how to use it on http://piwik.org/faq/how-to/#faq_30
- * @param none
+ * @throws Exception
* @return void
*/
function logme()
@@ -298,6 +298,7 @@ class Piwik_Login_Controller extends Piwik_Controller
* @param string $loginMail user name or email address
* @param string $token password reset token
* @param string $password new password
+ * @throws Exception
* @return string failure message
*/
protected function resetPasswordFormValidated($loginMail, $token, $password)
diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php
index 1f836e72cb..7c8bcbe994 100644
--- a/plugins/Login/Login.php
+++ b/plugins/Login/Login.php
@@ -42,7 +42,7 @@ class Piwik_Login extends Piwik_Plugin
* Redirects to Login form with error message.
* Listens to FrontController.NoAccessException hook.
*
- * @param Piwik_Event_Notification $notification
+ * @param Piwik_Event_Notification $notification notification object
*/
function noAccess( $notification )
{
@@ -57,7 +57,7 @@ class Piwik_Login extends Piwik_Plugin
* Set login name and autehntication token for authentication request.
* Listens to API.Request.authenticate hook.
*
- * @param Piwik_Event_Notification $notification
+ * @param Piwik_Event_Notification $notification notification object
*/
function ApiRequestAuthenticate($notification)
{
@@ -70,7 +70,7 @@ class Piwik_Login extends Piwik_Plugin
* Initializes the authentication object.
* Listens to FrontController.initAuthenticationObject hook.
*
- * @param Piwik_Event_Notification $notification
+ * @param Piwik_Event_Notification $notification notification object
*/
function initAuthenticationObject($notification)
{
@@ -98,12 +98,13 @@ class Piwik_Login extends Piwik_Plugin
$auth->setLogin($defaultLogin);
$auth->setTokenAuth($defaultTokenAuth);
}
-
+
/**
* Authenticate user and initializes the session.
* Listens to Login.initSession hook.
*
- * @param Piwik_Event_Notification $notification
+ * @param Piwik_Event_Notification $notification notification object
+ * @throws Exception
*/
function initSession($notification)
{