mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-04-20 23:21:54 +02:00
Code Issues Projects Releases Wiki Activity

Update code to manage users from external modules (#7445)

Browse Source 
* Update code to manage users from external modules

* Check POST data on load HForm

* Check POST data on load HForm

* Revert init AuthClientUserService
This commit is contained in:
Yuriy Bakhtin 2025-02-27 19:26:28 +01:00 committed by GitHub
parent 8f9d04389a
commit fe53f44547
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -17,6 +17,7 @@ HumHub Changelog
- Enh #7424: New event on get registration groups
- Enh #7437: Add beforeInitCallback `humhub.ui.picker`
- Fix #7441: Hide "Remember me" option on mobile app
- Enh #7408: Update code to manage users from external modules
1.17.0 (January 13, 2025)
-------------------------

31
protected/humhub/compat/HForm.php
View File

@ -69,11 +69,12 @@ class HForm extends \yii\base\Component
{
if (Yii::$app->request->method == 'POST') {
if ($buttonName == "" || isset($_POST[$buttonName])) {
$allowedPostData = $this->getAllowedPostData();
foreach ($this->models as $model) {
$model->load(Yii::$app->request->post());
$model->load($allowedPostData);
}
if ($this->primaryModel !== null) {
$this->primaryModel->load(Yii::$app->request->post());
$this->primaryModel->load($allowedPostData);
}
return true;
}
@ -84,6 +85,32 @@ class HForm extends \yii\base\Component
return false;
}
protected function getAllowedPostData(): array
{
$post = Yii::$app->request->post();
foreach ($this->models as $modelName => $model) {
$className = substr(strrchr(get_class($model), '\\'), 1);
if (!isset($post[$className])) {
continue;
}
if (!isset($this->definition['elements'][$modelName])) {
// Remove post data of the object if no definition
unset($post[$className]);
}
if (isset($this->definition['elements'][$modelName]['elements'])) {
foreach ($this->definition['elements'][$modelName]['elements'] as $elementName => $element) {
if (!empty($element['readonly']) && isset($post[$className][$elementName])) {
// Remove a readonly field from the POST data
unset($post[$className][$elementName]);
}
}
}
}
return $post;
}
public function validate()
{
$hasErrors = false;

2
protected/humhub/modules/admin/controllers/GroupController.php
View File

@ -132,7 +132,7 @@ class GroupController extends Controller
$group = Group::findOne(['id' => Yii::$app->request->get('id')]);
$this->checkGroupAccess($group);
$searchModel = new UserSearch();
$searchModel = Yii::createObject(UserSearch::class);
$searchModel->query = $group->getUsers();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
return $this->render('members', [

4
protected/humhub/modules/admin/controllers/UserController.php
View File

@ -83,7 +83,7 @@ class UserController extends Controller
*/
public function actionList()
{
$searchModel = new UserSearch();
$searchModel = Yii::createObject(UserSearch::class);
$searchModel->status = User::STATUS_ENABLED;
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
$showPendingRegistrations = Invite::find()->where(Invite::filterSource())->exists() &&
@ -390,7 +390,7 @@ class UserController extends Controller
*/
public function actionExport($format)
{
$searchModel = new UserSearch();
$searchModel = Yii::createObject(UserSearch::class);
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
$exporter = new SpreadsheetExport([