mambax7 / chess

class/chessgame.inc.php

Braces +495 added lines, -292 removed lines

@@ -260,8 +260,7 @@ 
 	if (!$this->fen_piece_placement_to_board())
 	{
 		return _MD_CHESS_FENBAD_PP_INVALID; // piece_placement invalid
-	}
-	elseif ($this->gamestate['fen_active_color'] != 'w' and $this->gamestate['fen_active_color'] != 'b')
+	} elseif ($this->gamestate['fen_active_color'] != 'w' and $this->gamestate['fen_active_color'] != 'b')
 	{
 		return _MD_CHESS_FENBAD_AC_INVALID; // active_color invalid
 	}
@@ -269,46 +268,37 @@ 
 	elseif ($this->gamestate['fen_castling_availability'] != '-' and !preg_match('/^K?Q?k?q?$/', $this->gamestate['fen_castling_availability']))
 	{
 		return _MD_CHESS_FENBAD_CA_INVALID; // castling_availability invalid
-	}
-	elseif ($this->gamestate['fen_en_passant_target_square'] != '-' and !preg_match('/^[a-h][36]$/', $this->gamestate['fen_en_passant_target_square']))
+	} elseif ($this->gamestate['fen_en_passant_target_square'] != '-' and !preg_match('/^[a-h][36]$/', $this->gamestate['fen_en_passant_target_square']))
 	{
 		return _MD_CHESS_FENBAD_EP_INVALID; // en_passant_target_square invalid
-	}
-	elseif (!preg_match('/^\d{0,4}$/', $this->gamestate['fen_halfmove_clock']))
+	} elseif (!preg_match('/^\d{0,4}$/', $this->gamestate['fen_halfmove_clock']))
 	{
 		return _MD_CHESS_FENBAD_HC_INVALID; // halfmove_clock invalid
-	}
-	elseif (!preg_match('/^\d{0,4}$/', $this->gamestate['fen_fullmove_number']) or $this->gamestate['fen_fullmove_number'] < 1)
+	} elseif (!preg_match('/^\d{0,4}$/', $this->gamestate['fen_fullmove_number']) or $this->gamestate['fen_fullmove_number'] < 1)
 	{
 		return _MD_CHESS_FENBAD_FN_INVALID; // fullmove_number invalid
-	}
-	elseif ($this->insufficient_mating_material())
+	} elseif ($this->insufficient_mating_material())
 	{
 		return _MD_CHESS_FENBAD_MATERIAL; // insufficient mating material
-	}
-	elseif (($this->gamestate['fen_active_color'] == 'w' and $this->kingIsUnderAttack('b', 'w'))
+	} elseif (($this->gamestate['fen_active_color'] == 'w' and $this->kingIsUnderAttack('b', 'w'))
 		or   ($this->gamestate['fen_active_color'] == 'b' and $this->kingIsUnderAttack('w', 'b')))
 	{
 		return _MD_CHESS_FENBAD_IN_CHECK; // player to move cannot have opponent in check
-	}
-	elseif ((strstr($this->gamestate['fen_castling_availability'], 'K') and ($this->board[ 4] != 'wK' or $this->board[ 7] != 'wR'))
+	} elseif ((strstr($this->gamestate['fen_castling_availability'], 'K') and ($this->board[ 4] != 'wK' or $this->board[ 7] != 'wR'))
 		or   (strstr($this->gamestate['fen_castling_availability'], 'Q') and ($this->board[ 4] != 'wK' or $this->board[ 0] != 'wR'))
 		or   (strstr($this->gamestate['fen_castling_availability'], 'k') and ($this->board[60] != 'bK' or $this->board[63] != 'bR'))
 		or   (strstr($this->gamestate['fen_castling_availability'], 'q') and ($this->board[60] != 'bK' or $this->board[56] != 'bR')))
 	{
 		return _MD_CHESS_FENBAD_CA_INCONSISTENT; // castling availability inconsistent with piece placement
-	}
-	elseif (($this->gamestate['fen_en_passant_target_square'] != '-' and $this->gamestate['fen_en_passant_target_square']{1} == 3 and $this->gamestate['fen_active_color'] != 'b')
+	} elseif (($this->gamestate['fen_en_passant_target_square'] != '-' and $this->gamestate['fen_en_passant_target_square']{1} == 3 and $this->gamestate['fen_active_color'] != 'b')
 		or   ($this->gamestate['fen_en_passant_target_square'] != '-' and $this->gamestate['fen_en_passant_target_square']{1} == 6 and $this->gamestate['fen_active_color'] != 'w'))
 	{
 		return _MD_CHESS_FENBAD_EP_COLOR; // en passant target square wrong color
-	}
-	elseif ($this->gamestate['fen_en_passant_target_square'] != '-' and $this->gamestate['fen_en_passant_target_square']{1} == 3
+	} elseif ($this->gamestate['fen_en_passant_target_square'] != '-' and $this->gamestate['fen_en_passant_target_square']{1} == 3
 		and $this->board[$this->boardCoordToIndex($this->gamestate['fen_en_passant_target_square']{0} . '4')] != 'wP')
 	{
 		return _MD_CHESS_FENBAD_EP_NO_PAWN; // en passant target square for nonexistent pawn
-	}
-	elseif ($this->gamestate['fen_en_passant_target_square'] != '-' and $this->gamestate['fen_en_passant_target_square']{1} == 6
+	} elseif ($this->gamestate['fen_en_passant_target_square'] != '-' and $this->gamestate['fen_en_passant_target_square']{1} == 6
 		and $this->board[$this->boardCoordToIndex($this->gamestate['fen_en_passant_target_square']{0} . '5')] != 'bP')
 	{
 		return _MD_CHESS_FENBAD_EP_NO_PAWN; // en passant target square for nonexistent pawn
@@ -341,8 +331,9 @@ 
 
 		#echo "path: $pos: '$this->board[$pos]' "; #*#DEBUG#
 
-		if (!$this->is_empty_tile($pos))
-			return 0;
+		if (!$this->is_empty_tile($pos)) {
+					return 0;
+		}
 	}
 
 	return 1;
@@ -421,8 +412,7 @@ 
 				$change += ($dx < $fx) ? -1 : 1;
 			} elseif ($fx == $dx) {
 				$change = ($dy < $fy) ? -8 : 8;
-			} 
-			else {
+			} else {
 				$change = ($dx < $fx) ? -1 : 1;
 			}
 			break;
