diff --git a/protected/humhub/modules/installer/libs/InitialData.php b/protected/humhub/modules/installer/libs/InitialData.php index c3709faee4..91810fa073 100644 --- a/protected/humhub/modules/installer/libs/InitialData.php +++ b/protected/humhub/modules/installer/libs/InitialData.php @@ -153,7 +153,7 @@ class InitialData $field->field_type_class = \humhub\modules\user\models\fieldtype\Select::class; $field->is_system = 1; if ($field->save()) { - $field->fieldType->options = "male=>Male\nfemale=>Female\ncustom=>Custom"; + $field->fieldType->options = "male=>Male\nfemale=>Female\ndiverse=>Diverse"; $field->fieldType->save(); } @@ -300,18 +300,6 @@ class InitialData $field->fieldType->save(); } - $field = new ProfileField(); - $field->internal_name = "im_skype"; - $field->title = 'Skype Nickname'; - $field->sort_order = 500; - $field->profile_field_category_id = $cCommunication->id; - $field->field_type_class = \humhub\modules\user\models\fieldtype\Text::class; - $field->is_system = 1; - if ($field->save()) { - $field->fieldType->maxLength = 100; - $field->fieldType->save(); - } - $field = new ProfileField(); $field->internal_name = "im_xmpp"; $field->title = 'XMPP Jabber Address'; @@ -360,6 +348,18 @@ class InitialData $field->fieldType->save(); } + $field = new ProfileField(); + $field->internal_name = "url_instagram"; + $field->title = 'Instagram URL'; + $field->sort_order = 350; + $field->profile_field_category_id = $cSocial->id; + $field->field_type_class = \humhub\modules\user\models\fieldtype\Text::class; + $field->is_system = 1; + if ($field->save()) { + $field->fieldType->validator = 'url'; + $field->fieldType->save(); + } + $field = new ProfileField(); $field->internal_name = "url_xing"; $field->title = 'Xing URL'; @@ -397,8 +397,8 @@ class InitialData } $field = new ProfileField(); - $field->internal_name = "url_flickr"; - $field->title = 'Flickr URL'; + $field->internal_name = "url_tiktok"; + $field->title = 'TikTok URL'; $field->sort_order = 700; $field->profile_field_category_id = $cSocial->id; $field->field_type_class = \humhub\modules\user\models\fieldtype\Text::class; @@ -408,18 +408,6 @@ class InitialData $field->fieldType->save(); } - $field = new ProfileField(); - $field->internal_name = "url_myspace"; - $field->title = 'MySpace URL'; - $field->sort_order = 800; - $field->profile_field_category_id = $cSocial->id; - $field->field_type_class = \humhub\modules\user\models\fieldtype\Text::class; - $field->is_system = 1; - if ($field->save()) { - $field->fieldType->validator = 'url'; - $field->fieldType->save(); - } - $field = new ProfileField(); $field->internal_name = "url_twitter"; $field->title = 'Twitter URL'; diff --git a/protected/humhub/modules/user/models/Profile.php b/protected/humhub/modules/user/models/Profile.php index 45837620d9..414ba6c8bd 100644 --- a/protected/humhub/modules/user/models/Profile.php +++ b/protected/humhub/modules/user/models/Profile.php @@ -157,7 +157,7 @@ class Profile extends ActiveRecord Yii::t('UserModule.profile', 'Gender'); Yii::t('UserModule.profile', 'Male'); Yii::t('UserModule.profile', 'Female'); - Yii::t('UserModule.profile', 'Custom'); + Yii::t('UserModule.profile', 'Diverse'); Yii::t('UserModule.profile', 'Hide year in profile'); Yii::t('UserModule.profile', 'Phone Private'); @@ -165,8 +165,6 @@ class Profile extends ActiveRecord Yii::t('UserModule.profile', 'Mobile'); Yii::t('UserModule.profile', 'E-Mail'); Yii::t('UserModule.profile', 'Fax'); - Yii::t('UserModule.profile', 'Skype Nickname'); - Yii::t('UserModule.profile', 'MSN'); Yii::t('UserModule.profile', 'XMPP Jabber Address'); Yii::t('UserModule.profile', 'Url'); @@ -175,8 +173,8 @@ class Profile extends ActiveRecord Yii::t('UserModule.profile', 'Xing URL'); Yii::t('UserModule.profile', 'YouTube URL'); Yii::t('UserModule.profile', 'Vimeo URL'); - Yii::t('UserModule.profile', 'Flickr URL'); - Yii::t('UserModule.profile', 'MySpace URL'); + Yii::t('UserModule.profile', 'TikTok URL'); + Yii::t('UserModule.profile', 'Instagram URL'); Yii::t('UserModule.profile', 'Twitter URL'); }