mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity

Fixed method name case mismatches

Browse Source
This commit is contained in:
Alexander Makarov 2016-10-16 00:32:47 +03:00
parent 3df4bbfc06
commit 4fb7fad866
20 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protected/humhub/compat/CActiveForm.php
View File

@ -41,7 +41,7 @@ class CActiveForm extends \yii\widgets\ActiveForm
public function textArea($model, $attribute, $htmlOptions = array())
{
return CHtml::activeTextArea($model, $attribute, $htmlOptions);
return CHtml::activeTextarea($model, $attribute, $htmlOptions);
}
public function checkBox($model, $attribute, $htmlOptions = array())

4
protected/humhub/modules/admin/views/authentication/authentication.php
View File

@ -21,12 +21,12 @@ use humhub\models\Setting;
<?php echo $form->field($model, 'internalRequireApprovalAfterRegistration')->checkbox(); ?>
<?php echo $form->field($model, 'defaultUserGroup')->dropdownList($groups, ['readonly' => Setting::IsFixed('auth.defaultUserGroup', 'user')]); ?>
<?php echo $form->field($model, 'defaultUserGroup')->dropDownList($groups, ['readonly' => Setting::IsFixed('auth.defaultUserGroup', 'user')]); ?>
<?php echo $form->field($model, 'defaultUserIdleTimeoutSec')->textInput(['readonly' => Setting::IsFixed('auth.defaultUserIdleTimeoutSec', 'user')]); ?>
<p class="help-block"><?php echo Yii::t('AdminModule.views_setting_authentication', 'Min value is 20 seconds. If not set, session will timeout after 1400 seconds (24 minutes) regardless of activity (default session timeout)'); ?></p>
<?php echo $form->field($model, 'defaultUserProfileVisibility')->dropdownList([1 => Yii::t('AdminModule.views_setting_authentication', 'Visible for members only'), 2 => Yii::t('AdminModule.views_setting_authentication', 'Visible for members+guests')], ['readonly' => (!Yii::$app->getModule('user')->settings->get('auth.allowGuestAccess'))]); ?>
<?php echo $form->field($model, 'defaultUserProfileVisibility')->dropDownList([1 => Yii::t('AdminModule.views_setting_authentication', 'Visible for members only'), 2 => Yii::t('AdminModule.views_setting_authentication', 'Visible for members+guests')], ['readonly' => (!Yii::$app->getModule('user')->settings->get('auth.allowGuestAccess'))]); ?>
<p class="help-block"><?php echo Yii::t('AdminModule.views_setting_authentication', 'Only applicable when limited access for non-authenticated users is enabled. Only affects new users.'); ?></p>
<hr>

6
protected/humhub/modules/admin/views/setting/basic.php
View File

