flashii/misuzu
flashii/misuzu
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disallow e-mail and password changing from test site.

Browse source
This commit is contained in:
flash 2018-04-14 05:10:47 +02:00
parent aea66a62fb
commit afa9495f29
3 changed files with 124 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
public/settings.php
View file

@ -91,6 +91,7 @@ if (!array_key_exists($settings_mode, $settings_modes)) {
$settings_errors = []; $settings_errors = [];
$prevent_registration = $app->config->get('Auth', 'prevent_registration', 'bool', false);
$avatar_filename = "{$settings_user->user_id}.msz"; $avatar_filename = "{$settings_user->user_id}.msz";
$avatar_max_width = $app->config->get('Avatar', 'max_width', 'int', 4000); $avatar_max_width = $app->config->get('Avatar', 'max_width', 'int', 4000);
$avatar_max_height = $app->config->get('Avatar', 'max_height', 'int', 4000); $avatar_max_height = $app->config->get('Avatar', 'max_height', 'int', 4000);
@ -130,6 +131,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
} }
} }
if (!$prevent_registration) {
if (!empty($_POST['current_password']) if (!empty($_POST['current_password'])
|| ( || (
(isset($_POST['password']) || isset($_OST['email'])) (isset($_POST['password']) || isset($_OST['email']))
@ -194,6 +196,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$settings_user->password = $_POST['password']['new']; $settings_user->password = $_POST['password']['new'];
} }
} }
}
if (count($settings_errors) < 1 && $settings_user->isDirty()) { if (count($settings_errors) < 1 && $settings_user->isDirty()) {
$settings_user->save(); $settings_user->save();
@ -351,7 +354,7 @@ $app->templating->var('settings_title', $settings_modes[$settings_mode]);
switch ($settings_mode) { switch ($settings_mode) {
case 'account': case 'account':
$app->templating->vars(compact('settings_profile_fields')); $app->templating->vars(compact('settings_profile_fields', 'prevent_registration'));
break; break;
case 'avatar': case 'avatar':

10
views/mio/_layout/meta.twig
View file

@ -3,15 +3,15 @@
{% set site_twitter = site_twitter|default(globals.site_twitter) %} {% set site_twitter = site_twitter|default(globals.site_twitter) %}
{% if title is defined %} {% if title is defined %}
{% set title = title ~ ' :: ' ~ globals.site_name %} {% set browser_title = title ~ ' :: ' ~ globals.site_name %}
{% else %} {% else %}
{% set title = globals.site_name %} {% set browser_title = globals.site_name %}
{% endif %} {% endif %}
<title>{{ title }}</title> <title>{{ browser_title }}</title>
<meta name="twitter:title" content="{{ title|slice(0, 70) }}"> <meta name="twitter:title" content="{{ title|default(globals.site_name)|slice(0, 70) }}">
<meta property="og:title" content="{{ title }}"> <meta property="og:title" content="{{ title|default(globals.site_name) }}">
<meta property="og:site_name" content="{{ globals.site_name }}"> <meta property="og:site_name" content="{{ globals.site_name }}">
{% if description|length > 0 %} {% if description|length > 0 %}

11
views/mio/settings/account.twig
View file

@ -19,6 +19,16 @@
</div> </div>
<div class="mio__settings__account__column mio__settings__account__column--no-margin"> <div class="mio__settings__account__column mio__settings__account__column--no-margin">
{% if prevent_registration %}
<div class="mio__settings__account__row">
<div class="mio__settings__account__column">
<div class="mio__settings__account__title">E-mail and Password changing</div>
<div style="text-align: center; padding: 5px;"> <!-- PUT CSS IN CSS FILE -->
<a class="mio__input__button" href="https://flashii.net/settings.php?m=account">visit main site</a>
</div>
</div>
</div>
{% else %}
<div class="mio__settings__account__row"> <div class="mio__settings__account__row">
<div class="mio__settings__account__column"> <div class="mio__settings__account__column">
<div class="mio__settings__account__title">E-mail</div> <div class="mio__settings__account__title">E-mail</div>
@ -81,6 +91,7 @@
</label> </label>
</div> </div>
</div> </div>
{% endif %}
</div> </div>
</div> </div>