andre 2 éve
szülő
commit
09faf21159
1 módosított fájl, 20 hozzáadás és 30 törlés
  1. 20 30
      app/UI/Client/EmailAlias/Pages/Aliases.php

+ 20 - 30
app/UI/Client/EmailAlias/Pages/Aliases.php

@@ -70,9 +70,7 @@ class Aliases extends DataTable implements ClientArea
         $fields = array(
             "id",
             "name",
-            "deliverToId",
-            "deliverTo",
-            "type");
+            "deliverTo");
 
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
@@ -106,42 +104,34 @@ class Aliases extends DataTable implements ClientArea
             );
             return ['error' => $error->getMessage()];
         }
+        $api->logout();
+
+        /**
+         * format model to array
+         */
+        $data = [];
+        foreach ($aliases as $alias)
+        {
+            /* @var $alias AccountAlias */
+            $tmp = [
+                'id'            => $alias['id'],
+                'email_alias'   => $alias['name'] . '@' . $this->maildomain,
+                'account'       => $alias['deliverTo']
+            ];
+
+            $data[] = $tmp;
+        }
 
         logModuleCall(
             'kerioEmail',
             __FUNCTION__,
-            $this->maildomainID,
+            $data,
             'Debug Error',
             $aliases
         );
 
-        $api->logout();
-
-        /*
-        $aliases     = (new KerioManager())
-            ->getApiByServer($hosting->server)
-            ->soap->repository()
-            ->accounts
-            ->getAccountAliasesByDomainName($hosting->domain);
-*/
-        /**
-         * format model to array
-         */
-        $data = [];
-//        foreach ($aliases as $alias)
-//        {
-//            /* @var $alias AccountAlias */
-//            $tmp = [
-//                'id'            => base64_encode(json_encode(['alias' => $alias->getAlias(), 'accId' => $alias->getAccountId()])),
-//                'email_alias'   => $alias->getAlias(),
-//                'account'       => $alias->getAccountName()
-//            ];
-
-//            $data[] = $tmp;
-//        }
-
         $dataProv = new ArrayDataProvider();
-        $dataProv->setDefaultSorting('account', 'ASC')->setData($data);
+        $dataProv->setDefaultSorting('email_alias', 'ASC')->setData($data);
 
         $this->setDataProvider($dataProv);
     }