@@ -448,7 +438,9 @@ 
  */
 function tileIsReachable($fig, $fig_pos, $dest_pos)
 {
-  if ( $fig_pos==$dest_pos) return;
+  if ( $fig_pos==$dest_pos) {
+  	return;
+  }
   $result = 0;
   $fy = floor($fig_pos/8); $fx = $fig_pos%8;
   $dy = floor($dest_pos/8); $dx = $dest_pos%8;
@@ -457,61 +449,103 @@ 
   {
     /* knight */
     case 'N':
-      if ( abs($fx-$dx)==1 && abs($fy-$dy)==2 )
-        $result = 1;
-      if ( abs($fy-$dy)==1 && abs($fx-$dx)==2 )
-        $result = 1;
+      if ( abs($fx-$dx)==1 && abs($fy-$dy)==2 ) {
+              $result = 1;
+      }
+      if ( abs($fy-$dy)==1 && abs($fx-$dx)==2 ) {
+              $result = 1;
+      }
       break;
     /* bishop */
     case 'B':
-      if ( abs($fx-$dx) != abs($fy-$dy) )
-        break;
-      if ( $dy < $fy ) $change = -8; else $change =  8;
-      if ( $dx < $fx ) $change -= 1; else $change += 1;
-      if ( $this->pathIsNotBlocked( $fig_pos+$change, $dest_pos, $change ) )
-        $result = 1;
+      if ( abs($fx-$dx) != abs($fy-$dy) ) {
+              break;
+      }
+      if ( $dy < $fy ) {
+      	$change = -8;
+      } else {
+      	$change =  8;
+      }
+      if ( $dx < $fx ) {
+      	$change -= 1;
+      } else {
+      	$change += 1;
+      }
+      if ( $this->pathIsNotBlocked( $fig_pos+$change, $dest_pos, $change ) ) {
+              $result = 1;
+      }
       break;
     /* rook */
     case 'R':
-      if ( $fx!=$dx && $fy!=$dy )
-        break;
+      if ( $fx!=$dx && $fy!=$dy ) {
+              break;
+      }
       if ( $fx==$dx ) 
       {
-        if ( $dy<$fy ) $change = -8; else $change = 8;
+        if ( $dy<$fy ) {
+        	$change = -8;
+        } else {
+        	$change = 8;
+        }
+      } else {
+        if ( $dx<$fx ) {
+        	$change = -1;
+        } else {
+        	$change = 1;
+        }
       }
-      else {
-        if ( $dx<$fx ) $change = -1; else $change = 1;
+      if ( $this->pathIsNotBlocked( $fig_pos+$change, $dest_pos, $change ) ) {
+              $result = 1;
       }
-      if ( $this->pathIsNotBlocked( $fig_pos+$change, $dest_pos, $change ) )
-        $result = 1;
       break;
     /* queen */
     case 'Q':
-      if ( abs($fx-$dx) != abs($fy-$dy) && $fx!=$dx && $fy!=$dy )
-        break;
+      if ( abs($fx-$dx) != abs($fy-$dy) && $fx!=$dx && $fy!=$dy ) {
+              break;
+      }
       if ( abs($fx-$dx) == abs($fy-$dy) )
       {
-        if ( $dy < $fy ) $change = -8; else $change =  8;
-        if ( $dx < $fx ) $change -= 1; else $change += 1;
-      }
-      else if ( $fx==$dx ) {
-        if ( $dy<$fy ) $change = -8; else $change = 8;
-      } 
-      else
+        if ( $dy < $fy ) {
+        	$change = -8;
+        } else {
+        	$change =  8;
+        }
+        if ( $dx < $fx ) {
+        	$change -= 1;
+        } else {
+        	$change += 1;
+        }
+      } else if ( $fx==$dx ) {
+        if ( $dy<$fy ) {
+        	$change = -8;
+        } else {
+        	$change = 8;
+        }
+      } else
       {
-        if ( $dx<$fx ) $change = -1; else $change = 1;
+        if ( $dx<$fx ) {
+        	$change = -1;
+        } else {
+        	$change = 1;
+        }
+      }
+      if ( $this->pathIsNotBlocked( $fig_pos+$change, $dest_pos, $change ) ) {
+              $result = 1;
       }
-      if ( $this->pathIsNotBlocked( $fig_pos+$change, $dest_pos, $change ) )
-        $result = 1;
       break;
     /* king */
     case 'K':
-      if ( abs($fx-$dx) > 1 || abs($fy-$dy) > 1 ) break;
+      if ( abs($fx-$dx) > 1 || abs($fy-$dy) > 1 ) {
+      	break;
+      }
       $kings = 0;
       $adj_tiles = $this->getAdjTiles( $dest_pos );
-      foreach( $adj_tiles as $tile )
-        if ($this->board[$tile]{1} == 'K' ) $kings++;
-      if ( $kings == 2 ) break;
+      foreach( $adj_tiles as $tile ) {
+              if ($this->board[$tile]{1} == 'K' ) $kings++;
+      }
+      if ( $kings == 2 ) {
+      	break;
+      }
       $result = 1;
       break;
   }
@@ -533,17 +567,20 @@ 
 {
   if ( $this->board[$fig_pos]{0} == 'w' )
   {
-    if ( ($fig_pos % 8) > 0 && $dest_pos == $fig_pos+7 )
-      return 1;
-    if ( ($fig_pos % 8) < 7 && $dest_pos == $fig_pos+9 )
-      return 1;
-  }
-  else if ( $this->board[$fig_pos]{0} == 'b' )
+    if ( ($fig_pos % 8) > 0 && $dest_pos == $fig_pos+7 ) {
+          return 1;
+    }
+    if ( ($fig_pos % 8) < 7 && $dest_pos == $fig_pos+9 ) {
+          return 1;
+    }
+  } else if ( $this->board[$fig_pos]{0} == 'b' )
   {
-    if ( ($fig_pos % 8) < 7 && $dest_pos == $fig_pos-7 )
-      return 1;
-    if ( ($fig_pos % 8) > 0 && $dest_pos == $fig_pos-9 )
-      return 1;
+    if ( ($fig_pos % 8) < 7 && $dest_pos == $fig_pos-7 ) {
+          return 1;
+    }
+    if ( ($fig_pos % 8) > 0 && $dest_pos == $fig_pos-9 ) {
+          return 1;
+    }
   }
   return 0;
 }
@@ -568,23 +605,28 @@ 
   
   if ( $this->board[$fig_pos]{0} == 'w' )
   {
-    if ( $fig_pos >= 8 && $fig_pos <= 15 )
-      $first_move = 1;
-    if ( $dest_pos==$fig_pos+8 )
-      return 1;
-    if ( $first_move && ( $dest_pos==$fig_pos+16 ) )
-    if ($this->is_empty_tile($fig_pos + 8))
+    if ( $fig_pos >= 8 && $fig_pos <= 15 ) {
+          $first_move = 1;
+    }
+    if ( $dest_pos==$fig_pos+8 ) {
+          return 1;
+    }
+    if ( $first_move && ( $dest_pos==$fig_pos+16 ) ) {
+        if ($this->is_empty_tile($fig_pos + 8))
       return 1;
-  }
-  else if ($this->board[$fig_pos]{0} == 'b' )
+    }
+  } else if ($this->board[$fig_pos]{0} == 'b' )
   {
-    if ( $fig_pos >= 48 && $fig_pos <= 55 )
-      $first_move = 1;
-    if ( $dest_pos==$fig_pos-8 )
-      return 1;
-    if ( $first_move && ( $dest_pos==$fig_pos-16 ) )
-    if ($this->is_empty_tile($fig_pos - 8))
+    if ( $fig_pos >= 48 && $fig_pos <= 55 ) {
+          $first_move = 1;
+    }
+    if ( $dest_pos==$fig_pos-8 ) {
+          return 1;
+    }
+    if ( $first_move && ( $dest_pos==$fig_pos-16 ) ) {
+        if ($this->is_empty_tile($fig_pos - 8))
       return 1;
+    }
   }
   return 0;
 }
