i love this system

12 files changed, 79 insertions, 91 deletions

diff --git a/config/.gitignore b/config/.gitignore
index a99da95f..cb667ea2 100644
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -3,3 +3,4 @@ config_jabber.php
 config_modem.php
 config.php
 config_IAX.php
+config_MessegeServer.php
diff --git a/config/config_MessegeServer.php b/config/config_MessegeServer.php
deleted file mode 100644
index ce7c7c3a..00000000
--- a/config/config_MessegeServer.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-  // Set the ip and port we will listen on
-  define(SERVER_ADDRESS, "127.0.0.1");
-  define(SERVER_PORT, 9000);
-
-  define(DEBUG, true);
-?>
diff --git a/includes/UserCVS.php b/includes/UserCVS.php
index c062106f..98a4fec7 100644
--- a/includes/UserCVS.php
+++ b/includes/UserCVS.php
@@ -20,8 +20,8 @@
   }
 
   // pagename ermitteln
-  //$Page["Name"] = basename($_SERVER['PHP_SELF']);
-  $Page["Name"] = str_replace($ENGEL_ROOT, '', $_SERVER['PHP_SELF']);
+  $Page["Name"] = basename($_SERVER['PHP_SELF']);
+//  $Page["Name"] = str_replace($ENGEL_ROOT, '', $_SERVER['PHP_SELF']);
 
   //recht fuer diese seite auslesen
   if(isset($_SESSION['CVS'][$Page["Name"]]))
diff --git a/includes/funktion_db.php b/includes/funktion_db.php
index 160a9c59..ffd7d6a2 100644
--- a/includes/funktion_db.php
+++ b/includes/funktion_db.php
@@ -48,7 +48,7 @@
       $Gefunden = false;
 
       $Diff  = "\n<table border=1>\n";
-      $Diff .= "<tr>\n\t<th>Feldname</th>\n\t<th>old Value</th>\n\t<th>new Value</th>\n";
+      $Diff .= "<tr>\n<th>Feldname</th>\n<th>old Value</th>\n<th>new Value</th>\n";
       $Diff .= "</tr>\n";
 
       foreach($Daten1 as $DataKey => $Data1) {
@@ -58,12 +58,12 @@
           foreach($Data1 as $key => $value)
             if( $value != $Data2[$key]) {
             $Gefunden = true;
-            $Diff .= "<tr>\n\t<td>$key</td>\n\t<td>$value</td>\n\t<td>" . $Data2[$key] . "</rd>\n</tr>";
+            $Diff .= "<tr>\n<td>$key</td>\n<td>$value</td>\n<td>" . $Data2[$key] . "</rd>\n</tr>";
           }
         } else
           foreach($Data1 as $key => $value) {
             $Gefunden = true;
-            $Diff .= "<tr>\n\t<td>$key</td>\n\t<td>$value</td>\n\t<td></rd>\n</tr>";
+            $Diff .= "<tr>\n<td>$key</td>\n<td>$value</td>\n<td></rd>\n</tr>";
           }
       }
 
diff --git a/includes/funktion_db_list.php b/includes/funktion_db_list.php
index 1131ffd3..44e3d865 100644
--- a/includes/funktion_db_list.php
+++ b/includes/funktion_db_list.php
@@ -38,7 +38,7 @@ function funktion_db_element_list_2row( $TopicName, $SQL)
 
   echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
   echo "<caption>$TopicName</caption>";
-#  echo "\t<tr class=\"contenttopic\"> <td><h1>$TopicName</h1></td> </tr>\n";
+#  echo "<tr class=\"contenttopic\"> <td><h1>$TopicName</h1></td> </tr>\n";
 
   $Erg = mysql_query($SQL, $con);
   echo mysql_error($con);
diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php
index e62ff37c..0a324758 100644
--- a/includes/funktion_menu.php
+++ b/includes/funktion_menu.php
@@ -1,7 +1,5 @@
 <?php
