Merge branch 'master' into spezial_includes

DB/SDrohnen.sql

@@ -572,8 +572,6 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/shiftadd.php'
 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/shiftadd.php', 'EN', ' ');
 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/schichtplan_druck.php', 'DE', ' ');
 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/schichtplan_druck.php', 'EN', ' ');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/user2.php', 'DE', ' ');
-INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/user2.php', 'EN', ' ');
 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dbUpdateFromXLS.php', 'DE', 'UpdateDB');
 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dbUpdateFromXLS.php', 'EN', 'UpdateDB');
 INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dect.php', 'DE', 'Dect');

www-ssl/admin/userChangeNormal.php

@@ -67,7 +67,7 @@ if (IsSet($_GET["enterUID"]))
 			"<input type=\"text\" size=\"5\" name=\"eSize\" value=\"".
 			mysql_result($Erg, 0, "Size")."\"></td></tr>\n";
 		echo "  <tr><td>Passwort</td><td>".
-			"<a href=\"./user2.php?action=newpw&eUID="
+			"<a href=\"./userSaveNormal.php?action=newpw&eUID="
 			.mysql_result($Erg, 0, "UID")."\">neues Kennwort setzen</a></td></tr>\n";
  
 		// Gekommen? 

www-ssl/admin/userSaveNormal.php

@@ -92,7 +92,7 @@ if (IsSet($_GET["action"]))
 		$Erg = mysql_query($USQL, $con);
 		echo mysql_result($Erg, 0, "Nick");
 		echo "</b> eingeben:<br>";
-		echo "<form action=\"./user2.php?action=newpwsave\" method=\"POST\">\n";	
+		echo "<form action=\"./userSaveNormal.php?action=newpwsave\" method=\"POST\">\n";	
 		echo "<input type=\"Password\" name=\"ePasswort\">";
 		echo "<input type=\"Password\" name=\"ePasswort2\">";
 		echo "<input type=\"hidden\" name=\"eUID\" value=\"". $_GET["eUID"]. "\">";