Add a checkbox to disable the Registration feature in the admin panel

Remove the old flag icon system
Fix #901
Update CHANGELOG

CHANGELOG.md

@@ -1,8 +1,12 @@
 Movim Changelog
 ================
 
-v0.20 (trunk)
+v0.19.1 (trunk)
 ---------------------------
+* Add a checkbox to disable the Registration feature in the admin panel (#901)
+* New CSS for articles table
+* Fix Notifications crash on MySQL
+* Fix MUC private message self Carbon handling
 
 v0.19
 ---------------------------

VERSION

@@ -1 +1 @@
-v0.19
+v0.19.1rc1

app/Configuration.php

@@ -12,6 +12,7 @@ class Configuration extends Model
 
     public $fillable = [
         'description',
+        'disableregistration',
         'firebaseauthorizationkey',
         'info',
         'unregister',
@@ -30,6 +31,7 @@ class Configuration extends Model
     protected $attributes = [
         'id'                    => 1,
         'unregister'            => false,
+        'disableregistration'   => false,
         'restrictsuggestions'   => false,
         'loglevel'              => 0,
         'locale'                => 'en',

app/controllers/AccountController.php

@@ -6,6 +6,10 @@ class AccountController extends Base
 {
     public function dispatch()
     {
+        if (\App\Configuration::get()->disableregistration) {
+            $this->redirect('login');
+        }
+
         requestAPI('disconnect', 2, ['sid' => SESSION_ID]);
 
         $this->page->setTitle(__('page.account_creation'));

app/controllers/AccountnextController.php

@@ -6,6 +6,10 @@ class AccountnextController extends Base
 {
     public function dispatch()
     {
+        if (\App\Configuration::get()->disableregistration) {
+            $this->redirect('login');
+        }
+
         $this->page->setTitle(__('page.account_creation'));
     }
 }

app/widgets/AdminMain/AdminMain.php

@@ -18,6 +18,7 @@ class AdminMain extends \Movim\Widget\Base
                 $configuration->password = password_hash($form['password'], PASSWORD_DEFAULT);
             }
 
+            $form['disableregistration'] = (isset($form['disableregistration']));
             $form['restrictsuggestions'] = (isset($form['restrictsuggestions']));
             $form['chatonly'] = (isset($form['chatonly']));
 

app/widgets/AdminMain/adminmain.tpl

@@ -83,6 +83,24 @@
                     <p class="all">{$c->__('chatonly.text')}</p>
                 </div>
             </li>
+            <li class="wide">
+                <span class="control">
+                    <div class="checkbox">
+                        <input
+                            {if="$conf->disableregistration"}
+                                checked
+                            {/if}
+                            type="checkbox"
+                            id="disableregistration"
+                            name="disableregistration"/>
+                        <label for="disableregistration"></label>
+                    </div>
+                </span>
+                <div>
+                    <p>{$c->__('disableregistration.title')}</p>
+                    <p class="all">{$c->__('disableregistration.text')}</p>
+                </div>
+            </li>
         </ul>
     </div>
 

app/widgets/AdminMain/locales.ini

@@ -20,6 +20,10 @@ username    = Username
 password    = Password
 re_password = Retype password
 
+[disableregistration]
+title       = Disable the XMPP registration feature
+text        = Remove the XMPP registration flow and buttons from the interface
+
 [whitelist]
 title         = Whitelisted XMPP Servers
 info1         = If you want to specify a list of authorized XMPP servers on your Movim pod and forbid the connection on all the others please put their domain name here, with comma (ex: movim.eu,jabber.fr)

app/widgets/Login/login.tpl

@@ -89,9 +89,11 @@
                                         data-loading="{$c->__('button.connecting')}…"
                                         value="{$c->__('page.login')}"
                                         class="button color"/>
-                                    <a class="button flat" href="{$c->route('account')}">
-                                        {$c->__('button.sign_up')}
-                                    </a>
+                                    {if="!App\Configuration::get()->disableregistration"}
+                                        <a class="button flat" href="{$c->route('account')}">
+                                            {$c->__('button.sign_up')}
+                                        </a>
+                                    {/if}
                                 </p>
                             </div>
                         </li>

app/widgets/Subscribe/Subscribe.php

@@ -5,11 +5,6 @@ use Movim\Widget\Base;
 
 class Subscribe extends Base
 {
-    public function flagPath($country)
-    {
-        return BASE_URI.'theme/img/flags/'.strtolower($country).'.png';
-    }
-
     public function accountNext($server)
     {
         return $this->route('accountnext', [$server]);

app/widgets/Subscribe/subscribe.tpl

@@ -18,15 +18,6 @@
                 </span>
                 <div>
                     <p>
-                        {if="!empty($config->xmppcountry)"}
-                            <span class="info">
-                                <img
-                                    class="flag"
-                                    title="{$config->xmppcountry}"
-                                    alt="{$config->xmppc}"
-                                    src="{$c->flagPath($config->xmppcountry)}"/>
-                            </span>
-                        {/if}
                         {$config->xmppdomain}
                     </p>
                     {if="!empty($config->xmppdescription)"}
@@ -50,13 +41,6 @@
             </span>
             <div>
                 <p>
-                    <span class="info">
-                    <img
-                        class="flag"
-                        title="{$value->geo_country}"
-                        alt="{$value->geo_country}"
-                        src="{$c->flagPath($value->geo_country)}"/>
-                    </span>
                     {$value->domain}
                 </p>
                 <p>

database/migrations/20210302212105_add_disable_registraton_to_configuration_table.php

@@ -0,0 +1,21 @@
+<?php
+
+use Movim\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class AddDisableRegistratonToConfigurationTable extends Migration
+{
+    public function up()
+    {
+        $this->schema->table('configuration', function (Blueprint $table) {
+            $table->boolean('disableregistration')->default(false);
+        });
+    }
+
+    public function down()
+    {
+        $this->schema->table('configuration', function (Blueprint $table) {
+            $table->dropColumn('disableregistration');
+        });
+    }
+}