Merge all to 2.x

.env.example

@@ -17,6 +17,7 @@ IMAP_AUTH_SERVER=localhost
 IMAP_AUTH_PORT=143
 IMAP_AUTH_TLS=
 IMAP_AUTH_SIEVE_CONF_HOST=
+IMAP_AUTH_SIEVE_TLS_MODE=true
 
 DEFAULT_SMTP_NAME=
 DEFAULT_SMTP_SERVER=
@@ -28,8 +29,6 @@ USER_CONFIG_TYPE=file
 USER_SETTINGS_DIR=/var/lib/hm3/users
 ATTACHMENT_DIR=/var/lib/hm3/attachments
 
-DISABLE_ORIGIN_CHECK=false
-
 ADMIN_USERS=
 
 COOKIE_DOMAIN=
@@ -74,7 +73,7 @@ ENCRYPT_LOCAL_STORAGE=
 
 DISABLE_IP_CHECK=false
 
-DISABLE_ORIGIN_CHECK=true
+DISABLE_ORIGIN_CHECK=false
 
 ALLOW_EXTERNAL_IMAGE_SOURCES=true
 
@@ -207,4 +206,6 @@ FANCY_LOGIN=false
 #Windows CA certificates
 #Get ON https://curl.se/ca/cacert.pem
 #Depending on your PHP Directory, e.g. "c:\php\extras\ssl\cacert.pem"
-WIN_CACERT_DIR=
+WIN_CACERT_DIR=
+
+JS_EXCLUDE_DEPS=

README.md