@ -21,12 +21,12 @@ use yii\widgets\ActiveForm;
<?php $allowedLanguages = Yii::$app->i18n->getAllowedLanguages(); ?>
<?php if (count($allowedLanguages) > 1) : ?>
<?php echo $languageDropDown = $form->field($model, 'defaultLanguage')->dropdownList($allowedLanguages); ?>
<?php echo $languageDropDown = $form->field($model, 'defaultLanguage')->dropDownList($allowedLanguages); ?>
<?php endif; ?>
<?php echo $form->field($model, 'timeZone')->dropdownList(\humhub\libs\TimezoneHelper::generateList()); ?>
<?php echo $form->field($model, 'timeZone')->dropDownList(\humhub\libs\TimezoneHelper::generateList()); ?>
<?php echo $form->field($model, 'defaultSpaceGuid')->textInput(['id' => 'space_select']); ?>
<?php echo $form->field($model, 'defaultStreamSort')->dropdownList($model->getDefaultStreamSortOptions()); ?>
<?php echo $form->field($model, 'defaultStreamSort')->dropDownList($model->getDefaultStreamSortOptions()); ?>
<?php
echo \humhub\modules\space\widgets\Picker::widget([

8
protected/humhub/modules/admin/views/setting/design.php
View File

@ -18,16 +18,16 @@ $this->registerJsFile('@web/resources/admin/uploadLogo.js');
<?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]); ?>
<?php echo $form->field($model, 'theme')->dropdownList($themes); ?>
<?php echo $form->field($model, 'theme')->dropDownList($themes); ?>
<?php echo $form->field($model, 'paginationSize'); ?>
<?php echo $form->field($model, 'displayName')->dropdownList(['{username}' => Yii::t('AdminModule.views_setting_design', 'Username (e.g. john)'), '{profile.firstname} {profile.lastname}' => Yii::t('AdminModule.views_setting_design', 'Firstname Lastname (e.g. John Doe)')]); ?>
<?php echo $form->field($model, 'displayName')->dropDownList(['{username}' => Yii::t('AdminModule.views_setting_design', 'Username (e.g. john)'), '{profile.firstname} {profile.lastname}' => Yii::t('AdminModule.views_setting_design', 'Firstname Lastname (e.g. John Doe)')]); ?>
<?php echo $form->field($model, 'spaceOrder')->dropdownList(['0' => Yii::t('AdminModule.views_setting_design', 'Alphabetical'), '1' => Yii::t('AdminModule.views_setting_design', 'Last visit')]); ?>
<?php echo $form->field($model, 'spaceOrder')->dropDownList(['0' => Yii::t('AdminModule.views_setting_design', 'Alphabetical'), '1' => Yii::t('AdminModule.views_setting_design', 'Last visit')]); ?>
<?php
echo $form->field($model, 'dateInputDisplayFormat')->dropdownList([
echo $form->field($model, 'dateInputDisplayFormat')->dropDownList([
'' => Yii::t('AdminModule.views_setting_design', 'Auto format based on user language - Example: {example}', ['{example}' => Yii::$app->formatter->asDate(time(), 'short')]),
'php:d/m/Y' => Yii::t('AdminModule.views_setting_design', 'Fixed format (mm/dd/yyyy) - Example: {example}', ['{example}' => Yii::$app->formatter->asDate(time(), 'php:d/m/Y')]),
]);

2
protected/humhub/modules/admin/views/setting/mailing_server.php
View File

@ -62,7 +62,7 @@ use yii\helpers\Url;
<strong>Encryption Options</strong>
<div class="checkbox">
<label>
<?php echo $form->checkbox($model, 'allowSelfSignedCerts', array('class' => 'form-control', 'readonly' => Setting::IsFixed('mailer.allowSelfSignedCerts'))); ?>
<?php echo $form->checkBox($model, 'allowSelfSignedCerts', array('class' => 'form-control', 'readonly' => Setting::IsFixed('mailer.allowSelfSignedCerts'))); ?>
<?php echo $model->getAttributeLabel('allowSelfSignedCerts'); ?>
</label>
</div>

2
protected/humhub/modules/comment/widgets/views/form.php
View File

@ -13,7 +13,7 @@ use humhub\widgets\AjaxButton;
<?php echo Html::hiddenInput('contentModel', $modelName); ?>
<?php echo Html::hiddenInput('contentId', $modelId); ?>
<?php echo Html::textArea("message", "", array('id' => 'newCommentForm_' . $id, 'rows' => '1', 'class' => 'form-control autosize commentForm', 'placeholder' => Yii::t('CommentModule.widgets_views_form', 'Write a new comment...'))); ?>
<?php echo Html::textarea("message", "", array('id' => 'newCommentForm_' . $id, 'rows' => '1', 'class' => 'form-control autosize commentForm', 'placeholder' => Yii::t('CommentModule.widgets_views_form', 'Write a new comment...'))); ?>
<?php echo humhub\widgets\RichTextEditor::widget(['id' => 'newCommentForm_' . $id]); ?>

2
protected/humhub/modules/content/controllers/ContentController.php
View File

@ -51,7 +51,7 @@ class ContentController extends Controller
$model = Yii::$app->request->get('model');
$id = (int) Yii::$app->request->get('id');
$contentObj = Content::get($model, $id);
$contentObj = Content::Get($model, $id);
if ($contentObj !== null && $contentObj->content->canEdit() && $contentObj->delete()) {
$json = [

2
protected/humhub/modules/content/models/ContentContainerSetting.php
View File

@ -41,7 +41,7 @@ class ContentContainerSetting extends \yii\db\ActiveRecord
[['value'], 'string'],
[['module_id', 'name'], 'string', 'max' => 50],
[['module_id', 'contentcontainer_id', 'name'], 'unique', 'targetAttribute' => ['module_id', 'contentcontainer_id', 'name'], 'message' => 'The combination of Module ID, Contentcontainer ID and Name has already been taken.'],
[['contentcontainer_id'], 'exist', 'skipOnError' => true, 'targetClass' => Contentcontainer::className(), 'targetAttribute' => ['contentcontainer_id' => 'id']],
[['contentcontainer_id'], 'exist', 'skipOnError' => true, 'targetClass' => ContentContainer::className(), 'targetAttribute' => ['contentcontainer_id' => 'id']],
];
}

4
protected/humhub/modules/file/libs/ImageConverter.php
View File

@ -242,8 +242,8 @@ class ImageConverter
$cropH = (float) ($sourceHeight - $cropY);
// crop the middle part of the image to fit proportions
$crop = ImageCreateTrueColor($cropW, $cropH);
ImageCopy(
$crop = imagecreatetruecolor($cropW, $cropH);
imagecopy(
$crop, $gdImage, 0, 0, (int) ($cropX / 2), (int) ($cropY / 2), $cropW, $cropH
);

2
protected/humhub/modules/post/views/post/edit.php
View File

@ -12,7 +12,7 @@ use yii\helpers\Url;
<div id="post_input_<?php echo $post->id; ?>_contenteditable" class="form-control atwho-input"
contenteditable="true"><?php echo \humhub\widgets\RichText::widget(['text' => $post->message, 'edit' => true]); ?></div>
<?php echo $form->field($post, 'message')->label(false)->textArea(array('class' => 'form-control', 'id' => 'post_input_' . $post->id, 'placeholder' => Yii::t('PostModule.views_edit', 'Edit your post...'))); ?>
<?php echo $form->field($post, 'message')->label(false)->textarea(array('class' => 'form-control', 'id' => 'post_input_' . $post->id, 'placeholder' => Yii::t('PostModule.views_edit', 'Edit your post...'))); ?>
<?= \humhub\widgets\RichTextEditor::widget(['id' => 'post_input_' . $post->id, 'inputContent' => $post->message, 'record' => $post]); ?>

2
protected/humhub/modules/post/widgets/views/form.php
View File

@ -3,7 +3,7 @@
use yii\helpers\Html;
?>
<?php echo Html::textArea("message", '', array('id' => 'contentForm_message', 'class' => 'form-control autosize contentForm', 'rows' => '1', 'placeholder' => Yii::t("PostModule.widgets_views_postForm", "What's on your mind?"))); ?>
<?php echo Html::textarea("message", '', array('id' => 'contentForm_message', 'class' => 'form-control autosize contentForm', 'rows' => '1', 'placeholder' => Yii::t("PostModule.widgets_views_postForm", "What's on your mind?"))); ?>
<?php

2
protected/humhub/modules/search/commands/SearchController.php
View File

@ -16,7 +16,7 @@ use Yii;
* @package humhub.modules_core.search.console
* @since 0.12
*/
class SearchController extends \yii\console\controller
class SearchController extends \yii\console\Controller
{
/**

6
protected/humhub/modules/space/modules/manage/views/security/index.php
View File

@ -18,7 +18,7 @@ use humhub\modules\space\modules\manage\widgets\SecurityTabMenu;
<?php $form = ActiveForm::begin(); ?>
<?php $joinPolicies = array(0 => Yii::t('SpaceModule.base', 'Only by invite'), 1 => Yii::t('SpaceModule.base', 'Invite and request'), 2 => Yii::t('SpaceModule.base', 'Everyone can enter')); ?>
<?php echo $form->field($model, 'join_policy')->dropdownList($joinPolicies); ?>
<?php echo $form->field($model, 'join_policy')->dropDownList($joinPolicies); ?>
<p class="help-block"><?php echo Yii::t('SpaceModule.views_admin_edit', 'Choose the kind of membership you want to provide for this workspace.'); ?></p>
<br>
@ -31,13 +31,13 @@ use humhub\modules\space\modules\manage\widgets\SecurityTabMenu;
$visibilities[2] = Yii::t('SpaceModule.base', 'Visible for all (members and guests)');
}
?>
<?php echo $form->field($model, 'visibility')->dropdownList($visibilities); ?>
<?php echo $form->field($model, 'visibility')->dropDownList($visibilities); ?>
<p class="help-block"><?php echo Yii::t('SpaceModule.views_admin_edit', 'Choose the security level for this workspace to define the visibleness.'); ?></p>
<br>
<?php $defaultVisibilityLabel = Yii::t('SpaceModule.base', 'Default') . ' (' . ((Yii::$app->getModule('space')->settings->get('defaultContentVisibility') == 1) ? Yii::t('SpaceModule.base', 'Public') : Yii::t('SpaceModule.base', 'Private')) . ')'; ?>
<?php $contentVisibilities = array('' => $defaultVisibilityLabel, 0 => Yii::t('SpaceModule.base', 'Private'), 1 => Yii::t('SpaceModule.base', 'Public')); ?>
<?php echo $form->field($model, 'default_content_visibility')->dropdownList($contentVisibilities); ?>
<?php echo $form->field($model, 'default_content_visibility')->dropDownList($contentVisibilities); ?>
<p class="help-block"><?php echo Yii::t('SpaceModule.views_admin_edit', 'Choose if new content should be public or private by default'); ?></p>
<?php echo Html::submitButton(Yii::t('base', 'Save'), array('class' => 'btn btn-primary', 'data-ui-loader' => '')); ?>

2
protected/humhub/modules/space/views/membership/invite.php
View File

@ -55,7 +55,7 @@ use yii\bootstrap\ActiveForm;
<?php echo Yii::t('SpaceModule.views_space_invite', 'You can also invite external users, which are not registered now. Just add their e-mail addresses separated by comma.'); ?>
<br/><br/>
<div class="form-group">
<?php echo $form->field($model, 'inviteExternal')->textArea(['rows' => '3', 'placeholder' => Yii::t('SpaceModule.views_space_invite', 'Email addresses'), 'id' => 'email_invite'])->label(false); ?>
<?php echo $form->field($model, 'inviteExternal')->textarea(['rows' => '3', 'placeholder' => Yii::t('SpaceModule.views_space_invite', 'Email addresses'), 'id' => 'email_invite'])->label(false); ?>
</div>
</div>
<?php endif; ?>

10
protected/humhub/modules/user/models/fieldtype/CountrySelect.php
View File

@ -9,7 +9,7 @@ namespace humhub\modules\user\models\fieldtype;
use humhub\modules\user\models\User;
use Yii;
use humhub\libs\ISO3166Codes;
use humhub\libs\iso3166Codes;
/**
* ProfileFieldTypeSelect handles numeric profile fields.
@ -54,15 +54,15 @@ class CountrySelect extends Select
// if no options set basically return a translated map of all defined countries
if (empty($this->options) || trim($this->options) == false) {
$items = ISO3166Codes::$countries;
$items = iso3166Codes::$countries;
foreach ($items as $code => $value) {
$items[$code] = ISO3166Codes::country($code);
$items[$code] = iso3166Codes::country($code);
}
} else {
foreach (explode(",", $this->options) as $code) {
$key = trim($code);
$value = ISO3166Codes::country($key, true);
$value = iso3166Codes::country($key, true);
if (! empty($key) && $key !== $value) {
$items[trim($key)] = trim($value);
}
@ -86,7 +86,7 @@ class CountrySelect extends Select
$value = $user->profile->$internalName;
if (! $raw) {
return \yii\helpers\Html::encode(ISO3166Codes::country($value));
return \yii\helpers\Html::encode(iso3166Codes::country($value));
}
return $value;

6
protected/humhub/modules/user/views/account/editSettings.php
View File

@ -11,15 +11,15 @@ use \humhub\compat\CHtml;
<?php echo $form->field($model, 'tags'); ?>
<?php if(count($languages) > 1) : ?>
<?php echo $form->field($model, 'language')->dropdownList($languages); ?>
<?php echo $form->field($model, 'language')->dropDownList($languages); ?>
<?php endif; ?>
<?php echo $form->field($model, 'timeZone')->dropdownList(\humhub\libs\TimezoneHelper::generateList()); ?>
<?php echo $form->field($model, 'timeZone')->dropDownList(\humhub\libs\TimezoneHelper::generateList()); ?>
<?php if (Yii::$app->getModule('user')->settings->get('auth.allowGuestAccess')): ?>
<?php
echo $form->field($model, 'visibility')->dropdownList([
echo $form->field($model, 'visibility')->dropDownList([
1 => Yii::t('UserModule.views_account_editSettings', 'Registered users only'),
2 => Yii::t('UserModule.views_account_editSettings', 'Visible for all (also unregistered users)'),
]);

4
protected/humhub/modules/user/views/account/emailing.php
View File

@ -17,7 +17,7 @@ use humhub\modules\user\models\User;
<?php echo Yii::t('UserModule.views_account_emailing', 'Get an email, when other users comment or like your posts.'); ?>
</div>
<?php echo $form->field($model, 'receive_email_notifications')->dropdownList([User::RECEIVE_EMAIL_NEVER => Yii::t('UserModule.views_account_emailing', 'Never'),
<?php echo $form->field($model, 'receive_email_notifications')->dropDownList([User::RECEIVE_EMAIL_NEVER => Yii::t('UserModule.views_account_emailing', 'Never'),
User::RECEIVE_EMAIL_WHEN_OFFLINE => Yii::t('UserModule.views_account_emailing', 'When I´m offline'),
User::RECEIVE_EMAIL_ALWAYS => Yii::t('UserModule.views_account_emailing', 'Always')])->label(false); ?>
@ -29,7 +29,7 @@ use humhub\modules\user\models\User;
<?php echo Yii::t('UserModule.views_account_emailing', 'Get an email, for every activity of other users you follow or work together in a workspace.'); ?>
</div>
<?php echo $form->field($model, 'receive_email_activities')->dropdownList([
<?php echo $form->field($model, 'receive_email_activities')->dropDownList([
User::RECEIVE_EMAIL_NEVER => Yii::t('UserModule.views_account_emailing', 'Never'),
User::RECEIVE_EMAIL_DAILY_SUMMARY => Yii::t('UserModule.views_account_emailing', 'Daily summary'),
User::RECEIVE_EMAIL_WHEN_OFFLINE => Yii::t('UserModule.views_account_emailing', 'When I´m offline'),

2
protected/humhub/modules/user/views/invite/index.php
View File

@ -18,7 +18,7 @@ use yii\bootstrap\ActiveForm;
<?php echo Yii::t('UserModule.invite', 'Please add the email addresses of people you want to invite below.'); ?>
<br/><br/>
<div class="form-group">
<?php echo $form->field($model, 'emails')->textArea(['rows' => '3', 'placeholder' => Yii::t('UserModule.invite', 'Email address(es)'), 'id' => 'emails'])->label(false)->hint(Yii::t('UserModule.invite', 'Separate multiple email addresses by comma.')); ?>
<?php echo $form->field($model, 'emails')->textarea(['rows' => '3', 'placeholder' => Yii::t('UserModule.invite', 'Email address(es)'), 'id' => 'emails'])->label(false)->hint(Yii::t('UserModule.invite', 'Separate multiple email addresses by comma.')); ?>
</div>
</div>
<div class="modal-footer">

2
protected/humhub/modules/user/widgets/UserPicker.php
View File

@ -244,7 +244,7 @@ class UserPicker extends \yii\base\Widget
}
return $result;
} else {
return self::createJsonUserInfo($users, $permission, $priority);
return self::createJSONUserInfo($users, $permission, $priority);
}
}

2
protected/humhub/widgets/RichText.php
View File

@ -78,7 +78,7 @@ REGEXP;
// Try use oembed
if ($maxOembedCount > $oembedCount) {
$oembed = UrlOembed::GetOembed($match[0]);
$oembed = UrlOembed::GetOEmbed($match[0]);
if ($oembed) {
$oembedCount++;
return $oembed;