-
-
-// Menü generieren
+// Menue generieren
 function ShowMenu($MenuName) {
 	global $MenueTableStart, $MenueTableEnd, $_SESSION, $debug, $url, $ENGEL_ROOT;
 	$Gefunden = false;
@@ -27,13 +25,13 @@ function ShowMenu($MenuName) {
 							$TempName .= " (" . noAnswer() . ")";
 						elseif ($Key == "credits.php") continue;
 						//ausgabe
-						$Text .= "\t\t\t<li><a href=\"" . $url . $ENGEL_ROOT . $Key . "\">$TempName</a></li>\n";
+						$Text .= "<li><a href=\"" . $url . $ENGEL_ROOT . $Key . "\">$TempName</a></li>\n";
 						$Gefunden = true;
 					}
 				}
 				elseif ($debug) {
 					$Gefunden = true;
-					$Text .= "\t\t\t<li>$TempName ($Key)</li>\n";
+					$Text .= "<li>$TempName ($Key)</li>\n";
 				}
 			}
 	if ($Gefunden)
diff --git a/includes/funktion_schichtplan.php b/includes/funktion_schichtplan.php
index afa79144..6d6c3553 100644
--- a/includes/funktion_schichtplan.php
+++ b/includes/funktion_schichtplan.php
@@ -20,7 +20,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
   ///////////////////////////////////////////////////////////////////
   $Spalten.=funktion_isLinkAllowed_addLink_OrEmpty( 
     "admin/schichtplan.php?action=change&SID=$SID",
-    "edit<br />\n\t\t");
+    "edit<br />\n");
 
   ///////////////////////////////////////////////////////////////////
     // Ausgabe des Schischtnamens
@@ -96,9 +96,9 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
       if( count($TempValue["Engel"]) > 0  )
       {
       if( count($TempValue["Engel"]) == 1  )
-        $Spalten.= Get_Text("inc_schicht_ist"). ":<br />\n\t\t";
+        $Spalten.= Get_Text("inc_schicht_ist"). ":<br />\n";
       else 
-        $Spalten.= Get_Text("inc_schicht_sind"). ":<br />\n\t\t";
+        $Spalten.= Get_Text("inc_schicht_sind"). ":<br />\n";
       
       foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID )
       {
@@ -123,7 +123,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
         
         $Spalten.= "&nbsp;&nbsp;". $TempText.
             ( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): "").
-            "<br />\n\t\t";
+            "<br />\n";
 
 
       }
@@ -145,7 +145,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
       if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y")
         if( $TempValue["free"] > 0 )
         {
-          $Spalten.= "<br />\n\t\t&nbsp;&nbsp;<a href=\"./schichtplan_add.php?SID=$SID&TID=".
+          $Spalten.= "<br />\n&nbsp;&nbsp;<a href=\"./schichtplan_add.php?SID=$SID&TID=".
                $TempValue["TID"]."\">";
           $Spalten.= $TempValue["free"];
           if( $TempValue["free"] != 1 )
@@ -164,10 +164,10 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
     {
       if( isset($TempValue["free"]))
         if( $TempValue["free"] > 0 )
-          $Spalten.= "<br />\n\t\t&nbsp;&nbsp;<h3><a>Fehlen noch: ". 
+          $Spalten.= "<br />\n&nbsp;&nbsp;<h3><a>Fehlen noch: ". 
               $TempValue["free"]. "</a></h3>";
     }
-    $Spalten.= "<br />\n\t\t";
+    $Spalten.= "<br />\n";
   
   } // FOREACH
   return $Spalten;
@@ -214,18 +214,18 @@ function CreateRoomShifts( $raum )
           mysql_result($ErgSonder, $i, "SID"). "\">".
           mysql_result($ErgSonder, $i, "DateS"). 
           " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)".
