iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into spezial_includes

This commit is contained in:
root 2010-11-28 23:04:10 +01:00
parent 973e2ec4a6 fa2a645343
commit 22afff97fa
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DB/SDrohnen.sql
View File

@ -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/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', 'DE', ' ');
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/schichtplan_druck.php', 'EN', ' '); 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', 'DE', 'UpdateDB');
INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dbUpdateFromXLS.php', 'EN', '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'); INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dect.php', 'DE', 'Dect');

2
www-ssl/admin/userChangeNormal.php
View File

@ -67,7 +67,7 @@ if (IsSet($_GET["enterUID"]))
"<input type=\"text\" size=\"5\" name=\"eSize\" value=\"". "<input type=\"text\" size=\"5\" name=\"eSize\" value=\"".
mysql_result($Erg, 0, "Size")."\"></td></tr>\n"; mysql_result($Erg, 0, "Size")."\"></td></tr>\n";
echo " <tr><td>Passwort</td><td>". 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"; .mysql_result($Erg, 0, "UID")."\">neues Kennwort setzen</a></td></tr>\n";
// Gekommen? // Gekommen?

2
www-ssl/admin/userSaveNormal.php
View File

@ -92,7 +92,7 @@ if (IsSet($_GET["action"]))
$Erg = mysql_query($USQL, $con); $Erg = mysql_query($USQL, $con);
echo mysql_result($Erg, 0, "Nick"); echo mysql_result($Erg, 0, "Nick");
echo "</b> eingeben:<br>"; 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=\"ePasswort\">";
echo "<input type=\"Password\" name=\"ePasswort2\">"; echo "<input type=\"Password\" name=\"ePasswort2\">";
echo "<input type=\"hidden\" name=\"eUID\" value=\"". $_GET["eUID"]. "\">"; echo "<input type=\"hidden\" name=\"eUID\" value=\"". $_GET["eUID"]. "\">";