Skip to content

Commit

Permalink
Resolves #222
Browse files Browse the repository at this point in the history
  • Loading branch information
danielbrendel committed Jul 1, 2024
1 parent 1e47705 commit d4b68d7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ via the admin section (e.g. environment settings, users, locations).

### Manual

In order to manually install HortusFox you need to first setup a PHP environment along with a MySQL database
In order to manually install HortusFox you need to first setup a PHP environment along with a MariaDB database
and also Composer. Afterwards you can clone or download the repository. Then go to the root directory
of the project and let Composer install the required dependencies.

Expand All @@ -180,7 +180,7 @@ APP_GITHUB_URL="https://github.com/danielbrendel/hortusfox-web"
# This must be set to true for the product to work in order to enable database connection
DB_ENABLE=true

# Enter your hostname or IP address of your MySQL database server
# Enter your hostname or IP address of your MariaDB database server
DB_HOST=localhost

# Enter the database username
Expand All @@ -192,7 +192,7 @@ DB_PASSWORD=""
# Database connection port. Normally this doesn't need to be changed
DB_PORT=3306

# The actual database of your MySQL server to be used
# The actual database of your MariaDB server to be used
DB_DATABASE=hortusfox

# Database driver. This needs to be unaltered for now
Expand Down Expand Up @@ -339,7 +339,7 @@ GET /cronjob/calendar/reminder?cronpw={your-auth-token}
## System requirements

- PHP ^8.3
- MySQL (10.4.27-MariaDB or similar)
- MariaDB ^11.4
- SMTP server for e-mailing
- Docker with Docker-Compose for containerization

Expand Down
2 changes: 1 addition & 1 deletion app/models/PlantsModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public static function getHistory($year = null, $limit = null, $sorting = null,
public static function getHistoryYears()
{
try {
return static::raw('SELECT DISTINCT YEAR(history_date) AS history_year FROM `' . self::tableName() . '` WHERE history = 1 AND history_date IS NOT NULL ORDER BY history_date DESC');
return static::raw('SELECT DISTINCT YEAR(history_date) AS history_year FROM `' . self::tableName() . '` WHERE history = 1 AND history_date IS NOT NULL ORDER BY YEAR(history_date) DESC');
} catch (\Exception $e) {
throw $e;
}
Expand Down
2 changes: 1 addition & 1 deletion launch.dnys
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This script launches a local web environment and opens the default browser with the URL of the web app.
#
# Requires AquaShell, Windows and Apache & MySQL (e.g. XAMPP installation)
# Requires AquaShell, Windows and Apache & MariaDB (e.g. XAMPP installation)
# On first start you'll need to specify your paths to httpd and mysqld.
#

Expand Down

0 comments on commit d4b68d7

Please sign in to comment.