-          "</a><br />\n\t\t";
+          "</a><br />\n";
       }
     }
   }
   elseif( (mysql_num_rows( $ErgSonder) == 1) )
   {
-    $Spalten[0].=  "\t\t<td valign=\"top\" rowspan=\"". (24 * $GlobalZeileProStunde). "\">\n".
-        "\t\t\t<h3>&uarr;&uarr;&uarr;</h3>".
+    $Spalten[0].=  "<td valign=\"top\" rowspan=\"". (24 * $GlobalZeileProStunde). "\">\n".
+        "<h3>&uarr;&uarr;&uarr;</h3>".
               Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), 
                  mysql_result($ErgSonder, 0, "Man") ).
-        "\t\t\t<h3>&darr;&darr;&darr;</h3>".
-               "\n\t\t</td>\n";
+        "<h3>&darr;&darr;&darr;</h3>".
+               "\n</td>\n";
     return;
   }
   
@@ -249,7 +249,7 @@ function CreateRoomShifts( $raum )
           mysql_result($ErgSonder, $i, "SID"). "\">".
           mysql_result($ErgSonder, $i, "DateS"). 
           " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)".
-          "</a><br />\n\t\t";
+          "</a><br />\n";
       }
     }
   }
@@ -257,11 +257,11 @@ function CreateRoomShifts( $raum )
   {
     $ZeitZeiger =  substr( mysql_result($ErgSonder, 0, "DateE"), 11, 2 )+
         (substr( mysql_result($ErgSonder, 0, "DateE"), 14, 2 ) / 60);
-    $Spalten[0].=  "\t\t<td valign=\"top\" rowspan=\"". ($ZeitZeiger * $GlobalZeileProStunde). "\">\n".
-        "\t\t\t<h3>&uarr;&uarr;&uarr;</h3>".
+    $Spalten[0].=  "<td valign=\"top\" rowspan=\"". ($ZeitZeiger * $GlobalZeileProStunde). "\">\n".
+        "<h3>&uarr;&uarr;&uarr;</h3>".
               Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), 
                  mysql_result($ErgSonder, 0, "Man") ).
-               "\n\t\t</td>\n";
+               "\n</td>\n";
   }
          
   /////////////////////////////////////////////////////////////
@@ -284,7 +284,7 @@ function CreateRoomShifts( $raum )
     if( $ZeitZeiger < $ZeitPos  )
     {
              $Spalten[$ZeitZeiger * $GlobalZeileProStunde].=  
-        "\t\t<td valign=\"top\" rowspan=\"". ( ($ZeitPos - $ZeitZeiger ) * $GlobalZeileProStunde ). "\">&nbsp;</td>\n";
+        "<td valign=\"top\" rowspan=\"". ( ($ZeitPos - $ZeitZeiger ) * $GlobalZeileProStunde ). "\">&nbsp;</td>\n";
 
       $ZeitZeiger += $ZeitPos - $ZeitZeiger;
     }
@@ -293,14 +293,14 @@ function CreateRoomShifts( $raum )
       //sonderfall wenn die schicht über dei 24 stunden hinaus geht
       // (eintrag abkürzen, pfeiel ausgeben)
              $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= 
-          "\t\t<td valign=\"top\" rowspan=\"". 
+          "<td valign=\"top\" rowspan=\"". 
           ( ( ($len+$ZeitZeiger)? $len : 24-$len+$ZeitZeiger) * $GlobalZeileProStunde). 
           "\">\n".
-          "\t\t\t".
+          "".
                 Ausgabe_Feld_Inhalt( mysql_result($Erg, $i, "SID"), 
                    mysql_result($Erg, $i, "Man") ).
-          (( ($ZeitZeiger+$len) > 24)? "\t\t\t<h3>&darr;&darr;&darr;</h3>" : "").
-                 "\n\t\t</td>\n";
+          (( ($ZeitZeiger+$len) > 24)? "<h3>&darr;&darr;&darr;</h3>" : "").
+                 "\n</td>\n";
       $ZeitZeiger += $len;
     }
     else
@@ -315,7 +315,7 @@ function CreateRoomShifts( $raum )
   }
   if( $ZeitZeiger < 24 )
            $Spalten[($ZeitZeiger * $GlobalZeileProStunde)].=  
