Compare commits

..

3 Commits

Author SHA1 Message Date
osaajani 61ba62ac86 Improve htaccess to allow direct access only to assets dir 2021-01-26 20:43:39 +01:00
osaajani 05cb62a503 implement logic for hiddens phone adapters 2021-01-26 19:33:08 +01:00
osaajani c0c79781bf Add meta_hidden to adapters 2021-01-26 19:27:30 +01:00
12 changed files with 100 additions and 10 deletions

View File

@ -1,2 +1,4 @@
RewriteEngine on RewriteEngine on
RewriteRule "!\.(js|ico|ICO|gif|GIF|jpg|JPG|jpeg|JPEG|png|PNG|css|woff|woff2|ttf|wav|ogg|mp3|svg|json)$" index.php RewriteRule ^assets - [L]
RewriteRule ^.well-known - [L]
RewriteRule . index.php

View File

@ -38,6 +38,12 @@ namespace adapters;
*/ */
public static function meta_uid(): string; public static function meta_uid(): string;
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
*/
public static function meta_hidden(): bool;
/** /**
* Name of the adapter. * Name of the adapter.
* It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.). * It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.).

View File

@ -57,6 +57,15 @@ namespace adapters;
return 'benchmark_adapter'; return 'benchmark_adapter';
} }
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
*/
public static function meta_hidden(): bool
{
return false;
}
/** /**
* Name of the adapter. * Name of the adapter.
* It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.). * It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.).

View File

@ -52,6 +52,16 @@ namespace adapters;
return 'gammu_adapter'; return 'gammu_adapter';
} }
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
*/
public static function meta_hidden(): bool
{
return false;
}
/** /**
* Name of the adapter. * Name of the adapter.
* It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.). * It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.).

View File

@ -78,6 +78,15 @@ class OctopushShortcodeAdapter implements AdapterInterface
return 'octopush_shortcode_adapter'; return 'octopush_shortcode_adapter';
} }
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
*/
public static function meta_hidden(): bool
{
return false;
}
/** /**
* Name of the adapter. * Name of the adapter.
* It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.). * It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.).
@ -393,7 +402,7 @@ class OctopushShortcodeAdapter implements AdapterInterface
$response = [ $response = [
'error' => false, 'error' => false,
'error_message' => null, 'error_message' => null,
'uid' => null, 'sms' => null,
]; ];
header('Connection: close'); header('Connection: close');

View File

@ -84,6 +84,15 @@ class OctopushVirtualNumberAdapter implements AdapterInterface
return 'octopush_virtual_number_adapter'; return 'octopush_virtual_number_adapter';
} }
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
*/
public static function meta_hidden(): bool
{
return false;
}
/** /**
* Name of the adapter. * Name of the adapter.
* It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.). * It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.).

View File

@ -63,6 +63,15 @@ namespace adapters;
return 'ovh_sms_shortcode_adapter'; return 'ovh_sms_shortcode_adapter';
} }
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
*/
public static function meta_hidden(): bool
{
return false;
}
/** /**
* Name of the adapter. * Name of the adapter.
* It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.). * It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.).

View File

@ -75,6 +75,15 @@ namespace adapters;
return 'ovh_sms_virtual_number_adapter'; return 'ovh_sms_virtual_number_adapter';
} }
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
*/
public static function meta_hidden(): bool
{
return false;
}
/** /**
* Name of the adapter. * Name of the adapter.
* It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.). * It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.).

View File

@ -62,6 +62,15 @@ namespace adapters;
return 'test_adapter'; return 'test_adapter';
} }
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
*/
public static function meta_hidden(): bool
{
return false;
}
/** /**
* Name of the adapter. * Name of the adapter.
* It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.). * It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.).

View File

@ -74,6 +74,15 @@ class TwilioVirtualNumberAdapter implements AdapterInterface
return 'twilio_virtual_number_adapter'; return 'twilio_virtual_number_adapter';
} }
/**
* Should this adapter be hidden in user interface for phone creation and
* available to creation through API only
*/
public static function meta_hidden(): bool
{
return false;
}
/** /**
* Name of the adapter. * Name of the adapter.
* It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.). * It should probably be the name of the service it adapt (e.g : Gammu SMSD, OVH SMS, SIM800L, etc.).

View File

@ -209,6 +209,13 @@ class Phone extends \descartes\Controller
return $this->redirect(\descartes\Router::url('Phone', 'add')); return $this->redirect(\descartes\Router::url('Phone', 'add'));
} }
if ($find_adapter['meta_hidden'])
{
\FlashMessage\FlashMessage::push('danger', 'Ce type de téléphone ne peux pas être créé via l\'interface graphique.');
return $this->redirect(\descartes\Router::url('Phone', 'add'));
}
//If missing required data fields, error //If missing required data fields, error
foreach ($find_adapter['meta_data_fields'] as $field) foreach ($find_adapter['meta_data_fields'] as $field)
{ {

View File

@ -54,14 +54,16 @@
</p> </p>
<select name="adapter" class="form-control" id="adapter-select"> <select name="adapter" class="form-control" id="adapter-select">
<?php foreach ($adapters as $adapter) { ?> <?php foreach ($adapters as $adapter) { ?>
<option <?php if ($adapter['meta_hidden'] === false) { ?>
value="<?= $adapter['meta_classname'] ?>" <option
data-description="<?php $this->s($adapter['meta_description']); ?>" value="<?= $adapter['meta_classname'] ?>"
data-data-fields="<?php $this->s(json_encode($adapter['meta_data_fields'])); ?>" data-description="<?php $this->s($adapter['meta_description']); ?>"
<?= ($_SESSION['previous_http_post']['adapter'] ?? '') == $adapter['meta_classname'] ? 'selected' : '' ?> data-data-fields="<?php $this->s(json_encode($adapter['meta_data_fields'])); ?>"
> <?= ($_SESSION['previous_http_post']['adapter'] ?? '') == $adapter['meta_classname'] ? 'selected' : '' ?>
<?php $this->s($adapter['meta_name']); ?> >
</option> <?php $this->s($adapter['meta_name']); ?>
</option>
<?php } ?>
<?php } ?> <?php } ?>
</select> </select>
</div> </div>