Merge branch 'fronkdev' into 'master'

Addded cifurl and -cable url to Preordercampaign

See merge request fronk/thetool!266

application/Preorder/Preorder.php

@@ -358,7 +358,7 @@ class Preorder extends mfBaseModel {
   
   public function createCiftoken() {
     $ciftoken = $this->generateNewCiftoken();
-    while(PreorderModel::search(['ciftoken' => $ciftoken])) {
+    while(PreorderModel::getFirst(['ciftoken' => $ciftoken])) {
       $ciftoken = $this->generateNewCiftoken();
     }
     $this->ciftoken = $ciftoken;
@@ -375,6 +375,24 @@ class Preorder extends mfBaseModel {
     return $ciftoken;
   }
   
+  public function generateCifUrl() {
+    $campaign = $this->getProperty("campaign");
+    
+    $cifurl = $campaign->cifurl;
+    str_replace("{{CIFTOKEN}}", $this->ciftoken, $cifurl);
+    
+    return $cifurl;
+  }
+  
+  public function generateCifCableUrl() {
+    $campaign = $this->getProperty("campaign");
+    
+    $cifcableurl = $campaign->cifcableurl;
+    str_replace("{{}}", $this->ciftoken, $cifcableurl);
+    
+    return $cifcableurl;
+  }
+  
   public function getCifdataApiArray() {
     if(!$this->id) {
       return false;

application/Preorder/PreorderModel.php

@@ -676,6 +676,13 @@ class PreorderModel {
       }
     }
     
+    if(array_key_exists("gemeinde_id", $filter)) {
+      $gemeinde_id = FronkDB::singleton()->escape($filter['gemeinde_id']);
+      if($gemeinde_id) {
+        $where .= " AND `".ADDRESSDB_DBNAME."`.adb_hausnummer.gemeinde_id = $gemeinde_id";
+      }
+    }
+    
     if(array_key_exists("gemeinde", $filter)) {
       $gemeinde = FronkDB::singleton()->escape($filter['gemeinde']);
       if($gemeinde) {

application/Preordercampaign/PreordercampaignController.php

@@ -229,11 +229,13 @@ class PreordercampaignController extends mfBaseController {
     
     $data = [];
     $data['network_id'] = $r->network_id;
-    $data['name'] = $r->name;
-    $data['description'] = $r->description;
-    $data['area'] = $r->area;
-    $data['note'] = $r->note;
+    $data['name'] = trim($r->name);
+    $data['description'] = trim($r->description);
+    $data['area'] = trim($r->area);
+    $data['note'] = trim($r->note);
     $data['homes_total'] = (int)$r->homes_total;
+    $data["cifurl"] = trim($r->cifurl);
+    $data["cifcableurl"] = trim($r->cifcableurl);
     
     if($r->from) {
       $data['from'] = self::dateToTimestamp($r->from);