chore: default branch is now main, no longer master

Author: HugoFara

.github/workflows/docker-image.yml

@@ -2,7 +2,7 @@ name: Build and push Docker images
 
 on:
   push:
-    branches: [ 'master' ]
+    branches: [ 'main' ]
   release:
     types: [ published ]
 

.github/workflows/php.yml

@@ -2,9 +2,9 @@ name: Composer CI
 
 on:
   push:
-    branches: [ master, dev ]
+    branches: [ main, dev ]
   pull_request:
-    branches: [ master, dev ]
+    branches: [ main, dev ]
 
 jobs:
   build:

CLAUDE.md

@@ -243,7 +243,7 @@ Migration files in `db/migrations/` with format `YYYYMMDD_HHMMSS_description.sql
 
 Branches:
 
-- `master` - Stable releases
+- `main` - Stable releases
 - `dev` - Development branch
 
 Before committing:

README.md

@@ -1,7 +1,7 @@
 # Learning with Texts
 
 <p align="center">
-  <img src="https://github.com/HugoFara/lwt/raw/master/img/lwt_icon_big.jpg" alt="LWT logo - an open book" width="200"/>
+  <img src="https://github.com/HugoFara/lwt/raw/main/img/lwt_icon_big.jpg" alt="LWT logo - an open book" width="200"/>
 </p>
 
 <p align="center">
@@ -51,15 +51,15 @@ Then open <http://localhost:8010/lwt/> in your browser.
 
 **1. Import a text** — Paste any content you want to read, or import from RSS feeds.
 
-![Adding French text](https://github.com/HugoFara/lwt/raw/master/img/05.jpg)
+![Adding French text](https://github.com/HugoFara/lwt/raw/main/img/05.jpg)
 
 **2. Read and learn** — Unknown words are highlighted. Click any word to see its translation and save it to your vocabulary.
 
-![Learning French text](https://github.com/HugoFara/lwt/raw/master/img/06.jpg)
+![Learning French text](https://github.com/HugoFara/lwt/raw/main/img/06.jpg)
 
 **3. Review with context** — Practice vocabulary with spaced repetition, always seeing words in their original context.
 
-![Reviewing French word](https://github.com/HugoFara/lwt/raw/master/img/07.jpg)
+![Reviewing French word](https://github.com/HugoFara/lwt/raw/main/img/07.jpg)
 
 Unlike flashcard apps like [Anki](https://apps.ankiweb.net/), LWT keeps words connected to the texts where you found them. We also include an Anki exporter if you want both.
 
@@ -126,8 +126,8 @@ Access at <http://localhost:8010/lwt/>
 
 ```bash
 # Download and extract the latest release
-wget https://github.com/HugoFara/lwt/archive/refs/heads/master.zip
-unzip master.zip && cd lwt-master
+wget https://github.com/HugoFara/lwt/archive/refs/heads/main.zip
+unzip main.zip && cd lwt-main
 
 # Run the installer
 chmod +x ./INSTALL.sh
@@ -202,7 +202,7 @@ npm run build:all          # Production build
 
 | Branch | Purpose |
 | --- | --- |
-| `master` | Stable releases |
+| `main` | Stable releases |
 | `dev` | Development and testing |
 | `official` | Tracks official LWT releases |
 

docs-src/.vitepress/config.ts

@@ -124,7 +124,7 @@ export default defineConfig({
     },
 
     editLink: {
-      pattern: 'https://github.com/HugoFara/lwt/edit/master/docs-src/:path',
+      pattern: 'https://github.com/HugoFara/lwt/edit/main/docs-src/:path',
       text: 'Edit this page on GitHub'
     }
   }

docs-src/changelog.md

@@ -15,6 +15,60 @@ ones are marked like "v1.0.0-fork".
 ### Added
 
 * Official support for PHP 8.3 and 8.4.