@@ -601,8 +643,8 @@ 
 function tileIsUnderAttack($opp, $dest_pos)
 {
 #var_dump('tileIsUnderAttack, opp', $opp, 'dest_pos', $dest_pos, 'board', $board);#*#DEBUG#
-  for ( $i = 0; $i < 64; $i++ )
-    if ($this->board[$i]{0} == $opp )
+  for ( $i = 0; $i < 64; $i++ ) {
+      if ($this->board[$i]{0} == $opp )
     {
       if ( ($this->board[$i]{1}=='P' && $this->checkPawnAttack($i,$dest_pos)) ||
            ($this->board[$i]{1}!='P' && 
@@ -610,6 +652,7 @@ 
       {
         /*DEBUG: echo "attack test: $i: ",$opp,"P<BR>"; */
         return 1;
+  }
       }
     }
   return 0;
@@ -628,10 +671,11 @@ 
 {
 
 #var_dump('kingIsUnderAttack, player', $player, 'opp', $opp, 'board', $board);#*#DEBUG#
-  for ( $i = 0; $i < 64; $i++ )
-    if ($this->board[$i]{0} == $player && $this->board[$i]{1} == 'K' )
+  for ( $i = 0; $i < 64; $i++ ) {
+      if ($this->board[$i]{0} == $player && $this->board[$i]{1} == 'K' )
     {
       $king_pos = $i;
+  }
       break;
     }
   /*DEBUG: echo "$player king is at $king_pos<BR>"; */
@@ -650,10 +694,11 @@ 
  */
 function isCheckMate($player, $opp)
 {
-  for ( $i = 0; $i < 64; $i++ )
-    if ($this->board[$i]{0} == $player && $this->board[$i]{1} == 'K' )
+  for ( $i = 0; $i < 64; $i++ ) {
+      if ($this->board[$i]{0} == $player && $this->board[$i]{1} == 'K' )
     {
       $king_pos = $i;
+  }
       $king_x = $i % 8;
       $king_y = floor($i/8);
       break;
@@ -664,8 +709,12 @@ 
   $contents = $this->board[$king_pos]; $this->clear_tile($king_pos);
   foreach ( $adj_tiles as $dest_pos ) 
   {
-    if ($this->board[$dest_pos]{0} == $player ) continue;
-    if ( $this->tileIsUnderAttack($opp,$dest_pos) ) continue;
+    if ($this->board[$dest_pos]{0} == $player ) {
+    	continue;
+    }
+    if ( $this->tileIsUnderAttack($opp,$dest_pos) ) {
+    	continue;
+    }
     $this->board[$king_pos] = $contents;
     return 0;
   }
@@ -675,14 +724,15 @@ 
 
   /* get all figures that attack the king */
   $attackers = array(); $count = 0;
-  for ( $i = 0; $i < 64; $i++ )
-    if ( $this->board[$i]{0} == $opp )
+  for ( $i = 0; $i < 64; $i++ ) {
+      if ( $this->board[$i]{0} == $opp )
     {
       if ( ($this->board[$i]{1}=='P' && $this->checkPawnAttack($i,$king_pos)) ||
            ($this->board[$i]{1}!='P' && 
                 $this->tileIsReachable($this->board[$i]{1},$i,$king_pos)) )
       {
           $attackers[$count++] = $i;
+  }
       }
     }
   /* DEBUG: 
@@ -691,12 +741,14 @@ 
   echo "Attackercount: ",count($attackers), " "; */
  
   /* if more than one there is no chance to escape */
-  if ( $count > 1 ) return 1;
+  if ( $count > 1 ) {
+  	return 1;
+  }
 
   /* check whether attacker can be killed by own figure */
   $dest_pos = $attackers[0];
-  for ( $i = 0; $i < 64; $i++ )
-    if ( $this->board[$i]{0} == $player )
+  for ( $i = 0; $i < 64; $i++ ) {
+      if ( $this->board[$i]{0} == $player )
     {
       if ( ($this->board[$i]{1}=='P' && $this->checkPawnAttack($i,$dest_pos)) ||
            ($this->board[$i]{1}!='P' && $this->board[$i]{1}!='K' &&
@@ -707,12 +759,14 @@ 
       {
         /* DEBUG: echo "candidate: $i "; */
         $can_kill_atk = 0;
+  }
         $contents_def = $this->board[$i];
         $contents_atk = $this->board[$dest_pos];
         $this->board[$dest_pos] = $this->board[$i];
         $this->clear_tile($i);
-        if ( !$this->tileIsUnderAttack($opp,$king_pos) )
-          $can_kill_atk = 1;
+        if ( !$this->tileIsUnderAttack($opp,$king_pos) ) {
+                  $can_kill_atk = 1;
+        }
         $this->board[$i] = $contents_def;
         $this->board[$dest_pos] = $contents_atk;
         if ( $can_kill_atk )
@@ -727,14 +781,17 @@ 
   
   /* if attacking unit is a knight there
    * is no way to block the path */
-  if ( $this->board[$dest_pos]{1} == 'N' ) return 1;
+  if ( $this->board[$dest_pos]{1} == 'N' ) {
+  	return 1;
+  }
 
   /* if enemy is adjacent to king there is no
    * way either */
   $dest_x = $dest_pos % 8;
   $dest_y = floor($dest_pos/8);
-  if ( abs($dest_x-$king_x)<=1 && abs($dest_y-$king_y)<=1 )
-    return 1;
+  if ( abs($dest_x-$king_x)<=1 && abs($dest_y-$king_y)<=1 ) {
+      return 1;
+  }
 
   /* get the list of tiles between king and attacking
    * unit that can be blocked to stop the attack */
@@ -744,8 +801,8 @@ 
   /* DEBUG: foreach( $path as $tile ) echo "tile: $tile "; */
   foreach( $path as $pos )
   {
-    for ( $i = 0; $i < 64; $i++ )
-      if ( $this->board[$i]{0} == $player )
+    for ( $i = 0; $i < 64; $i++ ) {
+          if ( $this->board[$i]{0} == $player )
       {
         if ( ($this->board[$i]{1}=='P' && $this->checkPawnMove($i,$pos)) ||
              ($this->board[$i]{1}!='P' && $this->board[$i]{1}!='K' &&
@@ -753,6 +810,7 @@ 
         {
             /* DEBUG: echo "$i can block "; */
             return 0;
+    }
         }
       }
   }
@@ -772,16 +830,21 @@ 
  */
 function isStaleMate($player, $opp)
 {
-  for ( $i = 0; $i < 64; $i++ )
-    if ($this->board[$i]{0} == $player )
+  for ( $i = 0; $i < 64; $i++ ) {
+      if ($this->board[$i]{0} == $player )
       switch ($this->board[$i]{1} )
       {
         case 'K':
           $adj_tiles = $this->getAdjTiles( $i );
+  }
           foreach ( $adj_tiles as $pos ) 
           {
-            if ( $this->board[$pos]{0} == $player ) continue;
-            if ( $this->tileIsUnderAttack($opp,$pos) ) continue;
+            if ( $this->board[$pos]{0} == $player ) {
+            	continue;
+            }
+            if ( $this->tileIsUnderAttack($opp,$pos) ) {
+            	continue;
+            }
             return 0;
           }
           /* DEBUG:  echo "King cannot escape by itself! "; */
@@ -789,44 +852,88 @@ 
         case 'P':
           if ( $player == 'w' )
           {
-            if ($this->is_empty_tile($i + 8)) return 0;
-            if ( ($i%8) > 0 && $this->board[$i+7]{0} != $player ) return 0;
-            if ( ($i%8) < 7 && $this->board[$i+9]{0} != $player ) return 0;
-          }
-          else
+            if ($this->is_empty_tile($i + 8)) {
+            	return 0;
+            }
+            if ( ($i%8) > 0 && $this->board[$i+7]{0} != $player ) {
+            	return 0;
+            }
+            if ( ($i%8) < 7 && $this->board[$i+9]{0} != $player ) {
+            	return 0;
+            }
+          } else
           {
-            if ($this->is_empty_tile($i - 8)) return 0;
-            if ( ($i%8) > 0 && $this->board[$i-9]{0} != $player ) return 0;
-            if ( ($i%8) < 7 && $this->board[$i-7]{0} != $player ) return 0;
+            if ($this->is_empty_tile($i - 8)) {
+            	return 0;
+            }
+            if ( ($i%8) > 0 && $this->board[$i-9]{0} != $player ) {
+            	return 0;
+            }
+            if ( ($i%8) < 7 && $this->board[$i-7]{0} != $player ) {
+            	return 0;
+            }
           }
           break;
         case 'B':
-          if ( $i-9 >= 0  && $this->board[$i-9]{0} != $player ) return 0;
-          if ( $i-7 >= 0  && $this->board[$i-7]{0} != $player ) return 0;
-          if ( $i+9 <= 63 && $this->board[$i+9]{0} != $player ) return 0;
-          if ( $i+7 <= 63 && $this->board[$i+7]{0} != $player ) return 0;
+          if ( $i-9 >= 0  && $this->board[$i-9]{0} != $player ) {
+          	return 0;
+          }
+          if ( $i-7 >= 0  && $this->board[$i-7]{0} != $player ) {
+          	return 0;
+          }
+          if ( $i+9 <= 63 && $this->board[$i+9]{0} != $player ) {
+          	return 0;
+          }
+          if ( $i+7 <= 63 && $this->board[$i+7]{0} != $player ) {
+          	return 0;
+          }
           break;
         case 'R':
-          if ( $i-8 >= 0  && $this->board[$i-8]{0} != $player ) return 0;
-          if ( $i-1 >= 0  && $this->board[$i-1]{0} != $player ) return 0;
-          if ( $i+8 <= 63 && $this->board[$i+8]{0} != $player ) return 0;
-          if ( $i+1 <= 63 && $this->board[$i+1]{0} != $player ) return 0;
+          if ( $i-8 >= 0  && $this->board[$i-8]{0} != $player ) {
+          	return 0;
+          }
+          if ( $i-1 >= 0  && $this->board[$i-1]{0} != $player ) {
+          	return 0;
+          }
+          if ( $i+8 <= 63 && $this->board[$i+8]{0} != $player ) {
+          	return 0;
+          }
+          if ( $i+1 <= 63 && $this->board[$i+1]{0} != $player ) {
+          	return 0;
+          }
           break;
         case 'Q':
           $adj_tiles = $this->getAdjTiles( $i );
-          foreach ( $adj_tiles as $pos )
-            if ( $this->board[$pos]{0} != $player ) 
+          foreach ( $adj_tiles as $pos ) {
+                      if ( $this->board[$pos]{0} != $player ) 
               return 0;
+          }
           break;
         case 'N':
-          if ( $i-17 >= 0  && $this->board[$i-17]{0} != $player ) return 0; 
-          if ( $i-15 >= 0  && $this->board[$i-15]{0} != $player ) return 0;
-          if ( $i-6  >= 0  && $this->board[$i-6]{0}  != $player ) return 0;
-          if ( $i+10 <= 63 && $this->board[$i+10]{0} != $player ) return 0;
-          if ( $i+17 <= 63 && $this->board[$i+17]{0} != $player ) return 0;
-          if ( $i+15 <= 63 && $this->board[$i+15]{0} != $player ) return 0;
-          if ( $i+6  <= 63 && $this->board[$i+6]{0}  != $player ) return 0;
-          if ( $i-10 >= 0  && $this->board[$i-10]{0} != $player ) return 0;
+          if ( $i-17 >= 0  && $this->board[$i-17]{0} != $player ) {
+          	return 0;
+          }
+          if ( $i-15 >= 0  && $this->board[$i-15]{0} != $player ) {
+          	return 0;
+          }
+          if ( $i-6  >= 0  && $this->board[$i-6]{0}  != $player ) {
+          	return 0;
+          }
+          if ( $i+10 <= 63 && $this->board[$i+10]{0} != $player ) {
+          	return 0;
+          }
+          if ( $i+17 <= 63 && $this->board[$i+17]{0} != $player ) {
+          	return 0;
+          }
+          if ( $i+15 <= 63 && $this->board[$i+15]{0} != $player ) {
+          	return 0;
+          }
+          if ( $i+6  <= 63 && $this->board[$i+6]{0}  != $player ) {
+          	return 0;
+          }
+          if ( $i-10 >= 0  && $this->board[$i-10]{0} != $player ) {
+          	return 0;
+          }
           break;
       }
       
@@ -892,9 +999,10 @@ 
   {
     /* full move: a pawn requires a ? in the end
      * to automatically choose a queen on last line */
-    if ( $move[0] == 'P' )
-    if ( $move[strlen($move)-1]<'A' || $move[strlen($move)-1]>'Z' )
+    if ( $move[0] == 'P' ) {
+        if ( $move[strlen($move)-1]<'A' || $move[strlen($move)-1]>'Z' )
       $this->ac_move = "$move?";
+    }
     return "";
   }
 
@@ -912,8 +1020,10 @@ 
   if ($move{strlen($move)-1} == '=') {
     $move = substr($move, 0, strlen($move)-1);
   }
-  if ( $pawn_upg == "P" || $pawn_upg == "K" )
-    return _MD_CHESS_MOVE_PAWN_MAY_BECOME; // "A pawn may only become either a knight, a bishop, a rook or a queen!"
+  if ( $pawn_upg == "P" || $pawn_upg == "K" ) {
+      return _MD_CHESS_MOVE_PAWN_MAY_BECOME;
+  }
+  // "A pawn may only become either a knight, a bishop, a rook or a queen!"
 
   if ( $move[0]>='a' && $move[0]<='h' )
   {
@@ -921,21 +1031,23 @@ 
      * listed above */
     if ( strlen($move) == 4 )
     {
-      if ( $move[1] != 'x' )
-        return _MD_CHESS_MOVE_USE_X; // "use x to indicate an attack"
+      if ( $move[1] != 'x' ) {
+              return _MD_CHESS_MOVE_USE_X;
+      }
+      // "use x to indicate an attack"
       $dest_x = $move[2];
       $dest_y = $move[3];
       $src_x  = $move[0];
-      if ( $player == 'w' )
-        $src_y  = $dest_y-1;
-      else
-        $src_y  = $dest_y+1;
+      if ( $player == 'w' ) {
+              $src_y  = $dest_y-1;
+      } else {
+              $src_y  = $dest_y+1;
+      }
       $this->ac_move = sprintf( "P%s%dx%s%d%s", 
                           $src_x,$src_y,$dest_x,$dest_y,
                           $pawn_upg );
       return "";
-    }
-    else
+    } else
     if (strlen($move) == 2 )
     {
       $fig = sprintf( "%sP", $player );
@@ -943,16 +1055,26 @@ 
       {
         /* pawn move */
         $pos = $this->boardCoordToIndex( $move );
-        if ( $pos == 64 ) return $this->move_msg(_MD_CHESS_MOVE_COORD_INVALID, $move); // "coordinate $move is invalid"
+        if ( $pos == 64 ) {
+        	return $this->move_msg(_MD_CHESS_MOVE_COORD_INVALID, $move);
+        }
+        // "coordinate $move is invalid"
         if ( $player == 'w' )
         {
-          while( $pos >= 0 && $this->board[$pos] != $fig ) $pos -= 8;
-          if ( $pos < 0 ) $not_found = 1;
-        }
-        else
+          while( $pos >= 0 && $this->board[$pos] != $fig ) {
+          	$pos -= 8;
+          }
+          if ( $pos < 0 ) {
+          	$not_found = 1;
+          }
+        } else
         {
-          while( $pos <= 63 && $this->board[$pos] != $fig ) $pos += 8;
-          if ( $pos > 63 ) $not_found = 1;
+          while( $pos <= 63 && $this->board[$pos] != $fig ) {
+          	$pos += 8;
+          }
+          if ( $pos > 63 ) {
+          	$not_found = 1;
+          }
         }
         $pos = $this->boardIndexToCoord( $pos );
         if ( (isset($not_found) && $not_found) || $pos == "" ) {
@@ -961,127 +1083,155 @@ 
           $this->ac_move = sprintf( "P%s-%s%s", $pos, $move, $pawn_upg );
           return "";
         }
-      }
-      else
+      } else
       {
         /* notation: [a-h][a-h] for pawn attack no longer allowed 
          * except for history browser */
-        if ( $this->browsing_mode == 0 )
-            return _MD_CHESS_MOVE_USE_NOTATION; // "please use denotation [a-h]x[a-h][1-8] for pawn attacks (see help for more information)"
+        if ( $this->browsing_mode == 0 ) {
+                    return _MD_CHESS_MOVE_USE_NOTATION;
+        }
+        // "please use denotation [a-h]x[a-h][1-8] for pawn attacks (see help for more information)"
         /* pawn attack must be only one pawn in column! */
         $pawns = 0;
         $start = $this->boardCoordToIndex( sprintf( "%s1", $move[0] ) );
-        if ( $start == 64 ) return $this->move_msg(_MD_CHESS_MOVE_COORD_INVALID, $move[0]); // "coordinate $move[0] is invalid"
-        for ( $i = 1; $i <= 8; $i++, $start+=8 )
-          if ( $this->board[$start] == $fig ) 
+        if ( $start == 64 ) {
+        	return $this->move_msg(_MD_CHESS_MOVE_COORD_INVALID, $move[0]);
+        }
+        // "coordinate $move[0] is invalid"
+        for ( $i = 1; $i <= 8; $i++, $start+=8 ) {
+                  if ( $this->board[$start] == $fig ) 
           {
             $pawns++;
+        }
             $pawn_line = $i;
           }
-        if ( $pawns == 0 )
-          return $this->move_msg(_MD_CHESS_MOVE_NO_PAWN, $move[0]); // "there is no pawn in column $move[0]"
-        else if ( $pawns > 1 )
-          return $this->move_msg(_MD_CHESS_MOVE_TWO_PAWNS, $move[0]); // "there is more than one pawn in column $move[0]"
+        if ( $pawns == 0 ) {
+                  return $this->move_msg(_MD_CHESS_MOVE_NO_PAWN, $move[0]);
+        }
+        // "there is no pawn in column $move[0]"
+        else if ( $pawns > 1 ) {
+                  return $this->move_msg(_MD_CHESS_MOVE_TWO_PAWNS, $move[0]);
+        }
+        // "there is more than one pawn in column $move[0]"
         else
         {
-          if ( $player == 'w' )
-            $dest_line = $pawn_line+1;
-          else
-            $dest_line = $pawn_line-1;
+          if ( $player == 'w' ) {
+                      $dest_line = $pawn_line+1;
+          } else {
+                      $dest_line = $pawn_line-1;
+          }
           $this->ac_move = sprintf( "P%s%dx%s%d", 
                             $move[0],$pawn_line,$move[1],$dest_line );
           return "";
         }
       }
     }
-  }
-  else
+  } else
   {
     /* figure move */
     $dest_coord = substr( $move, strlen($move)-2, 2 );
     $action = $move[strlen($move)-3];
-    if ( $action != 'x' ) $action = '-';
-    if ( $player == 'w' ) 
-      $figures = $this->w_figures;
-    else
-      $figures = $this->b_figures;
+    if ( $action != 'x' ) {
+    	$action = '-';
+    }
+    if ( $player == 'w' ) {
+          $figures = $this->w_figures;
+    } else {
+          $figures = $this->b_figures;
+    }
     $fig_count = 0;
-    foreach( $figures as $figure )
-      if ( $figure[0] == $move[0] )
+    foreach( $figures as $figure ) {
+          if ( $figure[0] == $move[0] )
       {
         $fig_count++;
-        if ( $fig_count == 1 )
-          $pos1 = substr( $figure, 1, 2 );
-        else
-          $pos2 = substr( $figure, 1, 2 );
+    }
+        if ( $fig_count == 1 ) {
+                  $pos1 = substr( $figure, 1, 2 );
+        } else {
+                  $pos2 = substr( $figure, 1, 2 );
+        }
       }
-    if ( $fig_count == 0 )
-      return $this->move_msg(_MD_CHESS_MOVE_NO_FIGURE, $move[0], $this->getFullFigureName($move[0])); // sprintf("there is no figure %s = %s", $move[0], $this->getFullFigureName($move[0]))
+    if ( $fig_count == 0 ) {
+          return $this->move_msg(_MD_CHESS_MOVE_NO_FIGURE, $move[0], $this->getFullFigureName($move[0]));
+    }
+    // sprintf("there is no figure %s = %s", $move[0], $this->getFullFigureName($move[0]))
     else
     if ( $fig_count == 1 )
     {
        $this->ac_move = sprintf( "%s%s%s%s",
                       $move[0], $pos1, $action, $dest_coord ); 
        return "";
-    }
-    else
+    } else
     {
       /* two figures which may cause ambiguity */
       $dest_pos = $this->boardCoordToIndex( $dest_coord );
-      if ( $dest_pos == 64 ) 
-        return $this->move_msg(_MD_CHESS_MOVE_COORD_INVALID, $dest_coord); // "coordinate $dest_coord is invalid"
+      if ( $dest_pos == 64 ) {
+              return $this->move_msg(_MD_CHESS_MOVE_COORD_INVALID, $dest_coord);
+      }
+      // "coordinate $dest_coord is invalid"
       $fig1_can_reach = $this->tileIsReachable( $move[0], 
                             $this->boardCoordToIndex($pos1), $dest_pos );
       $fig2_can_reach = $this->tileIsReachable( $move[0], 
                             $this->boardCoordToIndex($pos2), $dest_pos );
-      if ( !$fig1_can_reach && !$fig2_can_reach )
-        return $this->move_msg(_MD_CHESS_MOVE_NEITHER_CAN_REACH, $move[0], $this->getFullFigureName($move[0]), $dest_coord); // sprintf("neither of the %s = %s can reach %s", $move[0], $this->getFullFigureName($move[0]), $dest_coord)
+      if ( !$fig1_can_reach && !$fig2_can_reach ) {
+              return $this->move_msg(_MD_CHESS_MOVE_NEITHER_CAN_REACH, $move[0], $this->getFullFigureName($move[0]), $dest_coord);
+      }
+      // sprintf("neither of the %s = %s can reach %s", $move[0], $this->getFullFigureName($move[0]), $dest_coord)
       else
       if ( $fig1_can_reach && $fig2_can_reach )
       {
         /* ambiguity - check whether a hint is given */
         if ( ($action=='-' && strlen($move)==4) ||
-             ($action=='x' && strlen($move)==5) )
-          $hint = $move[1];
-        if ( empty($hint) )
-          return $this->move_msg(_MD_CHESS_MOVE_BOTH_CAN_REACH, $move[0], $this->getFullFigureName($move[0]), $dest_coord); // sprintf("both of the %s = %s can reach %s", $move[0], $this->getFullFigureName($move[0]), $dest_coord)
+             ($action=='x' && strlen($move)==5) ) {
+                  $hint = $move[1];
+        }
+        if ( empty($hint) ) {
+                  return $this->move_msg(_MD_CHESS_MOVE_BOTH_CAN_REACH, $move[0], $this->getFullFigureName($move[0]), $dest_coord);
+        }
+        // sprintf("both of the %s = %s can reach %s", $move[0], $this->getFullFigureName($move[0]), $dest_coord)
         else
         {
           $move_fig1 = 0;
           $move_fig2 = 0;
           if ( $hint>='1' && $hint<='8' )
           {
-            if ( $pos1[1]==$hint && $pos2[1]!=$hint )
-              $move_fig1 = 1;
-            if ( $pos2[1]==$hint && $pos1[1]!=$hint )
-              $move_fig2 = 1;
-          }
-          else
+            if ( $pos1[1]==$hint && $pos2[1]!=$hint ) {
+                          $move_fig1 = 1;
+            }
+            if ( $pos2[1]==$hint && $pos1[1]!=$hint ) {
+                          $move_fig2 = 1;
+            }
+          } else
           {
-            if ( $pos1[0]==$hint && $pos2[0]!=$hint )
-              $move_fig1 = 1;
-            if ( $pos2[0]==$hint && $pos1[0]!=$hint )
-              $move_fig2 = 1;
+            if ( $pos1[0]==$hint && $pos2[0]!=$hint ) {
+                          $move_fig1 = 1;
+            }
+            if ( $pos2[0]==$hint && $pos1[0]!=$hint ) {
+                          $move_fig2 = 1;
+            }
           }
-          if ( !$move_fig1 && !$move_fig2 )
-            return _MD_CHESS_MOVE_AMBIGUOUS; // "ambiguity is not properly resolved"
-          if ( $move_fig1 )
-            $this->ac_move = sprintf( "%s%s%s%s",
+          if ( !$move_fig1 && !$move_fig2 ) {
+                      return _MD_CHESS_MOVE_AMBIGUOUS;
+          }
+          // "ambiguity is not properly resolved"
+          if ( $move_fig1 ) {
+                      $this->ac_move = sprintf( "%s%s%s%s",
                           $move[0], $pos1, $action, $dest_coord );
-          else
-            $this->ac_move = sprintf( "%s%s%s%s",
+          } else {
+                      $this->ac_move = sprintf( "%s%s%s%s",
                           $move[0], $pos2, $action, $dest_coord );
+          }
           return;
         }
-      }
-      else
+      } else
       {
-        if ( $fig1_can_reach )
-          $this->ac_move = sprintf( "%s%s%s%s",
-                        $move[0], $pos1, $action, $dest_coord ); 
-        else
-          $this->ac_move = sprintf( "%s%s%s%s",
-                        $move[0], $pos2, $action, $dest_coord ); 
+        if ( $fig1_can_reach ) {
+                  $this->ac_move = sprintf( "%s%s%s%s",
+                        $move[0], $pos1, $action, $dest_coord );
+        } else {
+                  $this->ac_move = sprintf( "%s%s%s%s",
+                        $move[0], $pos2, $action, $dest_coord );
+        }
         return "";
       }
     }
@@ -1113,22 +1263,23 @@ 
   {
     /* skip P anycase. for attacks skip source digit
        and for moves skip source pos and - */
-    if ( $move[3] == '-' )
-      $new_move = substr( $move, 4 );
-    else
-    if ( $move[3] == 'x' )
-      $new_move = sprintf("%s%s", $move[1], substr( $move, 3 ) );
-  }
-  else
+    if ( $move[3] == '-' ) {
+          $new_move = substr( $move, 4 );
+    } else
+    if ( $move[3] == 'x' ) {
+          $new_move = sprintf("%s%s", $move[1], substr( $move, 3 ) );
+    }
+  } else
   {
     /* try to remove the source position and check whether it
      * is a non-ambigious move. if it is add one of the components
      * and check again */
-    if ( $move[3] == '-' )
-      $dest = substr( $move, 4 );
-    else
-    if ( $move[3] == 'x' )
-      $dest = substr( $move, 3 );
+    if ( $move[3] == '-' ) {
+          $dest = substr( $move, 4 );
+    } else
+    if ( $move[3] == 'x' ) {
+          $dest = substr( $move, 3 );
+    }
     $new_move = sprintf("%s%s", $move[0], $dest );
     if ( $this->completeMove($player,$new_move) != "" )
     {
@@ -1138,8 +1289,10 @@ 
       {
         /* add other component */
         $new_move = sprintf("%s%s%s", $move[0], $move[2], $dest );
-        if ( $this->completeMove($player,$new_move) != "" )
-           $new_move = $move; /* give up */
+        if ( $this->completeMove($player,$new_move) != "" ) {
+                   $new_move = $move;
+        }
+        /* give up */
       }
     }
   }
@@ -1323,67 +1476,91 @@ 
 		$result = _MD_CHESS_MOVE_CASTLED_LONG;
 		$move_handled = 1;
 		$this->last_move = "O-O-O";
-	}
-
-  else
+	} else
   {
     /* [PRNBQK][a-h][1-8][-:x][a-h][1-8][RNBQK] full move */
 
     /* allow short move description by autocompleting to
      * full description */
     $ac_error = $this->completeMove( $cur_player, trim($move) );
-    if ( $ac_error != "" )
-      return(array(false, $ac_error)); // "ERROR: autocomplete: $ac_error"
-    else 
-      $move = $this->ac_move;
+    if ( $ac_error != "" ) {
+          return(array(false, $ac_error));
+    }
+    // "ERROR: autocomplete: $ac_error"
+    else {
+          $move = $this->ac_move;
+    }
     $this->last_move = str_replace( "?", "", $move );
     
     /* a final captial letter may only be N,B,R,Q for the
      * appropiate chessman */
     $c = $move[strlen($move)-1];
-    if ( $c >= 'A' && $c <= 'Z' )
-    if ( $c != 'N' && $c != 'B' && $c != 'R' && $c != 'Q' )
-      return(array(false, _MD_CHESS_MOVE_INVALID_PIECE)); // "ERROR: only N (knight), B (bishop), R (rook) and Q (queen) are valid chessman identifiers"
+    if ( $c >= 'A' && $c <= 'Z' ) {
+        if ( $c != 'N' && $c != 'B' && $c != 'R' && $c != 'Q' )
+      return(array(false, _MD_CHESS_MOVE_INVALID_PIECE));
+    }
+    // "ERROR: only N (knight), B (bishop), R (rook) and Q (queen) are valid chessman identifiers"
     
     /* if it is a full move, try to shorten the history move */
-    if ( strlen( $history_move ) >= 6 )
-      $history_move = 
+    if ( strlen( $history_move ) >= 6 ) {
+          $history_move = 
           $this->convertFullToChessNotation($cur_player,$history_move);
+    }
     /* DEBUG: echo "Move: $move ($history_move)<BR>"; */
     
     /* validate figure and position */
     $fig_type = $move[0];
     $fig_name = $this->getFullFigureName( $fig_type );
-    if ( $fig_name == "empty" )
-      return(array(false, $this->move_msg(_MD_CHESS_MOVE_UNKNOWN_FIGURE, $fig_type))); // "ERROR: Figure $fig_type is unknown!"
+    if ( $fig_name == "empty" ) {
+          return(array(false, $this->move_msg(_MD_CHESS_MOVE_UNKNOWN_FIGURE, $fig_type)));
+    }
+    // "ERROR: Figure $fig_type is unknown!"
     $fig_coord = substr($move,1,2);
     $fig_pos = $this->boardCoordToIndex( $fig_coord );
-    if ( $fig_pos == 64 ) return(array(false, $this->move_msg(_MD_CHESS_MOVE_COORD_INVALID, $fig_coord))); // "ERROR: $fig_coord is invalid!"
+    if ( $fig_pos == 64 ) {
+    	return(array(false, $this->move_msg(_MD_CHESS_MOVE_COORD_INVALID, $fig_coord)));
+    }
+    // "ERROR: $fig_coord is invalid!"
     /* DEBUG  echo "fig_type: $fig_type, fig_pos: $fig_pos<BR>"; */
-    if ($this->is_empty_tile($fig_pos))
-      return(array(false, $this->move_msg(_MD_CHESS_MOVE_TILE_EMPTY, $fig_coord))); // "ERROR: Tile $fig_coord is empty."
-    if ( $this->board[$fig_pos]{0} != $cur_player )
-      return(array(false, _MD_CHESS_MOVE_NOT_YOUR_PIECE)); // "ERROR: Figure does not belong to you!"
-    if ( $this->board[$fig_pos]{1} != $fig_type )
-      return(array(false, _MD_CHESS_MOVE_NOEXIST_FIGURE)); // "ERROR: Figure does not exist!"
+    if ($this->is_empty_tile($fig_pos)) {
+          return(array(false, $this->move_msg(_MD_CHESS_MOVE_TILE_EMPTY, $fig_coord)));
+    }
+    // "ERROR: Tile $fig_coord is empty."
+    if ( $this->board[$fig_pos]{0} != $cur_player ) {
+          return(array(false, _MD_CHESS_MOVE_NOT_YOUR_PIECE));
+    }
+    // "ERROR: Figure does not belong to you!"
+    if ( $this->board[$fig_pos]{1} != $fig_type ) {
+          return(array(false, _MD_CHESS_MOVE_NOEXIST_FIGURE));
+    }
+    // "ERROR: Figure does not exist!"
     
     /* get target index */
     $dest_coord = substr($move,4,2);
     $dest_pos = $this->boardCoordToIndex( $dest_coord );
-    if ( $dest_pos == 64 )
-      return(array(false, $this->move_msg(_MD_CHESS_MOVE_COORD_INVALID, $dest_coord))); // "ERROR: $dest_coord is invalid!"
-    if ( $dest_pos == $fig_pos )
-      return(array(false, _MD_CHESS_MOVE_START_END_SAME));
+    if ( $dest_pos == 64 ) {
+          return(array(false, $this->move_msg(_MD_CHESS_MOVE_COORD_INVALID, $dest_coord)));
+    }
+    // "ERROR: $dest_coord is invalid!"
+    if ( $dest_pos == $fig_pos ) {
+          return(array(false, _MD_CHESS_MOVE_START_END_SAME));
+    }
     /* DEBUG  echo "dest_pos: $dest_pos<BR>"; */
 
     /* get action */
     $action = $move[3];
-    if ( $move[3] == "-" ) 
-      $action = 'M'; /* move */
-    else if ( $move[3] == 'x' )
-      $action = 'A'; /* attack */
-    else
-      return(array(false, $this->move_msg(_MD_CHESS_MOVE_UNKNOWN_ACTION, $action))); // "ERROR: $action is unknown! Please use \"-\" for a move and \"x\" for an attack."
+    if ( $move[3] == "-" ) {
+          $action = 'M';
+    }
+    /* move */
+    else if ( $move[3] == 'x' ) {
+          $action = 'A';
+    }
+    /* attack */
+    else {
+          return(array(false, $this->move_msg(_MD_CHESS_MOVE_UNKNOWN_ACTION, $action)));
+    }
+    // "ERROR: $action is unknown! Please use \"-\" for a move and \"x\" for an attack."
 
     /* if attack an enemy unit must be present on tile
      * and if move then tile must be empty. in both cases
@@ -1395,14 +1572,19 @@ 
      * checked here. */
     if ( $fig_type != 'P' )
     {
-        if ( !$this->tileIsReachable( $fig_type, $fig_pos, $dest_pos ) )
-          return(array(false, $this->move_msg(_MD_CHESS_MOVE_OUT_OF_RANGE, $dest_coord, $fig_name, $fig_coord))); // "ERROR: Tile $dest_coord is out of moving range for $fig_name at $fig_coord!"
-    }
-    else {
-      if ( $action == 'M' && !$this->checkPawnMove( $fig_pos, $dest_pos ) )
-          return(array(false, $this->move_msg(_MD_CHESS_MOVE_OUT_OF_RANGE, $dest_coord, $fig_name, $fig_coord))); // "ERROR: Tile $dest_coord is out of moving range for $fig_name at $fig_coord!"
-      if ( $action == 'A' && !$this->checkPawnAttack( $fig_pos, $dest_pos ) )
-          return(array(false, $this->move_msg(_MD_CHESS_MOVE_OUT_OF_RANGE, $dest_coord, $fig_name, $fig_coord))); // "ERROR: Tile $dest_coord is out of attacking range for $fig_name at $fig_coord!"
+        if ( !$this->tileIsReachable( $fig_type, $fig_pos, $dest_pos ) ) {
+                  return(array(false, $this->move_msg(_MD_CHESS_MOVE_OUT_OF_RANGE, $dest_coord, $fig_name, $fig_coord)));
+        }
+        // "ERROR: Tile $dest_coord is out of moving range for $fig_name at $fig_coord!"
+    } else {
+      if ( $action == 'M' && !$this->checkPawnMove( $fig_pos, $dest_pos ) ) {
+                return(array(false, $this->move_msg(_MD_CHESS_MOVE_OUT_OF_RANGE, $dest_coord, $fig_name, $fig_coord)));
+      }
+      // "ERROR: Tile $dest_coord is out of moving range for $fig_name at $fig_coord!"
+      if ( $action == 'A' && !$this->checkPawnAttack( $fig_pos, $dest_pos ) ) {
+                return(array(false, $this->move_msg(_MD_CHESS_MOVE_OUT_OF_RANGE, $dest_coord, $fig_name, $fig_coord)));
+      }
+      // "ERROR: Tile $dest_coord is out of attacking range for $fig_name at $fig_coord!"
     }
      
 	$en_passant_capture_performed = 0; // 1 if en passant captured occurred, else 0
@@ -1433,8 +1615,9 @@ 
 
     /* perform move */
     $this->clear_tile($fig_pos);
-    if (!$this->is_empty_tile($dest_pos))
-      $this->piece_captured = sprintf("%s%s",$this->board[$dest_pos],$dest_pos);
+    if (!$this->is_empty_tile($dest_pos)) {
+          $this->piece_captured = sprintf("%s%s",$this->board[$dest_pos],$dest_pos);
+    }
     $this->board[$dest_pos] = "$cur_player$fig_type";
     if ( $en_passant_capture_performed ) {
       /* kill pawn */
@@ -1442,8 +1625,7 @@ 
       {
         $this->clear_tile($dest_pos - 8);
         $this->piece_captured = sprintf("bP%s",$dest_pos-8);
-      }
-      else
+      } else
       {
         $this->clear_tile($dest_pos + 8);
         $this->piece_captured = sprintf("wP%s",$dest_pos+8);
@@ -1457,10 +1639,11 @@ 
       $this->board[$dest_pos] = $old_dest_tile;
       if ( $en_passant_capture_performed ) {
        // restore pawn that was captured above, since that move is invalid
-        if ( $cur_player == 'w' ) 
-          $this->board[$dest_pos-8] = "bP";
-        else
-          $this->board[$dest_pos+8] = "wP";
+        if ( $cur_player == 'w' ) {
+                  $this->board[$dest_pos-8] = "bP";
+        } else {
+                  $this->board[$dest_pos+8] = "wP";
+        }
       }
       return(array(false, _MD_CHESS_MOVE_IN_CHECK)); // "ERROR: Move is invalid because king would be under attack then."
     }
@@ -1501,10 +1684,11 @@ 
 		$this->gamestate['fen_en_passant_target_square'] = '-';
 	}
 
-    if ($action == 'M' )
-      $result = $this->move_msg(_MD_CHESS_MOVE_MOVED, $fig_name, $fig_coord, $dest_coord);
-    else
-      $result = $this->move_msg(_MD_CHESS_MOVE_CAPTURED, $fig_name, $dest_coord, $fig_coord);
+    if ($action == 'M' ) {
+          $result = $this->move_msg(_MD_CHESS_MOVE_MOVED, $fig_name, $fig_coord, $dest_coord);
+    } else {
+          $result = $this->move_msg(_MD_CHESS_MOVE_CAPTURED, $fig_name, $dest_coord, $fig_coord);
+    }
     
     /* if pawn reached last line convert into a queen */
     if ( $fig_type == 'P' )
@@ -1763,8 +1947,10 @@ 
     default: return 64; /* erronous coord */
   }
   $y = $coord[1]-1; 
-  if ( $y < 0 || $y > 7 )
-    return 64; /* erronous coord */
+  if ( $y < 0 || $y > 7 ) {
+      return 64;
+  }
+  /* erronous coord */
   $index = $y * 8 + $x;
   //echo "$index | ";
   return $index;
@@ -1781,8 +1967,9 @@ 
 function boardIndexToCoord( $index )
 {
   //echo $index," --> ";
-  if ( $index < 0 || $index > 63 )
-    return "";
+  if ( $index < 0 || $index > 63 ) {
+      return "";
+  }
   $y = floor($index/8)+1;
   $x = chr( ($index%8)+97 );
   $coord = "$x$y";
@@ -1825,14 +2012,30 @@ 
 
   $x = $fig_pos % 8; $y = floor( $fig_pos / 8 );
   
-  if ( $x > 0 && $y > 0 ) $adj_tiles[$i++] = $fig_pos-9;
-  if (           $y > 0 ) $adj_tiles[$i++] = $fig_pos-8;
-  if ( $x < 7 && $y > 0 ) $adj_tiles[$i++] = $fig_pos-7;
-  if ( $x < 7           ) $adj_tiles[$i++] = $fig_pos+1;
-  if ( $x < 7 && $y < 7 ) $adj_tiles[$i++] = $fig_pos+9;
-  if (           $y < 7 ) $adj_tiles[$i++] = $fig_pos+8;
-  if ( $x > 0 && $y < 7 ) $adj_tiles[$i++] = $fig_pos+7;
-  if ( $x > 0           ) $adj_tiles[$i++] = $fig_pos-1;
+  if ( $x > 0 && $y > 0 ) {
+  	$adj_tiles[$i++] = $fig_pos-9;
+  }
+  if (           $y > 0 ) {
+  	$adj_tiles[$i++] = $fig_pos-8;
+  }
+  if ( $x < 7 && $y > 0 ) {
+  	$adj_tiles[$i++] = $fig_pos-7;
+  }
+  if ( $x < 7           ) {
+  	$adj_tiles[$i++] = $fig_pos+1;
+  }
+  if ( $x < 7 && $y < 7 ) {
+  	$adj_tiles[$i++] = $fig_pos+9;
+  }
+  if (           $y < 7 ) {
+  	$adj_tiles[$i++] = $fig_pos+8;
+  }
+  if ( $x > 0 && $y < 7 ) {
+  	$adj_tiles[$i++] = $fig_pos+7;
+  }
+  if ( $x > 0           ) {
+  	$adj_tiles[$i++] = $fig_pos-1;
+  }
 
   /* DEBUG:  foreach( $adj_tiles as $tile )
     echo "adj: $tile "; */