Merge branch 'cypht-filter-start-from-one' of https://github.com/camilevahviraki/cypht into cypht-filter-start-from-one

Author: camilevahviraki

.env.example

@@ -216,7 +216,7 @@ WORDPRESS_CLIENT_URI=
 RECAPTCHA_SECRET=
 RECAPTCHA_SITE_KEY=
 
-CYPHT_MODULES="core,contacts,local_contacts,ldap_contacts,gmail_contacts,feeds,jmap,imap,smtp,account,idle_timer,desktop_notifications,calendar,themes,nux,developer,profiles,imap_folders,sievefilters,tags"
+CYPHT_MODULES="core,contacts,local_contacts,ldap_contacts,gmail_contacts,feeds,jmap,imap,smtp,account,idle_timer,desktop_notifications,calendar,themes,nux,developer,profiles,imap_folders,sievefilters,tags,history"
 
 #LoginPage
 FANCY_LOGIN=false

modules/calendar/js_modules/route_handlers.js

@@ -1,7 +1,7 @@
 function applyCalendarPageHandlers() {
-    $('.event_delete').on("click", function() {
+    $('.event_delete a').on("click", function() {
         if (hm_delete_prompt()) {
-            $(this).parent().submit();
+            $(this).closest('form').submit();
         }
     });
     $('.cal_title').on("click", function(e) {

modules/calendar/site.css

@@ -4,3 +4,7 @@
 .calendar_week td { width: 14%; height: 600px; text-align: left; padding: 10px; border-bottom: solid 1px #eee; vertical-align: top; border-right: solid 1px #eee; }
 .event_details { cursor: pointer; z-index: 100; display: none; position: absolute; width: 300px; border: solid 1px #ddd; background-color: #fff; padding: 10px; }
 .event_details td { padding: 5px; border: none;  height: auto; }
+.event_detail {
+    max-height: 35vh;
+    overflow: auto;
+}

modules/contacts/site.css

@@ -200,4 +200,126 @@
 
 .mobile .add_contact_row a {
     display: none;
-}
+}
+
+/* Table css */
+.contact-group { margin: 0;padding: 0;border: 0;outline: none;font-size: 0;text-align: left;padding-top: 15px; }
+.contact-group>input { position: absolute;left: -9999px; }
+.contact-group>label { position: relative;display: inline-block;margin: 0;padding: 0;border: 0;outline: none;cursor: pointer;transition: all 0.1s;-o-transition: all 0.1s;-ms-transition: all 0.1s;-moz-transition: all 0.1s;-webkit-transition: all 0.1s; }
+.contact-group>label i { display: block;float: left;margin: 16px 8px 0 -2px;padding: 0;border: 0;outline: none;font-family: FontAwesome;font-style: normal;font-size: 17px; }
+.contact-group>input:checked+label { cursor: default; }
+.contact-group>ul { list-style: none;position: relative;display: block;overflow: hidden;margin: 0;padding: 0;border: 0;outline: none;font-size: 13px; }
+.contact-group>ul>li { position: absolute;width: 100%;overflow: auto;padding: 20px 0px;box-sizing: border-box;-moz-box-sizing: border-box;opacity: 0;transition: all 0.5s;-o-transition: all 0.5s;-ms-transition: all 0.5s;-moz-transition: all 0.5s;-webkit-transition: all 0.5s; }
+.contact-group>.tab-content-first:checked~ul .tab-content-first,
+.contact-group>.tab-content-2:checked~ul .tab-content-2,
+.contact-group>.tab-content-3:checked~ul .tab-content-3,
+.contact-group>.tab-content-4:checked~ul .tab-content-4,
+.contact-group>.tab-content-5:checked~ul .tab-content-5,
+.contact-group>.tab-content-6:checked~ul .tab-content-6,
+.contact-group>.tab-content-7:checked~ul .tab-content-7,
+.contact-group>.tab-content-8:checked~ul .tab-content-8,
+.contact-group>.tab-content-9:checked~ul .tab-content-9,
+.contact-group>.tab-content-last:checked~ul .tab-content-last { z-index: 1;top: 0;left: 0;opacity: 1;-webkit-transform: scale(1, 1);-webkit-transform: rotate(0deg); }
+
+.contact-group-height-auto>ul { height: auto !important;}
+.contact-group-height-auto>ul>li { position: static;display: none;height: auto !important; }
+.contact-group-height-auto>.tab-content-first:checked~ul .tab-content-first,
+.contact-group-height-auto>.tab-content-2:checked~ul .tab-content-2,
+.contact-group-height-auto>.tab-content-3:checked~ul .tab-content-3,
+.contact-group-height-auto>.tab-content-4:checked~ul .tab-content-4,
+.contact-group-height-auto>.tab-content-5:checked~ul .tab-content-5,
+.contact-group-height-auto>.tab-content-last:checked~ul .tab-content-last { display: block; }
+.contact-group .grid-row { margin-top: 20px;}
+.contact-group .grid-row:after { content: '';display: table;clear: both; }
+.contact-group .grid-row:first-child { margin-top: 0;}
+.contact-group .grid-col { display: block;float: left;margin-left: 2%; }
+.contact-group .grid-col:first-child { margin-left: 0;}
+.contact-group .grid-col .inner { padding: 10px 0;border-radius: 5px;background: #BDCBE5;text-align: center; }
+.contact-group .grid-col-1 { width: 15%; }
+.contact-group .grid-col-2 { width: 32%; }
+.contact-group .grid-col-3 { width: 49%; }
+.contact-group .grid-col-4 { width: 66%; }
+.contact-group .grid-col-5 { width: 83%; }
+.contact-group .grid-col-offset-1 { margin-left: 19%; }
+.contact-group .grid-col-offset-1:first-child { margin-left: 17%; }
+.contact-group .grid-col-offset-2 { margin-left: 36%; }
+.contact-group .grid-col-offset-2:first-child { margin-left: 34%; }
+.contact-group .grid-col-offset-3 { margin-left: 53%; }
+
+.contact-group .grid-col-offset-3:first-child { margin-left: 51%; }
+
+.contact-group .grid-col-offset-4 { margin-left: 70%; }
+
+.contact-group .grid-col-offset-4:first-child { margin-left: 68%; }
+.contact-group .grid-col-offset-5:first-child { margin-left: 85%; }
+
+.contact-group .typography { color: #666; }
+.contact-group .typography h1,
+.contact-group .typography h2,
+.contact-group .typography h3,
+.contact-group .typography h4,
+.contact-group .typography h5,
+.contact-group .typography h6 { margin: 40px 0 0 0; padding: 0; text-align: left; color: #333; }
+.contact-group .typography h1 { font-size: 40px; line-height: 60px; text-shadow: 3px 3px rgba(0, 0, 0, 0.1); }
+.contact-group .typography h2 { font-size: 32px; line-height: 48px; text-shadow: 2px 2px rgba(0, 0, 0, 0.1); }
+.contact-group .typography h3 { font-size: 26px;line-height: 38px;text-shadow: 1px 1px rgba(0, 0, 0, 0.1); }
+.contact-group .typography h4 { font-size: 20px;line-height: 30px; }
+.contact-group .typography h5 { font-size: 15px;line-height: 23px;text-transform: uppercase; }
+.contact-group .typography h6 { font-size: 13px;line-height: 20px;font-weight: 700;text-transform: uppercase; }
+.contact-group .typography p { margin: 20px 0 0 0;padding: 0;line-height: 20px;text-align: left; }
+.contact-group .typography ul,
+.contact-group .typography ol { list-style: none; margin: 20px 0 0 0; padding: 0; }
+.contact-group .typography li { position: relative; margin-top: 5px; padding-left: 20px; }
+.contact-group .typography li ul,.contact-group .typography li ol { margin-top: 5px; }
+.contact-group .typography ul li:before {content: '';position: absolute;top: 8px;left: 0;width: 6px;height: 4px;background: #404040;}
+.contact-group .typography ol { counter-reset: list1; }
+.contact-group .typography ol>li:before { counter-increment: list1; content: counter(list1)'.'; position: absolute; top: 0; left: 0; }
+.contact-group .typography a { text-decoration: underline; color: #008080; }
+.contact-group .typography a:hover { text-decoration: none; }
+.contact-group .typography .pic { padding: 4px; border: 1px dotted #ccc; }
+.contact-group .typography .pic img { display: block; }
+.contact-group .typography .pic-right { float: right; margin: 0 0 10px 20px;}
+.contact-group .typography .link {text-decoration: underline;color: #008080;cursor: pointer;}
+.contact-group .typography .link:hover {text-decoration: none;}
+.contact-group .typography h1:first-child,.contact-group .typography h2:first-child,.contact-group .typography h3:first-child,.contact-group .typography h4:first-child,.contact-group .typography h5:first-child,.contact-group .typography h6:first-child,.contact-group .typography p:first-child { margin-top: 0; }
+.contact-group .typography .text-center { text-align: center; }
+.contact-group .typography .text-right { text-align: right; }
+.contact-group-steps>label { cursor: default; }
+
+.contact-group-effect-scale>ul>li { -webkit-transform: scale(0.1, 0.1); }
+.contact-group-effect-rotate>ul>li { -webkit-transform: rotate(180deg); }
+.contact-group-effect-slide-top>ul>li { top: -40px; }
+.contact-group-effect-slide-right>ul>li { left: 80px; }
+.contact-group-effect-slide-bottom>ul>li { top: 40px; }
+.contact-group-effect-slide-left>ul>li { left: -80px; }
+
+.contact-group-layout-top-right { text-align: right; }
+.contact-group-layout-top-center { text-align: center; }
+.contact-group>.right { float: right; }
+
+@media screen and (max-width: 980px) {}
+
+@media screen and (max-width: 767px) {
+    .contact-group>label { display: block; }
+    .contact-group>.right { float: none; }
+}
+
+.contact-group>label { padding: 0 20px; background: #e5e5e5; font-size: 13px; line-height: 49px; }
+.contact-group>label:hover { background: #f2f2f2; }
+.contact-group>input:checked+label { background: #f2f2f2; }
+.contact-group>ul { background: #fff;text-align: left; }
+.contact-group-steps>label:hover { background: #e5e5e5; }
+
+.contact-group-theme-1>label { margin: 0 5px 5px 0;border-radius: 5px;background: #fff;box-shadow: 0 2px rgba(0, 0, 0, 0.2);color: #808080;opacity: 0.8; }
+.contact-group-theme-1>label:hover { opacity: 1; }
+.contact-group-theme-1>input:checked+label { margin-bottom: 0; padding-bottom: 5px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; color: 008080; opacity: 1; }
+.contact-group-theme-1>ul { border-radius: 5px; }
+.contact-group-theme-1>.tab-content-first:checked~ul { border-top-left-radius: 0; }
+@media screen and (max-width: 767px) {
+    .contact-group-theme-1>label { margin-right: 0 }
+    .contact-group-theme-1>input:checked+label { margin-bottom: 5px; padding-bottom: 0; border-radius: 5px }
+    .contact-group-theme-1>.tab-content-first:checked~ul { border-top-left-radius: 5px; }
+}
+
+.contact-group>ul,
+.contact-group>ul>li {height: 100vh;}

modules/core/functions.php

@@ -383,7 +383,7 @@ function save_user_settings($handler, $form, $logout) {
             Hm_Msgs::add('Could not save settings: ' . $e->getMessage(), 'warning');
         }
     }
-    
+
 }}
 
 /**
@@ -486,6 +486,9 @@ function get_tls_stream_type() {
         $method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
         $method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
     }
+    if (defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT')) {
+        $method |= STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT;
+    }
     return $method;
 }}
 
@@ -550,7 +553,7 @@ function in_server_list($list, $id, $user) {
 /**
  * Perform a check on last added server
  * It gets deleted if already configured
- * 
+ *
  * @param string $list class to process on check
  * @param string $user username to check for
  * @return bool
@@ -777,3 +780,8 @@ function getSettingsSectionOutput($section, $sectionLabel, $sectionIcon, $settin
     return $res;
 }
 
+function isPageConfigured($page) {
+    $pages = array_keys(Hm_Handler_Modules::dump());
+    return in_array($page, $pages);
+}
+

modules/core/handler_modules.php

@@ -1179,7 +1179,11 @@ public function process() {
                     $this->out('imap_service_name', $provider);
                 }
                 $this->out('just_saved_credentials', true);
-                Hm_Msgs::add("Server saved. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
+                if (isPageConfigured('save')) {
+                    Hm_Msgs::add("Server saved. To preserve these settings after logout, please go to <a class='alert-link' href='/?page=save'>Save Settings</a>.");
+                } else {
+                    Hm_Msgs::add("Server saved.");
+                }
             }
 
             if ($createProfile && $this->smtp_server_id && ($this->imap_server_id || $this->jmap_server_id)) {

modules/core/hm-mailbox.php

@@ -559,25 +559,25 @@ public function set_search_charset($charset) {
         }
     }
 
-    public function search($folder, $target='ALL', $terms=array(), $sort=null, $reverse=null, $exclude_deleted=true, $exclude_auto_bcc=true, $only_auto_bcc=false) {
+    public function search($folder, $target='ALL', $terms=array(), $sort=null, $reverse=null, $exclude_deleted=true, $only_auto_bcc=false) {
         if (! $this->select_folder($folder)) {
             return [];
         }
         if ($this->is_imap()) {
             if ($sort) {
                 if ($this->connection->is_supported('SORT')) {
                     // use fast sort extension and search simultanously
-                    $uids = $this->connection->get_message_sort_order($sort, $reverse, $target, $terms, $exclude_deleted, $exclude_auto_bcc, $only_auto_bcc);
+                    $uids = $this->connection->get_message_sort_order($sort, $reverse, $target, $terms, $exclude_deleted, $only_auto_bcc);
                 } else {
                     // search first and then sort only the found ones by fetch
-                    $uids = $this->connection->search($target, false, $terms, [], $exclude_deleted, $exclude_auto_bcc, $only_auto_bcc);
+                    $uids = $this->connection->search($target, false, $terms, [], $exclude_deleted, $only_auto_bcc);
                     if ($uids) {
                         $uids = $this->connection->sort_by_fetch($sort, $reverse, $target, implode(',', $uids));
                     }
                 }
             } else {
                 // just search with default sort order
-                $uids = $this->connection->search($target, false, $terms, [], $exclude_deleted, $exclude_auto_bcc, $only_auto_bcc);
+                $uids = $this->connection->search($target, false, $terms, [], $exclude_deleted, $only_auto_bcc);
             }
             return $uids;
         } else {
@@ -587,12 +587,12 @@ public function search($folder, $target='ALL', $terms=array(), $sort=null, $reve
         }
     }
 
-    public function get_message_list($folder, $msg_ids) {
+    public function get_message_list($folder, $msg_ids, $exclude_auto_bcc = true) {
         if (! $this->select_folder($folder)) {
             return [];
         }
         if ($this->is_imap()) {
-            return $this->connection->get_message_list($msg_ids);
+            return $this->connection->get_message_list($msg_ids, exclude_auto_bcc: $exclude_auto_bcc);
         } else {
             return $this->connection->get_message_list($msg_ids);
         }

modules/core/js_modules/Hm_MessagesStore.js

@@ -312,7 +312,7 @@ class Hm_MessagesStore {
         } else {
             if (this.path == 'tag') {
                 config.push({ name: "hm_ajax_hook", value: 'ajax_imap_tag_data' });
-                config.push({ name: "folder", value: getParam('tag_id') });
+                config.push({ name: "folder", value: getParam('filter') });
                 configs.push(config);
             } else {
                 let sources = hm_data_sources();

modules/core/navigation/navigation.js

@@ -30,6 +30,10 @@ window.addEventListener('popstate', function(event) {
 });
 
 window.addEventListener('load', function() {
+    if (!hm_is_logged()) {
+        return;
+    }
+    
     const unMountCallback = renderPage(window.location.href);
     history.replaceState({ main: $('#cypht-main').prop('outerHTML'), scripts: extractCustomScripts($(document)) }, "");
 

modules/core/navigation/routes.js

@@ -81,6 +81,10 @@ const modulesRoutes = [
     {
         page: 'shortcuts',
         handler: 'applyShortcutsPageHandlers'
+    },
+    {
+        page: 'tags',
+        handler: 'applyTagsPageHandlers'
     }
 ]