From 75448045cfe70054c8f4bae1bcfaf9bb0f70d330 Mon Sep 17 00:00:00 2001 From: Moritz helios Rudert Date: Wed, 1 Jun 2011 12:13:39 +0200 Subject: fixes --- www-ssl/admin/free_DECT.php | 68 ++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 34 deletions(-) mode change 100755 => 100644 www-ssl/admin/free_DECT.php (limited to 'www-ssl/admin/free_DECT.php') diff --git a/www-ssl/admin/free_DECT.php b/www-ssl/admin/free_DECT.php old mode 100755 new mode 100644 index c28c78af..83a4123f --- a/www-ssl/admin/free_DECT.php +++ b/www-ssl/admin/free_DECT.php @@ -1,4 +1,4 @@ -=Now() AND ShiftEntry.UID>0);"; + "FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ". + "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND ShiftEntry.UID>0);"; $Erg = mysql_query($SQL, $con); $Zeilen = mysql_num_rows($Erg); @@ -21,17 +21,17 @@ $Zeilen = mysql_num_rows($Erg); $inuse=""; for ($i=0; $i < $Zeilen; $i++) { - if ($inuse!="") - $inuse.= " OR "; - $inuse.= "(UID = \"". mysql_result($Erg, $i, "UID"). "\")"; + if ($inuse!="") + $inuse.= " OR "; + $inuse.= "(UID = \"". mysql_result($Erg, $i, "UID"). "\")"; } if ($inuse!="") { - $inuse=" WHERE (NOT (".$inuse.")) AND (DECT!='')"; + $inuse=" WHERE (NOT (".$inuse.")) AND (DECT!='')"; } else { - $inuse=" WHERE (DECT!='')"; + $inuse=" WHERE (DECT!='')"; } @@ -42,36 +42,36 @@ $Erg = mysql_query($SQL, $con); $Zeilen = mysql_num_rows($Erg); for ($i=0; $i < $Zeilen; $i++) { - // get DECT number - echo mysql_result($Erg, $i, "DECT"). "\t"; + // get DECT number + echo mysql_result($Erg, $i, "DECT"). "\t"; - // get all user rights - $SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=". mysql_result($Erg, $i, "UID"). ";"; - $Erg_RIGHT = mysql_query($SQL_RIGHT, $con); - $UserRights = mysql_fetch_array($Erg_RIGHT); + // get all user rights + $SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=". mysql_result($Erg, $i, "UID"). ";"; + $Erg_RIGHT = mysql_query($SQL_RIGHT, $con); + $UserRights = mysql_fetch_array($Erg_RIGHT); - foreach( $UserRights as $Var => $Value) - { - if( (strpos( $Var, ".php") === false) AND - (strpos( $Var, "/") === false) AND - (strpos( $Var, "UID") === false) AND - (is_numeric($Var) === false) ) - { - echo "\"".$Var. "\"=". $Value. "\t"; - } - } + foreach( $UserRights as $Var => $Value) + { + if( (strpos( $Var, ".php") === false) AND + (strpos( $Var, "/") === false) AND + (strpos( $Var, "UID") === false) AND + (is_numeric($Var) === false) ) + { + echo "\"".$Var. "\"=". $Value. "\t"; + } + } - // get shift types - $SQL_TYPES = "SELECT TID FROM `ShiftEntry` WHERE UID=". mysql_result($Erg, $i, "UID"). " GROUP BY TID;"; - $Erg_TYPES = mysql_query($SQL_TYPES, $con); - $Zeilen_Typen = mysql_num_rows($Erg_TYPES); - for ($j=0; $j < $Zeilen_Typen; $j++) - { - echo "\"TID_". TID2Type( mysql_result($Erg_TYPES, $j, "TID")). "\"=Y\t"; - } + // get shift types + $SQL_TYPES = "SELECT TID FROM `ShiftEntry` WHERE UID=". mysql_result($Erg, $i, "UID"). " GROUP BY TID;"; + $Erg_TYPES = mysql_query($SQL_TYPES, $con); + $Zeilen_Typen = mysql_num_rows($Erg_TYPES); + for ($j=0; $j < $Zeilen_Typen; $j++) + { + echo "\"TID_". TID2Type( mysql_result($Erg_TYPES, $j, "TID")). "\"=Y\t"; + } - echo "\n"; -// echo "
"; + echo "\n"; +// echo "
"; } ?> -- cgit v1.3.1