diff --git a/.gitignore b/.gitignore index 43e6da5..aff5ced 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ *.swp *~ ./nbproject +.DS_Store +.idea diff --git a/modules/profile/models/YumPrivacySetting.php b/modules/profile/models/YumPrivacySetting.php index 36ae4c3..c77a7a7 100644 --- a/modules/profile/models/YumPrivacySetting.php +++ b/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'), ); } diff --git a/modules/user/UserModule.php b/modules/user/UserModule.php index 1d8fee3..1d61499 100644 --- a/modules/user/UserModule.php +++ b/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)', ); diff --git a/modules/user/controllers/YumUserController.php b/modules/user/controllers/YumUserController.php index bc7f762..500f5da 100644 --- a/modules/user/controllers/YumUserController.php +++ b/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; } - } diff --git a/modules/user/views/install/start.php b/modules/user/views/install/start.php index 21fe8b8..638688c 100755 --- a/modules/user/views/install/start.php +++ b/modules/user/views/install/start.php @@ -25,7 +25,7 @@
-
+
|