Merge branch 'master' of git://github.com/thyseus/yii-user-management

.gitignore

@@ -3,3 +3,5 @@
 *.swp
 *~
 ./nbproject
+.DS_Store
+.idea

modules/profile/models/YumPrivacySetting.php

@@ -65,7 +65,7 @@ public function attributeLabels()
 			'message_new_friendship' => Yum::t('Receive a Email for new Friendship request'),
 			'message_new_message' => Yum::t('Receive a Email when new Message arrives'),
 			'message_new_profilecomment' => Yum::t('Receive a Email when a new profile comment was made'),
-			'log_profile_visits' => Yum::t('Profilbesuche preisgeben'),
+			'log_profile_visits' => Yum::t('Log profile visits'),
 
 		);
 	}

modules/user/UserModule.php

@@ -163,7 +163,7 @@ class UserModule extends CWebModule {
   public $usernameRequirements=array(
     'minLen'=>3,
     'maxLen'=>30,
-    'match' => '/^[A-Za-z0-9@._-\s]+$/u',
+    'match' => '/^[A-Za-z0-9@._-]+$/u',
     'dontMatchMessage' => 'Incorrect symbol\'s. (A-z0-9)',
   );
 

modules/user/controllers/YumUserController.php

@@ -7,26 +7,15 @@ class YumUserController extends YumController {
 	public function accessRules() {
 		return array(
 				array('allow',
-					'actions'=>array('index', 'view', 'login'),
+					'actions'=>array('login'),
 					'users'=>array('*'),
 					),
 				array('allow',
-					'actions'=>array('profile',
-						'logout',
-						'changepassword',
-						'passwordexpired',
-						'delete',
-						'browse'),
+					'actions'=>array('profile', 'logout', 'changepassword', 'passwordexpired', 'delete', 'browse'),
 					'users'=>array('@'),
 					),
 				array('allow',
-					'actions'=>array('admin',
-						'delete',
-						'create',
-						'update',
-						'list',
-						'assign',
-						'generateData',
+					'actions'=>array('admin', 'index', 'view', 'delete', 'create', 'update', 'list', 'assign', 'generateData',
 						'csv'),
 					'expression' => 'Yii::app()->user->isAdmin()'
 					),
@@ -416,5 +405,4 @@ public function loadUser($uid = 0)
 		}
 		return $this->_model;
 	}
-
 }

modules/user/views/install/start.php

@@ -25,7 +25,7 @@
 	<tr>
 	<td>
 
-	<label for="installRole"> User Management </label>
+	<label> User Management </label>
 		<p>&nbsp;</p>
 	<table>
 		<tr>
@@ -112,7 +112,7 @@
 	</td>
 	<td>
 
-	<label for="installMessages"> Usergroups submodule </label>
+	<label> Usergroups submodule </label>
 	<?php echo CHtml::checkBox('installUsergroup', true); ?>
 	<div id="usergroup">
 		<table>
@@ -131,7 +131,7 @@
 	</td>
 	<td>
 
-	<label for="installMessages"> Friendship submodule </label>
+	<label> Friendship submodule </label>
 	<?php echo CHtml::checkBox('installFriendship', true); ?>
 	<div id="friendship">
 		<table>
@@ -144,7 +144,7 @@
 	</td>
 	<td>
 
-	<label for="installRole"> Profiles submodule </label>
+	<label> Profiles submodule </label>
 	<?php echo CHtml::checkBox('installProfiles', true); ?>
 
 	<div id="profiles">