-          "\t\t<td valign=\"top\" rowspan=\"". 
+          "<td valign=\"top\" rowspan=\"". 
           ((24 - $ZeitZeiger) * $GlobalZeileProStunde ). 
           "\">&nbsp;</td>\n";
 } // function CreateRoomShifts
@@ -330,10 +330,10 @@ function showEmptyShifts( )
 
   echo "<table border=\"1\">\n";
   echo "<tr>\n";
-  echo "\t<th>". Get_Text("inc_schicht_date"). "</th>\n";
-  echo "\t<th>". Get_Text("inc_schicht_time"). "</th>\n";
-  echo "\t<th>". Get_Text("inc_schicht_room"). "</th>\n";
-  echo "\t<th>". Get_Text("inc_schicht_commend"). "</th>\n";
+  echo "<th>". Get_Text("inc_schicht_date"). "</th>\n";
+  echo "<th>". Get_Text("inc_schicht_time"). "</th>\n";
+  echo "<th>". Get_Text("inc_schicht_room"). "</th>\n";
+  echo "<th>". Get_Text("inc_schicht_commend"). "</th>\n";
   echo "</tr>\n";
   
   $sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` ".
@@ -355,10 +355,10 @@ function showEmptyShifts( )
     {
       $angezeigt++;
       echo "<tr>\n";
-      echo "\t<td>". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "</td>\n";
-      echo "\t<td>". substr(mysql_result( $Erg, $i, "DateS"), 11). "</td>\n";
-      echo "\t<td>". $RoomID[mysql_result( $Erg, $i, "RID")]. "</td>\n";
-      echo "\t<td>". 
+      echo "<td>". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "</td>\n";
+      echo "<td>". substr(mysql_result( $Erg, $i, "DateS"), 11). "</td>\n";
+      echo "<td>". $RoomID[mysql_result( $Erg, $i, "RID")]. "</td>\n";
+      echo "<td>". 
         ausgabe_Feld_Inhalt( mysql_result( $Erg, $i, "SID"), mysql_result( $Erg, $i, "Man")).
         "</td>\n";
       echo "</tr>\n";
diff --git a/includes/funktion_schichtplan_beamer.php b/includes/funktion_schichtplan_beamer.php
index 177b6cb3..85c5ffe8 100644
--- a/includes/funktion_schichtplan_beamer.php
+++ b/includes/funktion_schichtplan_beamer.php
@@ -49,10 +49,10 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
 
   $Out.= "<table border=\"0\" width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" frame=\"void\">\n";
 
-  $Out.= "\t\t\t<colgroup span=\"2\"  align=\"left\" valign=\"center\">\n".
-    "\t\t\t\t<col width=\"45%\">\n".
-    "\t\t\t\t<col width=\"*\">\n".
-    "\t\t\t\t</colgroup>\n";
+  $Out.= "<colgroup span=\"2\"  align=\"left\" valign=\"center\">\n".
+    "<col width=\"45%\">\n".
+    "<col width=\"*\">\n".
+    "</colgroup>\n";
 
   ///////////////////////////////////////////////////////////////////
   // SQL abfrage für die benötigten schichten
@@ -94,10 +94,10 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
   if( isset($Temp) && count($Temp) )
     foreach( $Temp as $TempEntry => $TempValue )
     {
-      $Out.= "\t\t\t<tr>\n";
+      $Out.= "<tr>\n";
     
     // ausgabe EngelType
-    $Out.= "\t\t\t\t<td>". $EngelTypeID[ $TempValue["TID"] ];
+    $Out.= "<td>". $EngelTypeID[ $TempValue["TID"] ];
     
     // ausgabe Eingetragener Engel
     if( count($TempValue["Engel"]) > 0  )
@@ -107,7 +107,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
       else 
         $Out.= " ". trim(Get_Text("inc_schicht_sind")). ":";
       $Out.= "</td>\n";
-      $Out.= "\t\t\t\t<td>";
+      $Out.= "<td>";
       
       foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID )
               $Out.= UID2Nick( $TempEngelID ). ", ";
@@ -117,7 +117,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
     else
     {
       $Out.= ":</td>\n";
-      $Out.= "\t\t\t\t<td>\n";
+      $Out.= "<td>\n";
     }
       
     
@@ -133,11 +133,11 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
       }
     }
     $Out.= "</td>\n";
-    $Out.= "\t\t\t</tr>\n";
+    $Out.= "</tr>\n";
   
   } // FOREACH
 
-  $Out.= "\t\t\t</table>\n\t";
+  $Out.= "</table>\n";
   
   return $Out;
 } // function Ausgabe_Feld_Inhalt
@@ -157,7 +157,7 @@ function ausgabe_Zeile( $RID, $Time, &$AnzahlEintraege )
       " (`DateS` like '". gmdate("Y-m-d H", $Time). "%')) ) ORDER BY `DateS`;";
   
   $ErgRoom = mysql_query($SQL, $con);
-  $Out= "\t<td>";
+  $Out= "<td>";
   if( mysql_num_rows( $ErgRoom)>0 )
     for( $i=1; $i<=mysql_num_rows( $ErgRoom); $i++ )
     {
@@ -166,7 +166,7 @@ function ausgabe_Zeile( $RID, $Time, &$AnzahlEintraege )
               mysql_result( $ErgRoom, $i-1, "Man"));
       if( (mysql_num_rows( $ErgRoom) > 1) && !($i==mysql_num_rows( $ErgRoom)) )
         $Out.= "<br />";
-//        $Out.= "<hr width=\"95%\" align=\"center\">\n\t\t\t\t";
+//        $Out.= "<hr width=\"95%\" align=\"center\">\n";
       
     }
   else
diff --git a/includes/funktion_xml_room.php b/includes/funktion_xml_room.php
index cb91af6f..f31d5661 100644
--- a/includes/funktion_xml_room.php
+++ b/includes/funktion_xml_room.php
@@ -43,11 +43,11 @@
             CreateRoomArrays();
           } else {
             echo "<form action=\"dbUpdateFromXLS.php\">\n";
-            echo "\t<tr>\n";
-            echo "\t<td><input name=\"NameXML\" type=\"text\" value=\"$NameXML\" readonly></td>\n";
-            echo "\t<td><input type=\"submit\" name=\"RoomUpdate\" value=\"update\"></td>\n";
+            echo "<tr>\n";
+            echo "<td><input name=\"NameXML\" type=\"text\" value=\"$NameXML\" readonly></td>\n";
+            echo "<td><input type=\"submit\" name=\"RoomUpdate\" value=\"update\"></td>\n";
             $DS_KO++;
-            echo "\t</tr>\n";
+            echo "</tr>\n";
             echo "</form>\n";
             echo "<br />";
           }
diff --git a/includes/funktion_xml_schudle.php b/includes/funktion_xml_schudle.php
index 41efce04..f73f11ad 100644
--- a/includes/funktion_xml_schudle.php
+++ b/includes/funktion_xml_schudle.php
@@ -134,7 +134,7 @@ function SaveSchedule()
             {
               $EngelMin = $EngelNeeded_NotEmpty;
               echo "---> WARING ". $EngelNeeded_NotEmpty. 
-                " shift is used, can't del ". TID2Type($EngelTypeID). " shifts\t";
+                " shift is used, can't del ". TID2Type($EngelTypeID). " shifts";
             }
 
             echo "---->Delete empty Shifts for engeltype: ". TID2Type($EngelTypeID). " ".  
@@ -192,7 +192,7 @@ foreach($XMLmain->sub as $EventKey => $Event)
   if( $Event->name == "VEVENT")
   {
     echo "<form action=\"dbUpdateFromXLS.php\">\n";
-    echo "\t<tr>\n";
+    echo "<tr>\n";
   
     $PSIDXML  = getXMLsubData( $Event, "UID"); 
     $DateXML = 
@@ -236,17 +236,17 @@ foreach($XMLmain->sub as $EventKey => $Event)
     else
       $SIDDB = $PSIDDB  = $TimeDB = $LenDB  = $RIDDB  = $ManDB =  $URLDB = "";
 
-    echo "\t<td><input name=\"PSIDXML\" type=\"text\" value=\"$PSIDXML\" size=\"2\" eadonly></td>\n";
-    echo "\t<td><input name=\"DateXML\" type=\"text\" value=\"$DateXML\" size=\"17\" readonly>\n\t\t".
+    echo "<td><input name=\"PSIDXML\" type=\"text\" value=\"$PSIDXML\" size=\"2\" eadonly></td>\n";
+    echo "<td><input name=\"DateXML\" type=\"text\" value=\"$DateXML\" size=\"17\" readonly>\n".
        "<input name=\"DateDB\" type=\"text\" value=\"$TimeDB\" size=\"17\" readonly></td>\n";
-    echo "\t<td><input name=\"RIDXML\" type=\"text\" value=\"$RIDXML\" size=\"15\" readonly>\n\t\t".
+    echo "<td><input name=\"RIDXML\" type=\"text\" value=\"$RIDXML\" size=\"15\" readonly>\n".
        "<input name=\"RIDDB\" type=\"text\" value=\"$RIDDB\" size=\"15\" readonly></td>\n";
-    echo "\t<td><input name=\"LenXML\" type=\"text\" value=\"$LenXML\" size=\"1\"readonly>\n\t\t".
+    echo "<td><input name=\"LenXML\" type=\"text\" value=\"$LenXML\" size=\"1\"readonly>\n".
        "<input name=\"LenDB\" type=\"text\" value=\"$LenDB\" size=\"1\"readonly></td>\n";
-    echo "\t<td><input name=\"ManXML\" type=\"text\" value=\"$ManXML\" size=\"40\"readonly>\n\t\t".
+    echo "<td><input name=\"ManXML\" type=\"text\" value=\"$ManXML\" size=\"40\"readonly>\n".
        "<input name=\"ManDB\" type=\"text\" value=\"$ManDB\" size=\"40\"readonly></td>\n";
-    echo "\t<td><input name=\"URLXML\" type=\"hidden\" value=\"$URLXML\"></td>\n";
-    echo "\t<td><input name=\"URLDB\" type=\"hidden\" value=\"$URLDB\"></td>\n";
+    echo "<td><input name=\"URLXML\" type=\"hidden\" value=\"$URLXML\"></td>\n";
+    echo "<td><input name=\"URLDB\" type=\"hidden\" value=\"$URLDB\"></td>\n";
     if( !(  $PSIDXML==$PSIDDB && 
       $DateXML==$TimeDB && 
       $RIDXML==$RIDDB && 
@@ -254,15 +254,15 @@ foreach($XMLmain->sub as $EventKey => $Event)
       $ManXML==$ManDB &&
       $URLXML==$URLDB) )
     {
-      echo "\t<td><input type=\"submit\" name=\"ScheduleUpdate\" value=\"update\"></td>\n";
+      echo "<td><input type=\"submit\" name=\"ScheduleUpdate\" value=\"update\"></td>\n";
       $DS_KO++;
     }
     else
     {
-      echo "\t<td>". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "</td>\n";
+      echo "<td>". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "</td>\n";
       $DS_OK++;
     }
-    echo "\t</tr>\n";
+    echo "</tr>\n";
     echo "</form>\n";
     $Where.= " OR `PSID`='$PSIDXML'";
   }
@@ -281,7 +281,7 @@ echo mysql_error($con);
 if(mysql_num_rows($Erg2)>0 && $EnableSchudleDB )
   for( $i=0; $i<mysql_num_rows( $Erg2); $i++)
   {
-    echo "\t<tr>\n";
+    echo "<tr>\n";
     $SID  = mysql_result($Erg2, $i, "SID");
     $Time = mysql_result($Erg2, $i, "DateS");
     $Len  = mysql_result($Erg2, $i, "Len");
@@ -290,18 +290,18 @@ if(mysql_num_rows($Erg2)>0 && $EnableSchudleDB )
     else
       $RID  = "RID.". mysql_result($Erg2, $i, "RID");
     $Man  = mysql_result($Erg2, $i, "Man");
-    echo "\t<td><input name=\"SIDXML\" type=\"text\" value=\"$SID\" size=\"2\" eadonly></td>\n";
-    echo "\t<td><input name=\"DateXML\" type=\"text\" value=\"\" size=\"17\" readonly>\n\t\t".
+    echo "<td><input name=\"SIDXML\" type=\"text\" value=\"$SID\" size=\"2\" eadonly></td>\n";
+    echo "<td><input name=\"DateXML\" type=\"text\" value=\"\" size=\"17\" readonly>\n".
          "<input name=\"DateDB\" type=\"text\" value=\"$Time\" size=\"17\" readonly></td>\n";
-    echo "\t<td><input name=\"RIDXML\" type=\"text\" value=\"\" size=\"15\" readonly>\n\t\t".
+    echo "<td><input name=\"RIDXML\" type=\"text\" value=\"\" size=\"15\" readonly>\n".
          "<input name=\"RIDDB\" type=\"text\" value=\"$RID\" size=\"15\" readonly></td>\n";
-    echo "\t<td><input name=\"LenXML\" type=\"text\" value=\"\" size=\"1\"readonly>\n\t\t".
+    echo "<td><input name=\"LenXML\" type=\"text\" value=\"\" size=\"1\"readonly>\n".
          "<input name=\"LenDB\" type=\"text\" value=\"$Len\" size=\"1\"readonly></td>\n";
-    echo "\t<td><input name=\"ManXML\" type=\"text\" value=\"\" size=\"40\"readonly>\n\t\t".
+    echo "<td><input name=\"ManXML\" type=\"text\" value=\"\" size=\"40\"readonly>\n".
          "<input name=\"ManDB\" type=\"text\" value=\"$Man\" size=\"40\"readonly></td>\n";
-    echo "\t<td>". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). 
+    echo "<td>". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). 
         "</td>\n";
-    echo "\t<tr>\n";
+    echo "<tr>\n";
   }
 echo "</table>";
 
diff --git a/includes/header.php b/includes/header.php
index d4f212d9..9cd2e51d 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -3,7 +3,7 @@ include "header_start.php";
 
 echo "<!DOCTYPE html>\n";
 ?>
-<html> 
+<html>
 <head>
 
 <title><?php echo $title; ?> - Engelsystem</title>
@@ -22,8 +22,6 @@ echo "<!DOCTYPE html>\n";
 <link rel="stylesheet" type="text/css" href="../css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : $default_theme ?>.css" />
 
 <?php
-
-
 if (isset ($reload)) {
 	if ($reload == "")
 		$reload = 3330;
@@ -93,9 +91,9 @@ if ($Page["CVS"] != "Y") {
 	echo "Du besitzt kein Rechte f&uuml;r diesen Bereich.<br />\n";
 
 	if (isset ($_SESSION['oldurl']))
-		echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
+		echo "<a href=\"" . $_SESSION["oldurl"] . "\">hier</a> gehts zur&uuml;ck...\n";
 	else
-		echo "<a href=\"" . $url . $ENGEL_ROOT . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
+		echo "<a href=\"" . $url . $ENGEL_ROOT . "\">hier</a> geht's zur&uuml;ck...\n";
 
 	exit ();
 }
diff --git a/www-ssl/bootstrap.php b/www-ssl/bootstrap.php
index 3189c89a..40a32578 100644
--- a/www-ssl/bootstrap.php
+++ b/www-ssl/bootstrap.php
@@ -1,6 +1,4 @@
 <?php
-
-
 // path and include settings
 $rootpath = str_replace(DIRECTORY_SEPARATOR . 'bootstrap.php', '', __FILE__);
 define('ROOTPATH', $rootpath);