Merge branch 'master' into msg-actions-buttons

Author: pom2ter

CONTRIBUTING.md

@@ -1,6 +1,130 @@
-We appreciate all feedback and support of the project.
-Please use the issue tracker at GitHub to submit bug reports or feature requests:
+# How to contribute
 
-https://github.com/cypht-org/cypht/issues
+Thank you for choosing Cypht webmail and for your willingness to contribute to its development! Your support helps make it better for everyone. There are many ways to get involved, regardless of your technical skill level: you can **report a bug** you've encountered, **propose an exciting new feature**, submit a **code fix** for an existing issue, or **improve our documentation** to make it clearer for other users. Every contribution, big or small, is valued and makes a real difference to the project and our community.
+
+## Reporting Bugs
+
+Bugs are tracked as [GitHub issues](https://github.com/cypht-org/cypht/issues). Before creating a new issue:
+- **Search existing issues** to see if the problem has already been reported.
+- If it's a new bug, **create a new issue**.
+
+Please provide the following information in your bug report:
+- A clear, descriptive title.
+- A detailed description of the behavior and what you expected to happen instead.
+- Steps to reproduce the problem.
+- Your environment: OS (name and version), Browser, and any other relevant details.
+
+## Suggesting new features
+
+We welcome ideas for new features and improvements. For any new proposed feature, you need to create also a **new issue**. This allows maintainers and the community to discuss the approach before you write any code. Before submitting the issue:
+-  **search existing ideas** to avoid duplicates,
+-  **Provide a clear description** of the proposed feature and the problem it solves. 
+
+## Submit a bug fix
+
+Always link your code changes to a GitHub issue. If one doesn't exist for your change, please create it first. Next you will need to follow the Git workflow.
+
+## Git contribution workflow
+
+1. Fork the Official Repository
+
+Navigate to the official Cypht repository on GitHub (https://github.com/cypht-org/cypht) and click the "Fork" button in the top-right corner.
+
+2. Clone Your Fork Locally
+
+```
+git clone https://github.com/YOUR_USERNAME/cypht.git
+cd cypht
+```
+
+3. Configure Remote Repositories (origin & upstream)
+
+```
+# Check the existing remote name (it should be 'origin' pointing to your fork)
+git remote -v
+
+# Add the official Cypht repository as the 'upstream' remote
+git remote add upstream https://github.com/cypht-org/cypht.git
+
+# Verify both remotes are set correctly
+git remote -v
+```
+
+4. Create a new Branch (for the new Feature or a bug fix)
+
+```
+git checkout -b feature-amazing-new-feature
+# or
+git checkout -b fix-issue-123-description
+```
+
+5. Write Code and run tests
+
+**Code **
+
+This is the core development phase where you implement your change. Before writing a line of code, take a moment to explore Cypht's architecture and code style.
+
+Make changes that are minimal and specific to the issue you are solving. Avoid unnecessary refactoring or style changes in unrelated code.
+
+Match the existing code style (indentation, bracket placement, naming conventions for variables and functions). This makes your code feel like a natural part of the project.
+
+Add clear comments for complex logic, but strive to write code that is self-documenting through good variable and function names.
+
+**Manual test**
+
+Manual testing is your first line of defense to catch obvious issues and logic errors. **Do not skip this**. 
+
+Example:
+
+**For a Backend/Bug Fix** (e.g., fixing IMAP connection errors):
+
+- **Reproduce the Bug**: First, confirm you can reproduce the original issue described on GitHub.
+
+- **Test the Fix**: Apply your change and verify the specific error no longer occurs.
+
+- **Check for Regressions**: This is vital. Does your fix break any other existing functionality?
+
+    - Can you still read emails?
+    - Can you still send emails?
+    - Do all the other modules still load correctly?
+
+- **Test with Different Configurations**: If possible, test with different mail servers to ensure robustness.
+
+**Write Automated tests (for the new feature... if possible)**
+
+6. Run automated tests (if possible)
+
+ - Unit Tests and integration tests with PHPUnit
+ - End to end tests with Selenium
+
+You can learn about how to run these tests [here](https://www.cypht.org/developers-documentation/) in the **Run Tests** section.
+
+7. Commit Changes
+
+Stage and commit your changes with clear, descriptive messages.
+
+```
+# Stage changes
+git add .
+
+# Commit changes (be specific!)
+git commit -m "feat(backend): allow search flagged in all folders if enabled in settings"
+```
+
+8. Push to Your Fork and Create a Pull Request (PR)
+
+```
+git push -u origin feature-allow-flagged-emails-search
+```
+
+Go to your fork on GitHub. You will see a prompt to "Compare & pull request" for the newly pushed branch. Click it.
+
+Fill out the PR template:
+
+- Title: Clear summary
+- Description: Detail what you did, why you did it, and how it can be tested (if possible).
+
+
+**We appreciate all feedback and support of the project.**
 
 If you have questions, please join our chat at: https://gitter.im/cypht-org/community

config/app.php

@@ -795,7 +795,7 @@
     //     |
     //     | Github repository tracking.
     //     */
-    //     // 'github',
+        'github',
 
     //     /*
     //     | ---------
@@ -813,7 +813,7 @@
     //     |
     //     | WordPress.com notifications.
     //     */
-    //     // 'wordpress',
+        'wordpress',
 
     //     /*
     //     | -------

config/database.php

@@ -72,10 +72,10 @@
     | defined above, and the db user must have read-write access to it:
     |
     |  Postgresql:
-    |   CREATE TABLE hm_user_session (hm_id varchar(250) primary key not null, data text, hm_version INTEGEF DEFAULT 1, date timestamp);
+    |   CREATE TABLE hm_user_session (hm_id varchar(250) primary key not null, data text, hm_version INTEGER DEFAULT 1, date timestamp);
     |
     |  MySQL or SQLite:
-    |   CREATE TABLE hm_user_session (hm_id varchar(180), data longblob, hm_version INTEGEF DEFAULT 1, lock INTEGER DEFAULT 0, date timestamp, primary key (hm_id));
+    |   CREATE TABLE hm_user_session (hm_id varchar(180), data longblob, hm_version INTEGER DEFAULT 1, lock INTEGER DEFAULT 0, date timestamp, primary key (hm_id));
     |
     |
     | DB Authentication

docker/Dockerfile

@@ -82,6 +82,7 @@ COPY index.php index.php
 # Entrypoint
 COPY docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+COPY .env.example .env
 
 # Healthcheck
 HEALTHCHECK CMD curl --fail http://localhost || exit 1

docker/docker-compose.yaml

@@ -1,4 +1,5 @@
-version: '3.8'
+# this is a demo of using the production cypht image
+
 services:
   db:
     image: mariadb:10
@@ -12,7 +13,7 @@ services:
       - MYSQL_USER=cypht
       - MYSQL_PASSWORD=cypht_password
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-ucypht", "-pcypht_password"]
       interval: 10s
       timeout: 5s
       retries: 5

lib/framework.php

@@ -10,6 +10,7 @@
 
 /* load the framework */
 require APP_PATH.'lib/repository.php';
+require APP_PATH.'lib/searchable.php';
 require APP_PATH.'lib/module.php';
 require APP_PATH.'lib/modules.php';
 require APP_PATH.'lib/modules_exec.php';

lib/searchable.php

@@ -0,0 +1,27 @@
+<?php
+
+trait Searchable {
+    /**
+     * Return items matching $match in column $column.
+     *
+     * @param mixed  $match
+     * @param string $column
+     * @param bool   $returnFirst
+     * @return array|null
+     */
+    public static function getBy($match, $column = 'id', $returnFirst = false) {
+        $results = [];
+        foreach (static::getDataset() as $item) {
+            if (isset($item[$column]) && $item[$column] === $match) {
+                if ($returnFirst) {
+                    return $item;
+                }
+                $results[] = $item;
+            }
+        }
+        return $returnFirst ? null : $results;
+    }
+
+    // Each class must implement this
+    abstract protected static function getDataset();
+}

lib/servers.php

@@ -174,6 +174,7 @@ public static function toggle_hidden($id, $hide) {
 trait Hm_Server_List {
 
     use Hm_Server_Modify;
+    use Searchable;
     use Hm_Repository {
         Hm_Repository::add as repo_add;
         Hm_Repository::get as repo_get;
@@ -216,24 +217,11 @@ public static function dump($id = false, $full = false) {
     }
 
     /**
-     * Return server details matching $match in column $column.
-     *
-     * @param mixed  $match        Value to match.
-     * @param string $column       Column name to match against.
-     * @param bool   $returnFirst  If true, return only the first matching server.
-     * @return array|null          Array of matches, or a single server array, or null if no match.
+     * Get the dataset for the server list
+     * @return array
      */
-    public static function getBy($match, $column = 'id', $returnFirst = false) {
-        $results = [];
-        foreach (self::$server_list as $server) {
-            if (isset($server[$column]) && $server[$column] === $match) {
-                if ($returnFirst) {
-                    return $server;
-                }
-                $results[] = $server;
-            }
-        }
-        return $returnFirst ? null : $results;
+    protected static function getDataset() {
+        return self::$server_list;
     }
 
     /**

modules/core/hm-mailbox.php

@@ -240,12 +240,12 @@ public function get_folders($only_subscribed = false) {
         }
     }
 
-    public function get_subfolders($folder, $only_subscribed = false, $with_input = false) {
+    public function get_subfolders($folder, $only_subscribed = false, $with_input = false, $count_children = false) {
         if (! $this->authed()) {
             return;
         }
         if ($this->is_imap()) {
-            return $this->connection->get_folder_list_by_level($folder, $only_subscribed, $with_input);
+            return $this->connection->get_folder_list_by_level($folder, $only_subscribed, $with_input, $count_children);
         } else {
             return $this->connection->get_folders($folder, $only_subscribed, $this->user_config->get('unsubscribed_folders')[$this->server_id] ?? [], $with_input);
         }