Revert "Feature 1711 custom mail templates"

it-at-m · Dec 12, 2023 · fa65df3 · fa65df3
1 parent a0df6c6
commit fa65df3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 27 deletions.
diff --git a/zmsdb/src/Zmsdb/Calldisplay.php b/zmsdb/src/Zmsdb/Calldisplay.php
@@ -85,8 +85,6 @@ public function readImage(Entity $entity)
             ->fetchOne((new Query\Calldisplay(Query\Base::SELECT))
                 ->getQueryImage(), ['name' => "logo.png"]);
         }
-
-        return null;
         $mime = pathinfo($image['name'], PATHINFO_EXTENSION);
         $image['mime'] = ($mime == 'jpg') ? 'jpeg' : $mime;
         return $image;

diff --git a/zmsentities/src/Zmsentities/Helper/Messaging.php b/zmsentities/src/Zmsentities/Helper/Messaging.php
@@ -114,7 +114,7 @@ public static function getMailContent(
             $client = $mainProcess->getFirstClient();
         }
 
-        $template = self::getTemplate('mail', $status, $mainProcess);
+        $template = self::getTemplate('mail', $status);
         if ($initiator) {
             $template = self::getTemplate('admin', $status);
         }
@@ -193,15 +193,8 @@ public static function getNotificationContent(Process $process, Config $config,
         return $message;
     }
 
-    protected static function getTemplate($type, $status, ?Process $process = null)
+    protected static function getTemplate($type, $status)
     {
-        $providerName = $process->getCurrentScope()->getProvider()->getDisplayName();
-        $providerTemplate = 'custom/' . $type . '/' .  $status . '/' . (self::slugify($providerName)) . '.twig';
-
-        if (file_exists('messaging/' . $providerTemplate)) {
-            return $providerTemplate;
-        }
-
         $template = null;
         if (Property::__keyExists($type, self::$templates)) {
             if (Property::__keyExists($status, self::$templates[$type])) {
@@ -211,22 +204,6 @@ protected static function getTemplate($type, $status, ?Process $process = null)
         return $template;
     }
 
-    private static function slugify($text, string $divider = '_')
-    {
-        $text = preg_replace('~[^\pL\d]+~u', $divider, $text);
-        $text = iconv('utf-8', 'us-ascii//TRANSLIT', $text);
-        $text = preg_replace('~[^-\w]+~', '', $text);
-        $text = trim($text, $divider);
-        $text = preg_replace('~-+~', $divider, $text);
-        $text = strtolower($text);
-
-        if (empty($text)) {
-            return 'none';
-        }
-
-        return $text;
-    }
-
     public static function getMailSubject(
         Process $process,
         Config $config,