fix: work on very basic PHP remediation

scripts/game/admin/beta5/library.inc

@@ -3,7 +3,7 @@
 class admin_beta5_library {
 	var $index	= array();
 
-	function admin_beta5_library($lib) {
+	function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->msgs	= $this->lib->game->getLib('beta5/msg');

scripts/game/beta5/actions.inc

@@ -30,7 +30,7 @@ class actions_beta5 {
 	var	$ePower = array();
 
 
-	function actions_beta5($game) {
+	public function __construct($game) {
 		$this->game	= $game;
 		$this->lib	= $game->getLib();
 		$this->alliance	= $game->getLib('beta5/alliance');

scripts/game/beta5/alliance/library.inc

@@ -53,7 +53,7 @@ class beta5_alliance_library {
 	);
 
 
-	function beta5_alliance_library($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/acceptRequest.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_acceptRequest {
 
-	function beta5_alliance_acceptRequest($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->msgs	= $this->lib->game->getLib('beta5/msg');

scripts/game/beta5/alliance/library/addCandidate.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_addCandidate {
 
-	function beta5_alliance_addCandidate($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/cancelRequest.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_cancelRequest {
 
-	function beta5_alliance_cancelRequest($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/changeRank.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_changeRank {
 
-	function beta5_alliance_changeRank($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->game	= $this->lib->game;
 		$this->db	= $this->game->db;

scripts/game/beta5/alliance/library/create.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_create {
 
-	function beta5_alliance_create($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/createForum.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_createForum {
 
-	function beta5_alliance_createForum($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/createRank.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_createRank {
 
-	function beta5_alliance_createRank($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/deleteForum.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_deleteForum {
 
-	function beta5_alliance_deleteForum($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/deleteRank.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_deleteRank {
 
-	function beta5_alliance_deleteRank($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/get.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_get {
 
-	function beta5_alliance_get($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/getCandidates.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_getCandidates {
 
-	function beta5_alliance_getCandidates($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/getForums.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_getForums {
 
-	function beta5_alliance_getForums($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/getForumsComplete.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_getForumsComplete {
 
-	function beta5_alliance_getForumsComplete($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->players	= $this->lib->game->getLib('beta5/player');

scripts/game/beta5/alliance/library/getId.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_getId {
 
-	function beta5_alliance_getId($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/getKeepers.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_getKeepers {
 
-	function beta5_alliance_getKeepers($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/getMembers.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_getMembers {
 
-	function beta5_alliance_getMembers($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/getMilitary.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_getMilitary {
 
-	function beta5_alliance_getMilitary($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/getPlanets.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_getPlanets {
 
-	function beta5_alliance_getPlanets($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->planets	= $this->lib->game->getLib('beta5/planet');

scripts/game/beta5/alliance/library/getPrivileges.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_getPrivileges {
 
-	function beta5_alliance_getPrivileges($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->players	= $this->lib->game->getLib('beta5/player');

scripts/game/beta5/alliance/library/getRankPrivileges.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_getRankPrivileges {
 
-	function beta5_alliance_getRankPrivileges($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/getRankSize.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_getRankSize {
 
-	function beta5_alliance_getRankSize($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/alliance/library/getRanks.inc

@@ -2,7 +2,7 @@
 
 class beta5_alliance_getRanks {
 
-	function beta5_alliance_getRanks($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/fleet/library.inc

@@ -23,7 +23,7 @@ class beta5_fleet_library {
 	);
 
 
-	function beta5_fleet_library($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/fleet/library/getPower.inc

@@ -3,7 +3,7 @@
 class beta5_fleet_getPower {
 	var $ePower	= array();
 
-	function beta5_fleet_getPower($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->rules	= $this->lib->game->getLib('beta5/rules');

scripts/game/beta5/library.inc

@@ -17,7 +17,7 @@ class beta5_library {
 		'updateRankings'
 	);
 
-	function beta5_library($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/library/getPlayerCount.inc

@@ -2,7 +2,7 @@
 
 class beta5_getPlayerCount {
 
-	function beta5_getPlayerCount($lib) {
+	function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/library/getPlayerStatus.inc

@@ -2,7 +2,7 @@
 
 class beta5_getPlayerStatus {
 
-	function beta5_getPlayerStatus($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/library/register.inc

@@ -2,7 +2,7 @@
 
 class beta5_register {
 
-	function beta5_register($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/planet/library.inc

@@ -22,7 +22,7 @@ class beta5_planet_library {
 	);
 
 
-	function beta5_planet_library($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->game	= $this->lib->game;
 		$this->db	= $this->game->db;

scripts/game/beta5/planet/library/updateHappiness.inc

@@ -3,7 +3,7 @@
 class beta5_planet_updateHappiness {
 	var $avgFPower = null;
 
-	function beta5_planet_updateHappiness($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->players	= $this->lib->game->getLib('beta5/player');

scripts/game/beta5/planet/library/updateMaxPopulation.inc

@@ -3,7 +3,7 @@
 class beta5_planet_updateMaxPopulation {
 	var $maxPops = array();
 
-	function beta5_planet_updateMaxPopulation($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->rules	= $this->lib->game->getLib('beta5/rules');

scripts/game/beta5/player/library/assign.inc

@@ -2,7 +2,7 @@
 
 class beta5_player_assign {
 
-	function beta5_player_assign($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->game	= $this->lib->game;
 		$this->db	= $this->game->db;

scripts/game/beta5/player/library/getPlanetCount.inc

@@ -3,7 +3,7 @@
 class beta5_player_getPlanetCount {
 	var $pPlanets = array();
 
-	function beta5_player_getPlanetCount($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/player/library/getPower.inc

@@ -3,7 +3,7 @@
 class beta5_player_getPower {
 	var $pFleets = array();
 
-	function beta5_player_getPower($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->fleets	= $this->lib->game->getLib('beta5/fleet');

scripts/game/beta5/rules/library.inc

@@ -7,7 +7,7 @@ class beta5_rules_library {
 	);
 
 
-	function beta5_rules_library($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->planets	= $this->lib->game->getLib('beta5/planet');

scripts/game/beta5/rules/library/get.inc

@@ -1,7 +1,8 @@
 <?php
 
 class beta5_rules_get {
-	function beta5_rules_get($lib) {
+
+	function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/beta5/ticks/universe/library.inc

@@ -24,6 +24,7 @@ class beta5_ticks_universe_library {
 		// Run a special version of the tick if we are using a CTF map
 		$map = (int) $this->game->params['usemap'];
 		if ($map > 0) {
+            l::debug("handling CTF map");
 			$this->handleCTFMap($map);
 			return;
 		}
@@ -40,6 +41,7 @@ class beta5_ticks_universe_library {
 		if ($this->maxSystems) {
 			$ns = $this->getAllSystems();
 			if ($ns >= $this->maxSystems) {
+                l::debug("max system count reached");
 				return;
 			}
 		}
@@ -47,7 +49,8 @@ class beta5_ticks_universe_library {
 		// Get the amount of free systems
 		$this->reassignEmpty();
 		$ns = $this->getFreeSystems();
-		if ($ns >= $this->minSystems) {
+		if (!is_null($this->minSystems) && $ns >= $this->minSystems) {
+            l::debug("$ns systems are available, exiting");
 			return;
 		}
 

scripts/game/main/account/library.inc

@@ -15,7 +15,7 @@ class main_account_library {
 		'terminate'
 	);
 
-	function main_account_library($lib) {
+	function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/account/library/createAccount.inc

@@ -2,7 +2,7 @@
 
 class main_account_createAccount {
 
-	function main_account_createAccount($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/account/library/getKickList.inc

@@ -2,7 +2,7 @@
 
 class main_account_getKickList {
 
-	function main_account_getKickList($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/account/library/getLanguage.inc

@@ -2,7 +2,7 @@
 
 class main_account_getLanguage {
 
-	function main_account_getLanguage($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/account/library/getQuitCountdown.inc

@@ -2,7 +2,7 @@
 
 class main_account_getQuitCountdown {
 
-	function main_account_getQuitCountdown($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/account/library/log.inc

@@ -16,7 +16,7 @@
 
 class main_account_log {
 
-	function main_account_log($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/account/library/requestKick.inc

@@ -2,7 +2,7 @@
 
 class main_account_requestKick {
 
-	function main_account_requestKick($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/account/library/setQuitCountdown.inc

@@ -2,7 +2,7 @@
 
 class main_account_setQuitCountdown {
 
-	function main_account_setQuitCountdown($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/account/library/terminate.inc

@@ -2,7 +2,7 @@
 
 class main_account_terminate {
 
-	function main_account_terminate($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/actions.inc

@@ -11,7 +11,7 @@ class actions_main {
 	);
 
 
-	function actions_main($game) {
+	function __construct($game) {
 		$this->game = $game;
 		$this->main = $this->game->getLib('main');
 		$this->accounts = $this->game->getLib('main/account');

scripts/game/main/actions/joinGame.inc

@@ -49,7 +49,7 @@
  */
 class main_joinGame {
 
-	function main_joinGame($main) {
+	public function __construct($main) {
 		$this->main	= $main;
 		$this->lib	= $this->main->getLib();
 	}

scripts/game/main/actions/lostPassword.inc

@@ -10,7 +10,7 @@
  */
 class main_lostPassword {
 
-	function main_lostPassword($main) {
+	public function __construct($main) {
 		$this->main	= $main;
 		$this->db	= $this->main->db;
 		$this->lib	= $this->main->getLib();

scripts/game/main/library.inc

@@ -11,7 +11,7 @@ class main_library {
 	);
 
 
-	function main_library($lib) {
+	function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/library/getTick.inc

@@ -2,7 +2,7 @@
 
 class main_getTick {
 
-	function main_getTick($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/library/getTicks.inc

@@ -2,7 +2,7 @@
 
 class main_getTicks {
 
-	function main_getTicks($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/library/isGameRunning.inc

@@ -2,7 +2,7 @@
 
 class main_isGameRunning {
 
-	function main_isGameRunning($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 	}
 

scripts/game/main/library/requestGenPlanets.inc

@@ -2,7 +2,7 @@
 
 class main_requestGenPlanets {
 
-	function main_requestGenPlanets($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/library/sendMail.inc

@@ -2,7 +2,7 @@
 
 class main_sendMail {
 
-	function main_sendMail($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/manual/library/getNavLinks.inc

@@ -2,7 +2,7 @@
 
 class main_manual_getNavLinks {
 
-	function main_manual_getNavLinks($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/manual/library/getPageId.inc

@@ -2,7 +2,7 @@
 
 class main_manual_getPageId {
 
-	function main_manual_getPageId($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/manual/library/getSectionsIn.inc

@@ -2,7 +2,7 @@
 
 class main_manual_getSectionsIn {
 
-	function main_manual_getSectionsIn($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/manual/library/getStructure.inc

@@ -2,7 +2,7 @@
 
 class main_manual_getStructure {
 
-	function main_manual_getStructure($lib) {
+	function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->version	= $this->lib->mainClass->version;

scripts/game/main/manual/library/readXMLFile.inc

@@ -2,7 +2,7 @@
 
 class main_manual_readXMLFile {
 
-	function main_manual_readXMLFile($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/manual/library/search.inc

@@ -2,7 +2,7 @@
 
 class main_manual_search {
 
-	function main_manual_search($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/manual/library/updateSections.inc

@@ -2,7 +2,7 @@
 
 class main_manual_updateSections {
 
-	function main_manual_updateSections($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/rankings/library.inc

@@ -8,7 +8,7 @@ class main_rankings_library {
 		'update'
 	);
 
-	function main_rankings_library($lib) {
+	function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/rankings/library/append.inc

@@ -2,7 +2,7 @@
 
 class main_rankings_append {
 
-	function main_rankings_append($lib) {
+	function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/rankings/library/delete.inc

@@ -2,7 +2,7 @@
 
 class main_rankings_delete {
 
-	function main_rankings_delete($lib) {
+	function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/rankings/library/getAll.inc

@@ -2,7 +2,7 @@
 
 class main_rankings_getAll {
 
-	function main_rankings_getAll($lib) {
+	function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/rankings/library/update.inc

@@ -2,7 +2,7 @@
 
 class main_rankings_update {
 
-	function main_rankings_update($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/ticks/day/library.inc

@@ -9,7 +9,7 @@
 
 class main_ticks_day_library {
 
-	function main_ticks_day_library($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->main	= $this->lib->game->getLib();

scripts/game/main/vacation/library.inc

@@ -7,7 +7,7 @@ class main_vacation_library {
 		'leave'
 	);
 
-	function main_vacation_library($lib) {
+	function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/vacation/library/canSet.inc

@@ -2,7 +2,7 @@
 
 class main_vacation_canSet {
 
-	function main_vacation_canSet($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 	}

scripts/game/main/vacation/library/leave.inc

@@ -2,7 +2,7 @@
 
 class main_vacation_leave {
 
-	function main_vacation_leave($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->accounts	=& $this->lib->game->getLib('main/account');

scripts/game/main/vacation/library/start.inc

@@ -2,7 +2,7 @@
 
 class main_vacation_start {
 
-	function main_vacation_start($lib) {
+	public function __construct($lib) {
 		$this->lib	= $lib;
 		$this->db	= $this->lib->game->db;
 		$this->accounts	= $this->lib->game->getLib('main/account');