Browse Source

Remove the xmppcountry configuration parameter

Comment the Firebase configuration, not used anymore
pull/1058/head
Timothée Jaussoin 4 years ago
parent
commit
fe6e41ae59
  1. 1
      app/Configuration.php
  2. 19
      app/widgets/AdminMain/adminmain.tpl
  3. 21
      database/migrations/20220211130127_remove_xmpp_country_from_configuration_table.php
  4. 2
      database/seeds/FromModlToEloquent.php
  5. 6
      src/Movim/Console/ConfigCommand.php

1
app/Configuration.php

@ -24,7 +24,6 @@ class Configuration extends Model
'password',
'xmppdomain',
'xmppdescription',
'xmppcountry',
'xmppwhitelist'
];

19
app/widgets/AdminMain/adminmain.tpl

@ -134,23 +134,6 @@
<label for="xmppdescription">{$c->__('xmpp.description')}</label>
</div>
<div>
<div class="select">
<select id="xmppcountry" name="xmppcountry">
<option value="">{$c->__('xmpp.country_pick')}</option>
{loop="$countries"}
<option value="{$key}"
{if="$conf->xmppcountry == $key"}
selected="selected"
{/if}>
{$value}
</option>
{/loop}
</select>
</div>
<label for="xmppcountry">{$c->__('xmpp.country')}</label>
</div>
<br />
<h3>{$c->__('whitelist.title')}</h3>
@ -215,6 +198,7 @@
</li>
</ul>
<!-- Firebase is currently disabled
<h3>{$c->__('firebase.title')}</h3>
<div>
@ -240,6 +224,7 @@
</div>
</li>
</ul>
-->
<input
type="submit"

21
database/migrations/20220211130127_remove_xmpp_country_from_configuration_table.php

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

2
database/seeds/FromModlToEloquent.php

@ -28,8 +28,6 @@ class FromModlToEloquent extends AbstractSeed
? $config->xmppdomain : null;
$configuration->xmppdescription = !empty($config->xmppdescription)
? $config->xmppdescription : null;
$configuration->xmppcountry = !empty($config->xmppcountry)
? $config->xmppcountry : null;
$configuration->xmppwhitelist = !empty($config->xmppwhitelist)
? $config->xmppwhitelist : null;
$configuration->restrictsuggestions = !empty($config->restrictsuggestions)

6
src/Movim/Console/ConfigCommand.php

@ -64,12 +64,6 @@ class ConfigCommand extends Command
InputOption::VALUE_REQUIRED,
'The default XMPP server description'
)
->addOption(
'xmppcountry',
null,
InputOption::VALUE_REQUIRED,
'The default XMPP server country'
)
->addOption(
'xmppwhitelist',
null,

Loading…
Cancel
Save