@@ -4,8 +4,10 @@
 #### Cypht
 [https://cypht.org](https://cypht.org)
 
-All your E-mail, from all your accounts, in one place. Cypht is like a news 
-reader, but for E-mail. Cypht does not replace your existing accounts - it 
+All your email, from all your accounts, in one place. Supports IMAP/SMTP, 
+[JMAP](https://github.com/cypht-org/cypht/issues/180) and 
+[soon EWS](https://github.com/cypht-org/cypht/issues/247). Cypht is like a 
+news reader, but for E-mail. Cypht does not replace your existing accounts - it 
 combines them into one. And it's also a news reader.
 
 ![screenshot](https://github.com/cypht-org/cypht-website/blob/master/img/Inbox.PNG "Inbox View").

config/app.php

@@ -135,10 +135,18 @@
     /*
     |
     | The hostname/IP address and port sieve is listening on. Example: example.org:4190
-    | Note: Add tls:// prefix to enable explicit STARTTLS
+    | Keep this blank to disable sieve filter support on login
     |
     */
-    'imap_auth_sieve_conf_host' => env('IMAP_AUTH_SIEVE_CONF_HOST', 'tls://mail.gandi.net:4190'),
+    'imap_auth_sieve_conf_host' => env('IMAP_AUTH_SIEVE_CONF_HOST', ''),
+
+    /*
+    |
+    | this will add the tls:// prefix to the sieve host if set to true
+    | to make this work make sure you set DEFAULT_SETTING_ENABLE_SIEVE_FILTER to true
+    |
+    */
+    'imap_auth_sieve_tls_mode' => env('IMAP_AUTH_SIEVE_TLS_MODE', true),
 
     /*
     | -------------------
@@ -1309,4 +1317,6 @@
     | Use this setting switch between the legacy login page and the fancy one
     */
     'fancy_login' => env('FANCY_LOGIN', false),
+
+    'js_exclude_deps' => env('JS_EXCLUDE_DEPS', ''),
 ];

lib/auth.php

@@ -160,6 +160,7 @@ class Hm_Auth_IMAP extends Hm_Auth {
     public function __construct($config) {
         $this->site_config = $config;
         require_once APP_PATH.'modules/imap/hm-imap.php';
+        include_once APP_PATH.'modules/sievefilters/hm-sieve.php';
     }
 
     /* IMAP authentication server settings */
@@ -194,7 +195,7 @@ private function check_connection($imap) {
      */
     public function check_credentials($user, $pass) {
         $imap = new Hm_IMAP();
-        list($server, $port, $tls, $sieve_config) = get_auth_config($this->site_config, 'imap');
+        list($server, $port, $tls, $sieve_config, $sieve_tls_mode) = get_auth_config($this->site_config, 'imap');
         if (!$user || !$pass || !$server || !$port) {
             Hm_Debug::add($imap->show_debug(true));
             Hm_Debug::add('Invalid IMAP auth configuration settings');
@@ -203,7 +204,8 @@ public function check_credentials($user, $pass) {
         $this->imap_settings = ['server' => $server, 'port' => $port,
             'tls' => $tls, 'username' => $user, 'password' => $pass,
             'no_caps' => false, 'blacklisted_extensions' => ['enable'],
-            'sieve_config_host' => $sieve_config
+            'sieve_config_host' => $sieve_config,
+            'sieve_tls' => $sieve_tls_mode
         ];
         return $this->check_connection($imap);
     }
@@ -319,6 +321,7 @@ function get_auth_config($config, $prefix) {
     $ret = [$server, $port, $tls];
     if ($prefix == 'imap') {
         $ret[] = $config->get($prefix.'_auth_sieve_conf_host', false);
+        $ret[] = $config->get($prefix.'_auth_sieve_tls_mode', false);
     }
     return $ret;
 }

lib/framework.php

@@ -35,6 +35,7 @@
 require APP_PATH.'lib/servers.php';
 require APP_PATH.'lib/api.php';
 require APP_PATH.'lib/webdav_formats.php';
+require APP_PATH.'lib/js_libs.php';
 
 require_once APP_PATH.'modules/core/functions.php';
 

lib/js_libs.php

@@ -0,0 +1,32 @@
+<?php
+
+define('JS_LIBS', [
+    'bootstrap' => 'vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js',
+    'cash' => 'third_party/cash.min.js',
+    'resumable' => 'third_party/resumable.min.js',
+    'ays-beforeunload-shim' =>  'third_party/ays-beforeunload-shim.js',
+    'jquery-are-you-sure' => 'third_party/jquery.are-you-sure.js',
+    'sortable' => 'third_party/sortable.min.js'
+]);
+
+function get_js_libs($exclude_deps = []) {
+    $js_lib = '';
+
+    foreach (JS_LIBS as $dep) {
+        if (!in_array($dep, $exclude_deps)) {
+            $js_lib .= '<script type="text/javascript" src="'.WEB_ROOT.$dep.'"></script>';
+        }
+    }
+    return $js_lib;
+}
+
+function get_js_libs_content($exclude_deps = []) {
+    $js_lib = '';
+
+    foreach (JS_LIBS as $key => $dep) {
+        if (!in_array($key, $exclude_deps)) {
+            $js_lib .= file_get_contents(APP_PATH.$dep);
+        }
+    }
+    return $js_lib;
+}

lib/module.php

@@ -191,14 +191,22 @@ trait Hm_Handler_Validate {
      * @return bool
      */
     public function validate_method($session, $request) {
-        if (!in_array(mb_strtolower($request->method), ['get', 'post'], true)) {
-            if ($session->loaded) {
-                $session->destroy($request);
-                Hm_Debug::add(sprintf('LOGGED OUT: invalid method %s', $request->method));
+        if (!empty($request->method) && is_string($request->method)) {
+            if (!in_array(mb_strtolower($request->method), ['get', 'post'], true)) {
+                if ($session->loaded) {
+                    $session->destroy($request);
+                    Hm_Debug::add(sprintf('LOGGED OUT: invalid method %s', $request->method));
+                }
+                return false;
             }
-            return false;
+            return true;
         }
-        return true;
+        // Handle the case where method is null or invalid
+        if ($session->loaded) {
+            $session->destroy($request);
+            Hm_Debug::add('LOGGED OUT: missing or invalid request method');
+        }
+        return false;
     }
 
     /**

lib/modules_exec.php

@@ -201,7 +201,8 @@ public function merge_response($request, $session, $page) {
             'router_login_state'  => $session->is_active(),
             'router_url_path'     => $request->path,
             'router_module_list'  => $this->site_config->get_modules(),
-            'router_app_name'     => $this->site_config->get('app_name', 'HM3')
+            'router_app_name'     => $this->site_config->get('app_name', 'HM3'),
+            'router_js_exclude_deps' => $this->site_config->get('js_exclude_deps'),
         ));
     }
 }

lib/request.php

@@ -175,7 +175,7 @@ private function is_mobile() {
             $this->mobile = true;
             return;
         }
-        if (array_key_exists('HTTP_USER_AGENT', $this->server)) {
+        if (!empty($this->server['HTTP_USER_AGENT'])) {
             if (preg_match("/(iphone|ipod|ipad|android|blackberry|webos|opera mini)/i", $this->server['HTTP_USER_AGENT'])) {
                 $this->mobile = true;
             }

modules/account/modules.php

@@ -208,7 +208,7 @@ protected function output() {
         if ($this->get('internal_users')) {
             $res = '<li class="menu_change_password"><a class="unread_link" href="?page=change_password">';
             if (!$this->get('hide_folder_icons')) {
-                $res .= '<i class="bi bi-key-fill fs-5 me-2"></i>';
+                $res .= '<i class="bi bi-key-fill menu-icon"></i>';
             }
             $res .= $this->trans('Password').'</a></li>';
             $this->concat('formatted_folder_list', $res);

modules/calendar/modules.php

@@ -132,7 +132,7 @@ class Hm_Output_calendar_page_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_calendar"><a class="unread_link" href="?page=calendar">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<i class="bi bi-calendar-week-fill fs-5 me-2"></i>';
+            $res .= '<i class="bi bi-calendar-week-fill menu-icon"></i>';
         }
         $res .= $this->trans('Calendar').'</a></li>';
         if ($this->format == 'HTML5') {

modules/contacts/hm-contacts.php

@@ -139,13 +139,65 @@ public function reset() {
         $this->data = array();
     }
 
-    public function page($page, $size) {
+    public function page($page, $size, $data = null) {
         if ($page < 1) {
             return array();
         }
-        return array_slice($this->data, (($page - 1)*$size), $size, true);
+        if ($data === null) {
+            $data = $this->data;
+        }
+        return array_slice($data, (($page - 1)*$size), $size, true);
     }
 
+    public function group_by($column = 'group') {
+        if (!is_string($column) && !is_int($column) && !is_float($column)) {
+            trigger_error('group_by(): The key should be a string, an integer, or a float', E_USER_ERROR);
+            return null;
+        }
+
+        $_key = $column;
+        $grouped = [];
+        $defaultGroup = 'Collected Recipients';
+
+        foreach ($this->data as $value) {
+            $columnValue = null;
+
+            if (is_array($value) && isset($value[$_key])) {
+                $columnValue = $value[$_key];
+            }
+            elseif (is_object($value) && method_exists($value, 'value') && $value->value($_key)) {
+                $columnValue = $value->value($_key);
+            }
+
+            if ($columnValue === null) {
+                $columnValue = $defaultGroup;
+            }
+
+            $grouped[$columnValue][] = $value;
+        }
+
+        if (func_num_args() > 1) {
+            $args = func_get_args();
+            foreach ($grouped as $key => $values) {
+                $params = array_merge([ $values ], array_slice($args, 1));
+                $grouped[$key] = call_user_func_array([ $this, 'group_by' ], $params);
+            }
+        }
+
+        return $grouped;
+    }
+
+
+
+    public function paginate_grouped($column, $page, $size) {
+        $grouped = $this->group_by($column);
+        $paginated = [];
+        foreach ($grouped as $key => $group) {
+            $paginated[$key] = $this->page($page, $size, $group);
+        }
+        return $paginated;
+    }
+
     public function sort($fld) {
         $this->sort_fld = $fld;
         uasort($this->data, array($this, 'sort_callback'));