+* **Multi-user support** ([#221](https://github.com/HugoFara/lwt/issues/221)):
+  Users are now stored in a dedicated `users` table with proper foreign key
+  relationships instead of using table prefixes. Includes user authentication,
+  registration, and role-based access (user/admin).
+* **MVC Architecture** ([#212](https://github.com/HugoFara/lwt/issues/212),
+  [#215](https://github.com/HugoFara/lwt/issues/215)): Complete restructure of
+  the PHP codebase following the Model-View-Controller pattern:
+  * Controllers in `src/backend/Controllers/` (17 controller classes)
+  * Services in `src/backend/Services/` (35 service classes)
+  * Views in `src/backend/Views/`
+  * Router-based URL handling in `src/backend/Router/`
+* **Front Controller Pattern** ([#213](https://github.com/HugoFara/lwt/issues/213)):
+  All requests now route through `index.php`. The root folder no longer contains
+  dozens of PHP files - only `index.php` and `router.php` remain.
+* **Alpine.js Frontend Framework** ([#208](https://github.com/HugoFara/lwt/issues/208)):
+  Adopted Alpine.js for reactive UI components, reducing reliance on PHP-rendered
+  pages for user interactions.
+* **TypeScript Migration** ([#209](https://github.com/HugoFara/lwt/issues/209)):
+  Frontend JavaScript converted to TypeScript with 90+ `.ts` files organized in
+  `src/frontend/js/` with proper module structure (api/, core/, reading/, testing/,
+  feeds/, languages/, etc.).
+* **jQuery Removal** ([#211](https://github.com/HugoFara/lwt/issues/211)):
+  jQuery has been replaced with modern vanilla JavaScript and Alpine.js.
+* **Overlib Replacement** ([#214](https://github.com/HugoFara/lwt/issues/214)):
+  The 20-year-old overlib library has been removed in favor of modern alternatives.
+* **HoverIntent Replacement** ([#210](https://github.com/HugoFara/lwt/issues/210)):
+  The `briancherne/jquery-hoverintent` plugin has been replaced with a native
+  TypeScript implementation.
+* **Iframe Replacement** ([#166](https://github.com/HugoFara/lwt/issues/166)):
+  Legacy iframe-based dynamic content loading replaced with Alpine.js components
+  and REST API calls. Only dictionary iframes remain for external dictionary display.
+
+### Changed
+
+* **Database Engine Migration** ([#220](https://github.com/HugoFara/lwt/issues/220)):
+  All permanent tables converted from MyISAM to InnoDB engine. Benefits include:
+  * ACID transaction support
+  * Row-level locking for better concurrency
+  * Foreign key constraints for data integrity
+  * Improved crash recovery
+* **Inter-Table Foreign Keys** ([#220](https://github.com/HugoFara/lwt/issues/220)):
+  Added 16 foreign key constraints for referential integrity between tables:
+  * Language references: texts, words, sentences, archivedtexts, newsfeeds → languages (CASCADE)
+  * Text references: sentences, textitems2, texttags → texts (CASCADE)
+  * Other references: textitems2 → sentences (CASCADE), textitems2 → words (SET NULL),
+    wordtags → words/tags, texttags → tags2, archtexttags → archivedtexts/tags2,
+    feedlinks → newsfeeds (all CASCADE)
+  * Migration: `20251221_120000_add_inter_table_foreign_keys.sql`
+  * **Breaking change**: `textitems2.Ti2WoID` now uses NULL instead of 0 for unknown words
+* Database schema now includes foreign key constraints linking user-owned data
+  (languages, texts, words, tags, feeds) to the `users` table with CASCADE delete.
+* **TTS Settings Storage** ([#186](https://github.com/HugoFara/lwt/issues/186)):
+  Text-to-Speech language settings (voice, rate, pitch) now use browser localStorage
+  instead of cookies. Includes automatic migration from old cookie format.
 
 ### Fixed
 
@@ -30,6 +84,7 @@ ones are marked like "v1.0.0-fork".
 
 ### Security
 
+* Adds session security cookie to protect against session hijacking.
 * Fixed SQL injection vulnerabilities in `validateLang()`, `validateText()`,
   `validateTag()`, and `validateArchTextTag()` functions. All validation
   functions now properly sanitize non-numeric input before executing SQL
@@ -44,6 +99,9 @@ ones are marked like "v1.0.0-fork".
 ### Deprecated
 
 * Removed testing for PHP 8.0.
+* Legacy table prefix system (`$tbpref`) is deprecated in favor of the new
+  user-based multi-tenancy. Existing prefixed tables will be migrated to the
+  new system automatically.
 
 ## 2.10.0-fork (April 1 2024)
 

docs-src/developer/contributing.md

@@ -215,20 +215,32 @@ You can use it through `php tools/phpDocumentor` if installed with [Phive](https
 Code documentation for JavaScript is available at `docs/js/` is is generated thourgh [JSDoc](https://jsdoc.app/).
 The JSDoc configuration file is `jsdoc.json`.
 
-## New version
+## New Version
 
 LWT-fork follows a strict procedure for new versions.
-This section is mainly intended for the maintainers, but feel free to take a peak at it.
+This section is mainly intended for the maintainers, but feel free to take a peek at it.
 
-The steps to publish a new version are:
+### Version Locations
 
-1. In the [CHANGELOG](./CHANGELOG.md), add the latest release number and date.
-2. In `src/backend/Core/version.php`, update `LWT_APP_VERSION` and `LWT_RELEASE_DATE`.
+The version number must be updated in multiple places:
+
+| File | Field/Constant |
+| --- | --- |
+| `src/backend/Core/ApplicationInfo.php` | `VERSION` and `RELEASE_DATE` constants |
+| `package.json` | `version` field |
+| `CHANGELOG.md` | New version section header |
+
+The authoritative version is in `ApplicationInfo.php`. The `package.json` version should match (without the `-fork` suffix).
+
+### Release Steps
+
+1. Update the version in all locations listed above.
+2. In the [CHANGELOG](./CHANGELOG.md), move items from `[UNRELEASED]` to the new version section with the release date.
 3. Build frontend assets with `npm run build:all`.
 4. Regenerate documentation with `composer doc`.
-5. Commit your changes, `git commit -m "Regenerates documentation for release []."`
-6. Add a version tag with annotation `git tag -a [release number]` and push the changes.
-7. If all the GitHub actions are successful, write a new release on GitHub linking to the previously created tag.
+5. Commit your changes: `git commit -m "Release [version]"`
+6. Add a version tag with annotation: `git tag -a v[version] -m "Release [version]"` and push with `git push --tags`.
+7. If all GitHub Actions pass, create a new release on GitHub linking to the tag.
 8. The new version is live!
 
 ## Other Ways of Contribution

docs-src/guide/getting-started.md

@@ -27,7 +27,7 @@ To run LWT, you'll need:
     * [EasyPHP](http://www.easyphp.org/) or [XAMPP](https://www.apachefriends.org/download.html) (Windows), or
     * [MAMP](http://mamp.info/en/index.html) (macOS), or
     * a [LAMP (Linux-Apache-MariaDB-PHP) server](http://en.wikipedia.org/wiki/LAMP_%28software_bundle%29) (Linux).
-3. **The LWT Application**. The latest version  _lwt\_v\_x\_y.zip_ can be downloaded at <https://github.com/HugoFara/lwt/archive/refs/heads/master.zip>. View the [installation guide](installation.md).
+3. **The LWT Application**. The latest version  _lwt\_v\_x\_y.zip_ can be downloaded at <https://github.com/HugoFara/lwt/archive/refs/heads/main.zip>. View the [installation guide](installation.md).
 
 ## History
 

docs-src/guide/installation.md

@@ -30,7 +30,7 @@ Two main softwares can be used to set up a local server on your computer: XAMPP
 
 2. Get the [latest GitHub release](https://github.com/HugoFara/lwt/releases), unzip it.
 
-   You can also try to download the [latest stable version](https://github.com/HugoFara/lwt/archive/refs/heads/master.zip) if you want the cutting-edge updates (that may include some bugs)
+   You can also try to download the [latest stable version](https://github.com/HugoFara/lwt/archive/refs/heads/main.zip) if you want the cutting-edge updates (that may include some bugs)
 
 3. Now go into "C:\xampp\htdocs\lwt". Copy the file ".env.example" to ".env" and edit it with your database credentials (the defaults usually work for XAMPP).
 
@@ -63,7 +63,7 @@ Now you must only do step 4.2 to start LWT.
 
 3. Get the [latest GitHub release](https://github.com/HugoFara/lwt/releases), unzip it.
 
-   You can also try to download the [latest stable version](https://github.com/HugoFara/lwt/archive/refs/heads/master.zip) if you want the cutting-edge updates (that may include some bugs)
+   You can also try to download the [latest stable version](https://github.com/HugoFara/lwt/archive/refs/heads/main.zip) if you want the cutting-edge updates (that may include some bugs)
 
 4. Install everything
    1. Go to "C:\Program Files (x86)\EasyPHP-Devserver-17\eds-www\lwt".
@@ -93,7 +93,7 @@ Now you must only do step 5.2 to start LWT.
 
 4. Get the [latest GitHub release](https://github.com/HugoFara/lwt/releases), unzip it.
 
-   You can also try to download the [latest stable version](https://github.com/HugoFara/lwt/archive/refs/heads/master.zip) if you want the cutting-edge updates (that may include some bugs)
+   You can also try to download the [latest stable version](https://github.com/HugoFara/lwt/archive/refs/heads/main.zip) if you want the cutting-edge updates (that may include some bugs)
 
 5. Go to ``/Applications/MAMP/htdocs/lwt``. Copy the file ``.env.example`` to ``.env``. Edit it and set ``DB_HOST=localhost:8889`` (MAMP uses port 8889 for MySQL).
 
@@ -171,7 +171,7 @@ The following instruction were tested on Raspbian Stretch.
 
 2. Get the [latest GitHub release](https://github.com/HugoFara/lwt/releases).
 
-   You can also try to download the [latest stable version](https://github.com/HugoFara/lwt/archive/refs/heads/master.zip) if you want the cutting-edge updates (that may include some bugs)
+   You can also try to download the [latest stable version](https://github.com/HugoFara/lwt/archive/refs/heads/main.zip) if you want the cutting-edge updates (that may include some bugs)
 
 3. Unzip it.
 
@@ -233,7 +233,7 @@ The official repository is at <https://packagist.org/packages/hugofara/lwt>.
 
 2. Get the [latest GitHub release](https://github.com/HugoFara/lwt/releases).
 
-   You can also try to download the [latest stable version](https://github.com/HugoFara/lwt/archive/refs/heads/master.zip) if you want the cutting-edge updates (that may include some bugs)
+   You can also try to download the [latest stable version](https://github.com/HugoFara/lwt/archive/refs/heads/main.zip) if you want the cutting-edge updates (that may include some bugs)
 
 3. Unzip it.
 

docs-src/legal/links.md

@@ -3,7 +3,7 @@
 * [**Original Project Page** @ Sourceforge](http://sourceforge.net/projects/learning-with-texts/)
 * **Download Page**:
   * [Lastest release @ GitHub](https://github.com/HugoFara/lwt/releases/latest)
-  * [Lastest pushed @ GitHub](https://github.com/HugoFara/lwt/archive/refs/heads/master.zip)
+  * [Lastest pushed @ GitHub](https://github.com/HugoFara/lwt/archive/refs/heads/main.zip)
   * [Official version @ Sourceforge](http://sourceforge.net/projects/learning-with-texts/files/)
 * [**Community Maintained Version** @ GitHub](https://github.com/HugoFara/lwt)
 * **Documentation**: try either the [local link](index.html) or the [absolute link](https://hugofara.github.io/lwt/index.html).