Added CORS origin hostnames to preordercampaign

This commit is contained in:
Frank Schubert
2022-09-12 14:23:18 +02:00
parent c66ffb1d2f
commit dcc43b0564
5 changed files with 155 additions and 3 deletions

View File

@@ -138,18 +138,31 @@
<div class="card">
<div class="card-body">
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="apiusers">Benutzername</label>
<label class="col-lg-2 col-form-label" for="apiusers">Erlaubte User</label>
<div class="col-lg-10">
<select class="select2 form-control select2-multiple" name="apiusers[]" id="apiusers" multiple="multiple" data-placeholder="Benutzer auswählen ...">
<?php foreach(UserModel::search(['apikey' => true]) as $user): ?>
<option value="<?=$user->id?>" <?=(is_array($campaign->apiusers) && array_key_exists($user->id, $campaign->apiusers)) ? "selected='selected'" : ""?>><?=$user->username?> (<?=$user->name?>)</option>
<?php endforeach; ?>
</select>
<small>Benutzer mit API-Key</small>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="corsorigins">CORS Origin Hostnamen</label>
<div class="col-lg-10">
<textarea class="form-control" name="corsorigins"><?=($campaign->corsorigins) ? implode("\n", $campaign->corsorigins) : ""?></textarea>
<small>Website Url oder Hostname; ein Eintrag pro Zeile</small>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="card">
<div class="card-body">
<div class="card">
<div class="card-body">
<div class="form-group row">

View File

@@ -7,6 +7,7 @@ class Preordercampaign extends mfBaseModel {
private $setup_products;
private $gemeinden;
private $apiusers;
private $corsorigins;
public function addTypes(Array $types) {
@@ -103,6 +104,14 @@ class Preordercampaign extends mfBaseModel {
return $this->apiusers;
}
if($name == "corsorigins") {
$items = PreordercampaignOriginhostnameModel::search(["preordercampaign_id" => $this->id]);
foreach($items as $origin) {
$this->corsorigins[] = htmlentities($origin->hostname);
}
return $this->corsorigins;
}
if($name == "creator") {
$user = mfValuecache::singleton()->get("Worker-id-".$this->create_by);
if($user) {

View File

@@ -207,6 +207,25 @@ class PreordercampaignController extends mfBaseController {
}
}
foreach(PreordercampaignOriginhostnameModel::search(['preordercampaign_id' => $campaign->id]) as $origin) {
$origin->delete();
}
// var_dump($r->corsorigins);exit;
if($r->corsorigins) {
$origins = str_replace("\r", "\n", $r->corsorigins);
$origins = preg_replace("/\n+/", "\n", $origins);
$origins = explode("\n", $origins);
if(is_array($origins) && count($origins)) {
foreach($origins as $origin) {
$poh = PreordercampaignOriginhostnameModel::getFirst(['preordercampaign_id' => $campaign->id, 'hostname' => $origin]);
if($poh) continue;
$poh = PreordercampaignOriginhostnameModel::create(['preordercampaign_id' => $campaign->id, 'hostname' => $origin]);
$poh->save();
}
}
}
$this->layout()->setFlash("Vorbestellkampagne erfolgreich gespeichert.", "success");
//$this->redirect("Preordercampaign", "Edit", ['id' => $new_id]);
$this->redirect("Preordercampaign");

View File

@@ -0,0 +1,5 @@
<?php
class PreordercampaignOriginhostname extends mfBaseModel {
}

View File

@@ -0,0 +1,106 @@
<?php
class PreordercampaignOriginhostnameModel {
public $preordercampaign_id;
public $hostname;
public $create_by;
public $edit_by;
public $create;
public $edit;
public static function create(Array $data) {
$model = new PreordercampaignOriginhostname();
foreach($data as $field => $value) {
if(property_exists(get_called_class(), $field)) {
$model->$field = $value;
}
}
$me = mfValuecache::singleton()->get("me");
if(!$me) {
$me = new User();
$me->loadMe();
mfValuecache::singleton()->set("me", $me);
}
if($model->create_by === null) {
$model->create_by = $me->id;
}
if($model->edit_by === null) {
$model->edit_by = $me->id;
}
return $model;
}
public static function getAll() {
$items = [];
$db = FronkDB::singleton();
$res = $db->select("PreordercampaignOriginhostname", "*", "ORDER BY preordercampaign_id, hostname");
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[] = new PreordercampaignOriginhostname($data);
}
}
return $items;
}
public static function getFirst($filter) {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$res = $db->select("PreordercampaignOriginhostname", "*", "$where ORDER BY preordercampaign_id, hostname");
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
$item = new PreordercampaignOriginhostname($data);
if($item->id) {
return $item;
} else {
return null;
}
}
return null;
}
public static function search($filter) {
$items = [];
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$res = $db->select("PreordercampaignOriginhostname", "*", "$where ORDER BY preordercampaign_id, hostname");
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[] = new PreordercampaignOriginhostname($data);
}
}
return $items;
}
private static function getSqlFilter($filter) {
$where = "1=1 ";
//var_dump($filter);exit;
if(array_key_exists("preordercampaign_id", $filter)) {
$preordercampaign_id = $filter['preordercampaign_id'];
if(is_numeric($preordercampaign_id)) {
$where .= " AND preordercampaign_id=$preordercampaign_id";
}
}
if(array_key_exists("hostname", $filter)) {
$hostname = FronkDB::singleton()->escape($filter['hostname']);
if($hostname) {
$where .= " AND hostname like '%$hostname%'";
}
}
//var_dump($filter, $where);exit;
return $where;
}
}