Merge branch 'master' into ocs_api

Conflicts:
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot

1 files changed, 27 insertions, 5 deletions

diff --git a/lib/ocs/person.php b/lib/ocs/person.php
index b5f07d88ae1..169cc8211db 100644
--- a/lib/ocs/person.php
+++ b/lib/ocs/person.php
@@ -1,18 +1,40 @@
 <?php
+/**
+* ownCloud
+*
+* @author Frank Karlitschek
+* @author Tom Needham
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
+* @copyright 2012 Tom Needham tom@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 class OC_OCS_Person {
 
-	public static function check($parameters){
+	public static function check($parameters) {
 		$login = isset($_POST['login']) ? $_POST['login'] : false;
 		$password = isset($_POST['password']) ? $_POST['password'] : false;
-		if($login && $password){
-			if(OC_User::checkPassword($login,$password)){
+		if($login && $password) {
+			if(OC_User::checkPassword($login, $password)) {
 				$xml['person']['personid'] = $login;
 				return new OC_OCS_Result($xml);
-			}else{
+			} else {
 				return new OC_OCS_Result(null, 102);
 			}
-		}else{
+		} else {
 			return new OC_OCS_Result(null, 101);
 		}
 	}