summaryrefslogtreecommitdiff
path: root/www-ssl/admin
diff options
context:
space:
mode:
authorroot <root@www.engelsystem.de>2010-12-27 20:56:28 +0100
committerroot <root@www.engelsystem.de>2010-12-27 20:56:28 +0100
commit336affd4b5f304465580624254290f4e340f830e (patch)
tree00038aa0748a73f12cdf289d6587073b9db2203c /www-ssl/admin
parent4c48c66450d89f42a2bcf6543dbc9c1a3d5bd0e7 (diff)
parent7ba743a65b1d32e08c962be47d14c575987d1e12 (diff)
Merge branch 'master' into spezial_includes
Diffstat (limited to 'www-ssl/admin')
-rwxr-xr-xwww-ssl/admin/schichtplan.php20
1 files changed, 16 insertions, 4 deletions
diff --git a/www-ssl/admin/schichtplan.php b/www-ssl/admin/schichtplan.php
index 3b227f3d..bbccc14a 100755
--- a/www-ssl/admin/schichtplan.php
+++ b/www-ssl/admin/schichtplan.php
@@ -95,15 +95,19 @@ case 'change':
"\" type=\"text\" size=\"40\" name=\"eDate\"></td></tr>\n";
echo " <tr><td>Raum</td><td>\n<select name=\"eRID\">\n";
- $sql2 = "SELECT `RID`, `Name` FROM `Room`";
+ $sql2 = "SELECT `RID`, `Name`, `FromPentabarf` FROM `Room`";
$Erg2 = mysql_query($sql2, $con);
$rowcount = mysql_num_rows($Erg2);
+ $FromPentabarf = "N";
for( $i = 0; $i < $rowcount; $i++ )
{
$RID=mysql_result($Erg2, $i, "RID");
echo " <option value=\"".$RID."\"";
if( $RID == mysql_result($Erg, 0, "RID") )
- echo " selected";
+ {
+ echo " selected";
+ $FromPentabarf = mysql_result($Erg2, $i, "FromPentabarf");
+ }
echo ">".mysql_result($Erg2, $i, "Name")."</option>\n";
}
echo " </select>\n</td></tr>\n";
@@ -117,6 +121,11 @@ case 'change':
echo " <tr><td>URL</td>".
"<td><input value=\"". mysql_result($Erg, 0, "URL").
"\" type=\"text\" size=\"40\" name=\"eURL\"></td></tr>\n";
+ if( $FromPentabarf == "Y")
+ {
+ echo " <tr><td></td>".
+ "<td><h1>!!! Imported from Pentabarf !!!</h1></td></tr>\n";
+ }
echo "</table>\n";
echo "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n";
@@ -173,7 +182,7 @@ case 'change':
echo "\t\t<td>". UID2Nick($userUID). "</td>\n";
echo "\t\t<td>". TID2Type(mysql_result($Erg3, $j, "TID")). Get_Text("inc_schicht_Engel"). "</td>\n";
echo "\t\t<td><a href=\"./schichtplan.php?action=engeldel&SID=". $_GET["SID"]. "&UIDs=$userUID&freeloader=0\">###-austragen-###</a></td>\n";
- echo "\t\t<td><a href=\"./schichtplan.php?action=engeldel&SID=". $_GET["SID"]. "&UIDs=$userUID&freeloader=1\">###-austragen-###</a></td>\n";
+ echo "\t\t<td><a href=\"./schichtplan.php?action=engeldel&SID=". $_GET["SID"]. "&UIDs=$userUID&freeloader=1\">###-austragen-freeloader-###</a></td>\n";
echo "\t</tr>\n";
} // FOR
@@ -187,7 +196,10 @@ case 'change':
// Listet alle Nicks auf
echo "<select name=\"UIDs\">\n";
- echo "\t<option value=\"0\">--neu--</option>\n";
+ if( $FromPentabarf != "Y")
+ {
+ echo "\t<option value=\"0\">--neu--</option>\n";
+ }
$usql="SELECT * FROM `User` ORDER BY `Nick`";
$uErg = mysql_query($usql, $con);