From 909008b105c1b4e13af7f3fedd940b0d04c0639b Mon Sep 17 00:00:00 2001 From: Alexader Date: Sun, 27 Apr 2014 17:40:46 +0300 Subject: [PATCH 1/6] There is an error alias --- modules/profile/ProfileModule.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/profile/ProfileModule.php b/modules/profile/ProfileModule.php index c84c88f..40cdb81 100644 --- a/modules/profile/ProfileModule.php +++ b/modules/profile/ProfileModule.php @@ -45,11 +45,11 @@ class ProfileModule extends CWebModule { public $controllerMap=array( 'comments'=>array( - 'class'=>'ProfileModule.controllers.YumProfileCommentController'), + 'class'=>'profile.controllers.YumProfileCommentController'), 'privacy'=>array( - 'class'=>'ProfileModule.controllers.YumPrivacysettingController'), + 'class'=>'profile.controllers.YumPrivacysettingController'), 'profile'=>array( - 'class'=>'ProfileModule.controllers.YumProfileController'), + 'class'=>'profile.controllers.YumProfileController'), ); public function init() { From 58da0b0a9fca9b07d96273cbc82b5164f49ad2d8 Mon Sep 17 00:00:00 2001 From: Herbert Maschke Date: Thu, 18 Sep 2014 18:56:53 +0200 Subject: [PATCH 2/6] do not expose user index and view actions to not authenticated users (be more paranoid by default) --- modules/user/controllers/YumUserController.php | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) 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; } - } From d11d99d18023e0331ca173d504d84125972baef6 Mon Sep 17 00:00:00 2001 From: Herbert Maschke Date: Tue, 6 Jan 2015 16:42:43 +0100 Subject: [PATCH 3/6] Update username match for avatar upload Update username match for avatar upload - by https://github.com/BeeR13 --- modules/user/UserModule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)', ); From 06a473e10fba65b89021acf54fe6689091356d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Gro=C3=9Fe?= Date: Tue, 6 Jan 2015 16:50:13 +0100 Subject: [PATCH 4/6] improved .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 43e6da5..aff5ced 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ *.swp *~ ./nbproject +.DS_Store +.idea From fd51daff4385d3e643cca1e443b1ad4164a58465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Gro=C3=9Fe?= Date: Tue, 6 Jan 2015 16:51:45 +0100 Subject: [PATCH 5/6] Fixed for attribute in several labels - by https://github.com/tstauffe --- modules/user/views/install/start.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 @@ - +

 

@@ -112,7 +112,7 @@
- +
@@ -131,7 +131,7 @@
- +
@@ -144,7 +144,7 @@
- +
From 384ce084b2b445c1cb275476063a7f506d1d932b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Gro=C3=9Fe?= Date: Tue, 6 Jan 2015 16:53:57 +0100 Subject: [PATCH 6/6] 'Profilbesuche preisgeben' to 'Log profile visits' - by https://github.com/PrplHaz4 --- modules/profile/models/YumPrivacySetting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'), ); }