Allow AdminLock for normal moderators and remove the ability to use t…

…he vote buttons during an admin lock.

admin/adminActionsRestrictedVDip.php

@@ -48,11 +48,6 @@ public function __construct()
 				'description' => 'Set the orderstatus of all countries to "Ready".',
 				'params' => array('gameID'=>'GameID')
 			),
-			'toggleAdminLock' => array(
-				'name' => 'Lock/unlock a game.',
-				'description' => 'Lock (or unlock) a game to prevent users to enter orders.',
-				'params' => array('gameID'=>'GameID')
-			),
 			'delVariantGameCache' => array(
 				'name' => 'Clear cache of a given variant.',
 				'description' => 'Clear all cache files of all games from a given variant.',
@@ -121,16 +116,6 @@ public function clearAdvancedAccessLogs(array $params)
 		return 'Old advanced access logs cleared; '.$i.' records deleted.';
 	}
 
-	public function toggleAdminLock(array $params)
-	{
-		global $DB;
-		$gameID = (int)$params['gameID'];
-		list($status)=$DB->sql_row("SELECT adminLock FROM wD_Games WHERE id = ".$gameID);		
-		$DB->sql_put("UPDATE wD_Games SET adminLock = '".($status == 'Yes' ? 'No' : 'Yes')."' WHERE id = ".$gameID);		
-
-		return 'This game is now '.( $status == 'No' ? 'locked' : 'unlocked').'.';
-	}
-
 	public function RowAsString(array $row)
 	{
 		global $DB;

admin/adminActionsVDip.php

@@ -34,6 +34,11 @@ public function __construct()
 				'description' => 'How many days should the curent phase extend?',
 				'params' => array('gameID'=>'Game ID', 'extend'=>'Days to extend')
 			),
+			'toggleAdminLock' => array(
+				'name' => 'Lock/unlock a game.',
+				'description' => 'Lock (or unlock) a game to prevent users to enter orders.',
+				'params' => array('gameID'=>'GameID')
+			),
 		);
 
 		adminActions::$actions = array_merge(adminActions::$actions, $vDipActions);
@@ -136,6 +141,17 @@ public function changeGameReq(array $params)
 
 		return 'This games reliability requirements was changed to: minRating = '.$minRating.', minPhases = '.$minPhases;
 	}
+
+	public function toggleAdminLock(array $params)
+	{
+		global $DB;
+		$gameID = (int)$params['gameID'];
+		list($status)=$DB->sql_row("SELECT adminLock FROM wD_Games WHERE id = ".$gameID);
+		$DB->sql_put("UPDATE wD_Games SET adminLock = '".($status == 'Yes' ? 'No' : 'Yes')."' WHERE id = ".$gameID);		
+
+		return 'This game is now '.( $status == 'No' ? 'locked' : 'unlocked').'.';
+	}
+
 
 }
 ?>

board.php

@@ -266,7 +266,7 @@
 		}
 		else
 		{
-			$Orders = '<div id="orderDiv'.$Member->id.'">Game is currently locked by an admin (usually to fix some errors).</div>';
+			$Orders = '<div align="center" id="orderDiv'.$Member->id.'">Game is currently locked by an admin (usually to fix some errors).</div>';
 		}
 	}
 }

board/member.php

@@ -108,7 +108,9 @@ protected function setBackFromLeft()
 	public function toggleVote($voteName)
 	{
 		global $DB;
-
+
+		if ($this->Game->adminLock == 'Yes') return;
+
 		$voteText = $voteName;
 
 		// Unpause is stored as Pause in the database

gamepanel/gameboard.php

@@ -155,6 +155,9 @@ function votes()
 			!isset($this->Members->ByUserID[$User->id]) )
 			return '';
 
+		if ($this->adminLock == 'Yes')
+			return '';
+
 		$vAllowed = Members::$votes;
 		$vSet = $this->Members->ByUserID[$User->id]->votes;
 		$vPassed = $this->Members->votesPassed();
@@ -180,7 +183,7 @@ function votes()
 			</td>
 			</tr>
 			</table>';
-
+		
 		return $buf . '</div>';
 	}