From 65e6ddaf1f756d0c25f9e2a7422d96972427b6dc Mon Sep 17 00:00:00 2001
From: IT-Master GmbH <info@it-master.ch>
Date: Tue, 23 Sep 2014 12:25:39 +0200
Subject: [PATCH] Version 0.895

Fehler beim erfassen eines MA

In der Datei ./Data/users.txt
darf am Schluss keine leere Zeile sein.
---
 .gitattributes                 | 22 ++++++++++++++++++++++
 .gitignore                     | 24 +++++++++++++++++++++++-
 admin.php                      |  2 +-
 include/Settings/smalltime.txt |  2 +-
 include/class_user.php         |  6 +++++-
 5 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..412eeda
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/.gitignore b/.gitignore
index 723ef36..2c54cbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,23 @@
-.idea
\ No newline at end of file
+#PHP - Storm
+.idea
+
+#Codelobster - IDE
+*.clpprj
+
+# Can also ignore all directories and files in a directory.
+Data/*
+Data/administrator/*
+debug/*
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
\ No newline at end of file
diff --git a/admin.php b/admin.php
index 6b139ec..3f894f6 100644
--- a/admin.php
+++ b/admin.php
@@ -2,7 +2,7 @@
 /********************************************************************************
 * Small Time
 /*******************************************************************************
-* Version 0.894
+* Version 0.895
 * Author:  IT-Master GmbH
 * www.it-master.ch / info@it-master.ch
 * Copyright (c) , IT-Master GmbH, All rights reserved
diff --git a/include/Settings/smalltime.txt b/include/Settings/smalltime.txt
index 9f990dc..bf2fc37 100644
--- a/include/Settings/smalltime.txt
+++ b/include/Settings/smalltime.txt
@@ -1,2 +1,2 @@
-0.894
+0.895
 http://www.small.li/update
\ No newline at end of file
diff --git a/include/class_user.php b/include/class_user.php
index 31f940f..0408246 100644
--- a/include/class_user.php
+++ b/include/class_user.php
@@ -2,7 +2,7 @@
 /*******************************************************************************
 * User - Daten
 /*******************************************************************************
-* Version 0.872
+* Version 0.895
 * Author:  IT-Master GmbH
 * www.it-master.ch / info@it-master.ch
 * Copyright (c) , IT-Master GmbH, All rights reserved
@@ -105,6 +105,10 @@ function set_user_data($_id,$pfad,$loginname,$passwort,$rfid){
 		$_users= file("./Data/users.txt");
 		if($_POST['absenden'] == "OK"){
 			Global $_id;
+			if (count($_users) == ($_id+1)){
+				$_zeilenvorschub = "";
+			}
+			//echo count($_users);
 			//echo $_users[$_id];
 			//$_user = $_users[$_id];
 			//echo $_user;