WIP for JMAP support (issue #180)

cypht-org · Jan 16, 2019 · af0b416 · af0b416
1 parent 9e8d8f6
commit af0b416
Show file tree

Hide file tree

Showing 4 changed files with 555 additions and 7 deletions.
diff --git a/modules/imap/hm-imap.php b/modules/imap/hm-imap.php
@@ -10,6 +10,7 @@
 require_once('hm-imap-parser.php');
 require_once('hm-imap-cache.php');
 require_once('hm-imap-bodystructure.php');
+require_once('hm-jmap.php');
 
 /**
  * IMAP connection manager
@@ -22,14 +23,20 @@ class Hm_IMAP_List {
     public static $use_cache = true;
 
     public static function service_connect($id, $server, $user, $pass, $cache=false) {
-        self::$server_list[$id]['object'] = new Hm_IMAP();
+        if (array_key_exists('type', $server) && $server['type'] == 'jmap') {
+            self::$server_list[$id]['object'] = new Hm_JMAP();
+        }
+        else {
+            self::$server_list[$id]['object'] = new Hm_IMAP();
+        }
         if (self::$use_cache && $cache && is_array($cache)) {
             self::$server_list[$id]['object']->load_cache($cache, 'array');
         }
         $config = array(
             'server'    => $server['server'],
             'port'      => $server['port'],
             'tls'       => $server['tls'],
+            'type'      => array_key_exists('type', $server) ? $server['type'] : 'imap',
             'username'  => $user,
             'password'  => $pass,
             'use_cache' => self::$use_cache
@@ -2090,6 +2097,7 @@ public function get_folder_list_by_level($level='') {
                 'basename' => $folder['basename'],
                 'children' => $folder['has_kids'],
                 'noselect' => $folder['noselect'],
+                'id' => bin2hex($folder['basename']),
                 'name_parts' => $folder['name_parts'],
             );
         }