Merge branch 'release' into testserver

6 years ago · 2ba6d93dde
parent 238df056c6 97cf98140c
commit 2ba6d93dde
2 changed files with 7 additions and 4 deletions
--- a/INSTALL.txt
+++ b/INSTALL.txt
@ -29,7 +29,7 @@ Setup
 - Connect to your MySQL server with an administrative user and create a database for CATS:
  CREATE DATABASE cats_db;
 - Create a user for CATS to access the database:
-  CREATE USER cats-user IDENTIFIED BY '<a password>';
+  CREATE USER 'cats_user' IDENTIFIED BY '<a password>';
 - Grant the necessary user rights. These are a bit more than the absolute minimum:
  GRANT DELETE, INSERT, SELECT, UPDATE ON cats_db.* TO cats_user;
 - Change the database context to the newly created cats_db:
--- a/index.php.template
+++ b/index.php.template
@ -1,10 +1,13 @@
 <?php
 // Session starten
-@session_start();
+session_start();

-  // For the moment we are using ISO8859, should be changed to UTF-8 in the future...
-  header('Content-Type: text/html; charset=iso-8859-1');
+// For the moment we are using ISO8859, should be changed to UTF-8 in the future...
+header('Content-Type: text/html; charset=iso-8859-1');

+?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd"><?php
+  
 $_SESSION['_config']['filepath'] = "FILEPATHTOHERE"; // Filepath
 
  // Dateien einbinden